@whyour/qinglong 0.19.9 → 0.20.1

package/README-en.md

@@ -54,62 +54,6 @@ The npm version supports `debian/ubuntu/centos/alpine` systems and requires `nod
 npm i @whyour/qinglong
 ```
 
-## Built-in commands
-
-- task
-
-```bash
-# Execute in sequence, if a random delay is set, it will be randomly delayed by a certain number of seconds
-task <file_path>                                             
-# Execute in sequence, regardless of whether a random delay is set, all run immediately, 
-# and the foreground will output the day, while recorded in the log file
-task <file_path> now                                         
-# Concurrent execution, regardless of whether a random delay is set, are run immediately, 
-# the foreground does not generate the day, directly recorded in the log file, and can be specified account execution
-task <file_path> conc <env_name> <account_number>(Optional) 
-# Specify the account to execute and run immediately regardless of whether a random delay is set 
-task <file_path> desi <env_name> <account_number>       
-# Set task timeout   
-task -m <max_time> <file_path>
-# Use -- to split, -- followed by a parameter that is passed to the script, as in the following example, the script receives the parameter -u whyour -p password
-task <file_path> -- -u whyour -p password
-```
-
-- ql
-
-```bash
-# Update and restart Green Dragon
-ql update                                                    
-# Run custom scripts extra.sh
-ql extra                                                     
-# Adding a single script file
-ql raw <file_url>                                             
-# Add a specific script for a single repository
-ql repo <repo_url> <whitelist> <blacklist> <dependence> <branch>   
-# Delete old logs
-ql rmlog <days>                                              
-# Start bot
-ql bot                                                       
-# Detecting the Green Dragon environment and repairing it
-ql check                                                     
-# Reset the number of login errors
-ql resetlet                                                  
-# Disable two-step login
-ql resettfa                                                  
-```
-
-| **Parameter** | **Description** |
-|---|---|
-| file_url | Script address |
-| repo_url | Repository address |
-| whitelist | The whitelist when pulling the repository, i.e., the string contained in the path of the script to be pulled |
-| blacklist | Blacklisting when pulling repositories, i.e. strings that are not included in the path of the script to be pulled |
-| dependence | Pulling the dependencies needed for the repository will be copied directly from the repository to the repository directory under scripts, regardless of the blacklist |
-| extensions | Pull the branch of the repository |
-| branch | Number of days of logs to be kept |
-| days | File path for task execution |
-| file_path | The name of the environment variable that needs to be concurrent or specified at the time of task execution |
-
 ## Deployment
 
 ### Docker (Recommended)
@@ -183,16 +127,72 @@ export QL_DATA_DIR=""
 qinglong
 ```
 
+## Built-in commands
+
+- task
+
+```bash
+# Execute in sequence, if a random delay is set, it will be randomly delayed by a certain number of seconds
+task <file_path>                                             
+# Execute in sequence, regardless of whether a random delay is set, all run immediately, 
+# and the foreground will output the day, while recorded in the log file
+task <file_path> now                                         
+# Concurrent execution, regardless of whether a random delay is set, are run immediately, 
+# the foreground does not generate the day, directly recorded in the log file, and can be specified account execution
+task <file_path> conc <env_name> <account_number>(Optional) 
+# Specify the account to execute and run immediately regardless of whether a random delay is set 
+task <file_path> desi <env_name> <account_number>       
+# Set task timeout   
+task -m <max_time> <file_path>
+# Use -- to split, -- followed by a parameter that is passed to the script, as in the following example, the script receives the parameter -u whyour -p password
+task <file_path> -- -u whyour -p password
+```
+
+- ql
+
+```bash
+# Update and restart Green Dragon
+ql update                                                    
+# Run custom scripts extra.sh
+ql extra                                                     
+# Adding a single script file
+ql raw <file_url>                                             
+# Add a specific script for a single repository
+ql repo <repo_url> <whitelist> <blacklist> <dependence> <branch>   
+# Delete old logs
+ql rmlog <days>                                              
+# Start bot
+ql bot                                                       
+# Detecting the Green Dragon environment and repairing it
+ql check                                                     
+# Reset the number of login errors
+ql resetlet                                                  
+# Disable two-step login
+ql resettfa                                                  
+```
+
+| **Parameter** | **Description** |
+|---|---|
+| file_url | Script address |
+| repo_url | Repository address |
+| whitelist | The whitelist when pulling the repository, i.e., the string contained in the path of the script to be pulled |
+| blacklist | Blacklisting when pulling repositories, i.e. strings that are not included in the path of the script to be pulled |
+| dependence | Pulling the dependencies needed for the repository will be copied directly from the repository to the repository directory under scripts, regardless of the blacklist |
+| extensions | Pull the branch of the repository |
+| branch | Number of days of logs to be kept |
+| days | File path for task execution |
+| file_path | The name of the environment variable that needs to be concurrent or specified at the time of task execution |
+
 ## Development
 
 ```bash
-$ git clone https://github.com/whyour/qinglong.git
-$ cd qinglong
-$ cp .env.example .env
+git clone https://github.com/whyour/qinglong.git
+cd qinglong
+cp .env.example .env
 # Recommended use pnpm https://pnpm.io/zh/installation
-$ npm install -g pnpm@8.3.1
-$ pnpm install
-$ pnpm start
+npm install -g pnpm@8.3.1
+pnpm install
+pnpm start
 ```
 
 Open your browser and visit <http://127.0.0.1:5700>

package/README.md

@@ -56,60 +56,6 @@ npm 版本支持 `debian/ubuntu/centos/alpine` 系统，需要自行安装 `node
 npm i @whyour/qinglong
 ```
 
-## 内置命令
-
-- task
-
-```bash
-# 依次执行，如果设置了随机延迟，将随机延迟一定秒数
-task <file_path>                                             
-# 依次执行，无论是否设置了随机延迟，均立即运行，前台会输出日，同时记录在日志文件中
-task <file_path> now                                         
-# 并发执行，无论是否设置了随机延迟，均立即运行，前台不产生日，直接记录在日志文件中，且可指定账号执行
-task <file_path> conc <env_name> <account_number>(可选的) 
-# 指定账号执行，无论是否设置了随机延迟，均立即运行 
-task <file_path> desi <env_name> <account_number>      
-# 设置任务超时时间   
-task -m <max_time> <file_path>
-# 使用 -- 分割，-- 后面的参数会传给脚本，下面的例子，脚本就可接收到参数 -u whyour -p password
-task <file_path> -- -u whyour -p password
-```
-
-- ql
-
-```bash
-# 更新并重启青龙
-ql update
-# 运行自定义脚本extra.sh
-ql extra
-# 添加单个脚本文件
-ql raw <file_url>
-# 添加单个仓库的指定脚本
-ql repo <repo_url> <whitelist> <blacklist> <dependence> <branch> <extensions>
-# 删除旧日志
-ql rmlog <days>
-# 启动tg-bot
-ql bot
-# 检测青龙环境并修复
-ql check
-# 重置登录错误次数
-ql resetlet                                                  
-# 禁用两步登录
-ql resettfa
-```
-
-| **参数**   | **说明**                                                                                    |
-|------------|---------------------------------------------------------------------------------------------|
-| file_url   | 脚本地址                                                                                    |
-| repo_url   | 仓库地址                                                                                    |
-| whitelist  | 拉取仓库时的白名单，即就是需要拉取的脚本的路径包含的字符串，多个竖线分割                    |
-| blacklist  | 拉取仓库时的黑名单，即就是需要拉取的脚本的路径不包含的字符串，多个竖线分割                  |
-| dependence | 拉取仓库需要的依赖文件，会直接从仓库拷贝到scripts下的仓库目录，不受黑名单影响，多个竖线分割 |
-| extensions | 拉取仓库的文件后缀，多个竖线分割                                                            |
-| branch     | 拉取仓库的分支                                                                              |
-| days       | 需要保留的日志的天数                                                                        |
-| file_path  | 任务执行时的文件路径                                                                        |
-
 ## 部署
 
 ### docker (推荐)
@@ -183,16 +129,70 @@ export QL_DATA_DIR=""
 qinglong
 ```
 
+## 内置命令
+
+- task
+
+```bash
+# 依次执行，如果设置了随机延迟，将随机延迟一定秒数
+task <file_path>                                             
+# 依次执行，无论是否设置了随机延迟，均立即运行，前台会输出日，同时记录在日志文件中
+task <file_path> now                                         
+# 并发执行，无论是否设置了随机延迟，均立即运行，前台不产生日，直接记录在日志文件中，且可指定账号执行
+task <file_path> conc <env_name> <account_number>(可选的) 
+# 指定账号执行，无论是否设置了随机延迟，均立即运行 
+task <file_path> desi <env_name> <account_number>      
+# 设置任务超时时间   
+task -m <max_time> <file_path>
+# 使用 -- 分割，-- 后面的参数会传给脚本，下面的例子，脚本就可接收到参数 -u whyour -p password
+task <file_path> -- -u whyour -p password
+```
+
+- ql
+
+```bash
+# 更新并重启青龙
+ql update
+# 运行自定义脚本extra.sh
+ql extra
+# 添加单个脚本文件
+ql raw <file_url>
+# 添加单个仓库的指定脚本
+ql repo <repo_url> <whitelist> <blacklist> <dependence> <branch> <extensions>
+# 删除旧日志
+ql rmlog <days>
+# 启动tg-bot
+ql bot
+# 检测青龙环境并修复
+ql check
+# 重置登录错误次数
+ql resetlet                                                  
+# 禁用两步登录
+ql resettfa
+```
+
+| **参数**   | **说明**                                                                                    |
+|------------|---------------------------------------------------------------------------------------------|
+| file_url   | 脚本地址                                                                                    |
+| repo_url   | 仓库地址                                                                                    |
+| whitelist  | 拉取仓库时的白名单，即就是需要拉取的脚本的路径包含的字符串，多个竖线分割                    |
+| blacklist  | 拉取仓库时的黑名单，即就是需要拉取的脚本的路径不包含的字符串，多个竖线分割                  |
+| dependence | 拉取仓库需要的依赖文件，会直接从仓库拷贝到scripts下的仓库目录，不受黑名单影响，多个竖线分割 |
+| extensions | 拉取仓库的文件后缀，多个竖线分割                                                            |
+| branch     | 拉取仓库的分支                                                                              |
+| days       | 需要保留的日志的天数                                                                        |
+| file_path  | 任务执行时的文件路径                                                                        |
+
 ## 开发
 
 ```bash
-$ git clone https://github.com/whyour/qinglong.git
-$ cd qinglong
-$ cp .env.example .env
+git clone https://github.com/whyour/qinglong.git
+cd qinglong
+cp .env.example .env
 # 推荐使用 pnpm https://pnpm.io/zh/installation
-$ npm install -g pnpm@8.3.1
-$ pnpm install
-$ pnpm start
+npm install -g pnpm@8.3.1
+pnpm install
+pnpm start
 ```
 
 打开你的浏览器，访问 <http://127.0.0.1:5700>

package/package.json

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

package/sample/notify.js

@@ -97,7 +97,6 @@ const push_config = {
   WEBHOOK_CONTENT_TYPE: '', // 自定义通知 content-type
 };
 
-// 首先读取 面板变量 或者 github action 运行变量
 for (const key in push_config) {
   const v = process.env[key];
   if (v) {
@@ -358,17 +357,24 @@ function barkNotify(text, desp, params = {}) {
         BARK_PUSH = `https://api.day.app/${BARK_PUSH}`;
       }
       const options = {
-        url: `${BARK_PUSH}/${encodeURIComponent(text)}/${encodeURIComponent(
-          desp,
-        )}?icon=${BARK_ICON}&sound=${BARK_SOUND}&group=${BARK_GROUP}&isArchive=${BARK_ARCHIVE}&level=${BARK_LEVEL}&url=${BARK_URL}&${querystring.stringify(
-          params,
-        )}`,
+        url: `${BARK_PUSH}`,
+        json: {
+          title: text,
+          body: desp,
+          icon: BARK_ICON,
+          sound: BARK_SOUND,
+          group: BARK_GROUP,
+          isArchive: BARK_ARCHIVE,
+          level: BARK_LEVEL,
+          url: BARK_URL,
+          ...params,
+        },
         headers: {
-          'Content-Type': 'application/x-www-form-urlencoded',
+          'Content-Type': 'application/json',
         },
         timeout,
       };
-      $.get(options, (err, resp, data) => {
+      $.post(options, (err, resp, data) => {
         try {
           if (err) {
             console.log('Bark APP 发送通知调用API失败😞\n', err);
@@ -1283,7 +1289,7 @@ async function sendNotify(text, desp, params = {}) {
     }
   }
 
-  if (push_config.HITOKOTO) {
+  if (push_config.HITOKOTO !== 'false') {
     desp += '\n\n' + (await one());
   }
 

package/sample/notify.py

@@ -120,7 +120,6 @@ push_config = {
 }
 # fmt: on
 
-# 首先读取 面板变量 或者 github action 运行变量
 for k in push_config:
     if os.getenv(k):
         v = os.getenv(k)
@@ -137,9 +136,9 @@ def bark(title: str, content: str) -> None:
     print("bark 服务启动")
 
     if push_config.get("BARK_PUSH").startswith("http"):
-        url = f'{push_config.get("BARK_PUSH")}/{urllib.parse.quote_plus(title)}/{urllib.parse.quote_plus(content)}'
+        url = f'{push_config.get("BARK_PUSH")}'
     else:
-        url = f'https://api.day.app/{push_config.get("BARK_PUSH")}/{urllib.parse.quote_plus(title)}/{urllib.parse.quote_plus(content)}'
+        url = f'https://api.day.app/{push_config.get("BARK_PUSH")}'
 
     bark_params = {
         "BARK_ARCHIVE": "isArchive",
@@ -149,7 +148,10 @@ def bark(title: str, content: str) -> None:
         "BARK_LEVEL": "level",
         "BARK_URL": "url",
     }
-    params = ""
+    data = {
+        "title": title,
+        "body": content,
+    }
     for pair in filter(
         lambda pairs: pairs[0].startswith("BARK_")
         and pairs[0] != "BARK_PUSH"
@@ -157,10 +159,11 @@ def bark(title: str, content: str) -> None:
         and bark_params.get(pairs[0]),
         push_config.items(),
     ):
-        params += f"{bark_params.get(pair[0])}={pair[1]}&"
-    if params:
-        url = url + "?" + params.rstrip("&")
-    response = requests.get(url).json()
+        data[bark_params.get(pair[0])] = pair[1]
+    headers = {"Content-Type": "application/json;charset=utf-8"}
+    response = requests.post(
+        url=url, data=json.dumps(data), headers=headers, timeout=15
+    ).json()
 
     if response["code"] == 200:
         print("bark 推送成功！")
@@ -385,6 +388,7 @@ def pushplus_bot(title: str, content: str) -> None:
         else:
             print("PUSHPLUS 推送失败！")
 
+
 def weplus_bot(title: str, content: str) -> None:
     """
     通过 微加机器人 推送消息。
@@ -396,7 +400,7 @@ def weplus_bot(title: str, content: str) -> None:
 
     template = "txt"
     if len(content) > 800:
-      template = "html"
+        template = "html"
 
     url = "https://www.weplusbot.com/send"
     data = {
@@ -704,7 +708,11 @@ def pushme(title: str, content: str) -> None:
         return
     print("PushMe 服务启动")
 
-    url = push_config.get("PUSHME_URL") if push_config.get("PUSHME_URL") else "https://push.i-i.me/"
+    url = (
+        push_config.get("PUSHME_URL")
+        if push_config.get("PUSHME_URL")
+        else "https://push.i-i.me/"
+    )
     data = {
         "push_key": push_config.get("PUSHME_KEY"),
         "title": title,
@@ -953,7 +961,7 @@ def send(title: str, content: str, ignore_default_config: bool = False, **kwargs
             return
 
     hitokoto = push_config.get("HITOKOTO")
-    content += "\n\n" + one() if hitokoto else ""
+    content += "\n\n" + one() if hitokoto != "false" else ""
 
     notify_function = add_notify_function()
     ts = [

package/shell/update.sh

@@ -156,21 +156,15 @@ update_raw() {
     autoDelCron=${AutoDelCron}
   fi
 
-  local proxyStr=""
-  if [[ $proxy ]]; then
-    if [[ $url == http:* ]]; then
-      proxyStr="-e \"http_proxy=${proxy}\""
-    elif [[ $url == https:* ]]; then
-      proxyStr="-e \"http_proxy=${proxy};https_proxy=${proxy}\""
-    fi
-  fi
-
   local raw_url="$url"
   local suffix="${raw_url##*.}"
   local raw_file_name="${uniq_path}.${suffix}"
   echo -e "开始下载：${raw_url} \n\n保存路径：$dir_raw/${raw_file_name}\n"
 
-  wget -q --no-check-certificate $proxyStr -O "$dir_raw/${raw_file_name}.new" ${raw_url}
+  set_proxy "$proxy"
+  wget -q --no-check-certificate -O "$dir_raw/${raw_file_name}.new" ${raw_url}
+  exit_status=$?
+  unset_proxy
 
   if [[ $? -eq 0 ]]; then
     mv "$dir_raw/${raw_file_name}.new" "$dir_raw/${raw_file_name}"
@@ -255,7 +249,7 @@ reload_qinglong() {
   reload_pm2
 }
 
-## 更新qinglong
+## 更新 qinglong
 update_qinglong() {
   rm -rf ${dir_tmp}/*
   local mirror="gitee"
@@ -527,7 +521,7 @@ main() {
   raw)
     get_uniq_path "$p2"
     if [[ -n $p2 ]]; then
-      update_raw "$p2" "$p3" "$p4"
+      update_raw "$p2" "$p3" "$p4" "$p5"
     else
       eval echo -e "命令输入错误...\\\n" $cmd
       eval usage $cmd

package/static/build/api/env.js

@@ -180,7 +180,7 @@ exports.default = (app) => {
             else {
                 return res.send({
                     code: 400,
-                    message: '文件缺少name或者value字段，参考导出文件格式',
+                    message: '每条数据 name 或者 value 字段不能为空，参考导出文件格式',
                 });
             }
         }

package/static/build/config/subscription.js

@@ -27,7 +27,7 @@ function formatCommand(doc, url) {
     let _url = url || formatUrl(doc).url;
     const { type, whitelist, blacklist, dependences, branch, extensions, proxy, autoAddCron, autoDelCron, } = doc;
     if (type === 'file') {
-        command += `raw "${_url}"`;
+        command += `raw "${_url}" "${proxy || ''}" "${(0, isNil_1.default)(autoAddCron) ? true : Boolean(autoAddCron)}" "${(0, isNil_1.default)(autoDelCron) ? true : Boolean(autoDelCron)}"`;
     }
     else {
         command += `repo "${_url}" "${whitelist || ''}" "${blacklist || ''}" "${dependences || ''}" "${branch || ''}" "${extensions || ''}" "${proxy || ''}" "${(0, isNil_1.default)(autoAddCron) ? true : Boolean(autoAddCron)}" "${(0, isNil_1.default)(autoDelCron) ? true : Boolean(autoDelCron)}"`;

package/static/build/data/system.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SystemModel = exports.AuthDataType = exports.LoginStatus = exports.AuthInfo = void 0;
+exports.SystemModel = exports.AuthDataType = exports.LoginStatus = exports.SystemInfo = void 0;
 const _1 = require(".");
 const sequelize_1 = require("sequelize");
-class AuthInfo {
+class SystemInfo {
     constructor(options) {
         this.ip = options.ip;
         this.info = options.info;
@@ -11,7 +11,7 @@ class AuthInfo {
         this.id = options.id;
     }
 }
-exports.AuthInfo = AuthInfo;
+exports.SystemInfo = SystemInfo;
 var LoginStatus;
 (function (LoginStatus) {
     LoginStatus[LoginStatus["success"] = 0] = "success";

package/static/build/loaders/app.js

@@ -10,26 +10,20 @@ const initData_1 = __importDefault(require("./initData"));
 const deps_1 = __importDefault(require("./deps"));
 const initTask_1 = __importDefault(require("./initTask"));
 exports.default = async ({ expressApp }) => {
-    try {
-        (0, depInjector_1.default)();
-        logger_1.default.info('✌️ Dependency Injector loaded');
-        console.log('✌️ Dependency Injector loaded');
-        (0, express_1.default)({ app: expressApp });
-        logger_1.default.info('✌️ Express loaded');
-        console.log('✌️ Express loaded');
-        await (0, initData_1.default)();
-        logger_1.default.info('✌️ init data loaded');
-        console.log('✌️ init data loaded');
-        await (0, deps_1.default)();
-        logger_1.default.info('✌️ link deps loaded');
-        console.log('✌️ link deps loaded');
-        (0, initTask_1.default)();
-        logger_1.default.info('✌️ init task loaded');
-        console.log('✌️ init task loaded');
-    }
-    catch (error) {
-        logger_1.default.error(`✌️ depInjectorLoader expressLoader initData linkDeps failed, ${error}`);
-        console.error(`✌️ depInjectorLoader expressLoader initData linkDeps failed ${error}`);
-    }
+    (0, depInjector_1.default)();
+    logger_1.default.info('✌️ Dependency loaded');
+    console.log('✌️ Dependency loaded');
+    await (0, initData_1.default)();
+    logger_1.default.info('✌️ Init data loaded');
+    console.log('✌️ Init data loaded');
+    await (0, deps_1.default)();
+    logger_1.default.info('✌️ Link deps loaded');
+    console.log('✌️ Link deps loaded');
+    (0, initTask_1.default)();
+    logger_1.default.info('✌️ Init task loaded');
+    console.log('✌️ Init task loaded');
+    (0, express_1.default)({ app: expressApp });
+    logger_1.default.info('✌️ Express loaded');
+    console.log('✌️ Express loaded');
 };
 //# sourceMappingURL=app.js.map

package/static/build/loaders/initData.js

@@ -22,6 +22,9 @@ exports.default = async () => {
     const envService = typedi_1.Container.get(env_1.default);
     const dependenceService = typedi_1.Container.get(dependence_1.default);
     const systemService = typedi_1.Container.get(system_2.default);
+    // 初始化增加系统配置
+    await system_1.SystemModel.upsert({ type: system_1.AuthDataType.systemConfig });
+    await system_1.SystemModel.upsert({ type: system_1.AuthDataType.notification });
     const installDependencies = () => {
         // 初始化时安装所有处于安装中，安装成功，安装失败的依赖
         dependence_2.DependenceModel.findAll({
@@ -129,7 +132,5 @@ exports.default = async () => {
     // 初始化保存一次ck和定时任务数据
     await cronService.autosave_crontab();
     await envService.set_envs();
-    // 初始化增加系统配置
-    await system_1.SystemModel.upsert({ type: system_1.AuthDataType.systemConfig });
 };
 //# sourceMappingURL=initData.js.map

package/static/build/services/cron.js

@@ -323,7 +323,10 @@ let CronService = class CronService {
     }
     async getDb(query) {
         const doc = await cron_1.CrontabModel.findOne({ where: Object.assign({}, query) });
-        return doc && doc.get({ plain: true });
+        if (!doc) {
+            throw new Error(`Cron ${JSON.stringify(query)} not found`);
+        }
+        return doc.get({ plain: true });
     }
     async run(ids) {
         await cron_1.CrontabModel.update({ status: cron_1.CrontabStatus.queued }, { where: { id: ids } });

package/static/build/services/cronView.js

@@ -65,7 +65,10 @@ let CronViewService = class CronViewService {
     }
     async getDb(query) {
         const doc = await cronView_1.CrontabViewModel.findOne({ where: Object.assign({}, query) });
-        return doc && doc.get({ plain: true });
+        if (!doc) {
+            throw new Error(`CronView ${JSON.stringify(query)} not found`);
+        }
+        return doc.get({ plain: true });
     }
     async disabled(ids) {
         await cronView_1.CrontabViewModel.update({ isDisabled: 1 }, { where: { id: ids } });

package/static/build/services/dependence.js

@@ -141,7 +141,10 @@ let DependenceService = class DependenceService {
     }
     async getDb(query) {
         const doc = await dependence_1.DependenceModel.findOne({ where: Object.assign({}, query) });
-        return doc && doc.get({ plain: true });
+        if (!doc) {
+            throw new Error(`Dependency ${JSON.stringify(query)} not found`);
+        }
+        return doc.get({ plain: true });
     }
     async updateLog(ids, log) {
         pLimit_1.default.updateDepLog(async () => {

package/static/build/services/env.js

@@ -169,7 +169,10 @@ let EnvService = class EnvService {
     }
     async getDb(query) {
         const doc = await env_1.EnvModel.findOne({ where: Object.assign({}, query) });
-        return doc && doc.get({ plain: true });
+        if (!doc) {
+            throw new Error(`Env ${JSON.stringify(query)} not found`);
+        }
+        return doc.get({ plain: true });
     }
     async disabled(ids) {
         await env_1.EnvModel.update({ status: env_1.EnvStatus.disabled }, { where: { id: ids } });

package/static/build/services/notify.js

@@ -190,10 +190,20 @@ let NotificationService = class NotificationService {
         if (!barkPush.startsWith('http')) {
             barkPush = `https://api.day.app/${barkPush}`;
         }
-        const url = `${barkPush}/${encodeURIComponent(this.title)}/${encodeURIComponent(this.content)}?icon=${barkIcon}&sound=${barkSound}&group=${barkGroup}&level=${barkLevel}&url=${barkUrl}&isArchive=${barkArchive}`;
+        const url = `${barkPush}`;
+        const body = {
+            title: this.title,
+            body: this.content,
+            icon: barkIcon,
+            sound: barkSound,
+            group: barkGroup,
+            isArchive: barkArchive,
+            level: barkLevel,
+            url: barkUrl,
+        };
         try {
             const res = await got_1.default
-                .get(url, Object.assign(Object.assign({}, this.gotOption), { headers: { 'Content-Type': 'application/x-www-form-urlencoded' } }))
+                .post(url, Object.assign(Object.assign({}, this.gotOption), { json: body, headers: { 'Content-Type': 'application/json' } }))
                 .json();
             if (res.code === 200) {
                 return true;

package/static/build/services/open.js

@@ -55,7 +55,10 @@ let OpenService = class OpenService {
     }
     async getDb(query) {
         const doc = await open_1.AppModel.findOne({ where: query });
-        return doc && doc.get({ plain: true });
+        if (!doc) {
+            throw new Error(`App ${JSON.stringify(query)} not found`);
+        }
+        return doc.get({ plain: true });
     }
     async remove(ids) {
         await open_1.AppModel.destroy({ where: { id: ids } });

package/static/build/services/subscription.js

@@ -238,7 +238,7 @@ let SubscriptionService = class SubscriptionService {
     async getDb(query) {
         const doc = await subscription_1.SubscriptionModel.findOne({ where: Object.assign({}, query) });
         if (!doc) {
-            throw new Error(`${JSON.stringify(query)} not found`);
+            throw new Error(`Subscription ${JSON.stringify(query)} not found`);
         }
         return doc.get({ plain: true });
     }

package/static/build/services/system.js

@@ -39,7 +39,7 @@ let SystemService = class SystemService {
     }
     async getSystemConfig() {
         const doc = await this.getDb({ type: system_1.AuthDataType.systemConfig });
-        return doc || {};
+        return doc;
     }
     async updateAuthDb(payload) {
         await system_1.SystemModel.upsert(Object.assign({}, payload));
@@ -48,7 +48,10 @@ let SystemService = class SystemService {
     }
     async getDb(query) {
         const doc = await system_1.SystemModel.findOne({ where: Object.assign({}, query) });
-        return doc && doc.get({ plain: true });
+        if (!doc) {
+            throw new Error(`System ${JSON.stringify(query)} not found`);
+        }
+        return doc.get({ plain: true });
     }
     async updateNotificationMode(notificationInfo) {
         const code = Math.random().toString().slice(-6);

package/static/build/services/user.js

@@ -294,7 +294,7 @@ let UserService = class UserService {
     }
     async getNotificationMode() {
         const doc = await this.getDb({ type: system_1.AuthDataType.notification });
-        return (doc && doc.info) || {};
+        return doc.info;
     }
     async updateAuthDb(payload) {
         let doc = await system_1.SystemModel.findOne({ type: payload.type });
@@ -312,7 +312,10 @@ let UserService = class UserService {
     }
     async getDb(query) {
         const doc = await system_1.SystemModel.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 updateNotificationMode(notificationInfo) {
         const code = Math.random().toString().slice(-6);

package/version.yaml

@@ -1,9 +1,7 @@
-version: 2.17.5
-changeLogLink: https://t.me/jiao_long/406
-publishTime: 2024-05-25 19:00
+version: 2.17.6
+changeLogLink: https://t.me/jiao_long/407
+publishTime: 2024-06-14 23:00
 changeLog: |
-  1. 修复有可能手动运行任务无日志
-  2. 重构 JavaScript 脚本通知文件
-  3. PushMe 通知支持自建服务
-  4. 增加微加机器人消息通道
-  5. 修复任务详情查看脚本错误
+  1. bark 推送改为 post 请求，防止请求头过大
+  2. 修复单文件订阅代理无效
+  3. 修复系统设置通知和依赖数据未初始化