jsir 3.1.2 → 3.1.3

package/cmd/oaa.js

@@ -13,7 +13,7 @@ const {
     getFullPath, parseUniqueName, toUniqueName, isJsirFileName, toJsirFileName,
     getAlias, wrapperJsirText, eia, getKeyTips, getValTips, getJsirTypeKey,
     createDetachedProcess, interceptStdStreams,
-    draftModify, isRunningInBackground, fileJson, fileLock, processLock, cleanFileLocks, getMd5Key, terminalTitle,
+    draftModify, isRunningInBackground, fileJson, fileLock, processLock, getMd5Key, terminalTitle,
     getFileOpenExe, formatSec, formatMb
 } = $lib;
 const _args = process.argv.slice(2).map(trim);
@@ -150,7 +150,7 @@ const $data = {
             return _dealOnLazyGet(key, onLazyTempCode);
         }
         let result = null;
-        await processLock('gafs:' + key, async () => {
+        await processLock('jsir:gafs:' + key, async () => {
             if (!vl(_data[key])) {
                 result = _dataSet(key, await fn(), onLazyTempCode)
             } else {
@@ -203,7 +203,6 @@ function checkWorkspaces() {
 
 async function start() {
     terminalTitle()
-    cleanFileLocks();
 
     setting.wrapperInput = wrapperInput;
     interceptStdStreams()

package/deps/room.js

@@ -2,8 +2,8 @@ const os = require('os');
 const {fileJson, fileLock, vl, getKeyTips, getValTips,
     getRoomsDir, e, isRunningInBackground,
     batchAsync, trim, getOr, errorTag, warnStr, getConfig, getConfigDir,
-    fileExist, processLock, isPidAlive, cleanFileLocks,
-    roomConsole: console, reget, md5
+    fileExist, processLock, isPidAlive, getLockDir,
+    roomConsole: console, reget, md5, cacheFn
 } = require('./util');
 const {setRoute, createSign} = require('../deps/server')
 const roomDataFile = "jsirRoom.json"
@@ -340,10 +340,58 @@ async function processTasks(defTasks) {
     })
 }
 
-async function initRoom() {
-    if (process.pid === setting.defaultPort) {
-        cleanFileLocks();
+function cleanFnCache() {
+    const now = Date.now()
+    for (let key of Object.keys(setting.fnCache)) {
+        let item = setting.fnCache[key]
+        if (item && item.validMsTime && now > item.validMsTime) {
+            delete setting.fnCache[key]
+        }
+    }
+    console.$debug("cleanFnCache cost", `${Date.now() - now}ms`)
+}
+
+async function readLockPid(lockDir) {
+    try {
+        const files = await fp.readdir(lockDir);
+        const pidFile = files.find(name => name.startsWith('pid-'));
+        if (!pidFile) {
+            return null;
+        }
+        return pidFile.split("-")[1];
+    } catch (err) {
+        // 读取目录出错（可能不存在？）直接返回 null
+        return null;
     }
+}
+
+async function cleanFileLocks() {
+    const now = Date.now()
+    let lockDir = getLockDir();
+    const files = await fp.readdir(lockDir);
+    const deadPid = {}
+    for (let file of files) {
+        let lockKeyDir = lockDir + '/' + file;
+        let pid = await readLockPid(lockKeyDir);
+        if (!pid) {
+            continue;
+        }
+        if (deadPid[pid] || !isPidAlive(pid)) {
+            deadPid[pid] = true;
+            // 持有锁的进程已经没了，则删除锁文件
+            try {
+                await fp.rm(lockKeyDir, { recursive: true, force: true });
+            } catch (err) {
+                console.$error(`cleanLock ${lockKeyDir} failed`, err);
+            }
+        }
+    }
+    console.$debug("cleanFileLocks cost", `${Date.now() - now}ms`)
+}
+
+async function initRoom() {
+    // 每分钟清理缓存
+    cacheFn("jsir:cleanFnCache", cleanFnCache, 60_000)
     setting.roomTime = Date.now();
     setting.nodeMap = await fileJson(jsirNodesFile);
     let roomUpdateTouchTime = false;
@@ -355,6 +403,8 @@ async function initRoom() {
         }
     })
     if (roomUpdateTouchTime) {
+        // 每分钟清理lock 文件
+        cacheFn("jsir:cleanFileLocks", cleanFileLocks, 60_000)
         fileLock(updateRoomInfoLockKey, async () => {
             let pros = []
             pros.push(syncRooms())

package/deps/setting.js

@@ -52,5 +52,6 @@ module.exports = {
     newError: false,
     fnCache: {},
     syncQueues: {},
-    tipsOnRm: {}
+    tipsOnRm: {},
+    locks: {}
 }

package/deps/util.js

@@ -627,11 +627,12 @@ async function draftModify(fLine) {
         console.info("removed")
     }
     if (isEdit && results.length === 1) {
-        let tempPath = getLibDataDir() + "/log/draft.temp";
+        let tempPath = getTempDir() + '/draft_' + uid();
         fs.writeFileSync(tempPath, results[0].split(/\n/).slice(1).join('\n'))
         await eia(getEditor(), [`"${tempPath}"`], true)
         let tempText = String(fs.readFileSync(tempPath))
-        fs.writeFileSync(tempPath, '')
+        fs.unlinkSync(tempPath)
+
         let lineRange = lineRanges.get(results[0]);
         let before = allLines.filter((_, index) => {
             return index < lineRange.start;
@@ -705,21 +706,21 @@ function getVl(...obj) {
 
 async function cacheFn(key, fn, validMs = 0, awaitRefresh = true) {
     const cacheItem = getOr(setting.fnCache, key, {
-        createdAt: 0,
+        validMsTime: 0,
     });
-    if (Date.now() - cacheItem.createdAt > validMs) {
-        // 临时设为已创建，防止并发请求多次调用 fn
-        cacheItem.createdAt = Infinity;
+    if (Date.now() > cacheItem.validMsTime) {
+        cacheItem.validMsTime = Infinity;
         cacheItem.promise = (async () => {
             let val;
             try {
                 val = await fn()
-            } finally {
-                cacheItem.createdAt = 0; // 恢复为无效状态
+            } catch (e) {
+                delete setting.fnCache[key]
+                throw e
             }
             cacheItem.val = val;
             cacheItem.valInit = true;
-            cacheItem.createdAt = Date.now(); // 设置新的创建时间
+            cacheItem.validMsTime = Date.now() + validMs;
         })();
     }
     if (awaitRefresh || !cacheItem.valInit) {
@@ -770,13 +771,13 @@ function clearConsole(cleanType = 0) {
     if (cleanType === 0) {
         // \033[2J：清空屏幕。
         // \033[H：将光标定位到屏幕左上角。
-        process.stdout.write('\033[2J\033[H'); // 展开新的屏幕，信息都保留
+        process.stdout.write('\x1B[2J\x1B[H'); // 展开新的屏幕，信息都保留
     } else if (cleanType === 1) {
         // \033[0f 清除从光标位置到屏幕末尾的内容，并把光标移动到屏幕的左上角。
         // process.stdout.write('\033[0f');
         console.clear(); // 清空当前屏幕
     } else if (cleanType > 1) {
-        process.stdout.write('\x1B[3J\033[H'); // 全清，包括历史记录
+        process.stdout.write('\x1B[3J\x1B[H'); // 全清，包括历史记录
         console.clear();
     }
 }
@@ -1267,40 +1268,6 @@ function getLockKeyDir(key) {
     return lockDir + "/" + key;
 }
 
-async function readLockPid(lockDir) {
-    try {
-        const files = await fp.readdir(lockDir);
-        const pidFile = files.find(name => name.startsWith('pid-'));
-        if (!pidFile) {
-            return null;
-        }
-        return pidFile.split("-")[1];
-    } catch (err) {
-        // 读取目录出错（可能不存在？）直接返回 null
-        return null;
-    }
-}
-
-async function cleanFileLocks() {
-    let lockDir = getLockDir();
-    const files = await fp.readdir(lockDir);
-    for (let file of files) {
-        let lockKeyDir = lockDir + '/' + file;
-        let pid = await readLockPid(lockKeyDir);
-        if (!pid) {
-            continue;
-        }
-        if (!isPidAlive(pid)) {
-            // 持有锁的进程已经没了，则删除锁文件
-            try {
-                await fp.rm(lockKeyDir, { recursive: true, force: true });
-            } catch (err) {
-                console.$error(`cleanLock ${lockKeyDir} failed`, err);
-            }
-        }
-    }
-}
-
 async function _fileLock(key, fn) {
     `
     文件锁，返回true/false,
@@ -1310,41 +1277,28 @@ async function _fileLock(key, fn) {
         throw new Error('invalid arguments');
     }
 
-    let lockKeyDir = getLockKeyDir(key)
-    // 1. 尝试判断锁目录是否已存在
-    let lockExists = await fileExist(lockKeyDir);
-    if (lockExists) {
-        return false;
-    }
-
-    // 2. 创建锁目录
-    try {
-        await fp.mkdir(lockKeyDir, { recursive: false });
-    } catch (err) {
-        // 如果 mkdir 依旧失败，说明在这段时间里又被别人抢先创建了
-        return false;
-    }
+    let tempLockDir = getLockDir() + '/lock_' + uid()
+    // 创建临时锁目录
+    await fp.mkdir(tempLockDir, { recursive: false });
 
     const lockPidFile = `pid-${process.pid}`;
-    const lockPidFilePath = path.join(lockKeyDir, lockPidFile);
+    const lockPidFilePath = path.join(tempLockDir, lockPidFile);
+    await fp.writeFile(lockPidFilePath, '');
+
+    let lockKeyDir = getLockKeyDir(key)
     try {
-        await fp.writeFile(lockPidFilePath, '');
+        await fp.rename(tempLockDir, lockKeyDir);
     } catch (err) {
-        // 无法写文件就释放锁并抛错
-        try {
-            await fp.rm(lockKeyDir, { recursive: true, force: true });
-        } catch (_) {}
+        try { await fp.rm(tempLockDir, { recursive: true, force: true }); } catch (_) {}
         return false;
     }
 
-    // 4. 成功加锁后执行 fn
+    // 成功加锁后执行 fn
     try {
         await fn();
         return true;
     } finally {
-        try {
-            await fp.rm(lockKeyDir, { recursive: true, force: true });
-        } catch (_) {}
+        try { await fp.rm(lockKeyDir, { recursive: true, force: true }); } catch (_) {}
     }
 }
 
@@ -1388,21 +1342,20 @@ async function processLock(key, fn, wait = true) {
     }
 }
 
-const $locks = {}
 async function _processLock(key, fn) {
     if (!key || typeof fn !== 'function') {
         throw new Error('invalid arguments');
     }
     key = key.trim();
-    if ($locks.hasOwnProperty(key)) {
+    if (setting.locks.hasOwnProperty(key)) {
         return false;
     }
-    $locks[key] = true;
+    setting.locks[key] = true;
     try {
         await fn();
         return true;
     } finally {
-        delete $locks[key];
+        delete setting.locks[key];
     }
 }
 
@@ -1519,6 +1472,7 @@ async function cleanFile(path, maxChars = 9 * 1024 * 1024) {
         const bakFile = `${path}.bak`;
         // 备份日志
         try {
+            await fp.rm(bakFile, { force: true });
             await fp.rename(path, bakFile);
         } catch (e) {
             console.$error(`Failed to rename ${path} -> ${bakFile}`, e);
@@ -1610,9 +1564,9 @@ function ei(cmd, args = [], shell = false) {
 
 async function eia(cmd, args = [], shell = false, input = null) {
     `
-  当前进程不会卡住（事件循环仍在），但会 await 等子进程退出；
-  输入输出默认由 cmd 进程持有；如果传 input，则把 input 写入 stdin。
-  `
+    当前进程不会卡住（事件循环仍在），但会 await 等子进程退出；
+    输入输出默认由 cmd 进程持有；如果传 input，则把 input 写入 stdin。
+    `
     if (isRunningInBackground()) {
         throw 'Unsupported Operation';
     }
@@ -1643,18 +1597,51 @@ async function eia(cmd, args = [], shell = false, input = null) {
     });
 }
 
-async function getCbText(mbNum) {
-    return await e(`pbpaste`, mbNum, false)
+/**
+ * 获取剪贴板文本（macOS）
+ * @returns {Promise<string|null>}
+ */
+async function getCbText() {
+    return new Promise((resolve) => {
+        try {
+            const p = spawn("pbpaste");
+            let out = "";
+
+            p.stdout.setEncoding("utf8");
+            p.stdout.on("data", (d) => out += d);
+
+            p.on("error", () => resolve(null));
+            p.on("close", (code) => {
+                if (code === 0) resolve(out);
+                else resolve(null);
+            });
+        } catch (e) {
+            resolve(null);
+        }
+    });
 }
 
+/**
+ * 设置剪贴板文本（macOS）
+ * @param {string} str
+ * @returns {Promise<boolean>}
+ */
 async function setCbText(str) {
-    let tempDir = getLibDataDir() + '/temp'
-    mkdir(tempDir)
+    if (typeof str !== "string") return false;
 
-    let copyFile = tempDir + '/pbcopy.' + String(Math.random()).split('.')[1]
-    fs.writeFileSync(copyFile, str)
-    await e(`pbcopy < ${copyFile}`)
-    fs.unlinkSync(copyFile)
+    return new Promise((resolve) => {
+        try {
+            const p = spawn("pbcopy");
+
+            p.on("error", () => resolve(false));
+            p.on("close", (code) => resolve(code === 0));
+
+            p.stdin.setDefaultEncoding("utf8");
+            p.stdin.end(str);
+        } catch (e) {
+            resolve(false);
+        }
+    });
 }
 
 async function sleep(milliseconds, tIds = []) {
@@ -2380,7 +2367,6 @@ module.exports = {
     hasTips,
     tipKeys,
     isPidAlive,
-    cleanFileLocks,
     getMd5Key,
     isMd5Key,
     terminalTitle,
@@ -2392,5 +2378,6 @@ module.exports = {
     currentRoom,
     currentRooms,
     uid,
-    consoleStrs
+    consoleStrs,
+    getLockDir
 }

package/package.json

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