@whyour/qinglong 2.17.12-rc.2 → 2.18.0

package/static/build/data/notify.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.NtfyNotification = exports.LarkNotification = exports.WebhookNotification = exports.ChronocatNotification = exports.PushMeNotification = exports.EmailNotification = exports.WePlusBotNotification = exports.PushPlusNotification = exports.IGotNotification = exports.AibotkNotification = exports.WeWorkAppNotification = exports.WeWorkBotNotification = exports.DingtalkBotNotification = exports.TelegramBotNotification = exports.BarkNotification = exports.ChatNotification = exports.PushDeerNotification = exports.ServerChanNotification = exports.GoCqHttpBotNotification = exports.GotifyNotification = exports.NotificationMode = void 0;
+exports.WxPusherBotNotification = exports.NtfyNotification = exports.LarkNotification = exports.WebhookNotification = exports.ChronocatNotification = exports.PushMeNotification = exports.EmailNotification = exports.WePlusBotNotification = exports.PushPlusNotification = exports.IGotNotification = exports.AibotkNotification = exports.WeWorkAppNotification = exports.WeWorkBotNotification = exports.DingtalkBotNotification = exports.TelegramBotNotification = exports.BarkNotification = exports.ChatNotification = exports.PushDeerNotification = exports.ServerChanNotification = exports.GoCqHttpBotNotification = exports.GotifyNotification = exports.NotificationMode = void 0;
 var NotificationMode;
 (function (NotificationMode) {
     NotificationMode["gotify"] = "gotify";
@@ -23,6 +23,7 @@ var NotificationMode;
     NotificationMode["webhook"] = "webhook";
     NotificationMode["chronocat"] = "Chronocat";
     NotificationMode["ntfy"] = "ntfy";
+    NotificationMode["wxPusherBot"] = "wxPusherBot";
 })(NotificationMode || (exports.NotificationMode = NotificationMode = {}));
 class NotificationBaseInfo {
 }
@@ -137,6 +138,11 @@ class PushPlusNotification extends NotificationBaseInfo {
         super(...arguments);
         this.pushPlusToken = '';
         this.pushPlusUser = '';
+        this.pushPlusTemplate = '';
+        this.pushplusChannel = '';
+        this.pushplusWebhook = '';
+        this.pushplusCallbackUrl = '';
+        this.pushplusTo = '';
     }
 }
 exports.PushPlusNotification = PushPlusNotification;
@@ -202,4 +208,13 @@ class NtfyNotification extends NotificationBaseInfo {
     }
 }
 exports.NtfyNotification = NtfyNotification;
+class WxPusherBotNotification extends NotificationBaseInfo {
+    constructor() {
+        super(...arguments);
+        this.wxPusherBotAppToken = '';
+        this.wxPusherBotTopicIds = '';
+        this.wxPusherBotUids = '';
+    }
+}
+exports.WxPusherBotNotification = WxPusherBotNotification;
 //# sourceMappingURL=notify.js.map

package/static/build/data/system.js

@@ -24,6 +24,7 @@ var AuthDataType;
     AuthDataType["notification"] = "notification";
     AuthDataType["removeLogFrequency"] = "removeLogFrequency";
     AuthDataType["systemConfig"] = "systemConfig";
+    AuthDataType["authConfig"] = "authConfig";
 })(AuthDataType || (exports.AuthDataType = AuthDataType = {}));
 exports.SystemModel = _1.sequelize.define('Auth', {
     ip: sequelize_1.DataTypes.STRING,

package/static/build/loaders/express.js

@@ -31,18 +31,15 @@ const body_parser_1 = __importDefault(require("body-parser"));
 const cors_1 = __importDefault(require("cors"));
 const api_1 = __importDefault(require("../api"));
 const config_1 = __importDefault(require("../config"));
-const express_jwt_1 = __importStar(require("express-jwt"));
-const promises_1 = __importDefault(require("fs/promises"));
+const express_jwt_1 = require("express-jwt");
 const util_1 = require("../config/util");
-const typedi_1 = __importDefault(require("typedi"));
-const open_1 = __importDefault(require("../services/open"));
 const express_urlrewrite_1 = __importDefault(require("express-urlrewrite"));
-const user_1 = __importDefault(require("../services/user"));
 const Sentry = __importStar(require("@sentry/node"));
 const celebrate_1 = require("celebrate");
 const http_proxy_middleware_1 = require("http-proxy-middleware");
 const serverEnv_1 = require("../config/serverEnv");
 const logger_1 = __importDefault(require("./logger"));
+const store_1 = require("../shared/store");
 exports.default = ({ app }) => {
     app.set('trust proxy', 'loopback');
     app.use((0, cors_1.default)());
@@ -52,11 +49,11 @@ exports.default = ({ app }) => {
         target: `http://0.0.0.0:${config_1.default.publicPort}/api`,
         changeOrigin: true,
         pathRewrite: { '/api/public': '' },
-        logProvider: () => logger_1.default,
+        logger: logger_1.default,
     }));
     app.use(body_parser_1.default.json({ limit: '50mb' }));
     app.use(body_parser_1.default.urlencoded({ limit: '50mb', extended: true }));
-    app.use((0, express_jwt_1.default)({
+    app.use((0, express_jwt_1.expressjwt)({
         secret: config_1.default.secret,
         algorithms: ['HS384'],
     }).unless({
@@ -73,10 +70,11 @@ exports.default = ({ app }) => {
         return next();
     });
     app.use(async (req, res, next) => {
+        var _a;
         const headerToken = (0, util_1.getToken)(req);
         if (req.path.startsWith('/open/')) {
-            const openService = typedi_1.default.get(open_1.default);
-            const doc = await openService.findTokenByValue(headerToken);
+            const apps = await store_1.shareStore.getApps();
+            const doc = (_a = apps === null || apps === void 0 ? void 0 : apps.filter((x) => { var _a; return (_a = x.tokens) === null || _a === void 0 ? void 0 : _a.find((y) => y.value === headerToken); })) === null || _a === void 0 ? void 0 : _a[0];
             if (doc && doc.tokens && doc.tokens.length > 0) {
                 const currentToken = doc.tokens.find((x) => x.value === headerToken);
                 const keyMatch = req.path.match(/\/open\/([a-z]+)\/*/);
@@ -94,9 +92,9 @@ exports.default = ({ app }) => {
             config_1.default.apiWhiteList.includes(originPath)) {
             return next();
         }
-        const data = await promises_1.default.readFile(config_1.default.authConfigFile, 'utf8');
-        if (data && headerToken) {
-            const { token = '', tokens = {} } = (0, util_1.safeJSONParse)(data);
+        const authInfo = await store_1.shareStore.getAuthInfo();
+        if (authInfo && headerToken) {
+            const { token = '', tokens = {} } = authInfo;
             if (headerToken === token || tokens[req.platform] === headerToken) {
                 return next();
             }
@@ -112,8 +110,7 @@ exports.default = ({ app }) => {
         if (!['/api/user/init', '/api/user/notification/init'].includes(req.path)) {
             return next();
         }
-        const userService = typedi_1.default.get(user_1.default);
-        const authInfo = await userService.getUserInfo();
+        const authInfo = (await store_1.shareStore.getAuthInfo()) || {};
         let isInitialized = true;
         if (Object.keys(authInfo).length === 2 &&
             authInfo.username === 'admin' &&

package/static/build/loaders/initData.js

@@ -18,6 +18,10 @@ const system_1 = require("../data/system");
 const system_2 = __importDefault(require("../services/system"));
 const user_1 = __importDefault(require("../services/user"));
 const promises_1 = require("fs/promises");
+const util_1 = require("../config/util");
+const open_1 = __importDefault(require("../services/open"));
+const store_1 = require("../shared/store");
+const logger_1 = __importDefault(require("./logger"));
 exports.default = async () => {
     var _a, _b, _c, _d, _e, _f;
     const cronService = typedi_1.Container.get(cron_2.default);
@@ -25,12 +29,39 @@ exports.default = async () => {
     const dependenceService = typedi_1.Container.get(dependence_1.default);
     const systemService = typedi_1.Container.get(system_2.default);
     const userService = typedi_1.Container.get(user_1.default);
+    const openService = typedi_1.Container.get(open_1.default);
     // 初始化增加系统配置
-    await system_1.SystemModel.upsert({ type: system_1.AuthDataType.systemConfig });
-    await system_1.SystemModel.upsert({ type: system_1.AuthDataType.notification });
+    const [systemConfig] = await system_1.SystemModel.findOrCreate({
+        where: { type: system_1.AuthDataType.systemConfig },
+    });
+    const [notifyConfig] = await system_1.SystemModel.findOrCreate({
+        where: { type: system_1.AuthDataType.notification },
+    });
+    const [authConfig] = await system_1.SystemModel.findOrCreate({
+        where: { type: system_1.AuthDataType.authConfig },
+    });
+    if (!(authConfig === null || authConfig === void 0 ? void 0 : authConfig.info)) {
+        let authInfo = {
+            username: 'admin',
+            password: 'admin',
+        };
+        try {
+            const content = await (0, promises_1.readFile)(config_1.default.authConfigFile, 'utf8');
+            authInfo = (0, util_1.safeJSONParse)(content);
+        }
+        catch (error) {
+            logger_1.default.warn('Failed to read auth config file, using default credentials');
+        }
+        await system_1.SystemModel.upsert({
+            id: authConfig === null || authConfig === void 0 ? void 0 : authConfig.id,
+            info: authInfo,
+            type: system_1.AuthDataType.authConfig,
+        });
+    }
     // 初始化通知配置
-    const notifyConfig = await userService.getNotificationMode();
-    await (0, promises_1.writeFile)(config_1.default.systemNotifyFile, JSON.stringify(notifyConfig));
+    if (notifyConfig.info) {
+        await (0, promises_1.writeFile)(config_1.default.systemNotifyFile, JSON.stringify(notifyConfig.info));
+    }
     const installDependencies = () => {
         // 初始化时安装所有处于安装中，安装成功，安装失败的依赖
         dependence_2.DependenceModel.findAll({
@@ -48,7 +79,6 @@ exports.default = async () => {
         });
     };
     // 初始化更新 linux/python/nodejs 镜像源配置
-    const systemConfig = await systemService.getSystemConfig();
     if ((_a = systemConfig.info) === null || _a === void 0 ? void 0 : _a.pythonMirror) {
         systemService.updatePythonMirror({
             pythonMirror: (_b = systemConfig.info) === null || _b === void 0 ? void 0 : _b.pythonMirror,
@@ -138,5 +168,11 @@ exports.default = async () => {
     // 初始化保存一次ck和定时任务数据
     await cronService.autosave_crontab();
     await envService.set_envs();
+    const authInfo = await userService.getAuthInfo();
+    const apps = await openService.findApps();
+    await store_1.shareStore.updateAuthInfo(authInfo);
+    if (apps === null || apps === void 0 ? void 0 : apps.length) {
+        await store_1.shareStore.updateApps(apps);
+    }
 };
 //# sourceMappingURL=initData.js.map

package/static/build/loaders/initFile.js

@@ -8,6 +8,7 @@ const path_1 = __importDefault(require("path"));
 const os_1 = __importDefault(require("os"));
 const logger_1 = __importDefault(require("./logger"));
 const util_1 = require("../config/util");
+const utils_1 = require("../shared/utils");
 const rootPath = process.env.QL_DIR;
 let dataPath = path_1.default.join(rootPath, 'data/');
 if (process.env.QL_DATA_DIR) {
@@ -22,9 +23,7 @@ const bakPath = path_1.default.join(dataPath, 'bak/');
 const samplePath = path_1.default.join(rootPath, 'sample/');
 const tmpPath = path_1.default.join(logPath, '.tmp/');
 const confFile = path_1.default.join(configPath, 'config.sh');
-const authConfigFile = path_1.default.join(configPath, 'auth.json');
 const sampleConfigFile = path_1.default.join(samplePath, 'config.sample.sh');
-const sampleAuthFile = path_1.default.join(samplePath, 'auth.sample.json');
 const sampleTaskShellFile = path_1.default.join(samplePath, 'task.sample.sh');
 const sampleNotifyJsFile = path_1.default.join(samplePath, 'notify.js');
 const sampleNotifyPyFile = path_1.default.join(samplePath, 'notify.py');
@@ -40,81 +39,80 @@ const homedir = os_1.default.homedir();
 const sshPath = path_1.default.resolve(homedir, '.ssh');
 const sshdPath = path_1.default.join(dataPath, 'ssh.d');
 const systemLogPath = path_1.default.join(dataPath, 'syslog');
+const directories = [
+    configPath,
+    scriptPath,
+    preloadPath,
+    logPath,
+    tmpPath,
+    uploadPath,
+    sshPath,
+    bakPath,
+    sshdPath,
+    systemLogPath,
+];
+const files = [
+    {
+        target: confFile,
+        source: sampleConfigFile,
+        checkExistence: true,
+    },
+    {
+        target: jsNotifyFile,
+        source: sampleNotifyJsFile,
+        checkExistence: false,
+    },
+    {
+        target: pyNotifyFile,
+        source: sampleNotifyPyFile,
+        checkExistence: false,
+    },
+    {
+        target: scriptNotifyJsFile,
+        source: sampleNotifyJsFile,
+        checkExistence: true,
+    },
+    {
+        target: scriptNotifyPyFile,
+        source: sampleNotifyPyFile,
+        checkExistence: true,
+    },
+    {
+        target: TaskBeforeFile,
+        source: sampleTaskShellFile,
+        checkExistence: true,
+    },
+    {
+        target: TaskBeforeJsFile,
+        content: '// The JavaScript code that executes before the JavaScript task execution will execute.',
+        checkExistence: true,
+    },
+    {
+        target: TaskBeforePyFile,
+        content: '# The Python code that executes before the Python task execution will execute.',
+        checkExistence: true,
+    },
+    {
+        target: TaskAfterFile,
+        source: sampleTaskShellFile,
+        checkExistence: true,
+    },
+];
 exports.default = async () => {
-    const authFileExist = await (0, util_1.fileExist)(authConfigFile);
-    const confFileExist = await (0, util_1.fileExist)(confFile);
-    const scriptDirExist = await (0, util_1.fileExist)(scriptPath);
-    const preloadDirExist = await (0, util_1.fileExist)(preloadPath);
-    const logDirExist = await (0, util_1.fileExist)(logPath);
-    const configDirExist = await (0, util_1.fileExist)(configPath);
-    const uploadDirExist = await (0, util_1.fileExist)(uploadPath);
-    const sshDirExist = await (0, util_1.fileExist)(sshPath);
-    const bakDirExist = await (0, util_1.fileExist)(bakPath);
-    const sshdDirExist = await (0, util_1.fileExist)(sshdPath);
-    const systemLogDirExist = await (0, util_1.fileExist)(systemLogPath);
-    const tmpDirExist = await (0, util_1.fileExist)(tmpPath);
-    const scriptNotifyJsFileExist = await (0, util_1.fileExist)(scriptNotifyJsFile);
-    const scriptNotifyPyFileExist = await (0, util_1.fileExist)(scriptNotifyPyFile);
-    const TaskBeforeFileExist = await (0, util_1.fileExist)(TaskBeforeFile);
-    const TaskBeforeJsFileExist = await (0, util_1.fileExist)(TaskBeforeJsFile);
-    const TaskBeforePyFileExist = await (0, util_1.fileExist)(TaskBeforePyFile);
-    const TaskAfterFileExist = await (0, util_1.fileExist)(TaskAfterFile);
-    if (!configDirExist) {
-        await promises_1.default.mkdir(configPath);
-    }
-    if (!scriptDirExist) {
-        await promises_1.default.mkdir(scriptPath);
-    }
-    if (!preloadDirExist) {
-        await promises_1.default.mkdir(preloadPath);
-    }
-    if (!logDirExist) {
-        await promises_1.default.mkdir(logPath);
-    }
-    if (!tmpDirExist) {
-        await promises_1.default.mkdir(tmpPath);
-    }
-    if (!uploadDirExist) {
-        await promises_1.default.mkdir(uploadPath);
-    }
-    if (!sshDirExist) {
-        await promises_1.default.mkdir(sshPath);
-    }
-    if (!bakDirExist) {
-        await promises_1.default.mkdir(bakPath);
-    }
-    if (!sshdDirExist) {
-        await promises_1.default.mkdir(sshdPath);
-    }
-    if (!systemLogDirExist) {
-        await promises_1.default.mkdir(systemLogPath);
-    }
-    // 初始化文件
-    if (!authFileExist) {
-        await promises_1.default.writeFile(authConfigFile, await promises_1.default.readFile(sampleAuthFile));
-    }
-    if (!confFileExist) {
-        await promises_1.default.writeFile(confFile, await promises_1.default.readFile(sampleConfigFile));
-    }
-    await promises_1.default.writeFile(jsNotifyFile, await promises_1.default.readFile(sampleNotifyJsFile));
-    await promises_1.default.writeFile(pyNotifyFile, await promises_1.default.readFile(sampleNotifyPyFile));
-    if (!scriptNotifyJsFileExist) {
-        await promises_1.default.writeFile(scriptNotifyJsFile, await promises_1.default.readFile(sampleNotifyJsFile));
-    }
-    if (!scriptNotifyPyFileExist) {
-        await promises_1.default.writeFile(scriptNotifyPyFile, await promises_1.default.readFile(sampleNotifyPyFile));
-    }
-    if (!TaskBeforeFileExist) {
-        await promises_1.default.writeFile(TaskBeforeFile, await promises_1.default.readFile(sampleTaskShellFile));
-    }
-    if (!TaskBeforeJsFileExist) {
-        await promises_1.default.writeFile(TaskBeforeJsFile, '// The JavaScript code that executes before the JavaScript task execution will execute.');
-    }
-    if (!TaskBeforePyFileExist) {
-        await promises_1.default.writeFile(TaskBeforePyFile, '# The Python code that executes before the Python task execution will execute.');
-    }
-    if (!TaskAfterFileExist) {
-        await promises_1.default.writeFile(TaskAfterFile, await promises_1.default.readFile(sampleTaskShellFile));
+    for (const dirPath of directories) {
+        if (!(await (0, util_1.fileExist)(dirPath))) {
+            await promises_1.default.mkdir(dirPath);
+        }
+    }
+    for (const item of files) {
+        const exists = await (0, util_1.fileExist)(item.target);
+        if (!item.checkExistence || !exists) {
+            if (!item.content && !item.source) {
+                throw new Error(`Neither content nor source specified for ${item.target}`);
+            }
+            const content = item.content || (await promises_1.default.readFile(item.source));
+            await (0, utils_1.writeFileWithLock)(item.target, content);
+        }
     }
     logger_1.default.info('✌️ Init file down');
     console.log('✌️ Init file down');

package/static/build/loaders/sock.js

@@ -6,9 +6,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const sockjs_1 = __importDefault(require("sockjs"));
 const typedi_1 = require("typedi");
 const sock_1 = __importDefault(require("../services/sock"));
-const index_1 = __importDefault(require("../config/index"));
-const promises_1 = __importDefault(require("fs/promises"));
 const util_1 = require("../config/util");
+const store_1 = require("../shared/store");
 exports.default = async ({ server }) => {
     const echo = sockjs_1.default.createServer({ prefix: '/api/ws', log: () => { } });
     const sockService = typedi_1.Container.get(sock_1.default);
@@ -16,11 +15,11 @@ exports.default = async ({ server }) => {
         if (!conn.headers || !conn.url || !conn.pathname) {
             conn.close('404');
         }
-        const data = await promises_1.default.readFile(index_1.default.authConfigFile, 'utf8');
+        const authInfo = await store_1.shareStore.getAuthInfo();
         const platform = (0, util_1.getPlatform)(conn.headers['user-agent'] || '') || 'desktop';
         const headerToken = conn.url.replace(`${conn.pathname}?token=`, '');
-        if (data) {
-            const { token = '', tokens = {} } = (0, util_1.safeJSONParse)(data);
+        if (authInfo) {
+            const { token = '', tokens = {} } = authInfo;
             if (headerToken === token || tokens[platform] === headerToken) {
                 sockService.addClient(conn);
                 conn.on('data', (message) => {

package/static/build/loaders/update.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const body_parser_1 = __importDefault(require("body-parser"));
 const celebrate_1 = require("celebrate");
 const cors_1 = __importDefault(require("cors"));
-const express_jwt_1 = __importDefault(require("express-jwt"));
+const express_jwt_1 = require("express-jwt");
 const typedi_1 = __importDefault(require("typedi"));
 const config_1 = __importDefault(require("../config"));
 const system_1 = __importDefault(require("../services/system"));
@@ -16,7 +16,7 @@ exports.default = ({ app }) => {
     app.use((0, cors_1.default)());
     app.use(body_parser_1.default.json({ limit: '50mb' }));
     app.use(body_parser_1.default.urlencoded({ limit: '50mb', extended: true }));
-    app.use((0, express_jwt_1.default)({
+    app.use((0, express_jwt_1.expressjwt)({
         secret: config_1.default.secret,
         algorithms: ['HS384'],
     }));

package/static/build/schedule/index.js

@@ -19,7 +19,6 @@ server.bindAsync(`0.0.0.0:${config_1.default.cronPort}`, grpc_js_1.ServerCredent
     if (err) {
         throw err;
     }
-    server.start();
     logger_1.default.debug(`✌️ 定时服务启动成功！`);
     console.debug(`✌️ 定时服务启动成功！`);
     (_a = process.send) === null || _a === void 0 ? void 0 : _a.call(process, 'ready');

package/static/build/services/cron.js

@@ -32,6 +32,7 @@ const cross_spawn_1 = require("cross-spawn");
 const dayjs_1 = __importDefault(require("dayjs"));
 const pickBy_1 = __importDefault(require("lodash/pickBy"));
 const omit_1 = __importDefault(require("lodash/omit"));
+const utils_1 = require("../shared/utils");
 let CronService = class CronService {
     constructor(logger) {
         this.logger = logger;
@@ -496,7 +497,7 @@ let CronService = class CronService {
                 crontab_string += '\n';
             }
         });
-        await promises_1.default.writeFile(config_1.default.crontabFile, crontab_string);
+        await (0, utils_1.writeFileWithLock)(config_1.default.crontabFile, crontab_string);
         await cron_1.CrontabModel.update({ saved: true }, { where: {} });
     }
     import_crontab() {

package/static/build/services/dependence.js

@@ -175,6 +175,12 @@ let DependenceService = class DependenceService {
                 if (pLimit_1.default.firstDependencyId !== dependency.id) {
                     return resolve(null);
                 }
+                const depIds = [dependency.id];
+                let depName = dependency.name.trim();
+                const actionText = isInstall ? '安装' : '删除';
+                const socketMessageType = isInstall
+                    ? 'installDependence'
+                    : 'uninstallDependence';
                 const isNodeDependence = dependency.type === dependence_1.DependenceTypes.nodejs;
                 const isLinuxDependence = dependency.type === dependence_1.DependenceTypes.linux;
                 const isPythonDependence = dependency.type === dependence_1.DependenceTypes.python3;
@@ -183,19 +189,23 @@ let DependenceService = class DependenceService {
                 pLimit_1.default.removeQueuedDependency(dependency);
                 if (isLinuxDependence) {
                     if (!osType) {
+                        await dependence_1.DependenceModel.update({ status: dependence_1.DependenceStatus.installFailed }, { where: { id: depIds } });
+                        const startTime = (0, dayjs_1.default)();
+                        const message = `开始${actionText}依赖 ${depName}，开始时间 ${startTime.format('YYYY-MM-DD HH:mm:ss')}\n\n当前系统不支持\n\n依赖${actionText}失败，结束时间 ${startTime.format('YYYY-MM-DD HH:mm:ss')}，耗时 ${startTime.diff(startTime, 'second')} 秒`;
+                        this.sockService.sendMessage({
+                            type: socketMessageType,
+                            message,
+                            references: depIds,
+                        });
+                        this.updateLog(depIds, message);
                         return resolve(null);
                     }
                     linuxCommand = const_1.LINUX_DEPENDENCE_COMMAND[osType];
                 }
-                const depIds = [dependency.id];
                 const status = isInstall
                     ? dependence_1.DependenceStatus.installing
                     : dependence_1.DependenceStatus.removing;
                 await dependence_1.DependenceModel.update({ status }, { where: { id: depIds } });
-                const socketMessageType = isInstall
-                    ? 'installDependence'
-                    : 'uninstallDependence';
-                let depName = dependency.name.trim();
                 let depRunCommand = (isInstall
                     ? dependence_1.InstallDependenceCommandTypes
                     : dependence_1.unInstallDependenceCommandTypes)[dependency.type];
@@ -204,7 +214,6 @@ let DependenceService = class DependenceService {
                         ? linuxCommand.install
                         : linuxCommand.uninstall;
                 }
-                const actionText = isInstall ? '安装' : '删除';
                 const startTime = (0, dayjs_1.default)();
                 const message = `开始${actionText}依赖 ${depName}，开始时间 ${startTime.format('YYYY-MM-DD HH:mm:ss')}\n\n`;
                 this.sockService.sendMessage({
@@ -294,7 +303,7 @@ let DependenceService = class DependenceService {
                         references: depIds,
                     });
                     this.updateLog(depIds, message);
-                    let status = null;
+                    let status;
                     if (isSucceed) {
                         status = isInstall
                             ? dependence_1.DependenceStatus.installed

package/static/build/services/env.js

@@ -1,33 +1,10 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
@@ -41,10 +18,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const typedi_1 = require("typedi");
 const winston_1 = __importDefault(require("winston"));
 const config_1 = __importDefault(require("../config"));
-const fs = __importStar(require("fs/promises"));
 const env_1 = require("../data/env");
 const groupBy_1 = __importDefault(require("lodash/groupBy"));
 const sequelize_1 = require("sequelize");
+const utils_1 = require("../shared/utils");
 let EnvService = class EnvService {
     constructor(logger) {
         this.logger = logger;
@@ -215,9 +192,9 @@ let EnvService = class EnvService {
                 }
             }
         }
-        await fs.writeFile(config_1.default.envFile, env_string);
-        await fs.writeFile(config_1.default.jsEnvFile, js_env_string);
-        await fs.writeFile(config_1.default.pyEnvFile, py_env_string);
+        await (0, utils_1.writeFileWithLock)(config_1.default.envFile, env_string);
+        await (0, utils_1.writeFileWithLock)(config_1.default.jsEnvFile, js_env_string);
+        await (0, utils_1.writeFileWithLock)(config_1.default.pyEnvFile, py_env_string);
     }
 };
 EnvService = __decorate([

package/static/build/services/notify.js

@@ -55,6 +55,7 @@ let NotificationService = class NotificationService {
             ['lark', this.lark],
             ['chronocat', this.chronocat],
             ['ntfy', this.ntfy],
+            ['wxPusherBot', this.wxPusherBot],
         ]);
         this.title = '';
         this.content = '';
@@ -444,16 +445,22 @@ let NotificationService = class NotificationService {
         }
     }
     async pushPlus() {
-        const { pushPlusToken, pushPlusUser } = this.params;
+        const { pushPlusToken, pushPlusUser, pushplusWebhook, pushPlusTemplate, pushplusChannel, pushplusCallbackUrl, pushplusTo } = this.params;
         const url = `https://www.pushplus.plus/send`;
         try {
-            const res = await got_1.default
-                .post(url, Object.assign(Object.assign({}, this.gotOption), { json: {
+            let body = Object.assign(Object.assign({}, this.gotOption), { json: {
                     token: `${pushPlusToken}`,
                     title: `${this.title}`,
                     content: `${this.content.replace(/[\n\r]/g, '<br>')}`,
                     topic: `${pushPlusUser || ''}`,
-                } }))
+                    template: `${pushPlusTemplate || 'html'}`,
+                    channel: `${pushplusChannel || 'wechat'}`,
+                    webhook: `${pushplusWebhook || ''}`,
+                    callbackUrl: `${pushplusCallbackUrl || ''}`,
+                    to: `${pushplusTo || ''}`
+                } });
+            const res = await got_1.default
+                .post(url, body)
                 .json();
             if (res.code === 200) {
                 return true;
@@ -589,6 +596,45 @@ let NotificationService = class NotificationService {
             throw new Error(error.response ? error.response.body : error);
         }
     }
+    async wxPusherBot() {
+        const { wxPusherBotAppToken, wxPusherBotTopicIds, wxPusherBotUids } = this.params;
+        // 处理 topicIds，将分号分隔的字符串转为数组
+        const topicIds = wxPusherBotTopicIds ? wxPusherBotTopicIds.split(';')
+            .map(id => id.trim())
+            .filter(id => id)
+            .map(id => parseInt(id)) : [];
+        // 处理 uids，将分号分隔的字符串转为数组  
+        const uids = wxPusherBotUids ? wxPusherBotUids.split(';')
+            .map(uid => uid.trim())
+            .filter(uid => uid) : [];
+        // topic_ids 和 uids 至少要有一个
+        if (!topicIds.length && !uids.length) {
+            throw new Error('wxPusher 服务的 TopicIds 和 Uids 至少配置一个才行');
+        }
+        const url = `https://wxpusher.zjiecode.com/api/send/message`;
+        try {
+            const res = await got_1.default
+                .post(url, Object.assign(Object.assign({}, this.gotOption), { json: {
+                    appToken: wxPusherBotAppToken,
+                    content: `<h1>${this.title}</h1><br/><div style='white-space: pre-wrap;'>${this.content}</div>`,
+                    summary: this.title,
+                    contentType: 2,
+                    topicIds: topicIds,
+                    uids: uids,
+                    verifyPayType: 0
+                } }))
+                .json();
+            if (res.code === 1000) {
+                return true;
+            }
+            else {
+                throw new Error(JSON.stringify(res));
+            }
+        }
+        catch (error) {
+            throw new Error(error.response ? error.response.body : error);
+        }
+    }
     async chronocat() {
         var _a, _b;
         const { chronocatURL, chronocatQQ, chronocatToken } = this.params;