@whyour/qinglong 0.16.0 → 0.17.0

package/.env.example

@@ -1,3 +1,4 @@
+UPDATE_PORT=5300
 PUBLIC_PORT=5400
 CRON_PORT=5500
 BACK_PORT=5600

package/docker/310.Dockerfile

@@ -80,3 +80,7 @@ HEALTHCHECK --interval=5s --timeout=2s --retries=20 \
   CMD curl -sf --noproxy '*' http://127.0.0.1:5400/api/health || exit 1
 
 ENTRYPOINT ["./docker/docker-entrypoint.sh"]
+
+VOLUME /ql/data
+  
+EXPOSE 5700

package/docker/docker-entrypoint.sh

@@ -21,6 +21,7 @@ nginx -s reload 2>/dev/null || nginx -c /etc/nginx/nginx.conf
 echo -e "nginx启动成功...\n"
 
 echo -e "======================4. 启动pm2服务========================\n"
+reload_update
 reload_pm2
 
 if [[ $AutoStartBot == true ]]; then

package/docker/front.conf

@@ -6,6 +6,10 @@ upstream publicApi {
   server 0.0.0.0:5400;
 }
 
+upstream updateApi {
+  server 0.0.0.0:5300;
+}
+
 map $http_upgrade $connection_upgrade {
   default keep-alive;
   'websocket' upgrade;
@@ -16,6 +20,18 @@ server {
   IPV6_CONFIG
   ssl_session_timeout 5m;
 
+  location QL_BASE_URLapi/update/ {
+    proxy_set_header Host $http_host;
+    proxy_set_header X-Real-IP $remote_addr;
+    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    proxy_pass http://updateApi/api/;
+    proxy_buffering off;
+    proxy_redirect default;
+    proxy_connect_timeout 1800;
+    proxy_send_timeout 1800;
+    proxy_read_timeout 1800;
+  }
+
   location QL_BASE_URLapi/public/ {
     proxy_set_header Host $http_host;
     proxy_set_header X-Real-IP $remote_addr;

package/other.config.js

@@ -0,0 +1,13 @@
+module.exports = {
+  apps: [
+    {
+      name: 'update',
+      max_restarts: 10,
+      kill_timeout: 15000,
+      wait_ready: true,
+      listen_timeout: 10000,
+      time: true,
+      script: 'static/build/update.js',
+    },
+  ],
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@whyour/qinglong",
-  "version": "0.16.0",
+  "version": "0.17.0",
   "description": "Timed task management platform supporting Python3, JavaScript, Shell, Typescript",
   "repository": {
     "type": "git",
@@ -15,6 +15,7 @@
     "start": "concurrently -n w: npm:start:*",
     "start:front": "max dev",
     "start:back": "nodemon",
+    "start:update": "ts-node -P tsconfig.back.json ./back/update.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",
@@ -22,6 +23,7 @@
     "panel": "npm run build:back && node static/build/app.js",
     "schedule": "npm run build:back && node static/build/schedule/index.js",
     "public": "npm run build:back && node static/build/public.js",
+    "update": "npm run build:back && node static/build/update.js",
     "gen:proto": "protoc --experimental_allow_proto3_optional --plugin=./node_modules/.bin/protoc-gen-ts_proto ./back/protos/*.proto --ts_proto_out=./ --ts_proto_opt=outputServices=grpc-js,env=node,esModuleInterop=true",
     "prettier": "prettier --write '**/*.{js,jsx,tsx,ts,less,md,json}'",
     "postinstall": "max setup 2>/dev/null || true",
@@ -106,7 +108,6 @@
     "serve-handler": "^6.1.3",
     "sockjs": "^0.3.24",
     "sqlite3": "git+https://github.com/whyour/node-sqlite3.git#v1.0.3",
-    "tar": "^6.1.15",
     "toad-scheduler": "^1.6.0",
     "typedi": "^0.10.0",
     "uuid": "^8.3.2",
@@ -144,7 +145,6 @@
     "@types/serve-handler": "^6.1.1",
     "@types/sockjs": "^0.3.33",
     "@types/sockjs-client": "^1.5.1",
-    "@types/tar": "^6.1.5",
     "@types/uuid": "^8.3.4",
     "@types/request-ip": "0.0.41",
     "@uiw/codemirror-extensions-langs": "^4.21.9",

package/sample/config.sample.sh

@@ -148,6 +148,15 @@ export AIBOTK_TYPE=""
 ## aibotk_name (必填)填写群名或用户昵称，和上面的type类型要对应
 export AIBOTK_NAME=""
 
+## 13. CHRONOCAT
+## CHRONOCAT_URL 推送 http://127.0.0.1:16530
+## CHRONOCAT_TOKEN 填写在CHRONOCAT文件生成的访问密钥
+## CHRONOCAT_QQ 个人:user_id=个人QQ 群则填入group_id=QQ群 多个用英文;隔开同时支持个人和群 如：user_id=xxx;group_id=xxxx;group_id=xxxxx
+## CHRONOCAT相关API https://chronocat.vercel.app/install/docker/official/
+export CHRONOCAT_URL=""
+export CHRONOCAT_QQ=""
+export CHRONOCAT_TOKEN=""
+
 ## 14. SMTP
 ## 邮箱服务名称，比如126、163、Gmail、QQ等，支持列表 https://github.com/nodemailer/nodemailer/blob/master/lib/well-known/services.json
 export SMTP_SERVICE=""
@@ -163,13 +172,15 @@ export SMTP_NAME=""
 ## PUSHME_KEY (必填)填写PushMe APP上获取的push_key
 export PUSHME_KEY=""
 
-## 13. CHRONOCAT
-## CHRONOCAT_URL 推送 http://127.0.0.1:16530
-## CHRONOCAT_TOKEN 填写在CHRONOCAT文件生成的访问密钥
-## CHRONOCAT_QQ 个人:user_id=个人QQ 群则填入group_id=QQ群 多个用英文;隔开同时支持个人和群 如：user_id=xxx;group_id=xxxx;group_id=xxxxx
-## CHRONOCAT相关API https://chronocat.vercel.app/install/docker/official/
-export CHRONOCAT_URL=""
-export CHRONOCAT_QQ=""
-export CHRONOCAT_TOKEN=""
+## 15. 自定义通知
+## 自定义通知 接收回调的URL
+export WEBHOOK_URL=""
+## WEBHOOK_BODY 和 WEBHOOK_HEADERS 多个参数时，直接换行或者使用 $'\n' 连接多行字符串，比如 export dd="line 1"$'\n'"line 2"
+export WEBHOOK_BODY=""
+export WEBHOOK_HEADERS=""
+## 支持 GET/POST/PUT
+export WEBHOOK_METHOD=""
+## 支持 text/plain、application/json、multipart/form-data、application/x-www-form-urlencoded
+export WEBHOOK_CONTENT_TYPE=""
 
 ## 其他需要的变量，脚本中需要的变量使用 export 变量名= 声明即可

package/sample/notify.js

@@ -819,11 +819,11 @@ function ChangeUserId(desp) {
 async function qywxamNotify(text, desp) {
   const MAX_LENGTH = 900;
   if (desp.length > MAX_LENGTH) {
-    let d = desp.substr(0, MAX_LENGTH) + "\n==More==";
+    let d = desp.substr(0, MAX_LENGTH) + '\n==More==';
     await do_qywxamNotify(text, d);
     await qywxamNotify(text, desp.substr(MAX_LENGTH));
   } else {
-    return await do_qywxamNotify(text,desp);
+    return await do_qywxamNotify(text, desp);
   }
 }
 
@@ -1284,18 +1284,15 @@ function chronocatNotify(title, desp) {
 
 function webhookNotify(text, desp) {
   return new Promise((resolve) => {
-    const { formatBody, formatUrl } = formatNotifyContentFun(
-      WEBHOOK_URL,
-      WEBHOOK_BODY,
-      text,
-      desp,
-    );
-    if (!formatUrl && !formatBody) {
+    if (!WEBHOOK_URL.includes('$title') && !WEBHOOK_BODY.includes('$title')) {
       resolve();
       return;
     }
+
     const headers = parseHeaders(WEBHOOK_HEADERS);
-    const body = parseBody(formatBody, WEBHOOK_CONTENT_TYPE);
+    const body = parseBody(WEBHOOK_BODY, WEBHOOK_CONTENT_TYPE, (v) =>
+      v?.replaceAll('$title', text)?.replaceAll('$content', desp),
+    );
     const bodyParam = formatBodyFun(WEBHOOK_CONTENT_TYPE, body);
     const options = {
       method: WEBHOOK_METHOD,
@@ -1307,6 +1304,10 @@ function webhookNotify(text, desp) {
     };
 
     if (WEBHOOK_METHOD) {
+      const formatUrl = WEBHOOK_URL.replaceAll(
+        '$title',
+        encodeURIComponent(text),
+      ).replaceAll('$content', encodeURIComponent(desp));
       got(formatUrl, options).then((resp) => {
         try {
           if (resp.statusCode !== 200) {
@@ -1326,7 +1327,7 @@ function webhookNotify(text, desp) {
   });
 }
 
-function parseString(input) {
+function parseString(input, valueFormatFn) {
   const regex = /(\w+):\s*((?:(?!\n\w+:).)*)/g;
   const matches = {};
 
@@ -1338,9 +1339,10 @@ function parseString(input) {
       continue;
     }
 
-    const _value = value.trim();
+    let _value = value.trim();
 
     try {
+      _value = valueFormatFn ? valueFormatFn(_value) : _value;
       const jsonValue = JSON.parse(_value);
       matches[_key] = jsonValue;
     } catch (error) {
@@ -1375,12 +1377,12 @@ function parseHeaders(headers) {
   return parsed;
 }
 
-function parseBody(body, contentType) {
+function parseBody(body, contentType, valueFormatFn) {
   if (contentType === 'text/plain' || !body) {
     return body;
   }
 
-  const parsed = parseString(body);
+  const parsed = parseString(body, valueFormatFn);
 
   switch (contentType) {
     case 'multipart/form-data':