jsir 2.6.0 → 2.6.2

package/cmd/oaa.js

@@ -645,11 +645,7 @@ async function _wrapperInput(str) {
             } else if (firstName === setting.exeKey) {
                 await runCmd(str)
             } else if (firstName === setting.initKey) {
-                if (strs[1] === '-') {
-                    await offServer(uniqueName)
-                } else {
-                    await joinServer(uniqueName, strs[1] === '+')
-                }
+                await runInit(uniqueName, strs[1])
             } else {
                 console.log(String(fs.readFileSync(path)));
             }
@@ -659,6 +655,14 @@ async function _wrapperInput(str) {
     }
 }
 
+async function runInit(uniqueName, arg) {
+    if (arg === '-') {
+        await offServer(uniqueName)
+    } else {
+        await joinServer(uniqueName, arg === '+')
+    }
+}
+
 async function joinServer(uniqueName, isApi) {
     Room.onRoom();
     if (!setting.serviceReg.test(uniqueName)) {
@@ -1444,7 +1448,7 @@ const keywordDef = {
                 } else {
                     let typeKey = getJsirTypeKey(parseUniqueName(cmds[0])[1]);
                     if (setting.initKey === typeKey) {
-                        await joinServer(cmds[0])
+                        await runInit(cmds[0], args[1])
                     } else if (setting.exeKey === typeKey) {
                         await runScript(cmds[0], args.slice(1))
                     }
@@ -1601,7 +1605,15 @@ function getQuickRunCmds(input, matchStr) {
     } else if (input.startsWith("/")) {
         matchStr = '/' + matchStr;
     }
-    return filterCmd(matchStr).filter(i => [setting.exeKey, setting.initKey].includes(getJsirTypeKey(parseUniqueName(i)[1])))
+    return filterCmd(matchStr).filter(i => {
+        let types
+        if (setting.serviceReg.test(i)) {
+            types = [setting.exeKey, setting.initKey];
+        } else {
+            types = [setting.exeKey]
+        }
+        return types.includes(getJsirTypeKey(parseUniqueName(i)[1]))
+    })
 }
 
 async function preLoad(text, fnNameMatch, fn, packages = [], space) {

package/deps/room.js

@@ -301,6 +301,9 @@ async function processTasks() {
                 if (key.indexOf("*") !== -1 && setting.defaultPort !== setting.selfJsir.port) {
                     continue;
                 }
+                if (key.indexOf("*") === -1 && setting.defaultPort === setting.selfJsir.port) {
+                    continue;
+                }
                 unHandleKey = key
                 break;
             }
@@ -326,6 +329,9 @@ async function initRoom() {
             roomUpdateTouchTime = true;
         }
     })
+    if (defTasks) {
+        fileLock(roomTasksLockKey, processTasks, false)
+    }
 
     if (roomUpdateTouchTime) {
         await fileLock(updateRoomInfoLockKey, updateRoomInfo, false)
@@ -333,9 +339,6 @@ async function initRoom() {
         if (setting.serviceFns[setting.configMainFnKey] && !getConfig("configMain")) {
             fileLock(syncConfigsLockKey, syncConfigs, false);
         }
-        if (defTasks) {
-            fileLock(roomTasksLockKey, processTasks, false)
-        }
     }
 
     await syncSetting();

package/deps/server.js

@@ -7,7 +7,6 @@ const preferredPort = setting.defaultPort;
 // 路由存储
 const routes = setting.routes;
 let invokeStart = false;
-const apiReg = /[^a-zA-Z]api[^a-zA-Z]|[^a-zA-Z]api$/i;
 
 function debug(...args) {
     if (global.$DEBUG) {
@@ -143,9 +142,6 @@ async function startServer() {
  */
 function setRoute(method, url, fn, isApi = false, handler = jsonHandle) {
     startServer();
-    if (apiReg.test(url)) {
-        isApi = true;
-    }
     const routeKey = `${method.toLowerCase()} ${url}`;
     if (handler) {
         routes[routeKey] = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jsir",
-  "version": "2.6.0",
+  "version": "2.6.2",
   "description": "JavaScript Script Management Tool",
   "main": "index.js",
   "scripts": {