@whyour/qinglong 2.21.0-1 → 2.21.0-10

package/static/build/app.js

@@ -72,37 +72,37 @@ class Application {
         // Wait for gRPC worker to signal it's ready before starting HTTP worker
         this.waitForWorkerReady(grpcWorker, 30000)
             .then(() => {
-            logger_1.default.info('✌️ gRPC worker is ready, starting HTTP worker');
+            logger_1.default.info('[boot] gRPC worker is ready, starting HTTP worker');
             this.httpWorker = this.forkWorker('http');
         })
             .catch((error) => {
-            logger_1.default.error('✌️ Failed to wait for gRPC worker:', error);
+            logger_1.default.error('[boot] Failed to wait for gRPC worker:', error);
             process.exit(1);
         });
         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...`);
+                    logger_1.default.error(`${metadata.serviceType} worker ${worker.process.pid} died (${signal || code}). Restarting...`);
                     // If gRPC worker died, restart it and wait for it to be ready
                     if (metadata.serviceType === 'grpc') {
                         const newGrpcWorker = this.forkWorker('grpc');
                         this.waitForWorkerReady(newGrpcWorker, 30000)
                             .then(() => {
-                            logger_1.default.info('✌️ gRPC worker restarted and ready');
+                            logger_1.default.info('gRPC worker restarted and ready');
                             // Re-register cron jobs by notifying the HTTP worker
                             if (this.httpWorker) {
                                 try {
                                     this.httpWorker.send('reregister-crons');
-                                    logger_1.default.info('✌️ Sent reregister-crons message to HTTP worker');
+                                    logger_1.default.info('Sent reregister-crons message to HTTP worker');
                                 }
                                 catch (error) {
-                                    logger_1.default.error('✌️ Failed to send reregister-crons message:', error);
+                                    logger_1.default.error('Failed to send reregister-crons message:', error);
                                 }
                             }
                         })
                             .catch((error) => {
-                            logger_1.default.error('✌️ Failed to restart gRPC worker:', error);
+                            logger_1.default.error('Failed to restart gRPC worker:', error);
                             process.exit(1);
                         });
                     }
@@ -110,7 +110,7 @@ class Application {
                         // For HTTP worker, just restart it
                         const newWorker = this.forkWorker(metadata.serviceType);
                         this.httpWorker = newWorker;
-                        logger_1.default.info(`✌️ Restarted ${metadata.serviceType} worker (PID: ${newWorker.process.pid})`);
+                        logger_1.default.info(`Restarted ${metadata.serviceType} worker (PID: ${newWorker.process.pid})`);
                     }
                 }
                 this.workerMetadataMap.delete(worker.id);
@@ -168,14 +168,14 @@ class Application {
                 if (worker) {
                     const exitPromise = new Promise((resolve) => {
                         worker.once('exit', () => {
-                            logger_1.default.info(`✌️ Worker ${worker.process.pid} exited`);
+                            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);
+                            logger_1.default.warn(`Failed to send shutdown to worker ${worker.process.pid}:`, error);
                         }
                     });
                     workerPromises.push(exitPromise);
@@ -186,7 +186,7 @@ class Application {
                     Promise.all(workerPromises),
                     new Promise((resolve) => {
                         setTimeout(() => {
-                            logger_1.default.warn('✌️ Worker shutdown timeout reached');
+                            logger_1.default.warn('Worker shutdown timeout reached');
                             resolve();
                         }, 10000);
                     }),
@@ -194,7 +194,7 @@ class Application {
                 process.exit(0);
             }
             catch (error) {
-                logger_1.default.error('✌️ Error during worker shutdown:', error);
+                logger_1.default.error('Error during worker shutdown:', error);
                 process.exit(1);
             }
         };
@@ -205,10 +205,10 @@ class Application {
         var _a;
         const serviceType = process.env.SERVICE_TYPE;
         if (!serviceType || !['http', 'grpc'].includes(serviceType)) {
-            logger_1.default.error('✌️ Invalid SERVICE_TYPE:', serviceType);
+            logger_1.default.error('[boot] Invalid SERVICE_TYPE:', serviceType);
             process.exit(1);
         }
-        logger_1.default.info(`✌️ ${serviceType} worker started (PID: ${process.pid})`);
+        logger_1.default.info(`[boot] ${serviceType} worker started (PID: ${process.pid})`);
         try {
             if (serviceType === 'http') {
                 await this.startHttpService();
@@ -219,7 +219,7 @@ class Application {
             (_a = process.send) === null || _a === void 0 ? void 0 : _a.call(process, 'ready');
         }
         catch (error) {
-            logger_1.default.error(`✌️ ${serviceType} worker failed:`, error);
+            logger_1.default.error(`[boot] ${serviceType} worker failed:`, error);
             process.exit(1);
         }
     }
@@ -251,14 +251,14 @@ class Application {
             else if (msg === 'reregister-crons' && serviceType === 'http') {
                 // Re-register cron jobs when gRPC worker restarts
                 try {
-                    logger_1.default.info('✌️ Received reregister-crons message, re-registering cron jobs...');
+                    logger_1.default.info('[boot] Received reregister-crons message, re-registering cron jobs...');
                     const CronService = (await Promise.resolve().then(() => __importStar(require('./services/cron')))).default;
                     const cronService = typedi_1.Container.get(CronService);
                     await cronService.autosave_crontab();
-                    logger_1.default.info('✌️ Cron jobs re-registered successfully');
+                    logger_1.default.info('[boot] Cron jobs re-registered successfully');
                 }
                 catch (error) {
-                    logger_1.default.error('✌️ Failed to re-register cron jobs:', error);
+                    logger_1.default.error('[boot] Failed to re-register cron jobs:', error);
                 }
             }
         });
@@ -281,7 +281,7 @@ class Application {
             process.exit(0);
         }
         catch (error) {
-            logger_1.default.error(`✌️ [${serviceType}] Error during shutdown:`, error);
+            logger_1.default.error(`[${serviceType}] Error during shutdown:`, error);
             process.exit(1);
         }
     }

package/static/build/config/const.js

@@ -47,6 +47,7 @@ exports.NotificationModeStringMap = {
     18: 'chronocat',
     19: 'ntfy',
     20: 'wxPusherBot',
+    21: 'wxPusherSpt',
 };
 exports.LINUX_DEPENDENCE_COMMAND = {
     Debian: {

package/static/build/config/grpcCerts.js

@@ -52,7 +52,7 @@ async function tmpFile(prefix) {
     return path_1.default.join(dir, `.${prefix}_${Date.now()}_${Math.random().toString(36).slice(2)}.pem`);
 }
 async function generateAllCerts() {
-    logger_1.default.info('Generating gRPC mTLS certificates...');
+    logger_1.default.info('[boot] Generating gRPC mTLS certificates...');
     const caKeyTmp = await tmpFile('ca_key');
     const caCertTmp = await tmpFile('ca_cert');
     const serverKeyTmp = await tmpFile('server_key');
@@ -92,7 +92,7 @@ async function generateAllCerts() {
         const clientCert = run(`openssl x509 -req -days 3650 -in '${clientCsrTmp}' -CA '${caCertTmp}' -CAkey '${caKeyTmp}' -CAcreateserial -extfile '${clientExtTmp}' 2>/dev/null`);
         const clientKey = await fs.readFile(clientKeyTmp, 'utf-8');
         await cleanup();
-        logger_1.default.info('gRPC mTLS certificates generated successfully');
+        logger_1.default.info('[boot] gRPC mTLS certificates generated successfully');
         return { caCert, serverCert, serverKey, clientCert, clientKey };
     }
     catch (e) {
@@ -107,7 +107,7 @@ async function saveCerts(tlsConfig) {
     await fs.writeFile(serverKeyPath, tlsConfig.serverKey, { mode: 0o600 });
     await fs.writeFile(clientCertPath, tlsConfig.clientCert, { mode: 0o644 });
     await fs.writeFile(clientKeyPath, tlsConfig.clientKey, { mode: 0o600 });
-    logger_1.default.info(`gRPC mTLS certificates saved to ${certDir}`);
+    logger_1.default.info(`[boot] gRPC mTLS certificates saved to ${certDir}`);
 }
 async function loadExistingCerts() {
     const exists = await Promise.all([
@@ -127,7 +127,7 @@ async function loadExistingCerts() {
         fs.readFile(clientCertPath, 'utf-8'),
         fs.readFile(clientKeyPath, 'utf-8'),
     ]);
-    logger_1.default.info('Loaded existing gRPC mTLS certificates from disk');
+    logger_1.default.info('[boot] Loaded existing gRPC mTLS certificates from disk');
     return { caCert, serverCert, serverKey, clientCert, clientKey };
 }
 async function initGrpcCerts() {

package/static/build/config/index.js

@@ -87,8 +87,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 authError = '错误的用户名密码，请重试';
-const loginFaild = '请先登录!';
 const configString = 'config sample crontab shareCode diy';
 const versionFile = path_1.default.join(rootPath, 'version.yaml');
 const dataTgzFile = path_1.default.join(tmpPath, 'data.tgz');
@@ -105,8 +103,6 @@ exports.default = Object.assign(Object.assign({}, config), { jwt: config.jwt, ba
     shareShellFile,
     dependenceProxyFile,
     configString,
-    loginFaild,
-    authError,
     logPath,
     extraFile,
     authConfigFile,

package/static/build/config/util.js

@@ -498,7 +498,7 @@ function safeJSONParse(value) {
         return JSON.parse(value);
     }
     catch (error) {
-        logger_1.default.error('[safeJSONParse失败]', error);
+        logger_1.default.error('[safeJSONParse error]', error);
         return {};
     }
 }
@@ -511,7 +511,7 @@ async function rmPath(path) {
         }
     }
     catch (error) {
-        logger_1.default.error('[rmPath失败]', error);
+        logger_1.default.error('[rmPath error]', error);
     }
 }
 exports.rmPath = rmPath;
@@ -525,7 +525,7 @@ async function setSystemTimezone(timezone) {
         return true;
     }
     catch (error) {
-        logger_1.default.error('[setSystemTimezone失败]', error);
+        logger_1.default.error('[setSystemTimezone error]', error);
         return false;
     }
 }

package/static/build/data/notify.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.OpeniLinkNotification = 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;
+exports.OpeniLinkNotification = exports.WxPusherSptNotification = 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";
@@ -223,6 +223,13 @@ class WxPusherBotNotification extends NotificationBaseInfo {
     }
 }
 exports.WxPusherBotNotification = WxPusherBotNotification;
+class WxPusherSptNotification extends NotificationBaseInfo {
+    constructor() {
+        super(...arguments);
+        this.wxPusherSptList = '';
+    }
+}
+exports.WxPusherSptNotification = WxPusherSptNotification;
 class OpeniLinkNotification extends NotificationBaseInfo {
     constructor() {
         super(...arguments);

package/static/build/data/sock.js

@@ -6,6 +6,7 @@ class SockMessage {
         this.type = options.type;
         this.message = options.message;
         this.references = options.references;
+        this.status = options.status;
     }
 }
 exports.SockMessage = SockMessage;

package/static/build/loaders/app.js

@@ -12,16 +12,16 @@ const initTask_1 = __importDefault(require("./initTask"));
 const initFile_1 = __importDefault(require("./initFile"));
 exports.default = async ({ app }) => {
     (0, depInjector_1.default)();
-    logger_1.default.info('✌️ Dependency loaded');
+    logger_1.default.info('[boot] Dependency loaded');
     await (0, deps_1.default)();
-    logger_1.default.info('✌️ Link deps loaded');
+    logger_1.default.info('[boot] Link deps loaded');
     await (0, initFile_1.default)();
-    logger_1.default.info('✌️ Init file loaded');
+    logger_1.default.info('[boot] Init file loaded');
     await (0, initData_1.default)();
-    logger_1.default.info('✌️ Init data loaded');
+    logger_1.default.info('[boot] Init data loaded');
     (0, initTask_1.default)();
-    logger_1.default.info('✌️ Init task loaded');
+    logger_1.default.info('[boot] Init task loaded');
     (0, express_1.default)({ app });
-    logger_1.default.info('✌️ Express loaded');
+    logger_1.default.info('[boot] Express loaded');
 };
 //# sourceMappingURL=app.js.map

package/static/build/loaders/db.js

@@ -58,10 +58,10 @@ exports.default = async () => {
                 // Column already exists or other error, continue
             }
         }
-        logger_1.default.info('✌️ DB loaded');
+        logger_1.default.info('[boot] DB loaded');
     }
     catch (error) {
-        logger_1.default.error('✌️ DB load failed', error);
+        logger_1.default.error('[boot] DB load failed', error);
     }
 };
 //# sourceMappingURL=db.js.map

package/static/build/loaders/express.js

@@ -78,14 +78,22 @@ exports.default = ({ app }) => {
                 const currentToken = doc.tokens.find((x) => x.value === headerToken);
                 const keyMatch = pathLower.match(/\/open\/([a-z]+)\/*/);
                 const key = keyMatch && keyMatch[1];
-                if (doc.scopes.includes(key) &&
-                    currentToken &&
-                    currentToken.expiration >= Math.round(Date.now() / 1000)) {
-                    return next();
+                if (!doc.scopes.includes(key)) {
+                    const err = new express_jwt_1.UnauthorizedError('credentials_bad_scheme', {
+                        message: (0, i18n_1.t)('暂无权限'),
+                    });
+                    return next(err);
                 }
+                if (!currentToken || currentToken.expiration < Math.round(Date.now() / 1000)) {
+                    const err = new express_jwt_1.UnauthorizedError('invalid_token', {
+                        message: (0, i18n_1.t)('Token 已失效'),
+                    });
+                    return next(err);
+                }
+                return next();
             }
         }
-        const originPath = `${req.baseUrl}${req.path === '/' ? '' : req.path}`;
+        const originPath = `${req.baseUrl}${pathLower === '/' ? '' : pathLower}`;
         if (!headerToken &&
             originPath &&
             config_1.default.apiWhiteList.includes(originPath)) {
@@ -97,8 +105,8 @@ exports.default = ({ app }) => {
         }
         const errorCode = headerToken ? 'invalid_token' : 'credentials_required';
         const errorMessage = headerToken
-            ? 'jwt malformed'
-            : 'No authorization token was found';
+            ? (0, i18n_1.t)('Token 已失效')
+            : (0, i18n_1.t)('请先登录');
         const err = new express_jwt_1.UnauthorizedError(errorCode, { message: errorMessage });
         next(err);
     });
@@ -109,16 +117,11 @@ exports.default = ({ app }) => {
             '/api/user/notification/init',
             '/open/user/init',
             '/open/user/notification/init',
-        ].includes(req.path)) {
+        ].includes(pathLower)) {
             return next();
         }
         const authInfo = (await store_1.shareStore.getAuthInfo()) || {};
-        let isInitialized = true;
-        if (Object.keys(authInfo).length === 2 &&
-            authInfo.username === 'admin' &&
-            authInfo.password === 'admin') {
-            isInitialized = false;
-        }
+        let isInitialized = !(0, auth_1.isDefaultAuthInfo)(authInfo);
         if (isInitialized) {
             return res.send({ code: 450, message: (0, i18n_1.t)('未知错误') });
         }

package/static/build/loaders/initData.js

@@ -49,7 +49,7 @@ const open_2 = require("../data/open");
 const runningInstance_1 = require("../data/runningInstance");
 const i18n_1 = require("../shared/i18n");
 exports.default = async () => {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+    var _a, _b, _c, _d, _e, _f, _g, _h;
     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);
@@ -206,18 +206,19 @@ exports.default = async () => {
             }
         }
     });
-    // 初始化保存一次ck和定时任务数据
-    await cronService.autosave_crontab();
-    // 确保 lang_env.sh 存在，提供默认 QL_LANG
+    // 初始化语言（必须在 autosave_crontab 之前）
+    const lang = ((_h = systemConfig.info) === null || _h === void 0 ? void 0 : _h.lang) || (0, i18n_1.systemLang)();
+    (0, i18n_1.setLang)(lang);
+    // 确保 lang_env.sh 存在
     try {
         const langEnvExist = await (0, util_1.fileExist)(config_1.default.langEnvFile);
         if (!langEnvExist) {
-            const lang = ((_h = systemConfig.info) === null || _h === void 0 ? void 0 : _h.lang) || 'zh';
             await (0, promises_1.writeFile)(config_1.default.langEnvFile, `export QL_LANG='${lang}'\n`);
         }
     }
-    catch (_k) { }
-    (0, i18n_1.setLang)(((_j = systemConfig.info) === null || _j === void 0 ? void 0 : _j.lang) || 'zh');
+    catch (_j) { }
+    // 初始化保存一次ck和定时任务数据
+    await cronService.autosave_crontab();
     await envService.set_envs();
     const authInfo = await userService.getAuthInfo();
     const apps = await openService.findApps();

package/static/build/loaders/initFile.js

@@ -117,6 +117,6 @@ exports.default = async () => {
             await (0, utils_1.writeFileWithLock)(item.target, content);
         }
     }
-    logger_1.default.info('✌️ Init file down');
+    logger_1.default.info('[boot] Init file down');
 };
 //# sourceMappingURL=initFile.js.map

package/static/build/loaders/initTask.js

@@ -11,6 +11,7 @@ const sshKey_1 = __importDefault(require("../services/sshKey"));
 const config_1 = __importDefault(require("../config"));
 const util_1 = require("../config/util");
 const path_1 = require("path");
+const i18n_1 = require("../shared/i18n");
 exports.default = async () => {
     const systemService = typedi_1.Container.get(system_1.default);
     const scheduleService = typedi_1.Container.get(schedule_1.default);
@@ -24,7 +25,7 @@ exports.default = async () => {
     }
     const cron = {
         id: NaN,
-        name: '生成token',
+        name: (0, i18n_1.t)('生成token'),
         command: tokenCommand,
         runOrigin: 'system',
     };
@@ -38,7 +39,7 @@ exports.default = async () => {
         if (data.info.logRemoveFrequency) {
             const rmlogCron = {
                 id: data.id,
-                name: '删除日志',
+                name: (0, i18n_1.t)('删除日志'),
                 command: `ql rmlog ${data.info.logRemoveFrequency}`,
                 runOrigin: 'system',
             };

package/static/build/loaders/server.js

@@ -7,7 +7,7 @@ const logger_1 = __importDefault(require("./logger"));
 const sock_1 = __importDefault(require("./sock"));
 exports.default = async ({ server }) => {
     await (0, sock_1.default)({ server });
-    logger_1.default.info('✌️ Sock loaded');
+    logger_1.default.info('[boot] Sock loaded');
     process.on('uncaughtException', (error) => {
         logger_1.default.error('Uncaught exception:', error);
     });

package/static/build/protos/api.js

@@ -33,6 +33,7 @@ var NotificationMode;
     NotificationMode[NotificationMode["chronocat"] = 18] = "chronocat";
     NotificationMode[NotificationMode["ntfy"] = 19] = "ntfy";
     NotificationMode[NotificationMode["wxPusherBot"] = 20] = "wxPusherBot";
+    NotificationMode[NotificationMode["wxPusherSpt"] = 21] = "wxPusherSpt";
     NotificationMode[NotificationMode["UNRECOGNIZED"] = -1] = "UNRECOGNIZED";
 })(NotificationMode || (exports.NotificationMode = NotificationMode = {}));
 function notificationModeFromJSON(object) {
@@ -100,6 +101,9 @@ function notificationModeFromJSON(object) {
         case 20:
         case "wxPusherBot":
             return NotificationMode.wxPusherBot;
+        case 21:
+        case "wxPusherSpt":
+            return NotificationMode.wxPusherSpt;
         case -1:
         case "UNRECOGNIZED":
         default:
@@ -151,6 +155,8 @@ function notificationModeToJSON(object) {
             return "ntfy";
         case NotificationMode.wxPusherBot:
             return "wxPusherBot";
+        case NotificationMode.wxPusherSpt:
+            return "wxPusherSpt";
         case NotificationMode.UNRECOGNIZED:
         default:
             return "UNRECOGNIZED";
@@ -2495,6 +2501,7 @@ function createBaseNotificationInfo() {
         wxPusherBotAppToken: undefined,
         wxPusherBotTopicIds: undefined,
         wxPusherBotUids: undefined,
+        wxPusherSptList: undefined,
     };
 }
 exports.NotificationInfo = {
@@ -2706,6 +2713,9 @@ exports.NotificationInfo = {
         if (message.wxPusherBotUids !== undefined) {
             writer.uint32(546).string(message.wxPusherBotUids);
         }
+        if (message.wxPusherSptList !== undefined) {
+            writer.uint32(562).string(message.wxPusherSptList);
+        }
         return writer;
     },
     decode(input, length) {
@@ -3198,6 +3208,13 @@ exports.NotificationInfo = {
                     message.wxPusherBotUids = reader.string();
                     continue;
                 }
+                case 70: {
+                    if (tag !== 562) {
+                        break;
+                    }
+                    message.wxPusherSptList = reader.string();
+                    continue;
+                }
             }
             if ((tag & 7) === 4 || tag === 0) {
                 break;
@@ -3289,6 +3306,7 @@ exports.NotificationInfo = {
                 ? globalThis.String(object.wxPusherBotTopicIds)
                 : undefined,
             wxPusherBotUids: isSet(object.wxPusherBotUids) ? globalThis.String(object.wxPusherBotUids) : undefined,
+            wxPusherSptList: isSet(object.wxPusherSptList) ? globalThis.String(object.wxPusherSptList) : undefined,
         };
     },
     toJSON(message) {
@@ -3500,13 +3518,16 @@ exports.NotificationInfo = {
         if (message.wxPusherBotUids !== undefined) {
             obj.wxPusherBotUids = message.wxPusherBotUids;
         }
+        if (message.wxPusherSptList !== undefined) {
+            obj.wxPusherSptList = message.wxPusherSptList;
+        }
         return obj;
     },
     create(base) {
         return exports.NotificationInfo.fromPartial(base !== null && base !== void 0 ? base : {});
     },
     fromPartial(object) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, _41, _42, _43, _44;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, _41, _42, _43, _44, _45;
         const message = createBaseNotificationInfo();
         message.type = (_a = object.type) !== null && _a !== void 0 ? _a : 0;
         message.gotifyUrl = (_b = object.gotifyUrl) !== null && _b !== void 0 ? _b : undefined;
@@ -3577,6 +3598,7 @@ exports.NotificationInfo = {
         message.wxPusherBotAppToken = (_42 = object.wxPusherBotAppToken) !== null && _42 !== void 0 ? _42 : undefined;
         message.wxPusherBotTopicIds = (_43 = object.wxPusherBotTopicIds) !== null && _43 !== void 0 ? _43 : undefined;
         message.wxPusherBotUids = (_44 = object.wxPusherBotUids) !== null && _44 !== void 0 ? _44 : undefined;
+        message.wxPusherSptList = (_45 = object.wxPusherSptList) !== null && _45 !== void 0 ? _45 : undefined;
         return message;
     },
 };

package/static/build/schedule/addCron.js

@@ -4,14 +4,59 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addCron = void 0;
+const grpc_js_1 = require("@grpc/grpc-js");
 const node_schedule_1 = __importDefault(require("node-schedule"));
 const data_1 = require("./data");
 const runCron_1 = require("../shared/runCron");
 const logger_1 = __importDefault(require("../loaders/logger"));
+const i18n_1 = require("../shared/i18n");
+/**
+ * 预校验 cron 表达式，检测 node-schedule 会拒绝但 cron-parser 会接受的 pattern。
+ * node-schedule 对 bare /N（字段以 / 开头，如前无星号/数字前缀的 /6）返回 null，
+ * 提前拦截避免走 scheduleJob 后才发现无效。
+ */
+const isValidCronField = (cron) => {
+    // 检测 bare /N 模式：字段以 / 开头如 "/6"，或空格后紧跟 "/6"
+    // node-schedule 会对这种字段返回 null
+    if (/\s\/\d/.test(cron) || /^\/\d/.test(cron)) {
+        return false;
+    }
+    // 检测 ? 字符：Quartz cron 语法，node-schedule 在大多数位置返回 null
+    // cron-parser 接受但 node-schedule 拒绝，提前拦截
+    if (/\?/.test(cron)) {
+        return false;
+    }
+    return true;
+};
 const addCron = (call, callback) => {
     var _a;
+    // ===== 第一遍：预校验所有 cron 表达式 =====
+    const validationErrors = [];
+    for (const item of call.request.crons) {
+        const { id, schedule, extra_schedules } = item;
+        if (!isValidCronField(schedule)) {
+            validationErrors.push((0, i18n_1.tf)('任务ID %s: 无效的 cron 表达式 "%s"（不支持裸 /N 步长和 ? 字符）', String(id), schedule));
+        }
+        if (extra_schedules === null || extra_schedules === void 0 ? void 0 : extra_schedules.length) {
+            extra_schedules.forEach((x) => {
+                if (!isValidCronField(x.schedule)) {
+                    validationErrors.push((0, i18n_1.tf)('任务ID %s (extra_schedule): 无效的 cron 表达式 "%s"（不支持裸 /N 步长和 ? 字符）', String(id), x.schedule));
+                }
+            });
+        }
+    }
+    if (validationErrors.length > 0) {
+        const details = validationErrors.join('\n');
+        const err = new Error(details);
+        err.code = grpc_js_1.status.INVALID_ARGUMENT;
+        err.details = details;
+        callback(err, null);
+        return;
+    }
+    // ===== 第二遍：注册所有任务 =====
     for (const item of call.request.crons) {
         const { id, schedule, command, extra_schedules, name } = item;
+        // 取消该 id 已有的旧任务
         if (data_1.scheduleStacks.has(id)) {
             (_a = data_1.scheduleStacks.get(id)) === null || _a === void 0 ? void 0 : _a.forEach((x) => x.cancel());
         }
@@ -21,18 +66,30 @@ const addCron = (call, callback) => {
                 logger_1.default.info('[schedule][创建定时任务] 任务ID: %s, 名称: %s, cron: %s, 执行命令: %s', id, name, x.schedule, command);
             });
         }
-        data_1.scheduleStacks.set(id, [
-            node_schedule_1.default.scheduleJob(id, schedule, async () => {
-                logger_1.default.info(`[schedule][准备运行任务] 命令: ${command}`);
-                (0, runCron_1.runCron)(command, item);
-            }),
-            ...((extra_schedules === null || extra_schedules === void 0 ? void 0 : extra_schedules.length)
-                ? extra_schedules.map((x) => node_schedule_1.default.scheduleJob(id, x.schedule, async () => {
+        const mainJob = node_schedule_1.default.scheduleJob(id, schedule, async () => {
+            logger_1.default.info(`[schedule][准备运行任务] 命令: ${command}`);
+            (0, runCron_1.runCron)(command, item);
+        });
+        if (!mainJob) {
+            logger_1.default.warn('[schedule][创建定时任务] scheduleJob 返回 null（不符合预期，已通过预校验）: 任务ID: %s, cron: %s', id, schedule);
+        }
+        const extraJobs = (extra_schedules === null || extra_schedules === void 0 ? void 0 : extra_schedules.length)
+            ? extra_schedules.map((x) => {
+                const job = node_schedule_1.default.scheduleJob(id, x.schedule, async () => {
                     logger_1.default.info(`[schedule][准备运行任务] 命令: ${command}`);
                     (0, runCron_1.runCron)(command, item);
-                }))
-                : []),
-        ]);
+                });
+                if (!job) {
+                    logger_1.default.warn('[schedule][创建定时任务] scheduleJob 返回 null（不符合预期，已通过预校验）: 任务ID: %s, cron: %s', id, x.schedule);
+                }
+                return job;
+            })
+            : [];
+        // 过滤 null（兜底保护，正常情况下预校验已拦截）
+        const jobs = [mainJob, ...extraJobs].filter((x) => x != null);
+        if (jobs.length > 0) {
+            data_1.scheduleStacks.set(id, jobs);
+        }
     }
     callback(null, null);
 };

package/static/build/schedule/delCron.js

@@ -11,7 +11,17 @@ const delCron = (call, callback) => {
     for (const id of call.request.ids) {
         if (data_1.scheduleStacks.has(id)) {
             logger_1.default.info('[schedule][取消定时任务] 任务ID: %s', id);
-            (_a = data_1.scheduleStacks.get(id)) === null || _a === void 0 ? void 0 : _a.forEach(x => x.cancel());
+            // 过滤掉 nodeSchedule.scheduleJob() 对无效表达式返回的 null，
+            // 否则对 null 调 cancel() 会让整个取消流程抛出 UNKNOWN 错误，
+            // 进而导致 HTTP 端的 remove() 跳过 setCrontab()，造成 crontab.list 残留。
+            (_a = data_1.scheduleStacks.get(id)) === null || _a === void 0 ? void 0 : _a.filter((x) => x != null).forEach((x) => {
+                try {
+                    x.cancel();
+                }
+                catch (error) {
+                    logger_1.default.warn('[schedule][取消任务失败] 任务ID: %s, 错误: %s', id, (error === null || error === void 0 ? void 0 : error.message) || error);
+                }
+            });
             data_1.scheduleStacks.delete(id);
         }
     }