jsir 2.6.13 → 3.0.0

package/deps/server.js

@@ -1,6 +1,5 @@
 const http = require('http');
-const {createConsole, vl, aesDecipher, md5, aesCipher, debugStr, isError} = require('./util');
-const console = createConsole();
+const {vl, aesDecipher, md5, aesCipher, isError, roomConsole: console} = require('./util');
 const setting = require('../deps/setting')
 // 尝试监听的端口
 const preferredPort = setting.defaultPort;
@@ -8,12 +7,6 @@ const preferredPort = setting.defaultPort;
 const routes = setting.routes;
 let invokeStart = false;
 
-function debug(...args) {
-    if (global.$DEBUG) {
-        console.$log(debugStr('[debug]'), ...args);
-    }
-}
-
 function verifySign(sign) {
     try {
         let key = md5(Object.keys(setting.nodeMap).sort().join(":")).substring(0, 16);
@@ -103,18 +96,18 @@ async function createServer(port) {
         try {
             await process(routeKey, req, res, params);
         } finally {
-            debug(`Process cost ${Date.now() - time}ms for ${routeKey} from ${clientIp}`);
+            console.$debug(`Process cost ${Date.now() - time}ms for ${routeKey} from ${clientIp}`);
         }
     });
 
     return await new Promise((resolve, reject) => {
         server.listen(port, () => {
             const address = server.address();
-            debug(`Server listening on port ${address.port}`);
+            console.$debug(`Server listening on port ${address.port}`);
             resolve(server)
         });
         server.on('error', (err) => {
-            debug(`Error occurred: ${err.message}`);
+            console.$debug(`Error occurred: ${err.message}`);
             reject(err)
         });
     })
@@ -127,7 +120,7 @@ async function startServer() {
         try {
             setting.server = await createServer(preferredPort);
         } catch (e) {
-            debug("startServer failed, try other port")
+            console.$debug("startServer failed, try other port")
             setting.server = await createServer(0);
         }
     }
@@ -156,7 +149,7 @@ function setRoute(method, url, fn, isApi = false, handler = jsonHandle) {
             isApi
         };
     }
-    debug(`setRoute: ${method.toUpperCase()} ${url} ${handler ? handler.name:''}`);
+    console.$debug(`setRoute: ${method.toUpperCase()} ${url} ${handler ? handler.name:''}`);
     return setting.server;
 }
 

package/deps/setting.js

@@ -49,5 +49,8 @@ module.exports = {
     lastChangeFlag: null,
     terminalTitle: null,
     promptId: Date.now(),
-    newError: false
+    newError: false,
+    fnCache: {},
+    syncQueues: {},
+    tipsOnRm: {}
 }