@whyour/qinglong 0.19.1 → 0.19.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@whyour/qinglong",
-  "version": "0.19.1",
+  "version": "0.19.3",
   "description": "Timed task management platform supporting Python3, JavaScript, Shell, Typescript",
   "repository": {
     "type": "git",
@@ -101,7 +101,7 @@
     "node-schedule": "^2.1.0",
     "nodemailer": "^6.7.2",
     "p-queue-cjs": "7.3.4",
-    "protobufjs": "^7.2.3",
+    "protobufjs": "^7.3.0",
     "pstree.remy": "^1.1.8",
     "reflect-metadata": "^0.1.13",
     "sequelize": "^6.25.5",

package/static/build/services/cron.js

@@ -370,7 +370,7 @@ let CronService = class CronService {
                 }
                 const logPath = `${uniqPath}/${logTime}.log`;
                 const absolutePath = path_1.default.resolve(config_1.default.logPath, `${logPath}`);
-                const cp = (0, cross_spawn_1.spawn)(`real_log_path=${logPath} real_time=true no_delay=true ${this.makeCommand(cron)}`, { shell: '/bin/bash' });
+                const cp = (0, cross_spawn_1.spawn)(`real_log_path=${logPath} no_delay=true ${this.makeCommand(cron, true)}`, { shell: '/bin/bash' });
                 await cron_1.CrontabModel.update({ status: cron_1.CrontabStatus.running, pid: cp.pid, log_path: logPath }, { where: { id } });
                 cp.stdout.on('data', async (data) => {
                     await promises_1.default.appendFile(absolutePath, data.toString());
@@ -440,12 +440,12 @@ let CronService = class CronService {
             return [];
         }
     }
-    makeCommand(tab) {
+    makeCommand(tab, realTime) {
         let command = tab.command.trim();
         if (!command.startsWith(const_1.TASK_PREFIX) && !command.startsWith(const_1.QL_PREFIX)) {
             command = `${const_1.TASK_PREFIX}${tab.command}`;
         }
-        let commandVariable = `no_tee=true ID=${tab.id} `;
+        let commandVariable = `real_time=${Boolean(realTime)} no_tee=true ID=${tab.id} `;
         if (tab.task_before) {
             commandVariable += `task_before='${tab.task_before
                 .replace(/'/g, "'\\''")

package/static/build/services/subscription.js

@@ -95,15 +95,15 @@ let SubscriptionService = class SubscriptionService {
             throw error;
         }
     }
-    async handleTask(doc, needCreate = true, runImmediately = false) {
-        const { url } = (0, subscription_2.formatUrl)(doc);
-        doc.command = (0, subscription_2.formatCommand)(doc, url);
+    async handleTask(_doc, needCreate = true, runImmediately = false) {
+        const { url } = (0, subscription_2.formatUrl)(_doc);
+        const doc = Object.assign(Object.assign({}, _doc), { command: (0, subscription_2.formatCommand)(_doc, url) });
         if (doc.schedule_type === 'crontab') {
             this.scheduleService.cancelCronTask(doc);
             needCreate &&
                 (await this.scheduleService.createCronTask(doc, this.taskCallbacks(doc), runImmediately));
         }
-        else {
+        else if (doc.interval_schedule) {
             this.scheduleService.cancelIntervalTask(doc);
             const { type, value } = doc.interval_schedule;
             needCreate &&
@@ -237,7 +237,10 @@ let SubscriptionService = class SubscriptionService {
     }
     async getDb(query) {
         const doc = await subscription_1.SubscriptionModel.findOne({ where: Object.assign({}, query) });
-        return doc && doc.get({ plain: true });
+        if (!doc) {
+            throw new Error(`${JSON.stringify(query)} not found`);
+        }
+        return doc.get({ plain: true });
     }
     async run(ids) {
         await subscription_1.SubscriptionModel.update({ status: subscription_1.SubscriptionStatus.queued }, { where: { id: ids } });