@whyour/qinglong 2.19.1-0 → 2.19.2-0

package/back/protos/api.proto

@@ -53,14 +53,7 @@ message Response {
   optional string message = 2;
 }
 
-message SystemNotifyRequest {
-  string title = 1;
-  string content = 2;
-}
-
-message ExtraScheduleItem {
-  string schedule = 1;
-}
+message ExtraScheduleItem { string schedule = 1; }
 
 message CronItem {
   optional int32 id = 1;
@@ -124,6 +117,128 @@ message CronDetailResponse {
   optional string message = 3;
 }
 
+enum NotificationMode {
+  gotify = 0;
+  goCqHttpBot = 1;
+  serverChan = 2;
+  pushDeer = 3;
+  bark = 4;
+  chat = 5;
+  telegramBot = 6;
+  dingtalkBot = 7;
+  weWorkBot = 8;
+  weWorkApp = 9;
+  aibotk = 10;
+  iGot = 11;
+  pushPlus = 12;
+  wePlusBot = 13;
+  email = 14;
+  pushMe = 15;
+  feishu = 16;
+  webhook = 17;
+  chronocat = 18;
+  ntfy = 19;
+  wxPusherBot = 20;
+}
+
+message NotificationInfo {
+  NotificationMode type = 1;
+
+  optional string gotifyUrl = 2;
+  optional string gotifyToken = 3;
+  optional int32 gotifyPriority = 4;
+
+  optional string goCqHttpBotUrl = 5;
+  optional string goCqHttpBotToken = 6;
+  optional string goCqHttpBotQq = 7;
+
+  optional string serverChanKey = 8;
+
+  optional string pushDeerKey = 9;
+  optional string pushDeerUrl = 10;
+
+  optional string synologyChatUrl = 11;
+
+  optional string barkPush = 12;
+  optional string barkIcon = 13;
+  optional string barkSound = 14;
+  optional string barkGroup = 15;
+  optional string barkLevel = 16;
+  optional string barkUrl = 17;
+  optional string barkArchive = 18;
+
+  optional string telegramBotToken = 19;
+  optional string telegramBotUserId = 20;
+  optional string telegramBotProxyHost = 21;
+  optional string telegramBotProxyPort = 22;
+  optional string telegramBotProxyAuth = 23;
+  optional string telegramBotApiHost = 24;
+
+  optional string dingtalkBotToken = 25;
+  optional string dingtalkBotSecret = 26;
+
+  optional string weWorkBotKey = 27;
+  optional string weWorkOrigin = 28;
+
+  optional string weWorkAppKey = 29;
+
+  optional string aibotkKey = 30;
+  optional string aibotkType = 31;
+  optional string aibotkName = 32;
+
+  optional string iGotPushKey = 33;
+
+  optional string pushPlusToken = 34;
+  optional string pushPlusUser = 35;
+  optional string pushPlusTemplate = 36;
+  optional string pushplusChannel = 37;
+  optional string pushplusWebhook = 38;
+  optional string pushplusCallbackUrl = 39;
+  optional string pushplusTo = 40;
+
+  optional string wePlusBotToken = 41;
+  optional string wePlusBotReceiver = 42;
+  optional string wePlusBotVersion = 43;
+
+  optional string emailService = 44;
+  optional string emailUser = 45;
+  optional string emailPass = 46;
+  optional string emailTo = 47;
+
+  optional string pushMeKey = 48;
+  optional string pushMeUrl = 49;
+
+  optional string chronocatURL = 50;
+  optional string chronocatQQ = 51;
+  optional string chronocatToken = 52;
+
+  optional string webhookHeaders = 53;
+  optional string webhookBody = 54;
+  optional string webhookUrl = 55;
+  optional string webhookMethod = 56;
+  optional string webhookContentType = 57;
+
+  optional string larkKey = 58;
+
+  optional string ntfyUrl = 59;
+  optional string ntfyTopic = 60;
+  optional string ntfyPriority = 61;
+  optional string ntfyToken = 62;
+  optional string ntfyUsername = 63;
+  optional string ntfyPassword = 64;
+  optional string ntfyActions = 65;
+
+  optional string wxPusherBotAppToken = 66;
+  optional string wxPusherBotTopicIds = 67;
+  optional string wxPusherBotUids = 68;
+}
+
+message SystemNotifyRequest {
+  string title = 1;
+  string content = 2;
+  optional NotificationInfo notificationInfo = 3;
+}
+
 service Api {
   rpc GetEnvs(GetEnvsRequest) returns (EnvsResponse) {}
   rpc CreateEnv(CreateEnvRequest) returns (EnvsResponse) {}

package/package.json

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

package/sample/config.sample.sh

@@ -226,9 +226,17 @@ export QMSG_TYPE=""
 ## ntfy_url 填写ntfy地址,如https://ntfy.sh
 ## ntfy_topic 填写ntfy的消息应用topic
 ## ntfy_priority 填写推送消息优先级,默认为3
+## ntfy_token 填写推送token,可选
+## ntfy_username 填写推送用户名称,可选
+## ntfy_password 填写推送用户密码,可选
+## ntfy_actions 填写推送用户动作,可选
 export NTFY_URL=""
 export NTFY_TOPIC=""
 export NTFY_PRIORITY="3"
+export NTFY_TOKEN=""
+export NTFY_USERNAME=""
+export NTFY_PASSWORD=""
+export NTFY_ACTIONS=""
 
 ## 21. wxPusher
 ## 官方文档: https://wxpusher.zjiecode.com/docs/

package/sample/notify.js

@@ -140,6 +140,10 @@ const push_config = {
   NTFY_URL: '', // ntfy地址,如https://ntfy.sh,默认为https://ntfy.sh
   NTFY_TOPIC: '', // ntfy的消息应用topic
   NTFY_PRIORITY: '3', // 推送消息优先级,默认为3
+  NTFY_TOKEN: '', // 推送token,可选
+  NTFY_USERNAME: '', // 推送用户名称,可选
+  NTFY_PASSWORD: '', // 推送用户密码,可选
+  NTFY_ACTIONS: '', // 推送用户动作,可选
 
   // 官方文档: https://wxpusher.zjiecode.com/docs/
   // 管理后台: https://wxpusher.zjiecode.com/admin/
@@ -1258,7 +1262,7 @@ function ntfyNotify(text, desp) {
   }
 
   return new Promise((resolve) => {
-    const { NTFY_URL, NTFY_TOPIC, NTFY_PRIORITY } = push_config;
+    const { NTFY_URL, NTFY_TOPIC, NTFY_PRIORITY, NTFY_TOKEN, NTFY_USERNAME, NTFY_PASSWORD, NTFY_ACTIONS } = push_config;
     if (NTFY_TOPIC) {
       const options = {
         url: `${NTFY_URL || 'https://ntfy.sh'}/${NTFY_TOPIC}`,
@@ -1266,9 +1270,19 @@ function ntfyNotify(text, desp) {
         headers: {
           Title: `${encodeRFC2047(text)}`,
           Priority: NTFY_PRIORITY || '3',
+          Icon: 'https://qn.whyour.cn/logo.png',
         },
         timeout,
       };
+      if (NTFY_TOKEN) {
+        options.headers['Authorization'] = `Bearer ${NTFY_TOKEN}`;
+      } else if (NTFY_USERNAME && NTFY_PASSWORD) {
+        options.headers['Authorization'] = `Basic ${Buffer.from(`${NTFY_USERNAME}:${NTFY_PASSWORD}`).toString('base64')}`;
+      }
+      if (NTFY_ACTIONS) {
+        options.headers['Actions'] = encodeRFC2047(NTFY_ACTIONS);
+      }
+
       $.post(options, (err, resp, data) => {
         try {
           if (err) {

package/sample/notify.py

@@ -126,6 +126,10 @@ push_config = {
     'NTFY_URL': '',                     # ntfy地址,如https://ntfy.sh
     'NTFY_TOPIC': '',                   # ntfy的消息应用topic
     'NTFY_PRIORITY':'3',                # 推送消息优先级,默认为3
+    'NTFY_TOKEN': '',                   # 推送token,可选
+    'NTFY_USERNAME': '',                # 推送用户名称,可选
+    'NTFY_PASSWORD': '',                # 推送用户密码,可选
+    'NTFY_ACTIONS': '',                 # 推送用户动作,可选
 
     'WXPUSHER_APP_TOKEN': '',           # wxpusher 的 appToken 官方文档: https://wxpusher.zjiecode.com/docs/ 管理后台: https://wxpusher.zjiecode.com/admin/
     'WXPUSHER_TOPIC_IDS': '',           # wxpusher 的 主题ID，多个用英文分号;分隔 topic_ids 与 uids 至少配置一个才行
@@ -806,7 +810,14 @@ def ntfy(title: str, content: str) -> None:
     encoded_title = encode_rfc2047(title)
 
     data = content.encode(encoding="utf-8")
-    headers = {"Title": encoded_title, "Priority": priority}  # 使用编码后的 title
+    headers = {"Title": encoded_title, "Priority": priority, "Icon": "https://qn.whyour.cn/logo.png"}  # 使用编码后的 title
+    if push_config.get("NTFY_TOKEN"):
+        headers['Authorization'] = "Bearer " + push_config.get("NTFY_TOKEN")
+    elif push_config.get("NTFY_USERNAME") and push_config.get("NTFY_PASSWORD"):
+        authStr = push_config.get("NTFY_USERNAME") + ":" + push_config.get("NTFY_PASSWORD")
+        headers['Authorization'] = "Basic " + base64.b64encode(authStr.encode('utf-8')).decode('utf-8')
+    if push_config.get("NTFY_ACTIONS"):
+        headers['Actions'] = encode_rfc2047(push_config.get("NTFY_ACTIONS"))
 
     url = push_config.get("NTFY_URL") + "/" + push_config.get("NTFY_TOPIC")
     response = requests.post(url, data=data, headers=headers)

package/shell/preload/sitecustomize.js

@@ -87,12 +87,10 @@ function run() {
       console.log('执行前置命令结束\n');
     }
   } catch (error) {
-    if (!error.message.includes('spawnSync /bin/sh E2BIG')) {
+    if (!error.message.includes('spawnSync /bin/bash E2BIG')) {
       console.log(`\ue926 run task before error: `, error);
     } else {
-      console.log(
-        `\ue926 The environment variable is too large. It is recommended to use task_before.js instead of task_before.sh\n`,
-      );
+      // environment variable is too large
     }
     if (task_before) {
       console.log('执行前置命令结束\n');

package/shell/preload/sitecustomize.py

@@ -98,10 +98,8 @@ def run():
         error_message = str(error)
         if "Argument list too long" not in error_message:
             print(f"\ue926 run task before error: {error}")
-        else:
-            print(
-                "\ue926 The environment variable is too large. It is recommended to use task_before.py instead of task_before.sh\n"
-            )
+        # else:
+            # environment variable is too large
         if task_before:
             print("执行前置命令结束\n")
     except Exception as error:

package/shell/pub.sh

@@ -1,14 +1,10 @@
 #!/usr/bin/env bash
 echo -e "开始发布"
 
-echo -e "切换master分支"
-git checkout master
-
-echo -e "合并develop代码"
-git merge origin/develop
-
-echo -e "提交master代码"
-git push
+echo -e "切换 debian 分支"
+git branch -D debian
+git checkout -b debian
+git push --set-upstream origin debian -f
 
 echo -e "更新cdn文件"
 ts-node-transpile-only sample/tool.ts

package/static/build/api/system.js

@@ -277,10 +277,14 @@ exports.default = (app) => {
             return next(e);
         }
     });
-    route.put('/data/export', async (req, res, next) => {
+    route.put('/data/export', (0, celebrate_1.celebrate)({
+        body: celebrate_1.Joi.object({
+            type: celebrate_1.Joi.array().items(celebrate_1.Joi.string()).optional(),
+        }),
+    }), async (req, res, next) => {
         try {
             const systemService = typedi_1.Container.get(system_1.default);
-            await systemService.exportData(res);
+            await systemService.exportData(res, req.body.type);
         }
         catch (e) {
             return next(e);
@@ -352,5 +356,19 @@ exports.default = (app) => {
             return next(e);
         }
     });
+    route.put('/config/dependence-clean', (0, celebrate_1.celebrate)({
+        body: celebrate_1.Joi.object({
+            type: celebrate_1.Joi.string().allow(''),
+        }),
+    }), async (req, res, next) => {
+        try {
+            const systemService = typedi_1.Container.get(system_1.default);
+            const result = await systemService.cleanDependence(req.body.type);
+            res.send(result);
+        }
+        catch (e) {
+            return next(e);
+        }
+    });
 };
 //# sourceMappingURL=system.js.map

package/static/build/app.js

@@ -27,6 +27,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 require("reflect-metadata");
+const cluster_1 = __importDefault(require("cluster"));
 const compression_1 = __importDefault(require("compression"));
 const cors_1 = __importDefault(require("cors"));
 const express_1 = __importDefault(require("express"));
@@ -38,28 +39,51 @@ const monitoring_1 = require("./middlewares/monitoring");
 class Application {
     constructor() {
         this.isShuttingDown = false;
+        this.workerMetadataMap = new Map();
         this.app = (0, express_1.default)();
     }
     async start() {
-        var _a;
         try {
-            await this.initializeDatabase();
-            await this.initServer();
-            this.setupMiddlewares();
-            await this.initializeServices();
-            this.setupGracefulShutdown();
-            (_a = process.send) === null || _a === void 0 ? void 0 : _a.call(process, 'ready');
+            if (cluster_1.default.isPrimary) {
+                await this.initializeDatabase();
+            }
+            if (cluster_1.default.isPrimary) {
+                this.startMasterProcess();
+            }
+            else {
+                await this.startWorkerProcess();
+            }
         }
         catch (error) {
             logger_1.default.error('Failed to start application:', error);
             process.exit(1);
         }
     }
-    async initServer() {
-        const { HttpServerService } = await Promise.resolve().then(() => __importStar(require('./services/http')));
-        const { GrpcServerService } = await Promise.resolve().then(() => __importStar(require('./services/grpc')));
-        this.httpServerService = typedi_1.Container.get(HttpServerService);
-        this.grpcServerService = typedi_1.Container.get(GrpcServerService);
+    startMasterProcess() {
+        this.forkWorker('http');
+        this.forkWorker('grpc');
+        cluster_1.default.on('exit', (worker, code, signal) => {
+            const metadata = this.workerMetadataMap.get(worker.id);
+            if (metadata) {
+                if (!this.isShuttingDown) {
+                    logger_1.default.error(`${metadata.serviceType} worker ${worker.process.pid} died (${signal || code}). Restarting...`);
+                    const newWorker = this.forkWorker(metadata.serviceType);
+                    logger_1.default.info(`Restarted ${metadata.serviceType} worker (New PID: ${newWorker.process.pid})`);
+                }
+                this.workerMetadataMap.delete(worker.id);
+            }
+        });
+        this.setupMasterShutdown();
+    }
+    forkWorker(serviceType) {
+        const worker = cluster_1.default.fork({ SERVICE_TYPE: serviceType });
+        this.workerMetadataMap.set(worker.id, {
+            id: worker.id,
+            pid: worker.process.pid,
+            serviceType,
+            startTime: new Date(),
+        });
+        return worker;
     }
     async initializeDatabase() {
         await require('./loaders/db').default();
@@ -70,35 +94,116 @@ class Application {
         this.app.use((0, compression_1.default)());
         this.app.use(monitoring_1.monitoringMiddleware);
     }
-    async initializeServices() {
-        var _a, _b;
-        await ((_a = this.grpcServerService) === null || _a === void 0 ? void 0 : _a.initialize());
-        await require('./loaders/app').default({ app: this.app });
-        const server = await ((_b = this.httpServerService) === null || _b === void 0 ? void 0 : _b.initialize(this.app, config_1.default.port));
-        await require('./loaders/server').default({ server });
-    }
-    setupGracefulShutdown() {
+    setupMasterShutdown() {
         const shutdown = async () => {
-            var _a, _b;
             if (this.isShuttingDown)
                 return;
             this.isShuttingDown = true;
-            logger_1.default.info('Shutting down services...');
+            const workers = Object.values(cluster_1.default.workers || {});
+            const workerPromises = [];
+            workers.forEach((worker) => {
+                if (worker) {
+                    const exitPromise = new Promise((resolve) => {
+                        worker.once('exit', () => {
+                            logger_1.default.info(`Worker ${worker.process.pid} exited`);
+                            resolve();
+                        });
+                        try {
+                            worker.send('shutdown');
+                        }
+                        catch (error) {
+                            logger_1.default.warn(`Failed to send shutdown to worker ${worker.process.pid}:`, error);
+                        }
+                    });
+                    workerPromises.push(exitPromise);
+                }
+            });
             try {
-                await Promise.all([
-                    (_a = this.grpcServerService) === null || _a === void 0 ? void 0 : _a.shutdown(),
-                    (_b = this.httpServerService) === null || _b === void 0 ? void 0 : _b.shutdown(),
+                await Promise.race([
+                    Promise.all(workerPromises),
+                    new Promise((resolve) => {
+                        setTimeout(() => {
+                            logger_1.default.warn('Worker shutdown timeout reached');
+                            resolve();
+                        }, 10000);
+                    }),
                 ]);
                 process.exit(0);
             }
             catch (error) {
-                logger_1.default.error('Error during shutdown:', error);
+                logger_1.default.error('Error during worker shutdown:', error);
                 process.exit(1);
             }
         };
         process.on('SIGTERM', shutdown);
         process.on('SIGINT', shutdown);
     }
+    async startWorkerProcess() {
+        var _a;
+        const serviceType = process.env.SERVICE_TYPE;
+        if (!serviceType || !['http', 'grpc'].includes(serviceType)) {
+            logger_1.default.error('Invalid SERVICE_TYPE:', serviceType);
+            process.exit(1);
+        }
+        logger_1.default.info(`✌️ ${serviceType} worker started (PID: ${process.pid})`);
+        try {
+            if (serviceType === 'http') {
+                await this.startHttpService();
+            }
+            else {
+                await this.startGrpcService();
+            }
+            (_a = process.send) === null || _a === void 0 ? void 0 : _a.call(process, 'ready');
+        }
+        catch (error) {
+            logger_1.default.error(`${serviceType} worker failed:`, error);
+            process.exit(1);
+        }
+    }
+    async startHttpService() {
+        this.setupMiddlewares();
+        const { HttpServerService } = await Promise.resolve().then(() => __importStar(require('./services/http')));
+        this.httpServerService = typedi_1.Container.get(HttpServerService);
+        await require('./loaders/app').default({ app: this.app });
+        const server = await this.httpServerService.initialize(this.app, config_1.default.port);
+        await require('./loaders/server').default({ server });
+        this.setupWorkerShutdown('http');
+    }
+    async startGrpcService() {
+        const { GrpcServerService } = await Promise.resolve().then(() => __importStar(require('./services/grpc')));
+        this.grpcServerService = typedi_1.Container.get(GrpcServerService);
+        await this.grpcServerService.initialize();
+        this.setupWorkerShutdown('grpc');
+    }
+    setupWorkerShutdown(serviceType) {
+        process.on('message', (msg) => {
+            if (msg === 'shutdown') {
+                this.gracefulShutdown(serviceType);
+            }
+        });
+        const shutdown = () => this.gracefulShutdown(serviceType);
+        process.on('SIGTERM', shutdown);
+        process.on('SIGINT', shutdown);
+    }
+    async gracefulShutdown(serviceType) {
+        var _a, _b;
+        if (this.isShuttingDown)
+            return;
+        this.isShuttingDown = true;
+        try {
+            if (serviceType === 'http') {
+                await ((_a = this.httpServerService) === null || _a === void 0 ? void 0 : _a.shutdown());
+            }
+            else {
+                await ((_b = this.grpcServerService) === null || _b === void 0 ? void 0 : _b.shutdown());
+            }
+            process.exit(0);
+        }
+        catch (error) {
+            logger_1.default.error(`[${serviceType}] Error during shutdown:`, error);
+            process.exit(1);
+        }
+    }
 }
 const app = new Application();
 app.start().catch((error) => {

package/static/build/config/const.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.LINUX_DEPENDENCE_COMMAND = exports.PYTHON_INSTALL_DIR = exports.SAMPLE_FILES = exports.QL_PREFIX = exports.TASK_PREFIX = exports.QL_COMMAND = exports.TASK_COMMAND = exports.LOG_END_SYMBOL = void 0;
+exports.LINUX_DEPENDENCE_COMMAND = exports.NotificationModeStringMap = exports.PYTHON_INSTALL_DIR = exports.SAMPLE_FILES = exports.QL_PREFIX = exports.TASK_PREFIX = exports.QL_COMMAND = exports.TASK_COMMAND = exports.LOG_END_SYMBOL = void 0;
 exports.LOG_END_SYMBOL = '　　　　　';
 exports.TASK_COMMAND = 'task';
 exports.QL_COMMAND = 'ql';
@@ -24,6 +24,29 @@ exports.SAMPLE_FILES = [
     },
 ];
 exports.PYTHON_INSTALL_DIR = process.env.PYTHON_HOME;
+exports.NotificationModeStringMap = {
+    0: 'gotify',
+    1: 'goCqHttpBot',
+    2: 'serverChan',
+    3: 'pushDeer',
+    4: 'bark',
+    5: 'chat',
+    6: 'telegramBot',
+    7: 'dingtalkBot',
+    8: 'weWorkBot',
+    9: 'weWorkApp',
+    10: 'aibotk',
+    11: 'iGot',
+    12: 'pushPlus',
+    13: 'wePlusBot',
+    14: 'email',
+    15: 'pushMe',
+    16: 'feishu',
+    17: 'webhook',
+    18: 'chronocat',
+    19: 'ntfy',
+    20: 'wxPusherBot',
+};
 exports.LINUX_DEPENDENCE_COMMAND = {
     Debian: {
         install: 'apt-get install -y',

package/static/build/config/index.js

@@ -5,7 +5,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const dotenv_1 = __importDefault(require("dotenv"));
 const path_1 = __importDefault(require("path"));
-const share_1 = require("./share");
 dotenv_1.default.config({
     path: path_1.default.join(__dirname, '../../.env'),
 });
@@ -22,7 +21,7 @@ const config = {
         prefix: '/api',
     },
     jwt: {
-        secret: process.env.JWT_SECRET || (0, share_1.createRandomString)(16, 32),
+        secret: process.env.JWT_SECRET || 'whyour-secret',
         expiresIn: process.env.JWT_EXPIRES_IN,
     },
     cors: {
@@ -60,6 +59,7 @@ const dbPath = path_1.default.join(dataPath, 'db/');
 const uploadPath = path_1.default.join(dataPath, 'upload/');
 const sshdPath = path_1.default.join(dataPath, 'ssh.d/');
 const systemLogPath = path_1.default.join(dataPath, 'syslog/');
+const dependenceCachePath = path_1.default.join(dataPath, 'dep_cache/');
 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');
@@ -135,5 +135,6 @@ exports.default = Object.assign(Object.assign({}, config), { jwt: config.jwt, ro
     lastVersionFile,
     sqliteFile,
     sshdPath,
-    systemLogPath });
+    systemLogPath,
+    dependenceCachePath });
 //# sourceMappingURL=index.js.map

package/static/build/data/notify.js

@@ -205,6 +205,10 @@ class NtfyNotification extends NotificationBaseInfo {
         this.ntfyUrl = '';
         this.ntfyTopic = '';
         this.ntfyPriority = '';
+        this.ntfyToken = '';
+        this.ntfyUsername = '';
+        this.ntfyPassword = '';
+        this.ntfyActions = '';
     }
 }
 exports.NtfyNotification = NtfyNotification;