From 6f0f420063e9dddcd1bfea6828c04f741d0e004c Mon Sep 17 00:00:00 2001
From: Xrystal <xrystal@protonmail.com>
Date: Sat, 21 Oct 2023 18:55:52 +0800
Subject: [PATCH] Promisify getallchatsofcharacter

---
 server.js | 69 +++++++++++++++++++++++++++++++------------------------
 1 file changed, 39 insertions(+), 30 deletions(-)

diff --git a/server.js b/server.js
index 03cd45014..542359c37 100644
--- a/server.js
+++ b/server.js
@@ -1829,7 +1829,7 @@ app.post("/getallchatsofcharacter", jsonParser, function (request, response) {
     if (!request.body) return response.sendStatus(400);
 
     var char_dir = (request.body.avatar_url).replace('.png', '')
-    fs.readdir(chatsPath + char_dir, (err, files) => {
+    fs.readdir(chatsPath + char_dir, async (err, files) => {
         if (err) {
             console.log('found error in history loading');
             console.error(err);
@@ -1843,20 +1843,20 @@ app.post("/getallchatsofcharacter", jsonParser, function (request, response) {
         // sort the files by name
         //jsonFiles.sort().reverse();
         // print the sorted file names
-        var chatData = {};
-        let ii = jsonFiles.length;	//this is the number of files belonging to the character
-        if (ii !== 0) {
-            //console.log('found '+ii+' chat logs to load');
-            for (let i = jsonFiles.length - 1; i >= 0; i--) {
-                const file = jsonFiles[i];
+        let ii = jsonFiles.length; //this is the number of files belonging to the character
+        if (ii === 0) {
+            response.send({ error: true });
+            return;
+        }
+
+        const jsonFilesPromise = jsonFiles.map((file) => {
+            return new Promise(async (res) => {
                 const fileStream = fs.createReadStream(chatsPath + char_dir + '/' + file);
 
                 const fullPathAndFile = chatsPath + char_dir + '/' + file
                 const stats = fs.statSync(fullPathAndFile);
                 const fileSizeInKB = (stats.size / 1024).toFixed(2) + "kb";
 
-                //console.log(fileSizeInKB);
-
                 const rl = readline.createInterface({
                     input: fileStream,
                     crlfDelay: Infinity
@@ -1869,33 +1869,42 @@ app.post("/getallchatsofcharacter", jsonParser, function (request, response) {
                     lastLine = line;
                 });
                 rl.on('close', () => {
-                    ii--;
-                    if (lastLine) {
+                    rl.close();
 
+                    if (lastLine) {
                         let jsonData = tryParse(lastLine);
-                        if (jsonData && (jsonData.name !== undefined || jsonData.character_name !== undefined)) {
-                            chatData[i] = {};
-                            chatData[i]['file_name'] = file;
-                            chatData[i]['file_size'] = fileSizeInKB;
-                            chatData[i]['chat_items'] = itemCounter - 1;
-                            chatData[i]['mes'] = jsonData['mes'] || '[The chat is empty]';
-                            chatData[i]['last_mes'] = jsonData['send_date'] || Date.now();
+                        if (
+                            jsonData &&
+                            (jsonData.name !== undefined ||
+                                jsonData.character_name !== undefined)
+                        ) {
+                            const chatData = {};
+
+                            chatData['file_name'] = file;
+                            chatData['file_size'] = fileSizeInKB;
+                            chatData['chat_items'] = itemCounter - 1;
+                            chatData['mes'] =
+                                jsonData['mes'] || '[The chat is empty]';
+                            chatData['last_mes'] =
+                                jsonData['send_date'] || Date.now();
+
+                            res(chatData);
                         } else {
-                            console.log('Found an invalid or corrupted chat file: ' + fullPathAndFile);
+                            console.log(
+                                'Found an invalid or corrupted chat file: ' +
+                                    fullPathAndFile
+                            );
+
+                            res({});
                         }
                     }
-                    if (ii === 0) {
-                        //console.log('ii count went to zero, responding with chatData');
-                        response.send(chatData);
-                    }
-                    //console.log('successfully closing getallchatsofcharacter');
-                    rl.close();
                 });
-            };
-        } else {
-            //console.log('Found No Chats. Exiting Load Routine.');
-            response.send({ error: true });
-        };
+            });
+        });
+
+        const chatData = await Promise.all(jsonFilesPromise);
+
+        response.send(chatData);
     })
 });