fixed async promise Executor in iapi

Blorum · Sep 22, 2022 · 52ba94e · 52ba94e
1 parent 25af2a4
commit 52ba94e
Show file tree

Hide file tree

Showing 5 changed files with 2,348 additions and 59 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -0,0 +1,15 @@
+{
+    "env": {
+        "browser": true,
+        "es2021": true
+    },
+    "extends": "eslint:recommended",
+    "overrides": [
+    ],
+    "parserOptions": {
+        "ecmaVersion": "latest",
+        "sourceType": "module"
+    },
+    "rules": {
+    }
+}
diff --git a/modules/iapi.mjs b/modules/iapi.mjs
@@ -90,42 +90,51 @@ class IAPI {
         });
     }
     getValidUserSession(uid){
-        return new Promise(async (resolve, reject) => {
-            try {
-                let currentSessions = await this.getUserSession(uid);
+        return new Promise((resolve, reject) => {
+            this.getUserSession(uid).then((currentSessions) => {
                 if(currentSessions.length > 0){
-                    let userRoles = await this.getUserRoles(uid);
-                    let rolePermList = [];
-                    let promisePool = [];
-                    for(const role of userRoles){
-                        promisePool.push(this.getRolePermissions(role));
-                    }
-                    Promise.allSettled(promisePool).then((results) => {
-                        rolePermList = results;
-                    });
-                    let permissionSum = getPermissionSum(rolePermList);
-                    let removedSessionsCount = await this.removeExpiredSessions(uid, permissionSum.permissions.cookie_expire_after, currentSessions);
-                    let finalSessions = await this.getUserSession(uid);
-                    if(finalSessions.length > 0){
-                        resolve({
-                            "sessions": finalSessions,
-                            "permissions": permissionSum,
-                            "roles": userRoles,
-                            "removed_sessions": removedSessionsCount
+                    this.getUserRoles(uid).then((userRoles) => {
+                        let rolePermList = [];
+                        let promisePool = [];
+                        for(const role of userRoles){
+                            promisePool.push(this.getRolePermissions(role));
+                        }
+                        Promise.allSettled(promisePool).then((results) => {
+                            rolePermList = results;
                         });
-                    }else{
-                        resolve({
-                            "sessions": []
+                        let permissionSum = getPermissionSum(rolePermList);
+                        this.removeExpiredSessions(uid, permissionSum.permissions.cookie_expire_after, currentSessions).then((removedSessions) => {
+                            this.getUserSession(uid).then((finalSessions) => {
+                                if(finalSessions.length > 0){
+                                    resolve({
+                                        "sessions": finalSessions,
+                                        "permissions": permissionSum,
+                                        "roles": userRoles,
+                                        "removed_sessions": removedSessions
+                                    });
+                                }else{
+                                    resolve({
+                                        "sessions": []
+                                    });
+                                }
+                            }).catch((err) => {
+                                reject(err);
+                            });
+                        }).catch((err) => {
+                            reject(err);
                         });
-                    }
+                    }).catch((err) => {
+                        reject(err);
+                    });
                 }else{
                     resolve({
                         "sessions": []
                     });
                 }
-            } catch (error) {
-                reject(error);
-            }
+            }).catch((err) => {
+                this.log("debug", "IAPI", "Failed to get valid user session: " + err);
+                reject(err);
+            });
         });
     }
     getRolePermissions(role){
@@ -187,41 +196,43 @@ class IAPI {
         });
     }
     getUserPermissions(uid){
-        return new Promise(async (resolve, reject) => {
-            let userRoles = await this.getUserRoles(uid);
-            if(userRoles == null){
-                reject("User not found in database.");
-            }else if(typeof userRoles === "object" && userRoles[0] == ""){
-                reject("User has no roles.");
-            }else{
-                let promisePool = [];
-                for(const element of userRoles){
-                    promisePool.push(new Promise((resolve, reject) => {
-                        this.getRolePermissions(element).then((results) => {
-                            resolve(results);
-                        }).catch((err) => {
-                            reject(err);
-                        });
-                    }));
+        return new Promise((resolve, reject) => {
+            this.getUserRoles(uid).then((userRoles) => {
+                if(userRoles == null){
+                    reject("User not found in database.");
+                }else if(typeof userRoles === "object" && userRoles[0] == ""){
+                    reject("User has no roles.");
+                }else{
+                    let promisePool = [];
+                    for(const element of userRoles){
+                        promisePool.push(new Promise((resolve, reject) => {
+                            this.getRolePermissions(element).then((results) => {
+                                resolve(results);
+                            }).catch((err) => {
+                                reject(err);
+                            });
+                        }));
+                    }
+                    Promise.allSettled(promisePool).then((results) => {
+                        let permissions = getPermissionSum(results);
+                        resolve(permissions);
+                    }).catch((err) => {
+                        reject(err);
+                    });
                 }
-                Promise.allSettled(promisePool).then((results) => {
-                    let permissions = getPermissionSum(results);
-                    resolve(permissions);
-                }).catch((err) => {
-                    reject(err);
-                });
-            }
+            }).catch((err) => {
+                reject(err);
+            });
         });
     }
     //Actual service functions
     userLogin(ip, ua, username, password) {
         //Assume that user don't have login status, don't use session_check middleware optimization.
-        return new Promise(async (resolve, reject) => {
+        return new Promise((resolve, reject) => {
             password = blake3Hash(this.salt + password);
             this.mysql.query(
                 "SELECT uid,password,roles FROM users WHERE username = ?",
-                [username],
-                async (err, results) => {
+                [username], (err, results) => {
                     if (err) {
                         this.log("debug", "IAPI", "Failed to query database");
                         reject(err);

diff --git a/modules/init.mjs b/modules/init.mjs
@@ -19,10 +19,9 @@ function initializeBlorumServer() {
         if (err) throw err;
     }));
     var log = function (level, context, info) {
+        var output = outputLogs;
         if (bootConfig.logs.colored) {
-            var output = outputLogsColored;
-        } else {
-            var output = outputLogs;
+            output = outputLogsColored;
         }
         if (bootConfig.logs.level === "debug") {
             output(level, context, info);