@whyour/qinglong 2.18.2-3 → 2.18.2-6

package/static/build/app.js

@@ -18,6 +18,7 @@ async function startServer() {
         logger_1.default.debug(`✌️ 后端服务启动成功！`);
         console.debug(`✌️ 后端服务启动成功！`);
         (_a = process.send) === null || _a === void 0 ? void 0 : _a.call(process, 'ready');
+        require('./loaders/bootAfter').default();
     })
         .on('error', (err) => {
         logger_1.default.error(err);

package/static/build/config/index.js

@@ -39,8 +39,8 @@ const systemLogPath = path_1.default.join(dataPath, 'syslog/');
 const envFile = path_1.default.join(preloadPath, 'env.sh');
 const jsEnvFile = path_1.default.join(preloadPath, 'env.js');
 const pyEnvFile = path_1.default.join(preloadPath, 'env.py');
-const jsNotifyFile = path_1.default.join(preloadPath, 'notify.js');
-const pyNotifyFile = path_1.default.join(preloadPath, 'notify.py');
+const jsNotifyFile = path_1.default.join(preloadPath, '__ql_notify__.js');
+const pyNotifyFile = path_1.default.join(preloadPath, '__ql_notify__.py');
 const confFile = path_1.default.join(configPath, 'config.sh');
 const crontabFile = path_1.default.join(configPath, 'crontab.list');
 const authConfigFile = path_1.default.join(configPath, 'auth.json');

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.removeAnsi = exports.getFileContentByName = void 0;
+exports.updateLinuxMirrorFile = exports.detectOS = 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;
 const fs = __importStar(require("fs/promises"));
 const path = __importStar(require("path"));
 const got_1 = __importDefault(require("got"));
@@ -485,7 +485,7 @@ function safeJSONParse(value) {
         return JSON.parse(value);
     }
     catch (error) {
-        logger_1.default.error('[JSON.parse失败]', error);
+        logger_1.default.error('[safeJSONParse失败]', error);
         return {};
     }
 }
@@ -502,6 +502,21 @@ async function rmPath(path) {
     }
 }
 exports.rmPath = rmPath;
+async function setSystemTimezone(timezone) {
+    try {
+        if (!(await fileExist(`/usr/share/zoneinfo/${timezone}`))) {
+            throw new Error('Invalid timezone');
+        }
+        await promiseExec(`ln -sf /usr/share/zoneinfo/${timezone} /etc/localtime`);
+        await promiseExec(`echo "${timezone}" > /etc/timezone`);
+        return true;
+    }
+    catch (error) {
+        logger_1.default.error('[setSystemTimezone失败]', error);
+        return false;
+    }
+}
+exports.setSystemTimezone = setSystemTimezone;
 async function getOSReleaseInfo() {
     const osRelease = await fs.readFile('/etc/os-release', 'utf8');
     return osRelease;

package/static/build/data/notify.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-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;
+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.synologyChatNotification = exports.PushDeerNotification = exports.ServerChanNotification = exports.GoCqHttpBotNotification = exports.GotifyNotification = exports.NotificationMode = void 0;
 var NotificationMode;
 (function (NotificationMode) {
     NotificationMode["gotify"] = "gotify";
@@ -60,14 +60,13 @@ class PushDeerNotification extends NotificationBaseInfo {
     }
 }
 exports.PushDeerNotification = PushDeerNotification;
-class ChatNotification extends NotificationBaseInfo {
+class synologyChatNotification extends NotificationBaseInfo {
     constructor() {
         super(...arguments);
-        this.chatUrl = '';
-        this.chatToken = '';
+        this.synologyChatUrl = '';
     }
 }
-exports.ChatNotification = ChatNotification;
+exports.synologyChatNotification = synologyChatNotification;
 class BarkNotification extends NotificationBaseInfo {
     constructor() {
         super(...arguments);
@@ -77,7 +76,7 @@ class BarkNotification extends NotificationBaseInfo {
         this.barkGroup = 'qinglong';
         this.barkLevel = 'active';
         this.barkUrl = '';
-        this.barkArchive = "";
+        this.barkArchive = '';
     }
 }
 exports.BarkNotification = BarkNotification;

package/static/build/interface/schedule.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ScheduleType = void 0;
+var ScheduleType;
+(function (ScheduleType) {
+    ScheduleType["BOOT"] = "@boot";
+    ScheduleType["ONCE"] = "@once";
+})(ScheduleType || (exports.ScheduleType = ScheduleType = {}));
+//# sourceMappingURL=schedule.js.map

package/static/build/loaders/bootAfter.js

@@ -0,0 +1,12 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const typedi_1 = __importDefault(require("typedi"));
+const cron_1 = __importDefault(require("../services/cron"));
+exports.default = async () => {
+    const cronService = typedi_1.default.get(cron_1.default);
+    await cronService.bootTask();
+};
+//# sourceMappingURL=bootAfter.js.map

package/static/build/loaders/initFile.js

@@ -29,8 +29,8 @@ const sampleNotifyJsFile = path_1.default.join(samplePath, 'notify.js');
 const sampleNotifyPyFile = path_1.default.join(samplePath, 'notify.py');
 const scriptNotifyJsFile = path_1.default.join(scriptPath, 'sendNotify.js');
 const scriptNotifyPyFile = path_1.default.join(scriptPath, 'notify.py');
-const jsNotifyFile = path_1.default.join(preloadPath, 'notify.js');
-const pyNotifyFile = path_1.default.join(preloadPath, 'notify.py');
+const jsNotifyFile = path_1.default.join(preloadPath, '__ql_notify__.js');
+const pyNotifyFile = path_1.default.join(preloadPath, '__ql_notify__.py');
 const TaskBeforeFile = path_1.default.join(configPath, 'task_before.sh');
 const TaskBeforeJsFile = path_1.default.join(configPath, 'task_before.js');
 const TaskBeforePyFile = path_1.default.join(configPath, 'task_before.py');

package/static/build/loaders/initTask.js

@@ -32,17 +32,20 @@ exports.default = async () => {
     }, true);
     // 运行删除日志任务
     const data = await systemService.getSystemConfig();
-    if (data && data.info && data.info.logRemoveFrequency) {
-        const rmlogCron = {
-            id: data.id,
-            name: '删除日志',
-            command: `ql rmlog ${data.info.logRemoveFrequency}`,
-            runOrigin: 'system',
-        };
-        await scheduleService.cancelIntervalTask(rmlogCron);
-        scheduleService.createIntervalTask(rmlogCron, {
-            days: data.info.logRemoveFrequency,
-        }, true);
+    if (data && data.info) {
+        if (data.info.logRemoveFrequency) {
+            const rmlogCron = {
+                id: data.id,
+                name: '删除日志',
+                command: `ql rmlog ${data.info.logRemoveFrequency}`,
+                runOrigin: 'system',
+            };
+            await scheduleService.cancelIntervalTask(rmlogCron);
+            scheduleService.createIntervalTask(rmlogCron, {
+                days: data.info.logRemoveFrequency,
+            }, true);
+        }
+        systemService.updateTimezone(data.info);
     }
     await subscriptionService.setSshConfig();
     const subs = await subscriptionService.list();