@whyour/qinglong 2.18.2-1 → 2.18.2-3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@whyour/qinglong",
-  "version": "2.18.2-1",
+  "version": "2.18.2-3",
   "description": "Timed task management platform supporting Python3, JavaScript, Shell, Typescript",
   "repository": {
     "type": "git",

package/shell/share.sh

@@ -474,7 +474,7 @@ handle_task_end() {
   local end_timestamp=$(format_timestamp "$time_format" "$etime")
   local diff_time=$(($end_timestamp - $begin_timestamp))
   local suffix=""
-  [[ "$MANUAL" == "true" ]] && suffix="(手动停止)"
+  [[ "${MANUAL:=}" == "true" ]] && suffix="(手动停止)"
 
   [[ "$diff_time" == 0 ]] && diff_time=1
 
@@ -484,7 +484,7 @@ handle_task_end() {
       error_message=", 任务状态更新失败(${error})"
     fi
   fi
-  echo -e "\n## 执行结束$suffix... $end_time  耗时 $diff_time 秒${error_message}　　　　　"
+  echo -e "\n## 执行结束$suffix... $end_time  耗时 $diff_time 秒${error_message:=}　　　　　"
 }
 
 init_env

package/static/build/shared/utils.js

@@ -1,26 +1,42 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.writeFileWithLock = void 0;
 const proper_lockfile_1 = require("proper-lockfile");
+const os_1 = __importDefault(require("os"));
+const path_1 = __importDefault(require("path"));
 const promises_1 = require("fs/promises");
 const util_1 = require("../config/util");
-async function writeFileWithLock(path, content, options = {}) {
+function getUniqueLockPath(filePath) {
+    const sanitizedPath = filePath
+        .replace(/[<>:"/\\|?*]/g, '_')
+        .replace(/^_/, '');
+    return path_1.default.join(os_1.default.tmpdir(), `${sanitizedPath}.ql_lock`);
+}
+async function writeFileWithLock(filePath, content, options = {}) {
     if (typeof options === 'string') {
         options = { encoding: options };
     }
-    if (!(await (0, util_1.fileExist)(path))) {
-        const fileHandle = await (0, promises_1.open)(path, 'w');
+    if (!(await (0, util_1.fileExist)(filePath))) {
+        const fileHandle = await (0, promises_1.open)(filePath, 'w');
         fileHandle.close();
     }
-    const release = await (0, proper_lockfile_1.lock)(path, {
+    const lockfilePath = getUniqueLockPath(filePath);
+    const release = await (0, proper_lockfile_1.lock)(filePath, {
         retries: {
             retries: 10,
             factor: 2,
             minTimeout: 100,
             maxTimeout: 3000,
         },
+        lockfilePath,
     });
-    await (0, promises_1.writeFile)(path, content, Object.assign({ encoding: 'utf8' }, options));
+    await (0, promises_1.writeFile)(filePath, content, Object.assign({ encoding: 'utf8' }, options));
+    if (options === null || options === void 0 ? void 0 : options.mode) {
+        await (0, promises_1.chmod)(filePath, options.mode);
+    }
     await release();
 }
 exports.writeFileWithLock = writeFileWithLock;