jsir 2.5.6 → 2.5.8

package/cmd/oaa.js

@@ -168,10 +168,13 @@ function checkWorkspaces() {
 }
 
 async function start() {
+    setting.wrapperInput = wrapperInput;
     interceptStdStreams()
     checkWorkspaces()
     initWorkspace()
 
+    await Room.syncSetting();
+
     lastFilterArg = getConfig("lastFilterArg");
     _cmdMap = objDataFile(_cmdMapFile);
     if (_args[0]) {
@@ -657,6 +660,10 @@ async function _wrapperInput(str) {
 }
 
 async function joinServer(uniqueName, isApi) {
+    Room.onRoom();
+    if (!setting.serviceReg.test(uniqueName)) {
+        throw 'invalid service name';
+    }
     let exportLib = await _requireSource(setting.defaultSpace, uniqueName, true);
     let asyncFnSize = 0
     for (let key of Object.keys(exportLib)) {
@@ -684,6 +691,9 @@ async function joinServer(uniqueName, isApi) {
 }
 
 async function offServer(uniqueName) {
+    if (!setting.serviceReg.test(uniqueName)) {
+        throw 'invalid service name';
+    }
     let pair = parseUniqueName(uniqueName)
     let service = `${pair[0]}/${trimJsirFileName(pair[1])}`;
 
@@ -714,7 +724,9 @@ async function dealStar(text) {
     if (_cmdMap.hasOwnProperty(items[0])) {
         rows.push(...await dealStarCmd([], _cmdMap[items[0]], items.slice(1).join(' ')))
     } else if (items[0].indexOf("/") !== -1) {
-        await dealStartGlobalMode(rows, items, text);
+        for (let cmd of filterCmd(items[0])) {
+            dealStarCmd(rows, cmd, items.slice(1).join(" "))
+        }
     } else {
         try {
             let result = await evalText(`return ${items[0]}`)
@@ -739,7 +751,7 @@ function dealStarGlobal(items, text) {
         prefix = trim(items[0].substring(0, index + 1))
         text = trim(text.substring(index + 1))
     }
-    for (let cmd of filterCmd(prefix + '^i ,')) {
+    for (let cmd of filterCmd(prefix + '^i[^a-zA-Z]')) {
         dealStarCmd(rows, cmd, text)
     }
     return rows;
@@ -1189,7 +1201,22 @@ const keywordDef = {
         comment: 'Global settings',
         exeFn: async (args) => {
             if (args[0]) {
-                if (_cmdMap[args[0]]){
+                let configMain = getConfig("configMain");
+                if ("+" === args[0]) {
+                    if (!configMain) {
+                        throw 'Not Allowed';
+                    }
+                    Server.setRoute("post", "/" + setting.configMainFnKey, async (req, res) => {
+                        res.result = await Room.localConfigs();
+                    })
+                    console.msg("config service online")
+                } else if ("-" === args[0]) {
+                    if (!configMain) {
+                        throw 'Not Allowed';
+                    }
+                    delete setting.routes['post /' + setting.configMainFnKey]
+                    console.msg("config service offline")
+                } else if (_cmdMap[args[0]]){
                     let uniqueName = _cmdMap[args[0]];
                     await eia(getEditor(), [`${getConfigDir()}/${md5(uniqueName)}.json`])
                 } else {
@@ -1415,7 +1442,12 @@ const keywordDef = {
                 if (justList) {
                     listCmd(arrayToCmdMap(cmds))
                 } else {
-                    await runScript(cmds[0], args.slice(1))
+                    let typeKey = getJsirTypeKey(parseUniqueName(cmds[0])[1]);
+                    if (setting.initKey === typeKey) {
+                        await joinServer(cmds[0])
+                    } else if (setting.exeKey === typeKey) {
+                        await runScript(cmds[0], args.slice(1))
+                    }
                 }
             } else {
                 console.warn(`require "${keyword}" not unique`)
@@ -1467,7 +1499,7 @@ const keywordDef = {
     log: {
         comment: 'View log (type[[lt][le]], index)',
         exeFn: async (args) => {
-            let path = `${getLibDataDir()}/log/room`
+            let path = `${getLibDataDir()}/log/jsir`
             let type = '';
             for (let arg of args) {
                 if (_cmdMap[arg]) {
@@ -1475,7 +1507,7 @@ const keywordDef = {
                     let fileName = pair[0] + '/' +  pair[1].split(".")[0]
                     path = `${getLibDataDir()}/log/${fileName}`
                 } else if (arg === '0') {
-                    path = `${getLibDataDir()}/log/jsir`
+                    path = `${getLibDataDir()}/log/room`
                 } else {
                     type = arg;
                 }
@@ -1569,7 +1601,7 @@ function getQuickRunCmds(input, matchStr) {
     } else if (input.startsWith("/")) {
         matchStr = '/' + matchStr;
     }
-    return filterCmd(matchStr).filter(i => getJsirTypeKey(parseUniqueName(i)[1]) === setting.exeKey)
+    return filterCmd(matchStr).filter(i => [setting.exeKey, setting.initKey].includes(getJsirTypeKey(parseUniqueName(i)[1])))
 }
 
 async function preLoad(text, fnNameMatch, fn, packages = [], space) {
@@ -2163,17 +2195,25 @@ async function _requireSource(currSpace, cmdMatchStr, force = false) {
     let typeKey = getJsirTypeKey(pair[1]);
     if (typeKey === setting.initKey) {
         let pair = parseUniqueName(uniqueName)
-        let serviceKey = `${pair[0]}/${trimJsirFileName(pair[1])}`
-        if (setting.defaultSpace !== 'local' && !force && setting.services[serviceKey]) {
-            let serviceObj = {};
-            for (let fn of setting.services[serviceKey]) {
-                serviceObj[fn] = async (...args) => {
-                    return await Room.reqFn(`${serviceKey}/${fn}`, args);
+        if (setting.defaultSpace === 'local' || force) {
+            result = await evalText(text, uniqueName)
+        } else {
+            if (setting.serviceReg.test(uniqueName)) {
+                let serviceKey = `${pair[0]}/${trimJsirFileName(pair[1])}`
+                if (setting.services[serviceKey]) {
+                    let serviceObj = {};
+                    for (let fn of setting.services[serviceKey]) {
+                        serviceObj[fn] = async (...args) => {
+                            return await Room.reqFn(`${serviceKey}/${fn}`, args);
+                        }
+                    }
+                    return serviceObj
+                } else {
+                    throw `service ${serviceKey} not found`;
                 }
+            } else {
+                result = await evalText(text, uniqueName)
             }
-            return serviceObj
-        } else {
-            result = await evalText(text, uniqueName)
         }
     } else if (typeKey === setting.exeKey) {
         result = async (argsStr) => {
@@ -2267,7 +2307,7 @@ process.on('beforeExit', function () {
         delTips();
     } else {
         nextLine();
-        Room.onRoom(wrapperInput)
+        Room.onRoom()
     }
 });
 

package/deps/room.js

@@ -1,12 +1,14 @@
 const os = require('os');
 const {fileJson, fileLock, vl, createConsole, getKeyTips, getValTips,
-    getRoomsDir, e, regEach, isRunningInBackground,
+    getRoomsDir, e, isRunningInBackground,
     batchAsync, debugStr, trim, getOr, errorTag, warnStr, getConfig, getConfigDir,
     fileExist, formatUptime
 } = require('./util');
 const {setRoute, createSign} = require('../deps/server')
 const roomDataFile = "jsirRoom.json"
 const jsirNodesFile = "jsirNodes.json"
+const roomTasksFile = "roomTasks.json"
+const roomTasksLockKey = "LOCK_roomTasks.json"
 const roomsDirLockKey = "RW_" + getRoomsDir();
 const syncRoomsLockKey = "SyncRooms_" + getRoomsDir();
 const syncConfigsLockKey = "SyncConfigs_" + getConfigDir();
@@ -17,8 +19,8 @@ const fp = require('fs').promises
 const http = require('http');
 const tailscalePath = os.platform() === 'darwin' ?
     '/Applications/Tailscale.app/Contents/MacOS/Tailscale':'tailscale';
-const configMain = getConfig("configMain");
 const packageJson = require("../package.json");
+const defTasks = getConfig("tasks");
 
 function debug(...args) {
     if (global.$DEBUG) {
@@ -52,7 +54,7 @@ async function localConfigs() {
     return configs;
 }
 
-function onRoom(wrapperInput) {
+function onRoom() {
     if (!setting.roomTid[0]) {
         try {
             setRoute("get", "/", (req, res) => {
@@ -71,18 +73,13 @@ function onRoom(wrapperInput) {
                         return;
                     }
                     setting.enterOutputs = []
-                    await wrapperInput(req.input)
+                    await setting.wrapperInput(req.input)
                     let outputs = setting.enterOutputs || [];
                     setting.enterOutputs = null;
                     res.output = outputs.join('');
                     global.$newInput = true;
                 }
             })
-            if (configMain) {
-                setRoute("post", "/" + setting.configMainFnKey, async (req, res) => {
-                    res.result = await localConfigs();
-                })
-            }
         } catch (e) {
             debug("initRoute failed", e)
         }
@@ -130,7 +127,8 @@ async function getTailscaleNodes() {
         if (/^\d+\.\d+\.\d+\.\d+$/.test(ss[0])) {
             nodes[ss[0]] = {
                 name: ss[1],
-                offline
+                offline,
+                account: ss[2]
             }
         }
     }
@@ -187,7 +185,13 @@ async function syncRooms() {
                 }
                 if (respBody) {
                     let currRoom = JSON.parse(respBody);
+                    // 处理共享机器
                     currRoom.selfNode = node;
+                    if (setting.nodeMap[node].account !== setting.nodeMap[setting.selfRoom.selfNode].account) {
+                        currRoom.jsirs = Object.fromEntries(
+                            Object.entries(currRoom.jsirs || {}).filter(([pid, jsir]) => jsir.port === setting.defaultPort)
+                        );
+                    }
                     syncRooms.push(currRoom)
                     debug(`sync ${node} success`);
                 }
@@ -220,6 +224,7 @@ async function syncRooms() {
 }
 
 async function syncSetting() {
+    setting.nodeMap = await getTailscaleNodes();
     let room = await fileJson(roomDataFile)
     await fileLock(roomsDirLockKey, async () => await _syncSetting(room));
 }
@@ -249,7 +254,7 @@ async function _syncSetting(room) {
     setting.rooms = [setting.selfRoom, ...rooms]
         .map(room => {
             room.active = Date.now() - (room.lastUpdateTime || 0) <= setting.roomHeartbeatExpire;
-            Object.entries(room.jsirs).forEach(([key, jsir]) =>
+            Object.entries(room.jsirs || {}).forEach(([key, jsir]) =>
                 jsir.active = Date.now() - (jsir.lastUpdateTime || 0) <= setting.roomHeartbeatExpire)
             return room;
         });
@@ -282,6 +287,36 @@ async function _syncSetting(room) {
     }
 }
 
+async function processTasks() {
+    await fileJson(roomTasksFile, async tasks => {
+        tasks = Object.fromEntries(
+            Object.entries(tasks).filter(([key, pid]) => isPidAlive(pid))
+        );
+        if (Object.values(tasks).includes(process.pid)) {
+            return tasks;
+        }
+        let unHandleKey = null;
+        for (let key of Object.keys(defTasks)) {
+            if (!tasks[key]) {
+                if (key.indexOf("*") !== -1 && process.pid !== setting.defaultPort) {
+                    continue;
+                }
+                unHandleKey = key
+                break;
+            }
+        }
+        if (unHandleKey) {
+            console.$log(process.pid, `run task ${unHandleKey}[${defTasks[unHandleKey]}]`)
+            await setting.wrapperInput(defTasks[unHandleKey]);
+            if (!global.$newError) {
+                tasks[unHandleKey] = process.pid;
+                console.$log(process.pid, `handle task ${unHandleKey}[${defTasks[unHandleKey]}]`)
+            }
+        }
+        return tasks;
+    })
+}
+
 async function initRoom() {
     setting.nodeMap = await fileJson(jsirNodesFile);
     let roomUpdateTouchTime = false;
@@ -295,9 +330,12 @@ async function initRoom() {
     if (roomUpdateTouchTime) {
         await fileLock(updateRoomInfoLockKey, updateRoomInfo, false)
         fileLock(syncRoomsLockKey, syncRooms, false);
-        if (!configMain && setting.serviceFns[setting.configMainFnKey]) {
+        if (setting.serviceFns[setting.configMainFnKey] && !getConfig("configMain")) {
             fileLock(syncConfigsLockKey, syncConfigs, false);
         }
+        if (defTasks) {
+            fileLock(roomTasksLockKey, processTasks, false)
+        }
     }
 
     await syncSetting();
@@ -552,5 +590,6 @@ module.exports = {
     offRoom,
     syncSetting,
     reqNode,
-    reqFn
+    reqFn,
+    localConfigs
 }

package/deps/server.js

@@ -36,7 +36,7 @@ function createSign() {
 async function process(routeKey, req, res, params) {
     let router = routes[routeKey]
     if (router) {
-        if ("get /" !== routeKey && !router.isApi && !apiReg.test(routeKey)) {
+        if ("get /" !== routeKey && !router.isApi) {
             // 如果不是api接口，则校验签名
             // 取header里的sign字段
             const sign = req.headers['sign'];
@@ -143,7 +143,9 @@ 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/deps/setting.js

@@ -40,5 +40,7 @@ module.exports = {
     roomTimer: 1000,
     serverSignExpire: 6000,
     roomHeartbeatExpire: 9000,
-    configMainFnKey: "config/main"
+    configMainFnKey: "config/main",
+    serviceReg: /[^a-zA-Z]service[^a-zA-Z]|[^a-zA-Z]service$/i,
+    wrapperInput: null
 }

package/deps/util.js

@@ -26,6 +26,7 @@ let tempDir;
 let configDir;
 let roomsDir;
 let dataDir;
+let console = global.console
 
 
 function isRunningInBackground() {
@@ -77,7 +78,7 @@ class SyncQueue {
             try {
                 await task();
             } catch (error) {
-                console.error('Error during SyncQueue operation:', error);
+                console.$error('Error during SyncQueue operation:', error);
             }
         }
         this.isProcessing = false;
@@ -96,24 +97,25 @@ function syncQueue(task, key) {
     return queue.enqueue(task)
 }
 
-const roomLog = createLimitLogger(`room.log`, {
+const $log = createLimitLogger(`${setting.name}.log`, {
     logInfo: false
 });
-const roomError = createLimitLogger(`room.error`, {
+const $error = createLimitLogger(`${setting.name}.error`, {
     logInfo: false,
     error: true,
-    syncLogs: [roomLog]
+    syncLogs: [$log]
 });
 
-const $log = createLimitLogger(`${setting.name}.log`, {
+const roomLog = createLimitLogger(`room.log`, {
     logInfo: false,
-    syncLogs: [roomLog]
+    syncLogs: [$log]
 });
-const $error = createLimitLogger(`${setting.name}.error`, {
+const roomError = createLimitLogger(`room.error`, {
     logInfo: false,
     error: true,
-    syncLogs: [$log, roomError]
+    syncLogs: [roomLog, $error]
 });
+
 let _globalDraft= createLimitLogger(`draft.log`, {
     logInfo: false,
     time: false
@@ -267,6 +269,9 @@ function createConsole(uniqueName) {
             if ('debug' === key && !global.$DEBUG) {
                 return;
             }
+            if ('error' === key) {
+                global.$newError = true;
+            }
             if (uniqueName && quite) {
                 if ((key === 'table' || key === 'nable') && typeof args[0] === "object") {
                     args = ['', ...args]
@@ -286,7 +291,7 @@ function createConsole(uniqueName) {
     return result;
 }
 
-const console = createConsole();
+console = createConsole();
 // fix console done
 
 
@@ -1374,7 +1379,7 @@ function fileCleaner(path, maxChars) {
                 try {
                     cleanFile(path, maxChars)
                 } catch (e) {
-                    console.error(e)
+                    console.$error(e)
                 }
             }
         }, "f", false);
@@ -1405,9 +1410,13 @@ function cleanFile(path, maxChars = 9 * 1024 * 1024) {
             return;
         }
         await fileLock(path, async () => {
-            let content = String(await fp.readFile(path))
-            let newContext = content.slice(-Math.floor(maxChars * 0.7));
-            await fp.writeFile(path, newContext)
+            const bakFile = `${path}.bak`;
+            // 备份日志
+            try {
+                await fp.rename(path, bakFile);
+            } catch (e) {
+                console.$error(`Failed to rename ${path} -> ${bakFile}`, e);
+            }
         }, false)
     }, path)
 }

package/package.json

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