@whyour/qinglong 0.19.0 → 0.19.2

package/docker/docker-entrypoint.sh

@@ -3,7 +3,6 @@
 dir_shell=/ql/shell
 . $dir_shell/env.sh
 . $dir_shell/share.sh
-link_shell
 
 echo -e "======================1. 检测配置文件========================\n"
 make_dir /etc/nginx/conf.d

package/package.json

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

package/shell/share.sh

@@ -134,31 +134,6 @@ gen_random_num() {
   echo $((${RANDOM} % $divi))
 }
 
-link_shell_sub() {
-  local link_path="$1"
-  local original_path="$2"
-  if [[ ! -L $link_path ]] || [[ $(readlink -f $link_path) != $original_path ]]; then
-    rm -f $link_path 2>/dev/null
-    ln -sf $original_path $link_path
-  fi
-}
-
-link_shell() {
-  if [[ $is_termux -eq 1 ]]; then
-    local path="/data/data/com.termux/files/usr/bin/"
-  elif [[ $PATH == */usr/local/bin* ]] && [[ -d /usr/local/bin ]]; then
-    local path="/usr/local/bin/"
-  else
-    local path=""
-    echo -e "脚本功能受限，请自行添加命令的软连接...\n"
-  fi
-  if [[ $path ]]; then
-    for ((i = 0; i < ${#link_name[*]}; i++)); do
-      link_shell_sub "$path${link_name[i]}" "$dir_shell/${original_name[i]}"
-    done
-  fi
-}
-
 define_cmd() {
   local cmd_prefix cmd_suffix
   if type task &>/dev/null; then

package/static/build/loaders/deps.js

@@ -26,17 +26,20 @@ async function linkCommand() {
         {
             src: 'update.sh',
             dest: 'ql',
+            tmp: 'ql_tmp',
         },
         {
             src: 'task.sh',
             dest: 'task',
+            tmp: 'task_tmp',
         },
     ];
     for (const link of linkShell) {
         const source = path_1.default.join(index_1.default.rootPath, 'shell', link.src);
         const target = path_1.default.join(commandDir, link.dest);
-        await (0, util_1.rmPath)(target);
-        await promises_1.default.symlink(source, target);
+        const tmpTarget = path_1.default.join(commandDir, link.tmp);
+        await promises_1.default.symlink(source, tmpTarget);
+        await promises_1.default.rename(tmpTarget, target);
     }
 }
 exports.default = async (src = 'deps') => {

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,9 +95,9 @@ 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 &&
@@ -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 } });