create IAPI instance at main, finished scheduled scaffolding

Blorum · Oct 25, 2022 · 8fe83cf · 8fe83cf
1 parent 4cb887b
commit 8fe83cf
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 15 deletions.
diff --git a/main.cjs b/main.cjs
@@ -28,12 +28,22 @@ async function wrapper() {
         console.log("[WRAPPER] Starting Blorum Server (" + utils.version + ")...");
         const initializeBlorumServer = (await import("./modules/init.mjs")).initializeBlorumServer;
         const initializeRouter = (await import("./modules/router.mjs")).default;
-        const extensionList = (await import("./modules/extension.mjs")).extensionList;
-
+        //const extensionList = (await import("./modules/extension.mjs")).getExtensionsList;  
         const prerequisite = initializeBlorumServer();
-        prerequisite.then(function (results) {
+        prerequisite.then(async (results) => {
+            scheduleDaemon = results.scheduleDaemon;
+            scheduleDaemon.on('message', (message) => {
+                switch (message.action) {
+                    case "log":
+                        results.log(message.level, "ScheduleD", message.info);
+                        break;
+                }
+            });
+
+            const IAPI = (await import("./modules/iapi.mjs")).IAPI;
+            const iapi = new IAPI(results.mysql, results.redis, results.siteConfig, results.log, results.bootConfig.security.digest_salt, results.bootConfig.database.redis.prefix);
             results.log("log", "Main", "Blorum pre-initialization finished.");
-            let router = initializeRouter(results.mysql, results.redis, results.siteConfig, results.log, results.bootConfig.security.digest_salt, results.bootConfig.database.redis.prefix);
+            let router = initializeRouter(iapi, results.mysql, results.redis, results.siteConfig, results.log);
             if (results.bootConfig.port <= 1000 && results.bootConfig.port != 0) {
                 results.log("warn", "Main", "Port might cause conflict.");
                 results.log("warn", "Main", "If you are under *Unix system, this require privilege.");

diff --git a/modules/init.mjs b/modules/init.mjs
@@ -112,8 +112,6 @@ function initializeBlorumServer() {
                                                 "scheduleDaemon": scheduleDaemon
                                             });
                                             break;
-                                        case "log":
-                                            log(message.level, "ScheduleD", message.info);
                                     }
                                 });
                                 scheduleDaemon.on('exit', (code, signal) => {

diff --git a/modules/router.mjs b/modules/router.mjs
@@ -4,7 +4,6 @@ JSON.parse = parse.parse;
 
 import { default as express } from "express";
 import { version, innerVersion, isAllString, strNotOnlyNumber, objHasAllProperties} from "./utils.mjs";
-import { IAPI } from "./iapi.mjs";
 import { default as fs } from "fs";
 import { fileURLToPath } from "url";
 import { join } from "path";
@@ -26,7 +25,7 @@ function rejectForLoginStatusDecorator(func){
 }
 
 
-function initializeRouter(mysqlConnection, redisConnection, siteConfig, log, salt, redisPrefix){
+function initializeRouter(iapi, mysqlConnection, redisConnection, siteConfig, log){
     let getReqInfo = function(req){
         let ip = null;
         let ua = null;
@@ -59,8 +58,6 @@ function initializeRouter(mysqlConnection, redisConnection, siteConfig, log, sal
         }
     };
 
-    const iapi = new IAPI(mysqlConnection, redisConnection, siteConfig, log, salt, redisPrefix);
-
     let blorumRouter = express();
     let commonHeader = {
         "X-Powered-By": "Blorum",
@@ -463,9 +460,9 @@ function initializeRouter(mysqlConnection, redisConnection, siteConfig, log, sal
     return blorumRouter;
 }
 
-export default function(mysqlConnection, redisConnection, siteConfig, log, salt, redisPrefix){
+export default function(iapi, mysqlConnection, redisConnection, siteConfig, log){
     try {
-        let router = initializeRouter(mysqlConnection, redisConnection, siteConfig, log, salt, redisPrefix);
+        let router = initializeRouter(iapi, mysqlConnection, redisConnection, siteConfig, log);
         log("log","Router","Router initialized.");
         return router;
     } catch (error) {

diff --git a/modules/scheduled.mjs b/modules/scheduled.mjs
@@ -24,9 +24,9 @@ function beforeInit(message){
 }
 
 function afterInit(message){
-    setInterval(function(){
-        log("log", "test heartbeat");
-    },1000);
+    switch(message.action){
+
+    }
 }
 
 var eventExecutor = beforeInit;