@whyour/qinglong 0.10.1 → 0.11.0

package/README-en.md

@@ -61,7 +61,12 @@ npm i @whyour/qinglong
 # curl -sSL get.docker.com | sh
 docker run -dit \
   -v $PWD/ql/data:/ql/data \
+  # The 5700 after the colon is the default port, if QlPort is set, it needs to be the same as QlPort.
   -p 5700:5700 \
+  # Deployment paths are not required and begin and end with a slash, e.g. /test/.
+  -e QlBaseUrl="/" \
+  # Deployment port is not required, when using host mode, you can set the port after service startup, default 5700
+  -e QlPort="5700" \
   --name qinglong \
   --hostname qinglong \
   --restart unless-stopped \
@@ -88,7 +93,12 @@ docker-compose down
 podman run -dit \
   --network bridge \
   -v $PWD/ql/data:/ql/data \
+  # The 5700 after the colon is the default port, if QlPort is set, it needs to be the same as QlPort.
   -p 5700:5700 \
+  # Deployment paths are not required and begin and end with a slash, e.g. /test/.
+  -e QlBaseUrl="/" \
+  # Deployment port is not required, when using host mode, you can set the port after service startup, default 5700
+  -e QlPort="5700" \
   --name qinglong \
   --hostname qinglong \
   docker.io/whyour/qinglong:latest

package/README.md

@@ -63,9 +63,12 @@ npm i @whyour/qinglong
 # curl -sSL get.docker.com | sh
 docker run -dit \
   -v $PWD/ql/data:/ql/data \
+  # 冒号后面的 5700 为默认端口，如果设置了 QlPort, 需要跟 QlPort 保持一致
   -p 5700:5700 \
   # 部署路径非必须，以斜杠开头和结尾，比如 /test/
   -e QlBaseUrl="/" \
+  # 部署端口非必须，当使用 host 模式时，可以设置服务启动后的端口，默认 5700
+  -e QlPort="5700" \
   --name qinglong \
   --hostname qinglong \
   --restart unless-stopped \
@@ -92,9 +95,12 @@ docker-compose down
 podman run -dit \
   --network bridge \
   -v $PWD/ql/data:/ql/data \
+  # 冒号后面的 5700 为默认端口，如果设置了 QlPort, 需要跟 QlPort 保持一致
   -p 5700:5700 \
   # 部署路径非必须，以斜杠开头和结尾，比如 /test/
   -e QlBaseUrl="/" \
+  # 部署端口非必须，当使用 host 模式时，可以设置服务启动后的端口，默认 5700
+  -e QlPort="5700" \
   --name qinglong \
   --hostname qinglong \
   docker.io/whyour/qinglong:latest

package/docker/front.conf

@@ -12,7 +12,7 @@ map $http_upgrade $connection_upgrade {
 }
 
 server {
-  listen 5700;
+  IPV4_CONFIG
   IPV6_CONFIG
   ssl_session_timeout 5m;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@whyour/qinglong",
-  "version": "0.10.1",
+  "version": "0.11.0",
   "description": "Timed task management platform supporting Python3, JavaScript, Shell, Typescript",
   "repository": {
     "type": "git",
@@ -15,8 +15,8 @@
     "start": "concurrently -n w: npm:start:*",
     "start:front": "max dev",
     "start:back": "nodemon",
-    "start:public": "ts-node --transpile-only ./back/public.ts",
-    "start:rpc": "ts-node --transpile-only ./back/schedule/index.ts",
+    "start:public": "ts-node -P tsconfig.back.json ./back/public.ts",
+    "start:rpc": "ts-node -P tsconfig.back.json ./back/schedule/index.ts",
     "build:front": "max build",
     "build:back": "tsc -p tsconfig.back.json",
     "panel": "npm run build:back && node static/build/app.js",
@@ -85,11 +85,11 @@
     "dotenv": "^16.0.0",
     "express": "^4.17.3",
     "express-jwt": "^6.1.1",
-    "express-rate-limit": "^6.7.0",
+    "express-rate-limit": "^7.0.0",
     "express-urlrewrite": "^1.4.0",
     "form-data": "^4.0.0",
     "got": "^11.8.2",
-    "hpagent": "^0.1.2",
+    "hpagent": "^1.2.0",
     "http-proxy-middleware": "^2.0.6",
     "iconv-lite": "^0.6.3",
     "js-yaml": "^4.1.0",
@@ -178,7 +178,7 @@
     "ts-proto": "^1.146.0",
     "tslib": "^2.4.0",
     "tsx": "^3.12.3",
-    "typescript": "4.8.4",
+    "typescript": "5.2.2",
     "vh-check": "^2.0.5",
     "virtualizedtableforantd4": "1.3.0",
     "webpack": "^5.70.0",

package/sample/notify.js

@@ -55,6 +55,10 @@ let BARK_ICON = 'https://qn.whyour.cn/logo.png';
 let BARK_SOUND = '';
 //BARK app推送消息的分组, 默认为"QingLong"
 let BARK_GROUP = 'QingLong';
+//BARK app推送消息的时效性, 默认为"active"
+let BARK_LEVEL = 'active';
+//BARK app推送消息的跳转URL
+let BARK_URL = '';
 
 // =======================================telegram机器人通知设置区域===========================================
 //此处填你telegram bot 的Token，telegram机器人通知推送必填项.例如：1077xxx4424:AAFjv0FcqxxxxxxgEMGfi22B4yh15R5uw
@@ -211,6 +215,12 @@ if (process.env.BARK_PUSH) {
   if (process.env.BARK_GROUP) {
     BARK_GROUP = process.env.BARK_GROUP;
   }
+  if (process.env.BARK_LEVEL) {
+    BARK_LEVEL = process.env.BARK_LEVEL;
+  }
+  if (process.env.BARK_URL) {
+    BARK_URL = process.env.BARK_URL;
+  }
 } else {
   if (
     BARK_PUSH &&
@@ -552,7 +562,7 @@ function BarkNotify(text, desp, params = {}) {
       const options = {
         url: `${BARK_PUSH}/${encodeURIComponent(text)}/${encodeURIComponent(
           desp,
-        )}?icon=${BARK_ICON}&sound=${BARK_SOUND}&group=${BARK_GROUP}&${querystring.stringify(
+        )}?icon=${BARK_ICON}&sound=${BARK_SOUND}&group=${BARK_GROUP}&level=${BARK_LEVEL}&url=${BARK_URL}&${querystring.stringify(
           params,
         )}`,
         headers: {

package/sample/notify.py

@@ -40,6 +40,8 @@ push_config = {
     'BARK_GROUP': '',                   # bark 推送分组
     'BARK_SOUND': '',                   # bark 推送声音
     'BARK_ICON': '',                    # bark 推送图标
+    'BARK_LEVEL': '',                   # bark 推送时效性
+    'BARK_URL': '',                     # bark 推送跳转URL
 
     'CONSOLE': True,                    # 控制台输出
 
@@ -130,6 +132,8 @@ def bark(title: str, content: str) -> None:
         "BARK_GROUP": "group",
         "BARK_SOUND": "sound",
         "BARK_ICON": "icon",
+        "BARK_LEVEL": "level",
+        "BARK_URL": "url",
     }
     params = ""
     for pair in filter(

package/shell/otask.sh

@@ -78,7 +78,7 @@ env_str_to_array() {
 ## 正常运行单个脚本，$1：传入参数
 run_normal() {
   local file_param=$1
-  if [[ $# -eq 1 ]] && [[ "$real_time" != "true" ]]; then
+  if [[ $# -eq 1 ]] && [[ "$real_time" != "true" ]] && [[ "$no_delay" != "true" ]]; then
     random_delay "$file_param"
   fi
 

package/shell/share.sh

@@ -74,6 +74,7 @@ import_config() {
   [[ -f $file_env ]] && . $file_env
 
   ql_base_url=${QlBaseUrl:-"/"}
+  ql_port=${QlPort:-"5700"}
   command_timeout_time=${CommandTimeoutTime:-""}
   proxy_url=${ProxyUrl:-""}
   file_extensions=${RepoFileExtensions:-"js py"}
@@ -421,12 +422,15 @@ init_nginx() {
   sed -i "s,QL_BASE_URL_LOCATION,${location_url},g" /etc/nginx/conf.d/front.conf
   sed -i "s,QL_BASE_URL,${ql_base_url},g" /etc/nginx/conf.d/front.conf
 
-  ipv6=$(ip a | grep inet6)
-  ipv6Str=""
+  local ipv6=$(ip a | grep inet6)
+  local ipv6Str=""
   if [[ $ipv6 ]]; then
-    ipv6Str="listen [::]:5700 ipv6only=on;"
+    ipv6Str="listen [::]:${ql_port} ipv6only=on;"
   fi
+
+  local ipv4Str="listen ${ql_port};"
   sed -i "s,IPV6_CONFIG,${ipv6Str},g" /etc/nginx/conf.d/front.conf
+  sed -i "s,IPV4_CONFIG,${ipv4Str},g" /etc/nginx/conf.d/front.conf
 }
 
 handle_task_before() {
@@ -435,11 +439,23 @@ handle_task_before() {
   echo -e "## 开始执行... $begin_time\n"
 
   . $file_task_before "$@"
+
+  if [[ $task_before ]]; then
+    echo -e "执行前置命令\n"
+    eval "$task_before"
+    echo -e "\n执行前置命令结束\n"
+  fi
 }
 
 handle_task_after() {
   . $file_task_after "$@"
 
+  if [[ $task_after ]]; then
+    echo -e "\n执行后置命令\n"
+    eval "$task_after"
+    echo -e "\n执行后置命令结束"
+  fi
+
   local etime=$(date "+$time_format")
   local end_time=$(format_time "$time_format" "$etime")
   local end_timestamp=$(format_timestamp "$time_format" "$etime")

package/shell/update.sh

@@ -273,13 +273,13 @@ update_qinglong() {
   exit_status=$?
 
   if [[ $exit_status -eq 0 ]]; then
-    echo -e "\n更新青龙源文件成功...\n"
+    echo -e "更新青龙源文件成功...\n"
 
     unzip -oq ${dir_tmp}/ql.zip -d ${dir_tmp}
 
     update_qinglong_static
   else
-    echo -e "\n更新青龙源文件失败，请检查网络...\n"
+    echo -e "更新青龙源文件失败，请检查网络...\n"
   fi
 }
 
@@ -288,28 +288,29 @@ update_qinglong_static() {
   exit_status=$?
 
   if [[ $exit_status -eq 0 ]]; then
-    echo -e "\n更新青龙静态资源成功...\n"
+    echo -e "更新青龙静态资源成功...\n"
     unzip -oq ${dir_tmp}/static.zip -d ${dir_tmp}
 
     check_update_dep
   else
-    echo -e "\n更新青龙静态资源失败，请检查网络...\n"
+    echo -e "更新青龙静态资源失败，请检查网络...\n"
   fi
 }
 
 check_update_dep() {
   echo -e "\n开始检测依赖...\n"
-  if [[ $(diff $dir_sample/package.json $dir_scripts/package.json) ]]; then
+  if [[ ! -s $dir_scripts/package.json ]] || [[ $(diff $dir_sample/package.json $dir_scripts/package.json) ]]; then
     cp -f $dir_sample/package.json $dir_scripts/package.json
     npm_install_2 $dir_scripts
   fi
+
   if [[ $(diff $dir_root/package.json ${dir_tmp}/qinglong-${primary_branch}/package.json) ]]; then
     npm_install_2 "${dir_tmp}/qinglong-${primary_branch}"
   fi
 
   if [[ $exit_status -eq 0 ]]; then
     echo -e "\n依赖检测安装成功...\n"
-    echo -e "\n更新包下载成功...\n"
+    echo -e "更新包下载成功..."
 
     if [[ "$needRestart" == 'true' ]]; then
       cp -rf ${dir_tmp}/qinglong-${primary_branch}/* ${dir_root}/

package/static/build/api/cron.js

@@ -147,6 +147,9 @@ exports.default = (app) => {
             name: celebrate_1.Joi.string().optional(),
             labels: celebrate_1.Joi.array().optional(),
             sub_id: celebrate_1.Joi.number().optional().allow(null),
+            extra_schedules: celebrate_1.Joi.array().optional().allow(null),
+            task_before: celebrate_1.Joi.string().optional().allow('').allow(null),
+            task_after: celebrate_1.Joi.string().optional().allow('').allow(null),
         }),
     }), async (req, res, next) => {
         const logger = typedi_1.Container.get('logger');
@@ -270,6 +273,9 @@ exports.default = (app) => {
             schedule: celebrate_1.Joi.string().required(),
             name: celebrate_1.Joi.string().optional().allow(null),
             sub_id: celebrate_1.Joi.number().optional().allow(null),
+            extra_schedules: celebrate_1.Joi.array().optional().allow(null),
+            task_before: celebrate_1.Joi.string().optional().allow('').allow(null),
+            task_after: celebrate_1.Joi.string().optional().allow('').allow(null),
             id: celebrate_1.Joi.number().required(),
         }),
     }), async (req, res, next) => {

package/static/build/api/script.js

@@ -51,7 +51,7 @@ exports.default = (app) => {
         const logger = typedi_1.Container.get('logger');
         try {
             let result = [];
-            const blacklist = ['node_modules', '.git'];
+            const blacklist = ['node_modules', '.git', '.pnpm'];
             if (req.query.path) {
                 const targetPath = path_1.default.join(config_1.default.scriptPath, req.query.path);
                 result = (0, util_1.readDir)(targetPath, config_1.default.scriptPath, blacklist);

package/static/build/config/serverEnv.js

@@ -1,12 +1,15 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.serveEnv = void 0;
-const lodash_1 = require("lodash");
+const pick_1 = __importDefault(require("lodash/pick"));
 let pickedEnv;
 function getPickedEnv() {
     if (pickedEnv)
         return pickedEnv;
-    const picked = (0, lodash_1.pick)(process.env, ['QlBaseUrl', 'DeployEnv']);
+    const picked = (0, pick_1.default)(process.env, ['QlBaseUrl', 'DeployEnv']);
     pickedEnv = picked;
     return picked;
 }

package/static/build/data/auth.js

@@ -16,7 +16,7 @@ var LoginStatus;
 (function (LoginStatus) {
     LoginStatus[LoginStatus["success"] = 0] = "success";
     LoginStatus[LoginStatus["fail"] = 1] = "fail";
-})(LoginStatus = exports.LoginStatus || (exports.LoginStatus = {}));
+})(LoginStatus || (exports.LoginStatus = LoginStatus = {}));
 var AuthDataType;
 (function (AuthDataType) {
     AuthDataType["loginLog"] = "loginLog";
@@ -24,7 +24,7 @@ var AuthDataType;
     AuthDataType["notification"] = "notification";
     AuthDataType["removeLogFrequency"] = "removeLogFrequency";
     AuthDataType["systemConfig"] = "systemConfig";
-})(AuthDataType = exports.AuthDataType || (exports.AuthDataType = {}));
+})(AuthDataType || (exports.AuthDataType = AuthDataType = {}));
 exports.AuthModel = _1.sequelize.define('Auth', {
     ip: sequelize_1.DataTypes.STRING,
     type: sequelize_1.DataTypes.STRING,

package/static/build/data/cron.js

@@ -24,6 +24,9 @@ class Crontab {
         this.last_running_time = options.last_running_time || 0;
         this.last_execution_time = options.last_execution_time || 0;
         this.sub_id = options.sub_id;
+        this.extra_schedules = options.extra_schedules;
+        this.task_before = options.task_before;
+        this.task_after = options.task_after;
     }
 }
 exports.Crontab = Crontab;
@@ -33,7 +36,7 @@ var CrontabStatus;
     CrontabStatus[CrontabStatus["queued"] = 0.5] = "queued";
     CrontabStatus[CrontabStatus["idle"] = 1] = "idle";
     CrontabStatus[CrontabStatus["disabled"] = 2] = "disabled";
-})(CrontabStatus = exports.CrontabStatus || (exports.CrontabStatus = {}));
+})(CrontabStatus || (exports.CrontabStatus = CrontabStatus = {}));
 exports.CrontabModel = _1.sequelize.define('Crontab', {
     name: {
         unique: 'compositeIndex',
@@ -59,5 +62,8 @@ exports.CrontabModel = _1.sequelize.define('Crontab', {
     last_running_time: sequelize_1.DataTypes.NUMBER,
     last_execution_time: sequelize_1.DataTypes.NUMBER,
     sub_id: { type: sequelize_1.DataTypes.NUMBER, allowNull: true },
+    extra_schedules: sequelize_1.DataTypes.JSON,
+    task_before: sequelize_1.DataTypes.STRING,
+    task_after: sequelize_1.DataTypes.STRING,
 });
 //# sourceMappingURL=cron.js.map

package/static/build/data/cronView.js

@@ -7,7 +7,7 @@ var CronViewType;
 (function (CronViewType) {
     CronViewType[CronViewType["\u7CFB\u7EDF"] = 1] = "\u7CFB\u7EDF";
     CronViewType[CronViewType["\u4E2A\u4EBA"] = 2] = "\u4E2A\u4EBA";
-})(CronViewType = exports.CronViewType || (exports.CronViewType = {}));
+})(CronViewType || (exports.CronViewType = CronViewType = {}));
 class CrontabView {
     constructor(options) {
         this.name = options.name;

package/static/build/data/dependence.js

@@ -27,37 +27,37 @@ var DependenceStatus;
     DependenceStatus[DependenceStatus["removed"] = 4] = "removed";
     DependenceStatus[DependenceStatus["removeFailed"] = 5] = "removeFailed";
     DependenceStatus[DependenceStatus["queued"] = 6] = "queued";
-})(DependenceStatus = exports.DependenceStatus || (exports.DependenceStatus = {}));
+})(DependenceStatus || (exports.DependenceStatus = DependenceStatus = {}));
 var DependenceTypes;
 (function (DependenceTypes) {
     DependenceTypes[DependenceTypes["nodejs"] = 0] = "nodejs";
     DependenceTypes[DependenceTypes["python3"] = 1] = "python3";
     DependenceTypes[DependenceTypes["linux"] = 2] = "linux";
-})(DependenceTypes = exports.DependenceTypes || (exports.DependenceTypes = {}));
+})(DependenceTypes || (exports.DependenceTypes = DependenceTypes = {}));
 var InstallDependenceCommandTypes;
 (function (InstallDependenceCommandTypes) {
     InstallDependenceCommandTypes[InstallDependenceCommandTypes["pnpm add -g"] = 0] = "pnpm add -g";
     InstallDependenceCommandTypes[InstallDependenceCommandTypes["pip3 install --disable-pip-version-check --root-user-action=ignore"] = 1] = "pip3 install --disable-pip-version-check --root-user-action=ignore";
     InstallDependenceCommandTypes[InstallDependenceCommandTypes["apt install -y"] = 2] = "apt install -y";
-})(InstallDependenceCommandTypes = exports.InstallDependenceCommandTypes || (exports.InstallDependenceCommandTypes = {}));
+})(InstallDependenceCommandTypes || (exports.InstallDependenceCommandTypes = InstallDependenceCommandTypes = {}));
 var GetDependenceCommandTypes;
 (function (GetDependenceCommandTypes) {
     GetDependenceCommandTypes[GetDependenceCommandTypes["pnpm ls -g "] = 0] = "pnpm ls -g ";
     GetDependenceCommandTypes[GetDependenceCommandTypes["pip3 show --disable-pip-version-check"] = 1] = "pip3 show --disable-pip-version-check";
     GetDependenceCommandTypes[GetDependenceCommandTypes["apt info"] = 2] = "apt info";
-})(GetDependenceCommandTypes = exports.GetDependenceCommandTypes || (exports.GetDependenceCommandTypes = {}));
+})(GetDependenceCommandTypes || (exports.GetDependenceCommandTypes = GetDependenceCommandTypes = {}));
 var versionDependenceCommandTypes;
 (function (versionDependenceCommandTypes) {
     versionDependenceCommandTypes[versionDependenceCommandTypes["@"] = 0] = "@";
     versionDependenceCommandTypes[versionDependenceCommandTypes["=="] = 1] = "==";
     versionDependenceCommandTypes[versionDependenceCommandTypes["="] = 2] = "=";
-})(versionDependenceCommandTypes = exports.versionDependenceCommandTypes || (exports.versionDependenceCommandTypes = {}));
+})(versionDependenceCommandTypes || (exports.versionDependenceCommandTypes = versionDependenceCommandTypes = {}));
 var unInstallDependenceCommandTypes;
 (function (unInstallDependenceCommandTypes) {
     unInstallDependenceCommandTypes[unInstallDependenceCommandTypes["pnpm remove -g"] = 0] = "pnpm remove -g";
     unInstallDependenceCommandTypes[unInstallDependenceCommandTypes["pip3 uninstall --disable-pip-version-check --root-user-action=ignore -y"] = 1] = "pip3 uninstall --disable-pip-version-check --root-user-action=ignore -y";
     unInstallDependenceCommandTypes[unInstallDependenceCommandTypes["apt remove -y"] = 2] = "apt remove -y";
-})(unInstallDependenceCommandTypes = exports.unInstallDependenceCommandTypes || (exports.unInstallDependenceCommandTypes = {}));
+})(unInstallDependenceCommandTypes || (exports.unInstallDependenceCommandTypes = unInstallDependenceCommandTypes = {}));
 exports.DependenceModel = _1.sequelize.define('Dependence', {
     name: sequelize_1.DataTypes.STRING,
     type: sequelize_1.DataTypes.NUMBER,

package/static/build/data/env.js

@@ -22,7 +22,7 @@ var EnvStatus;
 (function (EnvStatus) {
     EnvStatus[EnvStatus["normal"] = 0] = "normal";
     EnvStatus[EnvStatus["disabled"] = 1] = "disabled";
-})(EnvStatus = exports.EnvStatus || (exports.EnvStatus = {}));
+})(EnvStatus || (exports.EnvStatus = EnvStatus = {}));
 exports.maxPosition = 9000000000000000;
 exports.initPosition = 4500000000000000;
 exports.stepPosition = 10000000000;

package/static/build/data/notify.js

@@ -20,7 +20,7 @@ var NotificationMode;
     NotificationMode["pushMe"] = "pushMe";
     NotificationMode["feishu"] = "feishu";
     NotificationMode["webhook"] = "webhook";
-})(NotificationMode = exports.NotificationMode || (exports.NotificationMode = {}));
+})(NotificationMode || (exports.NotificationMode = NotificationMode = {}));
 class NotificationBaseInfo {
 }
 class GotifyNotification extends NotificationBaseInfo {
@@ -71,6 +71,8 @@ class BarkNotification extends NotificationBaseInfo {
         this.barkIcon = 'https://qn.whyour.cn/logo.png';
         this.barkSound = '';
         this.barkGroup = 'qinglong';
+        this.barkLevel = 'active';
+        this.barkUrl = '';
     }
 }
 exports.BarkNotification = BarkNotification;

package/static/build/data/subscription.js

@@ -41,7 +41,7 @@ var SubscriptionStatus;
     SubscriptionStatus[SubscriptionStatus["idle"] = 1] = "idle";
     SubscriptionStatus[SubscriptionStatus["disabled"] = 2] = "disabled";
     SubscriptionStatus[SubscriptionStatus["queued"] = 3] = "queued";
-})(SubscriptionStatus = exports.SubscriptionStatus || (exports.SubscriptionStatus = {}));
+})(SubscriptionStatus || (exports.SubscriptionStatus = SubscriptionStatus = {}));
 exports.SubscriptionModel = _1.sequelize.define('Subscription', {
     name: {
         unique: 'compositeIndex',

package/static/build/loaders/db.js

@@ -50,6 +50,18 @@ exports.default = async () => {
             await data_1.sequelize.query('alter table Crontabs add column sub_id NUMBER');
         }
         catch (error) { }
+        try {
+            await data_1.sequelize.query('alter table Crontabs add column extra_schedules JSON');
+        }
+        catch (error) { }
+        try {
+            await data_1.sequelize.query('alter table Crontabs add column task_before TEXT');
+        }
+        catch (error) { }
+        try {
+            await data_1.sequelize.query('alter table Crontabs add column task_after TEXT');
+        }
+        catch (error) { }
         // 2.10-2.11 升级
         const cronDbFile = path_1.default.join(config_1.default.rootPath, 'db/crontab.db');
         const envDbFile = path_1.default.join(config_1.default.rootPath, 'db/env.db');