@whyour/qinglong 2.19.0-2 → 2.19.0-4

package/docker/310.Dockerfile

@@ -75,7 +75,7 @@ ENV PNPM_HOME=${QL_DIR}/data/dep_cache/node \
   PYTHON_HOME=${QL_DIR}/data/dep_cache/python3 \
   PYTHONUSERBASE=${QL_DIR}/data/dep_cache/python3
 
-ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:${PNPM_HOME} \
+ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:${PNPM_HOME}:${PYTHON_HOME}/bin \
   NODE_PATH=/usr/local/bin:/usr/local/lib/node_modules:${PNPM_HOME}/global/5/node_modules \
   PIP_CACHE_DIR=${PYTHON_HOME}/pip \
   PYTHONPATH=${PYTHON_HOME}:${PYTHON_HOME}/lib/python${PYTHON_SHORT_VERSION}:${PYTHON_HOME}/lib/python${PYTHON_SHORT_VERSION}/site-packages:${PYTHONPATH}

package/docker/Dockerfile

@@ -76,7 +76,7 @@ ENV PNPM_HOME=${QL_DIR}/data/dep_cache/node \
   PYTHON_HOME=${QL_DIR}/data/dep_cache/python3 \
   PYTHONUSERBASE=${QL_DIR}/data/dep_cache/python3
 
-ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:${PNPM_HOME} \
+ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:${PNPM_HOME}:${PYTHON_HOME}/bin \
   NODE_PATH=/usr/local/bin:/usr/local/lib/node_modules:${PNPM_HOME}/global/5/node_modules \
   PIP_CACHE_DIR=${PYTHON_HOME}/pip \
   PYTHONPATH=${PYTHON_HOME}:${PYTHON_HOME}/lib/python${PYTHON_SHORT_VERSION}:${PYTHON_HOME}/lib/python${PYTHON_SHORT_VERSION}/site-packages:${PYTHONPATH}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@whyour/qinglong",
-  "version": "2.19.0-2",
+  "version": "2.19.0-4",
   "description": "Timed task management platform supporting Python3, JavaScript, Shell, Typescript",
   "repository": {
     "type": "git",
@@ -86,8 +86,7 @@
     "express-jwt": "^8.4.1",
     "express-rate-limit": "^7.4.1",
     "express-urlrewrite": "^2.0.3",
-    "form-data": "^4.0.0",
-    "got": "^11.8.2",
+    "undici": "^7.9.0",
     "hpagent": "^1.2.0",
     "http-proxy-middleware": "^3.0.3",
     "iconv-lite": "^0.6.3",

package/sample/notify.js

@@ -1,7 +1,42 @@
 const querystring = require('node:querystring');
-const got = require('got');
+const { request: undiciRequest, ProxyAgent, FormData } = require('undici');
 const timeout = 15000;
 
+async function request(url, options = {}) {
+  const { json, form, body, headers = {}, ...rest } = options;
+
+  const finalHeaders = { ...headers };
+  let finalBody = body;
+
+  if (json) {
+    finalHeaders['content-type'] = 'application/json';
+    finalBody = JSON.stringify(json);
+  } else if (form) {
+    finalBody = form;
+    delete finalHeaders['content-type'];
+  }
+
+  return undiciRequest(url, {
+    headers: finalHeaders,
+    body: finalBody,
+    ...rest,
+  });
+}
+
+function post(url, options = {}) {
+  return request(url, { ...options, method: 'POST' });
+}
+
+function get(url, options = {}) {
+  return request(url, { ...options, method: 'GET' });
+}
+
+const httpClient = {
+  request,
+  post,
+  get,
+};
+
 const push_config = {
   HITOKOTO: true, // 启用一言（随机句子）
 
@@ -123,9 +158,9 @@ for (const key in push_config) {
 const $ = {
   post: (params, callback) => {
     const { url, ...others } = params;
-    got.post(url, others).then(
-      (res) => {
-        let body = res.body;
+    httpClient.post(url, others).then(
+      async (res) => {
+        let body = await res.body.text();
         try {
           body = JSON.parse(body);
         } catch (error) {}
@@ -138,9 +173,9 @@ const $ = {
   },
   get: (params, callback) => {
     const { url, ...others } = params;
-    got.get(url, others).then(
-      (res) => {
-        let body = res.body;
+    httpClient.get(url, others).then(
+      async (res) => {
+        let body = await res.body.text();
         try {
           body = JSON.parse(body);
         } catch (error) {}
@@ -156,8 +191,8 @@ const $ = {
 
 async function one() {
   const url = 'https://v1.hitokoto.cn/';
-  const res = await got.get(url);
-  const body = JSON.parse(res.body);
+  const res = await httpClient.request(url);
+  const body = await res.body.json();
   return `${body.hitokoto}    ----${body.from}`;
 }
 
@@ -442,21 +477,11 @@ function tgBotNotify(text, desp) {
         timeout,
       };
       if (TG_PROXY_HOST && TG_PROXY_PORT) {
-        const { HttpProxyAgent, HttpsProxyAgent } = require('hpagent');
-        const _options = {
-          keepAlive: true,
-          keepAliveMsecs: 1000,
-          maxSockets: 256,
-          maxFreeSockets: 256,
-          proxy: `http://${TG_PROXY_AUTH}${TG_PROXY_HOST}:${TG_PROXY_PORT}`,
-        };
-        const httpAgent = new HttpProxyAgent(_options);
-        const httpsAgent = new HttpsProxyAgent(_options);
-        const agent = {
-          http: httpAgent,
-          https: httpsAgent,
-        };
-        options.agent = agent;
+        let agent;
+        agent = new ProxyAgent({
+          uri: `http://${TG_PROXY_AUTH}${TG_PROXY_HOST}:${TG_PROXY_PORT}`,
+        });
+        options.dispatcher = agent;
       }
       $.post(options, (err, resp, data) => {
         try {
@@ -1209,17 +1234,18 @@ function webhookNotify(text, desp) {
       '$title',
       encodeURIComponent(text),
     ).replaceAll('$content', encodeURIComponent(desp));
-    got(formatUrl, options).then((resp) => {
+    httpClient.request(formatUrl, options).then(async (resp) => {
+      const body = await resp.body.text();
       try {
         if (resp.statusCode !== 200) {
-          console.log(`自定义发送通知消息失败😞 ${resp.body}\n`);
+          console.log(`自定义发送通知消息失败😞 ${body}\n`);
         } else {
-          console.log(`自定义发送通知消息成功🎉 ${resp.body}\n`);
+          console.log(`自定义发送通知消息成功🎉 ${body}\n`);
         }
       } catch (e) {
         $.logErr(e, resp);
       } finally {
-        resolve(resp.body);
+        resolve(body);
       }
     });
   });

package/static/build/api/dependence.js

@@ -29,7 +29,6 @@ exports.default = (app) => {
             remark: celebrate_1.Joi.string().optional().allow(''),
         })),
     }), async (req, res, next) => {
-        const logger = typedi_1.Container.get('logger');
         try {
             const dependenceService = typedi_1.Container.get(dependence_1.default);
             const data = await dependenceService.create(req.body);
@@ -47,7 +46,6 @@ exports.default = (app) => {
             remark: celebrate_1.Joi.string().optional().allow(''),
         }),
     }), async (req, res, next) => {
-        const logger = typedi_1.Container.get('logger');
         try {
             const dependenceService = typedi_1.Container.get(dependence_1.default);
             const data = await dependenceService.update(req.body);
@@ -60,7 +58,6 @@ exports.default = (app) => {
     route.delete('/', (0, celebrate_1.celebrate)({
         body: celebrate_1.Joi.array().items(celebrate_1.Joi.number().required()),
     }), async (req, res, next) => {
-        const logger = typedi_1.Container.get('logger');
         try {
             const dependenceService = typedi_1.Container.get(dependence_1.default);
             const data = await dependenceService.remove(req.body);
@@ -73,7 +70,6 @@ exports.default = (app) => {
     route.delete('/force', (0, celebrate_1.celebrate)({
         body: celebrate_1.Joi.array().items(celebrate_1.Joi.number().required()),
     }), async (req, res, next) => {
-        const logger = typedi_1.Container.get('logger');
         try {
             const dependenceService = typedi_1.Container.get(dependence_1.default);
             const data = await dependenceService.remove(req.body, true);
@@ -88,7 +84,6 @@ exports.default = (app) => {
             id: celebrate_1.Joi.number().required(),
         }),
     }), async (req, res, next) => {
-        const logger = typedi_1.Container.get('logger');
         try {
             const dependenceService = typedi_1.Container.get(dependence_1.default);
             const data = await dependenceService.getDb({ id: req.params.id });
@@ -101,7 +96,6 @@ exports.default = (app) => {
     route.put('/reinstall', (0, celebrate_1.celebrate)({
         body: celebrate_1.Joi.array().items(celebrate_1.Joi.number().required()),
     }), async (req, res, next) => {
-        const logger = typedi_1.Container.get('logger');
         try {
             const dependenceService = typedi_1.Container.get(dependence_1.default);
             const data = await dependenceService.reInstall(req.body);

package/static/build/config/http.js

@@ -0,0 +1,48 @@
+"use strict";
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.httpClient = void 0;
+const undici_1 = require("undici");
+async function request(url, options) {
+    const _a = options || {}, { json, form, body, headers = {} } = _a, rest = __rest(_a, ["json", "form", "body", "headers"]);
+    const finalHeaders = Object.assign({}, headers);
+    let finalBody = body;
+    if (json) {
+        finalHeaders['content-type'] = 'application/json';
+        finalBody = JSON.stringify(json);
+    }
+    else if (form) {
+        finalBody = form;
+        delete finalHeaders['content-type'];
+    }
+    const res = await (0, undici_1.request)(url, Object.assign({ method: 'POST', headers: finalHeaders, body: finalBody }, rest));
+    return res;
+}
+async function post(url, options) {
+    const resp = await request(url, Object.assign(Object.assign({}, options), { method: 'POST' }));
+    const rawText = await resp.body.text();
+    if ((options === null || options === void 0 ? void 0 : options.responseType) === 'text') {
+        return rawText;
+    }
+    try {
+        return JSON.parse(rawText);
+    }
+    catch (_a) {
+        return rawText;
+    }
+}
+exports.httpClient = {
+    post,
+    request,
+};
+//# sourceMappingURL=http.js.map

package/static/build/config/util.js

@@ -33,7 +33,6 @@ exports.updateLinuxMirrorFile = exports.detectOS = exports.isDemoEnv = exports.g
 const fs = __importStar(require("fs/promises"));
 const path = __importStar(require("path"));
 const child_process_1 = require("child_process");
-const form_data_1 = __importDefault(require("form-data"));
 const ps_tree_1 = __importDefault(require("ps-tree"));
 const util_1 = require("util");
 const js_yaml_1 = require("js-yaml");
@@ -42,6 +41,7 @@ const const_1 = require("./const");
 const logger_1 = __importDefault(require("../loaders/logger"));
 const utils_1 = require("../shared/utils");
 const dependence_1 = require("../data/dependence");
+const undici_1 = require("undici");
 const os_1 = __importDefault(require("os"));
 __exportStar(require("./share"), exports);
 let osType;
@@ -354,7 +354,7 @@ function parseBody(body, contentType, valueFormatFn) {
             return Object.keys(parsed).reduce((p, c) => {
                 p.append(c, parsed[c]);
                 return p;
-            }, new form_data_1.default());
+            }, new undici_1.FormData());
         case 'application/x-www-form-urlencoded':
             return Object.keys(parsed).reduce((p, c) => {
                 return p ? `${p}&${c}=${parsed[c]}` : `${c}=${parsed[c]}`;

package/static/build/services/config.js

@@ -39,7 +39,7 @@ const typedi_1 = require("typedi");
 const path_1 = __importStar(require("path"));
 const config_1 = __importDefault(require("../config"));
 const util_1 = require("../config/util");
-const got_1 = __importDefault(require("got"));
+const undici_1 = require("undici");
 let ConfigService = class ConfigService {
     constructor() { }
     async getFile(filePath, res) {
@@ -51,8 +51,8 @@ let ConfigService = class ConfigService {
             return res.send({ code: 403, message: '文件无法访问' });
         }
         if (filePath.startsWith('sample/')) {
-            const res = await got_1.default.get(`https://gitlab.com/whyour/qinglong/-/raw/master/${filePath}`);
-            content = res.body;
+            const res = await (0, undici_1.request)(`https://gitlab.com/whyour/qinglong/-/raw/master/${filePath}`);
+            content = await res.body.text();
         }
         else if (filePath.startsWith('data/scripts/')) {
             content = await (0, util_1.getFileContentByName)((0, path_1.join)(config_1.default.rootPath, filePath));

package/static/build/services/dependence.js

@@ -70,6 +70,9 @@ let DependenceService = class DependenceService {
     }
     async remove(ids, force = false) {
         const docs = await dependence_1.DependenceModel.findAll({ where: { id: ids } });
+        for (const doc of docs) {
+            pLimit_1.default.removeQueuedDependency(doc);
+        }
         const unInstalledDeps = docs.filter((x) => x.status !== dependence_1.DependenceStatus.installed);
         const installedDeps = docs.filter((x) => x.status === dependence_1.DependenceStatus.installed);
         await this.removeDb(unInstalledDeps.map((x) => x.id));
@@ -114,6 +117,9 @@ let DependenceService = class DependenceService {
     async reInstall(ids) {
         await dependence_1.DependenceModel.update({ status: dependence_1.DependenceStatus.queued, log: [] }, { where: { id: ids } });
         const docs = await dependence_1.DependenceModel.findAll({ where: { id: ids } });
+        for (const doc of docs) {
+            pLimit_1.default.removeQueuedDependency(doc);
+        }
         this.installDependenceOneByOne(docs, true, true);
         return docs;
     }

package/static/build/services/notify.js

@@ -24,12 +24,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const crypto_1 = __importDefault(require("crypto"));
-const got_1 = __importDefault(require("got"));
-const hpagent_1 = require("hpagent");
 const nodemailer_1 = __importDefault(require("nodemailer"));
 const typedi_1 = require("typedi");
 const util_1 = require("../config/util");
 const user_1 = __importDefault(require("./user"));
+const http_1 = require("../config/http");
+const undici_1 = require("undici");
 let NotificationService = class NotificationService {
     constructor() {
         this.modeMap = new Map([
@@ -92,11 +92,9 @@ let NotificationService = class NotificationService {
     async gotify() {
         const { gotifyUrl, gotifyToken, gotifyPriority = 1 } = this.params;
         try {
-            const res = await got_1.default
-                .post(`${gotifyUrl}/message?token=${gotifyToken}`, Object.assign(Object.assign({}, this.gotOption), { body: `title=${encodeURIComponent(this.title)}&message=${encodeURIComponent(this.content)}&priority=${gotifyPriority}`, headers: {
+            const res = await http_1.httpClient.post(`${gotifyUrl}/message?token=${gotifyToken}`, Object.assign(Object.assign({}, this.gotOption), { body: `title=${encodeURIComponent(this.title)}&message=${encodeURIComponent(this.content)}&priority=${gotifyPriority}`, headers: {
                     'Content-Type': 'application/x-www-form-urlencoded',
-                } }))
-                .json();
+                } }));
             if (typeof res.id === 'number') {
                 return true;
             }
@@ -111,9 +109,7 @@ let NotificationService = class NotificationService {
     async goCqHttpBot() {
         const { goCqHttpBotQq, goCqHttpBotToken, goCqHttpBotUrl } = this.params;
         try {
-            const res = await got_1.default
-                .post(`${goCqHttpBotUrl}?${goCqHttpBotQq}`, Object.assign(Object.assign({}, this.gotOption), { json: { message: `${this.title}\n${this.content}` }, headers: { Authorization: 'Bearer ' + goCqHttpBotToken } }))
-                .json();
+            const res = await http_1.httpClient.post(`${goCqHttpBotUrl}?${goCqHttpBotQq}`, Object.assign(Object.assign({}, this.gotOption), { json: { message: `${this.title}\n${this.content}` }, headers: { Authorization: 'Bearer ' + goCqHttpBotToken } }));
             if (res.retcode === 0) {
                 return true;
             }
@@ -132,9 +128,7 @@ let NotificationService = class NotificationService {
             ? `https://${matchResult[1]}.push.ft07.com/send/${serverChanKey}.send`
             : `https://sctapi.ftqq.com/${serverChanKey}.send`;
         try {
-            const res = await got_1.default
-                .post(url, Object.assign(Object.assign({}, this.gotOption), { body: `title=${encodeURIComponent(this.title)}&desp=${encodeURIComponent(this.content)}`, headers: { 'Content-Type': 'application/x-www-form-urlencoded' } }))
-                .json();
+            const res = await http_1.httpClient.post(url, Object.assign(Object.assign({}, this.gotOption), { body: `title=${encodeURIComponent(this.title)}&desp=${encodeURIComponent(this.content)}`, headers: { 'Content-Type': 'application/x-www-form-urlencoded' } }));
             if (res.errno === 0 || res.data.errno === 0) {
                 return true;
             }
@@ -150,9 +144,7 @@ let NotificationService = class NotificationService {
         const { pushDeerKey, pushDeerUrl } = this.params;
         const url = pushDeerUrl || `https://api2.pushdeer.com/message/push`;
         try {
-            const res = await got_1.default
-                .post(url, Object.assign(Object.assign({}, this.gotOption), { body: `pushkey=${pushDeerKey}&text=${encodeURIComponent(this.title)}&desp=${encodeURIComponent(this.content)}&type=markdown`, headers: { 'Content-Type': 'application/x-www-form-urlencoded' } }))
-                .json();
+            const res = await http_1.httpClient.post(url, Object.assign(Object.assign({}, this.gotOption), { body: `pushkey=${pushDeerKey}&text=${encodeURIComponent(this.title)}&desp=${encodeURIComponent(this.content)}&type=markdown`, headers: { 'Content-Type': 'application/x-www-form-urlencoded' } }));
             if (res.content.result.length !== undefined &&
                 res.content.result.length > 0) {
                 return true;
@@ -168,9 +160,7 @@ let NotificationService = class NotificationService {
     async chat() {
         const { synologyChatUrl } = this.params;
         try {
-            const res = await got_1.default
-                .post(synologyChatUrl, Object.assign(Object.assign({}, this.gotOption), { body: `payload={"text":"${this.title}\n${this.content}"}`, headers: { 'Content-Type': 'application/x-www-form-urlencoded' } }))
-                .json();
+            const res = await http_1.httpClient.post(synologyChatUrl, Object.assign(Object.assign({}, this.gotOption), { body: `payload={"text":"${this.title}\n${this.content}"}`, headers: { 'Content-Type': 'application/x-www-form-urlencoded' } }));
             if (res.success) {
                 return true;
             }
@@ -199,9 +189,7 @@ let NotificationService = class NotificationService {
             url: barkUrl,
         };
         try {
-            const res = await got_1.default
-                .post(url, Object.assign(Object.assign({}, this.gotOption), { json: body, headers: { 'Content-Type': 'application/json' } }))
-                .json();
+            const res = await http_1.httpClient.post(url, Object.assign(Object.assign({}, this.gotOption), { json: body, headers: { 'Content-Type': 'application/json' } }));
             if (res.code === 200) {
                 return true;
             }
@@ -219,24 +207,12 @@ let NotificationService = class NotificationService {
         const url = `${telegramBotApiHost ? telegramBotApiHost : 'https://api.telegram.org'}/bot${telegramBotToken}/sendMessage`;
         let agent;
         if (telegramBotProxyHost && telegramBotProxyPort) {
-            const options = {
-                keepAlive: true,
-                keepAliveMsecs: 1000,
-                maxSockets: 256,
-                maxFreeSockets: 256,
-                proxy: `http://${authStr}${telegramBotProxyHost}:${telegramBotProxyPort}`,
-            };
-            const httpAgent = new hpagent_1.HttpProxyAgent(options);
-            const httpsAgent = new hpagent_1.HttpsProxyAgent(options);
-            agent = {
-                http: httpAgent,
-                https: httpsAgent,
-            };
+            agent = new undici_1.ProxyAgent({
+                uri: `http://${authStr}${telegramBotProxyHost}:${telegramBotProxyPort}`,
+            });
         }
         try {
-            const res = await got_1.default
-                .post(url, Object.assign(Object.assign({}, this.gotOption), { body: `chat_id=${telegramBotUserId}&text=${this.title}\n\n${this.content}&disable_web_page_preview=true`, headers: { 'Content-Type': 'application/x-www-form-urlencoded' }, agent }))
-                .json();
+            const res = await http_1.httpClient.post(url, Object.assign(Object.assign({}, this.gotOption), { body: `chat_id=${telegramBotUserId}&text=${this.title}\n\n${this.content}&disable_web_page_preview=true`, headers: { 'Content-Type': 'application/x-www-form-urlencoded' }, dispatcher: agent }));
             if (res.ok) {
                 return true;
             }
@@ -260,14 +236,12 @@ let NotificationService = class NotificationService {
         }
         const url = `https://oapi.dingtalk.com/robot/send?access_token=${dingtalkBotToken}${secretParam}`;
         try {
-            const res = await got_1.default
-                .post(url, Object.assign(Object.assign({}, this.gotOption), { json: {
+            const res = await http_1.httpClient.post(url, Object.assign(Object.assign({}, this.gotOption), { json: {
                     msgtype: 'text',
                     text: {
                         content: ` ${this.title}\n\n${this.content}`,
                     },
-                } }))
-                .json();
+                } }));
             if (res.errcode === 0) {
                 return true;
             }
@@ -283,14 +257,12 @@ let NotificationService = class NotificationService {
         const { weWorkBotKey, weWorkOrigin = 'https://qyapi.weixin.qq.com' } = this.params;
         const url = `${weWorkOrigin}/cgi-bin/webhook/send?key=${weWorkBotKey}`;
         try {
-            const res = await got_1.default
-                .post(url, Object.assign(Object.assign({}, this.gotOption), { json: {
+            const res = await http_1.httpClient.post(url, Object.assign(Object.assign({}, this.gotOption), { json: {
                     msgtype: 'text',
                     text: {
                         content: ` ${this.title}\n\n${this.content}`,
                     },
-                } }))
-                .json();
+                } }));
             if (res.errcode === 0) {
                 return true;
             }
@@ -306,12 +278,10 @@ let NotificationService = class NotificationService {
         const { weWorkAppKey, weWorkOrigin = 'https://qyapi.weixin.qq.com' } = this.params;
         const [corpid, corpsecret, touser, agentid, thumb_media_id = '1'] = weWorkAppKey.split(',');
         const url = `${weWorkOrigin}/cgi-bin/gettoken`;
-        const tokenRes = await got_1.default
-            .post(url, Object.assign(Object.assign({}, this.gotOption), { json: {
+        const tokenRes = await http_1.httpClient.post(url, Object.assign(Object.assign({}, this.gotOption), { json: {
                 corpid,
                 corpsecret,
-            } }))
-            .json();
+            } }));
         let options = {
             msgtype: 'mpnews',
             mpnews: {
@@ -349,10 +319,8 @@ let NotificationService = class NotificationService {
                 break;
         }
         try {
-            const res = await got_1.default
-                .post(`${weWorkOrigin}/cgi-bin/message/send?access_token=${tokenRes.access_token}`, Object.assign(Object.assign({}, this.gotOption), { json: Object.assign({ touser,
-                    agentid, safe: '0' }, options) }))
-                .json();
+            const res = await http_1.httpClient.post(`${weWorkOrigin}/cgi-bin/message/send?access_token=${tokenRes.access_token}`, Object.assign(Object.assign({}, this.gotOption), { json: Object.assign({ touser,
+                    agentid, safe: '0' }, options) }));
             if (res.errcode === 0) {
                 return true;
             }
@@ -393,9 +361,7 @@ let NotificationService = class NotificationService {
                 break;
         }
         try {
-            const res = await got_1.default
-                .post(url, Object.assign(Object.assign({}, this.gotOption), { json: Object.assign({}, json) }))
-                .json();
+            const res = await http_1.httpClient.post(url, Object.assign(Object.assign({}, this.gotOption), { json: Object.assign({}, json) }));
             if (res.code === 0) {
                 return true;
             }
@@ -411,9 +377,7 @@ let NotificationService = class NotificationService {
         const { iGotPushKey } = this.params;
         const url = `https://push.hellyw.com/${iGotPushKey.toLowerCase()}`;
         try {
-            const res = await got_1.default
-                .post(url, Object.assign(Object.assign({}, this.gotOption), { body: `title=${this.title}&content=${this.content}`, headers: { 'Content-Type': 'application/x-www-form-urlencoded' } }))
-                .json();
+            const res = await http_1.httpClient.post(url, Object.assign(Object.assign({}, this.gotOption), { body: `title=${this.title}&content=${this.content}`, headers: { 'Content-Type': 'application/x-www-form-urlencoded' } }));
             if (res.ret === 0) {
                 return true;
             }
@@ -440,7 +404,7 @@ let NotificationService = class NotificationService {
                     callbackUrl: `${pushplusCallbackUrl || ''}`,
                     to: `${pushplusTo || ''}`,
                 } });
-            const res = await got_1.default.post(url, body).json();
+            const res = await http_1.httpClient.post(url, body);
             if (res.code === 200) {
                 return true;
             }
@@ -462,16 +426,14 @@ let NotificationService = class NotificationService {
         }
         const url = `https://www.weplusbot.com/send`;
         try {
-            const res = await got_1.default
-                .post(url, Object.assign(Object.assign({}, this.gotOption), { json: {
+            const res = await http_1.httpClient.post(url, Object.assign(Object.assign({}, this.gotOption), { json: {
                     token: `${wePlusBotToken}`,
                     title: `${this.title}`,
                     template: `${template}`,
                     content: `${content}`,
                     receiver: `${wePlusBotReceiver || ''}`,
                     version: `${wePlusBotVersion || 'pro'}`,
-                } }))
-                .json();
+                } }));
             if (res.code === 200) {
                 return true;
             }
@@ -489,12 +451,10 @@ let NotificationService = class NotificationService {
             larkKey = `https://open.feishu.cn/open-apis/bot/v2/hook/${larkKey}`;
         }
         try {
-            const res = await got_1.default
-                .post(larkKey, Object.assign(Object.assign({}, this.gotOption), { json: {
+            const res = await http_1.httpClient.post(larkKey, Object.assign(Object.assign({}, this.gotOption), { json: {
                     msg_type: 'text',
                     content: { text: `${this.title}\n\n${this.content}` },
-                }, headers: { 'Content-Type': 'application/json' } }))
-                .json();
+                }, headers: { 'Content-Type': 'application/json' } }));
             if (res.StatusCode === 0 || res.code === 0) {
                 return true;
             }
@@ -537,16 +497,16 @@ let NotificationService = class NotificationService {
     async pushMe() {
         const { pushMeKey, pushMeUrl } = this.params;
         try {
-            const res = await got_1.default.post(pushMeUrl || 'https://push.i-i.me/', Object.assign(Object.assign({}, this.gotOption), { json: {
+            const res = await http_1.httpClient.post(pushMeUrl || 'https://push.i-i.me/', Object.assign(Object.assign({}, this.gotOption), { json: {
                     push_key: pushMeKey,
                     title: this.title,
                     content: this.content,
                 }, headers: { 'Content-Type': 'application/json' } }));
-            if (res.body === 'success') {
+            if (res === 'success') {
                 return true;
             }
             else {
-                throw new Error(res.body);
+                throw new Error(res);
             }
         }
         catch (error) {
@@ -562,12 +522,12 @@ let NotificationService = class NotificationService {
         };
         try {
             const encodedTitle = encodeRfc2047(this.title);
-            const res = await got_1.default.post(`${ntfyUrl || 'https://ntfy.sh'}/${ntfyTopic}`, Object.assign(Object.assign({}, this.gotOption), { body: `${this.content}`, headers: { Title: encodedTitle, Priority: `${ntfyPriority || '3'}` } }));
+            const res = await http_1.httpClient.request(`${ntfyUrl || 'https://ntfy.sh'}/${ntfyTopic}`, Object.assign(Object.assign({}, this.gotOption), { body: `${this.content}`, headers: { Title: encodedTitle, Priority: `${ntfyPriority || '3'}` }, method: 'POST' }));
             if (res.statusCode === 200) {
                 return true;
             }
             else {
-                throw new Error(JSON.stringify(res));
+                throw new Error(await res.body.text());
             }
         }
         catch (error) {
@@ -597,8 +557,7 @@ let NotificationService = class NotificationService {
         }
         const url = `https://wxpusher.zjiecode.com/api/send/message`;
         try {
-            const res = await got_1.default
-                .post(url, Object.assign(Object.assign({}, this.gotOption), { json: {
+            const res = await http_1.httpClient.post(url, Object.assign(Object.assign({}, this.gotOption), { json: {
                     appToken: wxPusherBotAppToken,
                     content: `<h1>${this.title}</h1><br/><div style='white-space: pre-wrap;'>${this.content}</div>`,
                     summary: this.title,
@@ -606,8 +565,7 @@ let NotificationService = class NotificationService {
                     topicIds: topicIds,
                     uids: uids,
                     verifyPayType: 0,
-                } }))
-                .json();
+                } }));
             if (res.code === 1000) {
                 return true;
             }
@@ -655,12 +613,12 @@ let NotificationService = class NotificationService {
                             },
                         ],
                     };
-                    const res = await got_1.default.post(url, Object.assign(Object.assign({}, this.gotOption), { json: data, headers }));
+                    const res = await http_1.httpClient.request(url, Object.assign(Object.assign({}, this.gotOption), { json: data, headers, method: 'POST' }));
                     if (res.statusCode === 200) {
                         return true;
                     }
                     else {
-                        throw new Error(res.body);
+                        throw new Error(await res.body.text());
                     }
                 }
             }
@@ -682,12 +640,13 @@ let NotificationService = class NotificationService {
         const options = Object.assign(Object.assign(Object.assign({ method: webhookMethod, headers }, this.gotOption), { allowGetBody: true }), bodyParam);
         try {
             const formatUrl = (_a = webhookUrl === null || webhookUrl === void 0 ? void 0 : webhookUrl.replaceAll('$title', encodeURIComponent(this.title))) === null || _a === void 0 ? void 0 : _a.replaceAll('$content', encodeURIComponent(this.content));
-            const res = await (0, got_1.default)(formatUrl, options);
+            const res = await http_1.httpClient.request(formatUrl, options);
+            const text = await res.body.text();
             if (String(res.statusCode).startsWith('20')) {
                 return true;
             }
             else {
-                throw new Error(JSON.stringify(res));
+                throw new Error(await res.body.text());
             }
         }
         catch (error) {

package/static/build/services/system.js

@@ -28,7 +28,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const cross_spawn_1 = require("cross-spawn");
 const fs_1 = __importDefault(require("fs"));
-const got_1 = __importDefault(require("got"));
+const undici_1 = require("undici");
 const sum_1 = __importDefault(require("lodash/sum"));
 const path_1 = __importDefault(require("path"));
 const typedi_1 = require("typedi");
@@ -212,10 +212,14 @@ let SystemService = class SystemService {
             const currentVersionContent = await (0, util_1.parseVersion)(config_1.default.versionFile);
             let lastVersionContent;
             try {
-                const result = await got_1.default.get(`${config_1.default.lastVersionFile}?t=${Date.now()}`, {
-                    timeout: 30000,
+                const { body } = await (0, undici_1.request)(`${config_1.default.lastVersionFile}?t=${Date.now()}`, {
+                    dispatcher: new undici_1.Agent({
+                        keepAliveTimeout: 30000,
+                        keepAliveMaxTimeout: 30000,
+                    }),
                 });
-                lastVersionContent = (0, util_1.parseContentVersion)(result.body);
+                const text = await body.text();
+                lastVersionContent = (0, util_1.parseContentVersion)(text);
             }
             catch (error) { }
             if (!lastVersionContent) {

package/static/build/services/user.js

@@ -29,6 +29,8 @@ const dayjs_1 = __importDefault(require("dayjs"));
 const ip2region_1 = __importDefault(require("ip2region"));
 const request_ip_1 = __importDefault(require("request-ip"));
 const uniq_1 = __importDefault(require("lodash/uniq"));
+const pickBy_1 = __importDefault(require("lodash/pickBy"));
+const isNil_1 = __importDefault(require("lodash/isNil"));
 const store_1 = require("../shared/store");
 let UserService = class UserService {
     constructor(logger, scheduleService, sockService) {
@@ -300,12 +302,13 @@ let UserService = class UserService {
     async resetAuthInfo(info) {
         const { retries, twoFactorActivated, password, username } = info;
         const authInfo = await this.getAuthInfo();
-        await this.updateAuthInfo(authInfo, {
+        const payload = (0, pickBy_1.default)({
             retries,
             twoFactorActivated,
             password,
-            username
-        });
+            username,
+        }, (x) => !(0, isNil_1.default)(x));
+        await this.updateAuthInfo(authInfo, payload);
     }
 };
 __decorate([