@whyour/qinglong 2.18.0 → 2.18.2-0

package/static/build/config/index.js

@@ -48,7 +48,6 @@ const extraFile = path_1.default.join(configPath, 'extra.sh');
 const confBakDir = path_1.default.join(dataPath, 'config/bak/');
 const sampleFile = path_1.default.join(samplePath, 'config.sample.sh');
 const sqliteFile = path_1.default.join(samplePath, 'database.sqlite');
-const systemNotifyFile = path_1.default.join(preloadPath, 'system-notify.json');
 const authError = '错误的用户名密码，请重试';
 const loginFaild = '请先登录!';
 const configString = 'config sample crontab shareCode diy';
@@ -129,6 +128,5 @@ exports.default = {
     sqliteFile,
     sshdPath,
     systemLogPath,
-    systemNotifyFile,
 };
 //# sourceMappingURL=index.js.map

package/static/build/config/util.js

@@ -29,7 +29,7 @@ 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.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.getFileContentByName = void 0;
+exports.updateLinuxMirrorFile = exports.detectOS = 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;
 const fs = __importStar(require("fs/promises"));
 const path = __importStar(require("path"));
 const got_1 = __importDefault(require("got"));
@@ -54,6 +54,10 @@ async function getFileContentByName(fileName) {
     return '';
 }
 exports.getFileContentByName = getFileContentByName;
+function removeAnsi(text) {
+    return text.replace(/\x1b\[\d+m/g, '');
+}
+exports.removeAnsi = removeAnsi;
 async function getLastModifyFilePath(dir) {
     let filePath = '';
     const _exsit = await fileExist(dir);
@@ -250,7 +254,7 @@ var FileType;
 })(FileType || (FileType = {}));
 function dirSort(a, b) {
     if (a.type === 'file' && b.type === 'file') {
-        return b.mtime - a.mtime;
+        return b.createTime - a.createTime;
     }
     else if (a.type === 'directory' && b.type === 'directory') {
         return a.title.localeCompare(b.title);
@@ -278,7 +282,7 @@ async function readDirs(dir, baseDir = '', blacklist = [], sort = dirSort) {
                 key,
                 type: 'directory',
                 parent: relativePath,
-                mtime: stats.mtime.getTime(),
+                createTime: stats.birthtime.getTime(),
                 children: children.sort(sort),
             });
         }
@@ -289,7 +293,7 @@ async function readDirs(dir, baseDir = '', blacklist = [], sort = dirSort) {
                 key,
                 parent: relativePath,
                 size: stats.size,
-                mtime: stats.mtime.getTime(),
+                createTime: stats.birthtime.getTime(),
             });
         }
     }

package/static/build/data/env.js

@@ -14,7 +14,7 @@ class Env {
         this.timestamp = new Date().toString();
         this.position = options.position;
         this.name = options.name;
-        this.remarks = options.remarks;
+        this.remarks = options.remarks || '';
     }
 }
 exports.Env = Env;

package/static/build/loaders/db.js

@@ -4,17 +4,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const logger_1 = __importDefault(require("./logger"));
-const path_1 = __importDefault(require("path"));
-const nedb_1 = __importDefault(require("nedb"));
 const env_1 = require("../data/env");
 const cron_1 = require("../data/cron");
 const dependence_1 = require("../data/dependence");
 const open_1 = require("../data/open");
 const system_1 = require("../data/system");
-const util_1 = require("../config/util");
 const subscription_1 = require("../data/subscription");
 const cronView_1 = require("../data/cronView");
-const config_1 = __importDefault(require("../config"));
 const data_1 = require("../data");
 exports.default = async () => {
     try {
@@ -62,72 +58,6 @@ exports.default = async () => {
             await data_1.sequelize.query('alter table Crontabs add column task_after TEXT');
         }
         catch (error) { }
-        // 2.10-2.11 升级
-        const cronDbFile = path_1.default.join(config_1.default.rootPath, 'db/crontab.db');
-        const envDbFile = path_1.default.join(config_1.default.rootPath, 'db/env.db');
-        const appDbFile = path_1.default.join(config_1.default.rootPath, 'db/app.db');
-        const authDbFile = path_1.default.join(config_1.default.rootPath, 'db/auth.db');
-        const dependenceDbFile = path_1.default.join(config_1.default.rootPath, 'db/dependence.db');
-        const crondbExist = await (0, util_1.fileExist)(cronDbFile);
-        const dependenceDbExist = await (0, util_1.fileExist)(dependenceDbFile);
-        const envDbExist = await (0, util_1.fileExist)(envDbFile);
-        const appDbExist = await (0, util_1.fileExist)(appDbFile);
-        const authDbExist = await (0, util_1.fileExist)(authDbFile);
-        const cronCount = await cron_1.CrontabModel.count();
-        const dependenceCount = await dependence_1.DependenceModel.count();
-        const envCount = await env_1.EnvModel.count();
-        const appCount = await open_1.AppModel.count();
-        const authCount = await system_1.SystemModel.count();
-        if (crondbExist && cronCount === 0) {
-            const cronDb = new nedb_1.default({
-                filename: cronDbFile,
-                autoload: true,
-            });
-            cronDb.persistence.compactDatafile();
-            cronDb.find({}).exec(async (err, docs) => {
-                await cron_1.CrontabModel.bulkCreate(docs, { ignoreDuplicates: true });
-            });
-        }
-        if (dependenceDbExist && dependenceCount === 0) {
-            const dependenceDb = new nedb_1.default({
-                filename: dependenceDbFile,
-                autoload: true,
-            });
-            dependenceDb.persistence.compactDatafile();
-            dependenceDb.find({}).exec(async (err, docs) => {
-                await dependence_1.DependenceModel.bulkCreate(docs, { ignoreDuplicates: true });
-            });
-        }
-        if (envDbExist && envCount === 0) {
-            const envDb = new nedb_1.default({
-                filename: envDbFile,
-                autoload: true,
-            });
-            envDb.persistence.compactDatafile();
-            envDb.find({}).exec(async (err, docs) => {
-                await env_1.EnvModel.bulkCreate(docs, { ignoreDuplicates: true });
-            });
-        }
-        if (appDbExist && appCount === 0) {
-            const appDb = new nedb_1.default({
-                filename: appDbFile,
-                autoload: true,
-            });
-            appDb.persistence.compactDatafile();
-            appDb.find({}).exec(async (err, docs) => {
-                await open_1.AppModel.bulkCreate(docs, { ignoreDuplicates: true });
-            });
-        }
-        if (authDbExist && authCount === 0) {
-            const authDb = new nedb_1.default({
-                filename: authDbFile,
-                autoload: true,
-            });
-            authDb.persistence.compactDatafile();
-            authDb.find({}).exec(async (err, docs) => {
-                await system_1.SystemModel.bulkCreate(docs, { ignoreDuplicates: true });
-            });
-        }
         console.log('✌️ DB loaded');
         logger_1.default.info('✌️ DB loaded');
     }

package/static/build/loaders/express.js

@@ -1,27 +1,4 @@
 "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 __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 __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -34,7 +11,6 @@ const config_1 = __importDefault(require("../config"));
 const express_jwt_1 = require("express-jwt");
 const util_1 = require("../config/util");
 const express_urlrewrite_1 = __importDefault(require("express-urlrewrite"));
-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");
@@ -132,7 +108,6 @@ exports.default = ({ app }) => {
         next(err);
     });
     app.use((0, celebrate_1.errors)());
-    Sentry.setupExpressErrorHandler(app);
     app.use((err, req, res, next) => {
         if (err.name === 'UnauthorizedError') {
             return res
@@ -148,8 +123,8 @@ exports.default = ({ app }) => {
                 .status(500)
                 .send({
                 code: 400,
-                message: `${err.name} ${err.message}`,
-                validation: err.errors,
+                message: `${err.message}`,
+                errors: err.errors,
             })
                 .end();
         }

package/static/build/loaders/initData.js

@@ -22,8 +22,9 @@ 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"));
+const open_2 = require("../data/open");
 exports.default = async () => {
-    var _a, _b, _c, _d, _e, _f;
+    var _a, _b, _c, _d, _e, _f, _g;
     const cronService = typedi_1.Container.get(cron_2.default);
     const envService = typedi_1.Container.get(env_1.default);
     const dependenceService = typedi_1.Container.get(dependence_1.default);
@@ -31,10 +32,21 @@ exports.default = async () => {
     const userService = typedi_1.Container.get(user_1.default);
     const openService = typedi_1.Container.get(open_1.default);
     // 初始化增加系统配置
+    let systemApp = (_a = (await open_2.AppModel.findOne({
+        where: { name: 'system' },
+    }))) === null || _a === void 0 ? void 0 : _a.get({ plain: true });
+    if (!systemApp) {
+        systemApp = await open_2.AppModel.create({
+            name: 'system',
+            scopes: ['crons', 'system'],
+            client_id: (0, util_1.createRandomString)(12, 12),
+            client_secret: (0, util_1.createRandomString)(24, 24),
+        });
+    }
     const [systemConfig] = await system_1.SystemModel.findOrCreate({
         where: { type: system_1.AuthDataType.systemConfig },
     });
-    const [notifyConfig] = await system_1.SystemModel.findOrCreate({
+    await system_1.SystemModel.findOrCreate({
         where: { type: system_1.AuthDataType.notification },
     });
     const [authConfig] = await system_1.SystemModel.findOrCreate({
@@ -58,10 +70,6 @@ exports.default = async () => {
             type: system_1.AuthDataType.authConfig,
         });
     }
-    // 初始化通知配置
-    if (notifyConfig.info) {
-        await (0, promises_1.writeFile)(config_1.default.systemNotifyFile, JSON.stringify(notifyConfig.info));
-    }
     const installDependencies = () => {
         // 初始化时安装所有处于安装中，安装成功，安装失败的依赖
         dependence_2.DependenceModel.findAll({
@@ -79,22 +87,22 @@ exports.default = async () => {
         });
     };
     // 初始化更新 linux/python/nodejs 镜像源配置
-    if ((_a = systemConfig.info) === null || _a === void 0 ? void 0 : _a.pythonMirror) {
+    if ((_b = systemConfig.info) === null || _b === void 0 ? void 0 : _b.pythonMirror) {
         systemService.updatePythonMirror({
-            pythonMirror: (_b = systemConfig.info) === null || _b === void 0 ? void 0 : _b.pythonMirror,
+            pythonMirror: (_c = systemConfig.info) === null || _c === void 0 ? void 0 : _c.pythonMirror,
         });
     }
-    if ((_c = systemConfig.info) === null || _c === void 0 ? void 0 : _c.linuxMirror) {
+    if ((_d = systemConfig.info) === null || _d === void 0 ? void 0 : _d.linuxMirror) {
         systemService.updateLinuxMirror({
-            linuxMirror: (_d = systemConfig.info) === null || _d === void 0 ? void 0 : _d.linuxMirror,
+            linuxMirror: (_e = systemConfig.info) === null || _e === void 0 ? void 0 : _e.linuxMirror,
         }, undefined, () => installDependencies());
     }
     else {
         installDependencies();
     }
-    if ((_e = systemConfig.info) === null || _e === void 0 ? void 0 : _e.nodeMirror) {
+    if ((_f = systemConfig.info) === null || _f === void 0 ? void 0 : _f.nodeMirror) {
         systemService.updateNodeMirror({
-            nodeMirror: (_f = systemConfig.info) === null || _f === void 0 ? void 0 : _f.nodeMirror,
+            nodeMirror: (_g = systemConfig.info) === null || _g === void 0 ? void 0 : _g.nodeMirror,
         });
     }
     // 初始化新增默认全部任务视图