@whyour/qinglong 0.15.1 → 0.15.3

package/package.json

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

package/static/build/loaders/initData.js

@@ -22,21 +22,40 @@ exports.default = async () => {
     const envService = typedi_1.Container.get(env_1.default);
     const dependenceService = typedi_1.Container.get(dependence_1.default);
     const systemService = typedi_1.Container.get(system_2.default);
+    const installDependencies = () => {
+        // 初始化时安装所有处于安装中，安装成功，安装失败的依赖
+        dependence_2.DependenceModel.findAll({
+            where: {},
+            order: [
+                ['type', 'DESC'],
+                ['createdAt', 'DESC'],
+            ],
+            raw: true,
+        }).then(async (docs) => {
+            await dependence_2.DependenceModel.update({ status: dependence_2.DependenceStatus.queued, log: [] }, { where: { id: docs.map((x) => x.id) } });
+            setTimeout(() => {
+                dependenceService.installDependenceOneByOne(docs);
+            }, 5000);
+        });
+    };
     // 初始化更新 linux/python/nodejs 镜像源配置
     const systemConfig = await systemService.getSystemConfig();
     if ((_a = systemConfig.info) === null || _a === void 0 ? void 0 : _a.pythonMirror) {
         systemService.updatePythonMirror({
-            linuxMirror: (_b = systemConfig.info) === null || _b === void 0 ? void 0 : _b.linuxMirror,
+            pythonMirror: (_b = systemConfig.info) === null || _b === void 0 ? void 0 : _b.pythonMirror,
         });
     }
     if ((_c = systemConfig.info) === null || _c === void 0 ? void 0 : _c.linuxMirror) {
         systemService.updateLinuxMirror({
             linuxMirror: (_d = systemConfig.info) === null || _d === void 0 ? void 0 : _d.linuxMirror,
-        });
+        }, undefined, () => installDependencies());
+    }
+    else {
+        installDependencies();
     }
     if ((_e = systemConfig.info) === null || _e === void 0 ? void 0 : _e.nodeMirror) {
         systemService.updateNodeMirror({
-            linuxMirror: (_f = systemConfig.info) === null || _f === void 0 ? void 0 : _f.linuxMirror,
+            nodeMirror: (_f = systemConfig.info) === null || _f === void 0 ? void 0 : _f.nodeMirror,
         });
     }
     // 初始化新增默认全部任务视图
@@ -54,20 +73,6 @@ exports.default = async () => {
     });
     // 初始化更新所有任务状态为空闲
     await cron_1.CrontabModel.update({ status: cron_1.CrontabStatus.idle }, { where: {} });
-    // 初始化时安装所有处于安装中，安装成功，安装失败的依赖
-    dependence_2.DependenceModel.findAll({
-        where: {},
-        order: [
-            ['type', 'DESC'],
-            ['createdAt', 'DESC'],
-        ],
-        raw: true,
-    }).then(async (docs) => {
-        await dependence_2.DependenceModel.update({ status: dependence_2.DependenceStatus.queued, log: [] }, { where: { id: docs.map((x) => x.id) } });
-        setTimeout(() => {
-            dependenceService.installDependenceOneByOne(docs);
-        }, 5000);
-    });
     // 初始化时执行一次所有的 ql repo 任务
     cron_1.CrontabModel.findAll({
         where: {

package/static/build/services/system.js

@@ -141,14 +141,17 @@ let SystemService = class SystemService {
         await (0, util_1.promiseExec)(cmd);
         return { code: 200, data: info };
     }
-    async updateLinuxMirror(info, res) {
-        var _a;
+    async updateLinuxMirror(info, res, onEnd) {
         const oDoc = await this.getSystemConfig();
         await this.updateAuthDb(Object.assign(Object.assign({}, oDoc), { info: Object.assign(Object.assign({}, oDoc.info), info) }));
         let defaultDomain = 'http://deb.debian.org';
         let targetDomain = 'http://deb.debian.org';
-        if ((_a = oDoc.info) === null || _a === void 0 ? void 0 : _a.linuxMirror) {
-            defaultDomain = oDoc.info.linuxMirror;
+        const content = await fs_1.default.promises.readFile('/etc/apt/sources.list', {
+            encoding: 'utf-8',
+        });
+        const domainMatch = content.match(/(http.*)\/debian /);
+        if (domainMatch) {
+            defaultDomain = domainMatch[1];
         }
         if (info.linuxMirror) {
             targetDomain = info.linuxMirror;
@@ -164,6 +167,7 @@ let SystemService = class SystemService {
                     type: 'updateLinuxMirror',
                     message: 'update linux mirror end',
                 });
+                onEnd === null || onEnd === void 0 ? void 0 : onEnd();
             },
             onError: async (message) => {
                 this.sockService.sendMessage({ type: 'updateLinuxMirror', message });