@whyour/qinglong 2.18.2-0 → 2.18.2-2

package/package.json

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

package/sample/notify.js

@@ -428,7 +428,7 @@ function tgBotNotify(text, desp) {
       TG_PROXY_AUTH,
     } = push_config;
     if (TG_BOT_TOKEN && TG_USER_ID) {
-      const options = {
+      let options = {
         url: `${TG_API_HOST}/bot${TG_BOT_TOKEN}/sendMessage`,
         json: {
           chat_id: `${TG_USER_ID}`,
@@ -442,20 +442,20 @@ function tgBotNotify(text, desp) {
       };
       if (TG_PROXY_HOST && TG_PROXY_PORT) {
         const { HttpProxyAgent, HttpsProxyAgent } = require('hpagent');
-        const options = {
+        const _options = {
           keepAlive: true,
           keepAliveMsecs: 1000,
           maxSockets: 256,
           maxFreeSockets: 256,
           proxy: `http://${TG_PROXY_AUTH}${TG_PROXY_HOST}:${TG_PROXY_PORT}`,
         };
-        const httpAgent = new HttpProxyAgent(options);
-        const httpsAgent = new HttpsProxyAgent(options);
+        const httpAgent = new HttpProxyAgent(_options);
+        const httpsAgent = new HttpsProxyAgent(_options);
         const agent = {
           http: httpAgent,
           https: httpsAgent,
         };
-        Object.assign(options, { agent });
+        options.agent = agent;
       }
       $.post(options, (err, resp, data) => {
         try {

package/static/build/shared/utils.js

@@ -1,26 +1,39 @@
 "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));
     await release();
 }
 exports.writeFileWithLock = writeFileWithLock;