@whyour/qinglong 2.17.8 → 2.17.9-beta.2

package/docker/docker-entrypoint.sh

@@ -1,10 +1,11 @@
 #!/bin/bash
 
 dir_shell=/ql/shell
-. $dir_shell/env.sh
 . $dir_shell/share.sh
+. $dir_shell/env.sh
 
 echo -e "======================1. 检测配置文件========================\n"
+import_config "$@"
 make_dir /etc/nginx/conf.d
 make_dir /run/nginx
 init_nginx

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@whyour/qinglong",
-  "version": "2.17.8",
+  "version": "2.17.9-beta.2",
   "description": "Timed task management platform supporting Python3, JavaScript, Shell, Typescript",
   "repository": {
     "type": "git",

package/sample/config.sample.sh

@@ -43,7 +43,7 @@ BotRepoUrl=""
 
 ## 通知环境变量
 ## 1. Server酱
-## https://sct.ftqq.com
+## https://sct.ftqq.com/r/13363
 ## 下方填写 SCHKEY 值或 SendKey 值
 export PUSH_KEY=""
 

package/sample/ql_sample.js

@@ -4,8 +4,6 @@
  * 定时规则
  * cron: 1 9 * * *
  */
-const { sendNotify } = require('./sendNotify.js'); // commonjs
-// import { sendNotify } from './sendNotify'; // es6
-
 console.log('test scripts');
-sendNotify('test scripts', 'test desc');
+QLAPI.notify('test scripts', 'test desc');
+console.log('test desc');

package/sample/ql_sample.py

@@ -4,7 +4,6 @@ name: script name
 定时规则
 cron: 1 9 * * *
 """
-import notify
-
 print("test script")
-notify.send('test script', 'test desc')
+QLAPI.notify('test script', 'test desc')
+print("test desc")

package/shell/otask.sh

@@ -69,10 +69,12 @@ run_nohup() {
   nohup node $file_name &>$log_path &
 }
 
-
 env_str_to_array() {
+  . $file_env
   local IFS="&"
   read -ra array <<<"${!env_param}"
+  array_length=${#array[@]}
+  clear_env
 }
 
 clear_non_sh_env() {
@@ -98,7 +100,7 @@ run_normal() {
   if [[ $isJsOrPythonFile == 'false' ]]; then
     clear_non_sh_env
   fi
-  configDir="${dir_config}" $timeoutCmd $which_program $file_param "${script_params[@]}"
+  $timeoutCmd $which_program $file_param "${script_params[@]}"
 }
 
 handle_env_split() {
@@ -107,7 +109,7 @@ handle_env_split() {
   fi
 
   env_str_to_array
-  local tempArr=$(echo $num_param | sed "s/-max/-${#array[@]}/g" | sed "s/max-/${#array[@]}-/g" | perl -pe "s|(\d+)(-\|~\|_)(\d+)|{\1..\3}|g")
+  local tempArr=$(echo $num_param | sed "s/-max/-${array_length}/g" | sed "s/max-/${array_length}-/g" | perl -pe "s|(\d+)(-\|~\|_)(\d+)|{\1..\3}|g")
   local runArr=($(eval echo $tempArr))
   array_run=($(awk -v RS=' ' '!a[$1]++' <<<${runArr[@]}))
 }
@@ -141,7 +143,7 @@ run_concurrent() {
       export "${env_param}=${array[$i - 1]}"
       clear_non_sh_env
     fi
-    eval configDir="${dir_config}" envParam="${env_param}" numParam="${i}" $timeoutCmd $which_program $file_param "${script_params[@]}" &>$single_log_path &
+    eval envParam="${env_param}" numParam="${i}" $timeoutCmd $which_program $file_param "${script_params[@]}" &>$single_log_path &
   done
 
   wait
@@ -186,7 +188,7 @@ run_designated() {
     file_param=${file_param/$relative_path\//}
   fi
 
-  configDir="${dir_config}" envParam="${env_param}" numParam="${num_param}" $timeoutCmd $which_program $file_param "${script_params[@]}"
+  envParam="${env_param}" numParam="${num_param}" $timeoutCmd $which_program $file_param "${script_params[@]}"
 }
 
 ## 运行其他命令
@@ -206,23 +208,30 @@ run_else() {
   $timeoutCmd $which_program $file_param "$@"
 }
 
-## 命令检测
-main() {
+check_file() {
   isJsOrPythonFile="false"
   if [[ $1 == *.js ]] || [[ $1 == *.py ]] || [[ $1 == *.pyc ]] || [[ $1 == *.ts ]]; then
     isJsOrPythonFile="true"
   fi
   if [[ -f $file_env ]]; then
+    get_env_array
     if [[ $isJsOrPythonFile == 'true' ]]; then
-      export NODE_OPTIONS="${NODE_OPTIONS} -r ${preload_js_file}"
-      export PYTHONPATH="${PYTHONPATH}:${dir_preload}"
+      PREV_NODE_OPTIONS="${NODE_OPTIONS}"
+      PREV_PYTHONPATH="${PYTHONPATH}"
+      export NODE_OPTIONS="${NODE_OPTIONS} -r ${file_preload_js}"
+      export PYTHONPATH="${PYTHONPATH}:${dir_preload}:${dir_config}"
     else
-      get_env_array
       . $file_env
     fi
   fi
+}
 
+main() {
   if [[ $1 == *.js ]] || [[ $1 == *.py ]] || [[ $1 == *.pyc ]] || [[ $1 == *.sh ]] || [[ $1 == *.ts ]]; then
+    if [[ $1 == *.sh ]]; then
+      timeoutCmd=""
+    fi
+
     case $# in
     1)
       run_normal "$1"
@@ -253,8 +262,15 @@ main() {
 }
 
 handle_task_start "${task_shell_params[@]}"
-run_task_before "${task_shell_params[@]}"
+check_file "${task_shell_params[@]}"
+if [[ $isJsOrPythonFile == 'false' ]]; then
+  run_task_before "${task_shell_params[@]}"
+fi
 main "${task_shell_params[@]}"
+if [[ $isJsOrPythonFile == 'true' ]]; then
+  export NODE_OPTIONS="${PREV_NODE_OPTIONS}"
+  export PYTHONPATH="${PREV_PYTHONPATH}"
+fi
 run_task_after "${task_shell_params[@]}"
 clear_env
 handle_task_end "${task_shell_params[@]}"

package/shell/preload/sitecustomize.js

@@ -1,5 +1,13 @@
+const { execSync } = require('child_process');
+const { sendNotify } = require('./notify.js');
 require(`./env.js`);
 
+function initGlobal() {
+  global.QLAPI = {
+    notify: sendNotify,
+  };
+}
+
 function expandRange(rangeStr, max) {
   const tempRangeStr = rangeStr
     .trim()
@@ -17,8 +25,43 @@ function expandRange(rangeStr, max) {
 }
 
 function run() {
-  if (process.env.envParam && process.env.numParam) {
-    const { envParam, numParam } = process.env;
+  const {
+    envParam,
+    numParam,
+    file_task_before,
+    file_task_before_js,
+    dir_scripts,
+    task_before,
+  } = process.env;
+
+  require(file_task_before_js);
+
+  try {
+    const splitStr = '__sitecustomize__';
+    const fileName = process.argv[1].replace(`${dir_scripts}/`, '');
+    let command = `bash -c "source ${file_task_before} ${fileName}`;
+    if (task_before) {
+      command = `${command} && echo -e '执行前置命令\n' && eval '${task_before}' && echo -e '\n执行前置命令结束\n'`;
+    }
+    const res = execSync(
+      `${command} && echo -e '${splitStr}' && NODE_OPTIONS= node -p 'JSON.stringify(process.env)'"`,
+      {
+        encoding: 'utf-8',
+      },
+    );
+    const [output, envStr] = res.split(splitStr);
+    const newEnvObject = JSON.parse(envStr.trim());
+    for (const key in newEnvObject) {
+      process.env[key] = newEnvObject[key];
+    }
+    console.log(output);
+  } catch (error) {
+    if (!error.message.includes('spawnSync /bin/sh E2BIG')) {
+      console.log(`run task before error: `, error);
+    }
+  }
+
+  if (envParam && numParam) {
     const array = (process.env[envParam] || '').split('&');
     const runArr = expandRange(numParam, array.length);
     const arrayRun = runArr.map((i) => array[i - 1]);
@@ -27,4 +70,9 @@ function run() {
   }
 }
 
-run();
+try {
+  initGlobal();
+  run();
+} catch (error) {
+  console.log(`run builtin code error: `, error, '\n');
+}

package/shell/preload/sitecustomize.py

@@ -1,6 +1,21 @@
 import os
 import re
+import subprocess
+import json
+import builtins
+import sys
 import env
+from notify import send
+
+
+class BaseApi:
+    def notify(self, *args, **kwargs):
+        return send(*args, **kwargs)
+
+
+def init_global():
+    QLAPI = BaseApi()
+    builtins.QLAPI = QLAPI
 
 
 def try_parse_int(value):
@@ -30,6 +45,39 @@ def expand_range(range_str, max_value):
 
 
 def run():
+    import task_before
+
+    try:
+        split_str = "__sitecustomize__"
+        file_name = sys.argv[0].replace(f"{os.getenv('dir_scripts')}/", "")
+        command = f'bash -c "source {os.getenv("file_task_before")} {file_name}'
+        task_before = os.getenv("task_before")
+
+        if task_before:
+            command += f" && echo -e '执行前置命令\n' && eval '{task_before}' && echo -e '\n执行前置命令结束\n'"
+
+        python_command = "PYTHONPATH= python3 -c 'import os, json; print(json.dumps(dict(os.environ)))'"
+        command += f" && echo -e '{split_str}' && {python_command}\""
+
+        res = subprocess.check_output(command, shell=True, encoding="utf-8")
+        output, env_str = res.split(split_str)
+
+        env_json = json.loads(env_str.strip())
+
+        for key, value in env_json.items():
+            os.environ[key] = value
+
+        print(output)
+
+    except subprocess.CalledProcessError as error:
+        print(f"run task before error: {error}")
+    except OSError as error:
+        error_message = str(error)
+        if "Argument list too long" not in error_message:
+            print(f"run task before error: {error}")
+    except Exception as error:
+        print(f"run task before error: {error}")
+
     env_param = os.getenv("envParam")
     num_param = os.getenv("numParam")
 
@@ -41,4 +89,8 @@ def run():
         os.environ[env_param] = env_str
 
 
-run()
+try:
+    init_global()
+    run()
+except Exception as error:
+    print(f"run builtin code error: {error}\n")

package/shell/share.sh

@@ -1,57 +1,57 @@
 #!/usr/bin/env bash
 
 ## 目录
-dir_root=$QL_DIR
-dir_tmp=$dir_root/.tmp
-dir_data=$dir_root/data
+export dir_root=$QL_DIR
+export dir_tmp=$dir_root/.tmp
+export dir_data=$dir_root/data
 
 if [[ $QL_DATA_DIR ]]; then
-  dir_data="${QL_DATA_DIR%/}"
+  export dir_data="${QL_DATA_DIR%/}"
 fi
 
-dir_shell=$dir_root/shell
-dir_preload=$dir_shell/preload
-dir_sample=$dir_root/sample
-dir_static=$dir_root/static
-dir_config=$dir_data/config
-dir_scripts=$dir_data/scripts
-dir_repo=$dir_data/repo
-dir_raw=$dir_data/raw
-dir_log=$dir_data/log
-dir_db=$dir_data/db
-dir_dep=$dir_data/deps
-dir_list_tmp=$dir_log/.tmp
-dir_update_log=$dir_log/update
-ql_static_repo=$dir_repo/static
+export dir_shell=$dir_root/shell
+export dir_preload=$dir_shell/preload
+export dir_sample=$dir_root/sample
+export dir_static=$dir_root/static
+export dir_config=$dir_data/config
+export dir_scripts=$dir_data/scripts
+export dir_repo=$dir_data/repo
+export dir_raw=$dir_data/raw
+export dir_log=$dir_data/log
+export dir_db=$dir_data/db
+export dir_dep=$dir_data/deps
+export dir_list_tmp=$dir_log/.tmp
+export dir_update_log=$dir_log/update
+export ql_static_repo=$dir_repo/static
 
 ## 文件
-file_config_sample=$dir_sample/config.sample.sh
-file_env=$dir_preload/env.sh
-js_file_env=$dir_preload/env.js
-py_file_env=$dir_preload/env.py
-preload_js_file=$dir_preload/sitecustomize.js
-file_sharecode=$dir_config/sharecode.sh
-file_config_user=$dir_config/config.sh
-file_auth_sample=$dir_sample/auth.sample.json
-file_auth_user=$dir_config/auth.json
-file_auth_token=$dir_config/token.json
-file_extra_shell=$dir_config/extra.sh
-file_task_before=$dir_config/task_before.sh
-file_task_after=$dir_config/task_after.sh
-file_task_sample=$dir_sample/task.sample.sh
-file_extra_sample=$dir_sample/extra.sample.sh
-file_notify_js_sample=$dir_sample/notify.js
-file_notify_py_sample=$dir_sample/notify.py
-file_test_js_sample=$dir_sample/ql_sample.js
-file_test_py_sample=$dir_sample/ql_sample.py
-file_notify_py=$dir_scripts/notify.py
-file_notify_js=$dir_scripts/sendNotify.js
-file_test_js=$dir_scripts/ql_sample.js
-file_test_py=$dir_scripts/ql_sample.py
-nginx_app_conf=$dir_root/docker/front.conf
-nginx_conf=$dir_root/docker/nginx.conf
-dep_notify_py=$dir_dep/notify.py
-dep_notify_js=$dir_dep/sendNotify.js
+export file_config_sample=$dir_sample/config.sample.sh
+export file_env=$dir_preload/env.sh
+export file_preload_js=$dir_preload/sitecustomize.js
+export file_sharecode=$dir_config/sharecode.sh
+export file_config_user=$dir_config/config.sh
+export file_auth_sample=$dir_sample/auth.sample.json
+export file_auth_user=$dir_config/auth.json
+export file_auth_token=$dir_config/token.json
+export file_extra_shell=$dir_config/extra.sh
+export file_task_before=$dir_config/task_before.sh
+export file_task_before_js=$dir_config/task_before.js
+export file_task_before_py=$dir_config/task_before.py
+export file_task_after=$dir_config/task_after.sh
+export file_task_sample=$dir_sample/task.sample.sh
+export file_extra_sample=$dir_sample/extra.sample.sh
+export file_notify_js_sample=$dir_sample/notify.js
+export file_notify_py_sample=$dir_sample/notify.py
+export file_test_js_sample=$dir_sample/ql_sample.js
+export file_test_py_sample=$dir_sample/ql_sample.py
+export file_notify_py=$dir_scripts/notify.py
+export file_notify_js=$dir_scripts/sendNotify.js
+export file_test_js=$dir_scripts/ql_sample.js
+export file_test_py=$dir_scripts/ql_sample.py
+export nginx_app_conf=$dir_root/docker/front.conf
+export nginx_conf=$dir_root/docker/nginx.conf
+export dep_notify_py=$dir_dep/notify.py
+export dep_notify_js=$dir_dep/sendNotify.js
 
 ## 清单文件
 list_crontab_user=$dir_config/crontab.list
@@ -91,10 +91,6 @@ import_config() {
   else
     default_cron="$(random_range 0 59) $(random_range 0 23) * * *"
   fi
-
-  cpu_warn=${CpuWarn}
-  mem_warn=${MemoryWarn}
-  disk_warn=${DiskWarn}
 }
 
 set_proxy() {
@@ -179,12 +175,6 @@ fix_config() {
     echo
   fi
 
-  if [[ ! -f $file_env ]]; then
-    echo -e "检测到config配置目录下不存在env.sh，创建一个空文件用于初始化...\n"
-    touch $file_env
-    echo
-  fi
-
   if [[ ! -f $file_task_before ]]; then
     echo -e "复制一份 $file_task_sample 为 $file_task_before\n"
     cp -fv $file_task_sample $file_task_before
@@ -463,7 +453,7 @@ run_task_before() {
 
   if [[ $task_before ]]; then
     echo -e "执行前置命令\n"
-    eval "$task_before"
+    eval "$task_before" "$@"
     echo -e "\n执行前置命令结束\n"
   fi
 }
@@ -473,7 +463,7 @@ run_task_after() {
 
   if [[ $task_after ]]; then
     echo -e "\n执行后置命令\n"
-    eval "$task_after"
+    eval "$task_after" "$@"
     echo -e "\n执行后置命令结束"
   fi
 }
@@ -494,5 +484,3 @@ init_env
 detect_termux
 detect_macos
 define_cmd
-
-import_config $1

package/shell/start.sh

@@ -27,6 +27,14 @@ if [[ ! $QL_DATA_DIR ]]; then
   exit 1
 fi
 
+command="$1"
+
+if [[ $command == "reload" ]]; then
+  mkdir -p /run/nginx
+  nginx -s reload 2>/dev/null || nginx -c /etc/nginx/nginx.conf
+  exit 1
+fi
+
 # 安装依赖
 os_name=$(source /etc/os-release && echo "$ID")
 
@@ -92,6 +100,9 @@ if [[ $EnableExtraShell == true ]]; then
   echo -e "自定义脚本后台执行中...\n"
 fi
 
+pm2 startup
+pm2 save
+
 echo -e "############################################################\n"
 echo -e "启动完成..."
 echo -e "############################################################\n"

package/shell/task.sh

@@ -113,6 +113,7 @@ init_begin_time() {
   begin_timestamp=$(format_timestamp "$time_format" "$time")
 }
 
+import_config "$@"
 while getopts ":lm:" opt; do
   case $opt in
   l)

package/shell/update.sh

@@ -1,9 +1,9 @@
 #!/usr/bin/env bash
 
 dir_shell=$QL_DIR/shell
-. $dir_shell/env.sh
 . $dir_shell/share.sh
 . $dir_shell/api.sh
+. $dir_shell/env.sh
 
 send_mark=$dir_shell/send_mark
 
@@ -563,6 +563,7 @@ main() {
   fi
 }
 
+import_config "$@"
 main "$@"
 
 exit 0

package/static/build/config/index.js

@@ -38,6 +38,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 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');
@@ -86,6 +88,8 @@ exports.default = {
     envFile,
     jsEnvFile,
     pyEnvFile,
+    jsNotifyFile,
+    pyNotifyFile,
     dbPath,
     uploadPath,
     configPath,

package/static/build/loaders/initFile.js

@@ -30,7 +30,11 @@ 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 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');
 const TaskAfterFile = path_1.default.join(configPath, 'task_after.sh');
 const homedir = os_1.default.homedir();
 const sshPath = path_1.default.resolve(homedir, '.ssh');
@@ -52,6 +56,8 @@ exports.default = async () => {
     const scriptNotifyJsFileExist = await (0, util_1.fileExist)(scriptNotifyJsFile);
     const scriptNotifyPyFileExist = await (0, util_1.fileExist)(scriptNotifyPyFile);
     const TaskBeforeFileExist = await (0, util_1.fileExist)(TaskBeforeFile);
+    const TaskBeforeJsFileExist = await (0, util_1.fileExist)(TaskBeforeJsFile);
+    const TaskBeforePyFileExist = await (0, util_1.fileExist)(TaskBeforePyFile);
     const TaskAfterFileExist = await (0, util_1.fileExist)(TaskAfterFile);
     if (!configDirExist) {
         await promises_1.default.mkdir(configPath);
@@ -90,6 +96,8 @@ exports.default = async () => {
     if (!confFileExist) {
         await promises_1.default.writeFile(confFile, await promises_1.default.readFile(sampleConfigFile));
     }
+    await promises_1.default.writeFile(jsNotifyFile, await promises_1.default.readFile(sampleNotifyJsFile));
+    await promises_1.default.writeFile(pyNotifyFile, await promises_1.default.readFile(sampleNotifyPyFile));
     if (!scriptNotifyJsFileExist) {
         await promises_1.default.writeFile(scriptNotifyJsFile, await promises_1.default.readFile(sampleNotifyJsFile));
     }
@@ -99,6 +107,12 @@ exports.default = async () => {
     if (!TaskBeforeFileExist) {
         await promises_1.default.writeFile(TaskBeforeFile, await promises_1.default.readFile(sampleTaskShellFile));
     }
+    if (!TaskBeforeJsFileExist) {
+        await promises_1.default.writeFile(TaskBeforeJsFile, '// The JavaScript code that executes before the JavaScript task execution will execute.');
+    }
+    if (!TaskBeforePyFileExist) {
+        await promises_1.default.writeFile(TaskBeforePyFile, '# The Python code that executes before the Python task execution will execute.');
+    }
     if (!TaskAfterFileExist) {
         await promises_1.default.writeFile(TaskAfterFile, await promises_1.default.readFile(sampleTaskShellFile));
     }

package/static/build/services/env.js

@@ -206,13 +206,12 @@ let EnvService = class EnvService {
                         .replace(/'/g, "'\\''")
                         .trim();
                     env_string += `export ${key}='${value}'\n`;
-                    const _env_value = `'${group
+                    const _env_value = `${group
                         .map((x) => x.value)
                         .join('&')
-                        .replace(/\\/g, '\\\\')
-                        .replace(/'/g, "\\'")}'`;
-                    js_env_string += `process.env.${key}=${_env_value};\n`;
-                    py_env_string += `os.environ['${key}']=${_env_value}\n`;
+                        .replace(/\\/g, '\\\\')}`;
+                    js_env_string += `process.env.${key}=\`${_env_value.replace(/\`/g, '\\`')}\`;\n`;
+                    py_env_string += `os.environ['${key}']='''${_env_value.replace(/\'/g, "\\'")}'''\n`;
                 }
             }
         }

package/static/dist/index.html

@@ -10,6 +10,6 @@
 </head>
 <body>
 <div id="root"></div>
-<script src="./umi.03b3fd83.js"></script>
+<script src="./umi.5e777fc4.js"></script>
 
 </body></html>