@whyour/qinglong 2.19.0-0 → 2.19.0-2

package/package.json

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

package/shell/preload/sitecustomize.py

@@ -54,7 +54,7 @@ def run():
         
         task_before = os.getenv("task_before")
         if task_before:
-            escaped_task_before = task_before.replace("'", "'\\''")
+            escaped_task_before = task_before.replace('"', '\\"').replace("$", "\\$")
             commands.append(f"eval '{escaped_task_before}'")
             print("执行前置命令\n")
             

package/static/build/config/util.js

@@ -29,11 +29,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.updateLinuxMirrorFile = exports.detectOS = exports.isDemoEnv = exports.getUninstallCommand = exports.getInstallCommand = exports.setSystemTimezone = exports.rmPath = exports.safeJSONParse = exports.getUniqPath = exports.parseContentVersion = exports.parseVersion = exports.getPid = exports.killTask = exports.psTree = exports.parseBody = exports.parseHeaders = exports.promiseExecSuccess = exports.promiseExec = exports.readDir = exports.readDirs = exports.dirSort = exports.concurrentRun = exports.handleLogPath = exports.createFile = exports.fileExist = exports.getPlatform = exports.getNetIp = exports.getToken = exports.getLastModifyFilePath = exports.removeAnsi = exports.getFileContentByName = void 0;
+exports.updateLinuxMirrorFile = exports.detectOS = exports.isDemoEnv = exports.getUninstallCommand = exports.getInstallCommand = exports.setSystemTimezone = exports.rmPath = exports.safeJSONParse = exports.getUniqPath = exports.parseContentVersion = exports.parseVersion = exports.getPid = exports.killTask = exports.psTree = exports.parseBody = exports.parseHeaders = exports.promiseExecSuccess = exports.promiseExec = exports.readDir = exports.readDirs = exports.dirSort = exports.concurrentRun = exports.handleLogPath = exports.createFile = exports.fileExist = exports.getPlatform = exports.getToken = exports.getLastModifyFilePath = exports.removeAnsi = exports.getFileContentByName = void 0;
 const fs = __importStar(require("fs/promises"));
 const path = __importStar(require("path"));
-const got_1 = __importDefault(require("got"));
-const iconv_lite_1 = __importDefault(require("iconv-lite"));
 const child_process_1 = require("child_process");
 const form_data_1 = __importDefault(require("form-data"));
 const ps_tree_1 = __importDefault(require("ps-tree"));
@@ -88,73 +86,6 @@ function getToken(req) {
     return '';
 }
 exports.getToken = getToken;
-async function getNetIp(req) {
-    const ipArray = [
-        ...new Set([
-            ...(req.headers['x-real-ip'] || '').split(','),
-            ...(req.headers['x-forwarded-for'] || '').split(','),
-            req.ip,
-            ...req.ips,
-            req.socket.remoteAddress,
-        ]),
-    ].filter(Boolean);
-    let ip = ipArray[0];
-    if (ipArray.length > 1) {
-        for (let i = 0; i < ipArray.length; i++) {
-            const ipNumArray = ipArray[i].split('.');
-            const tmp = ipNumArray[0] + '.' + ipNumArray[1];
-            if (tmp === '192.168' ||
-                (ipNumArray[0] === '172' &&
-                    ipNumArray[1] >= 16 &&
-                    ipNumArray[1] <= 32) ||
-                tmp === '10.7' ||
-                tmp === '127.0') {
-                continue;
-            }
-            ip = ipArray[i];
-            break;
-        }
-    }
-    ip = ip.substr(ip.lastIndexOf(':') + 1, ip.length);
-    if (ip.includes('127.0') || ip.includes('192.168') || ip.includes('10.7')) {
-        ip = '';
-    }
-    if (!ip) {
-        return { address: `获取失败`, ip };
-    }
-    try {
-        const csdnApi = got_1.default
-            .get(`https://searchplugin.csdn.net/api/v1/ip/get?ip=${ip}`, {
-            timeout: 10000,
-            retry: 0,
-        })
-            .text();
-        const pconlineApi = got_1.default
-            .get(`https://whois.pconline.com.cn/ipJson.jsp?ip=${ip}&json=true`, {
-            timeout: 10000,
-            retry: 0,
-        })
-            .buffer();
-        const [csdnBody, pconlineBody] = await await Promise.all([
-            csdnApi,
-            pconlineApi,
-        ]);
-        const csdnRes = JSON.parse(csdnBody);
-        const pconlineRes = JSON.parse(iconv_lite_1.default.decode(pconlineBody, 'GBK'));
-        let address = '';
-        if (csdnBody && csdnRes.code == 200) {
-            address = csdnRes.data.address;
-        }
-        else if (pconlineRes && pconlineRes.addr) {
-            address = pconlineRes.addr;
-        }
-        return { address, ip };
-    }
-    catch (error) {
-        return { address: `获取失败`, ip };
-    }
-}
-exports.getNetIp = getNetIp;
 function getPlatform(userAgent) {
     const ua = userAgent.toLowerCase();
     const testUa = (regexp) => regexp.test(ua);

package/static/build/services/http.js

@@ -20,6 +20,7 @@ let HttpServerService = class HttpServerService {
     async initialize(expressApp, port) {
         try {
             return new Promise((resolve, reject) => {
+                var _a;
                 this.server = expressApp.listen(port, '0.0.0.0', () => {
                     logger_1.default.debug(`✌️ HTTP service started successfully`);
                     metrics_1.metricsService.record('http_service_start', 1, {
@@ -27,7 +28,7 @@ let HttpServerService = class HttpServerService {
                     });
                     resolve(this.server);
                 });
-                this.server.on('error', (err) => {
+                (_a = this.server) === null || _a === void 0 ? void 0 : _a.on('error', (err) => {
                     logger_1.default.error('Failed to start HTTP service:', err);
                     reject(err);
                 });

package/static/build/services/notify.js

@@ -73,7 +73,7 @@ let NotificationService = class NotificationService {
                 return await (notificationModeAction === null || notificationModeAction === void 0 ? void 0 : notificationModeAction.call(this));
             }
             catch (error) {
-                throw error;
+                console.error(error);
             }
         }
         return false;

package/static/build/services/user.js

@@ -216,7 +216,16 @@ let UserService = class UserService {
             return this.login({ username, password }, req, false);
         }
         else {
-            const { ip, address } = await (0, util_1.getNetIp)(req);
+            const ip = request_ip_1.default.getClientIp(req) || '';
+            const query = new ip2region_1.default();
+            const ipAddress = query.search(ip);
+            let address = '';
+            if (ipAddress) {
+                const { country, province, city, isp } = ipAddress;
+                address = (0, uniq_1.default)([country, province, city, isp])
+                    .filter(Boolean)
+                    .join(' ');
+            }
             await this.updateAuthInfo(authInfo, {
                 lastip: ip,
                 lastaddr: address,
@@ -289,12 +298,13 @@ let UserService = class UserService {
         }
     }
     async resetAuthInfo(info) {
-        const { retries, twoFactorActivated, password } = info;
+        const { retries, twoFactorActivated, password, username } = info;
         const authInfo = await this.getAuthInfo();
         await this.updateAuthInfo(authInfo, {
             retries,
             twoFactorActivated,
             password,
+            username
         });
     }
 };