node-karin 1.0.4 → 1.0.9

package/CHANGELOG.md

@@ -1,5 +1,61 @@
 # 更新日志
 
+## [1.0.9](https://github.com/KarinJS/Karin/compare/core-v1.0.8...core-v1.0.9) (2025-01-15)
+
+
+### 🐛 Bug Fixes
+
+* 哦~该死 ([aee10ea](https://github.com/KarinJS/Karin/commit/aee10eaa6c6b383f9c8e8953a614e49d653970e4))
+
+## [1.0.8](https://github.com/KarinJS/Karin/compare/core-v1.0.7...core-v1.0.8) (2025-01-15)
+
+
+### 🐛 Bug Fixes
+
+* close [#217](https://github.com/KarinJS/Karin/issues/217) [#215](https://github.com/KarinJS/Karin/issues/215) ([75e9ea7](https://github.com/KarinJS/Karin/commit/75e9ea7268082fce53862bdca2f4156a3210039b))
+* fix 215 ([036f40d](https://github.com/KarinJS/Karin/commit/036f40da34d599d5b5cc6e184c009bb09fa3d80b))
+
+## [1.0.7](https://github.com/KarinJS/Karin/compare/core-v1.0.6...core-v1.0.7) (2025-01-15)
+
+
+### 🐛 Bug Fixes
+
+* build types error ([f732ca3](https://github.com/KarinJS/Karin/commit/f732ca38155f08adefed7a9f8d42d373a9fc9cc7))
+* ci ([1d25234](https://github.com/KarinJS/Karin/commit/1d252344a1384314bab30e663be019c6d2536317))
+* ci ([56b3823](https://github.com/KarinJS/Karin/commit/56b382335d63577078e5aa8572d6238c63caf3e9))
+* registerBot ws_client ([a9d7905](https://github.com/KarinJS/Karin/commit/a9d7905b5c0c739eb1e8c64beafb658a3c12c64d))
+* test ci ([e998b9d](https://github.com/KarinJS/Karin/commit/e998b9de51941141d842c1e6032fdc6c721efdf8))
+* test ci ([d2c0771](https://github.com/KarinJS/Karin/commit/d2c077180e0f495dd5918a2cb2f0c51683192c0c))
+* test ci ([437350f](https://github.com/KarinJS/Karin/commit/437350f3376af7bc7f3fca6e51e8c6d846f1d798))
+* tips ([9f67525](https://github.com/KarinJS/Karin/commit/9f67525d592094532a3a29fe1f3de41bc1ec1936))
+* version ([1b15d0b](https://github.com/KarinJS/Karin/commit/1b15d0b6c1583a8abc674b97cd746aac97b918c1))
+* 导出 ([33b0683](https://github.com/KarinJS/Karin/commit/33b06831c3c4e6679edb3353962d88d7e2cb4d9b))
+
+
+### 🎫 Chores
+
+* release main ([#219](https://github.com/KarinJS/Karin/issues/219)) ([bfe073f](https://github.com/KarinJS/Karin/commit/bfe073fa5af28364f12e3143bf3aab612cd87c59))
+* release main ([#220](https://github.com/KarinJS/Karin/issues/220)) ([9cb7b59](https://github.com/KarinJS/Karin/commit/9cb7b59d003a1a3582d222413056af1d8ce5b13a))
+* release main ([#221](https://github.com/KarinJS/Karin/issues/221)) ([0c871c5](https://github.com/KarinJS/Karin/commit/0c871c58b3fc26d5cb66b0d2f6e33a0c3bef4bb9))
+* release main ([#224](https://github.com/KarinJS/Karin/issues/224)) ([abdf414](https://github.com/KarinJS/Karin/commit/abdf4149a171f8c9c58ea9f8d4cf7705690e1941))
+* release main ([#225](https://github.com/KarinJS/Karin/issues/225)) ([4343d8d](https://github.com/KarinJS/Karin/commit/4343d8dab7f58f5c913345ee818d19ad14ebac48))
+* release main ([#226](https://github.com/KarinJS/Karin/issues/226)) ([bedfe6a](https://github.com/KarinJS/Karin/commit/bedfe6a98d4637b59d0752565d353caf4a776251))
+* **release:** node-karin 1.0.1 [skip-ci] ([#218](https://github.com/KarinJS/Karin/issues/218)) ([f3ce8b7](https://github.com/KarinJS/Karin/commit/f3ce8b7d0e7ad19ebe96a97e818e8aa4c52130c7))
+
+## [1.0.6](https://github.com/KarinJS/Karin/compare/node-karin-v1.0.5...node-karin-v1.0.6) (2025-01-15)
+
+
+### 🐛 Bug Fixes
+
+* test ci ([e998b9d](https://github.com/KarinJS/Karin/commit/e998b9de51941141d842c1e6032fdc6c721efdf8))
+
+## [1.0.5](https://github.com/KarinJS/Karin/compare/node-karin-v1.0.4...node-karin-v1.0.5) (2025-01-15)
+
+
+### 🐛 Bug Fixes
+
+* test ci ([d2c0771](https://github.com/KarinJS/Karin/commit/d2c077180e0f495dd5918a2cb2f0c51683192c0c))
+
 ## [1.0.4](https://github.com/KarinJS/Karin/compare/node-karin-v1.0.3...node-karin-v1.0.4) (2025-01-15)
 
 

package/dist/cli/index.cjs

@@ -87,11 +87,15 @@ var stop = () => {
   process.exit(0);
 };
 var restart = () => {
+  console.log("[pm2] \u91CD\u542F\u4E2D...");
   if (!fs2__default.default.existsSync(pm2Dir)) {
     console.log(`[pm2] \u914D\u7F6E\u6587\u4EF6\u4E0D\u5B58\u5728 \u8BF7\u68C0\u67E5 ${pm2Dir} \u662F\u5426\u5B58\u5728`);
     console.log("[pm2] \u5982\u679C\u662F\u65B0\u9879\u76EE\uFF0C\u8BF7\u5148\u524D\u53F0\u542F\u52A8\u751F\u6210\u914D\u7F6E\u6587\u4EF6: pnpm app");
     process.exit(1);
   }
+  execSync(`pm2 restart ${pm2Dir}`, { cwd: process.cwd() });
+  console.log("[pm2] \u91CD\u542F\u6210\u529F");
+  process.exit(0);
 };
 var pm2 = {
   start,

package/dist/cli/index.js

@@ -78,11 +78,15 @@ var stop = () => {
   process.exit(0);
 };
 var restart = () => {
+  console.log("[pm2] \u91CD\u542F\u4E2D...");
   if (!fs2.existsSync(pm2Dir)) {
     console.log(`[pm2] \u914D\u7F6E\u6587\u4EF6\u4E0D\u5B58\u5728 \u8BF7\u68C0\u67E5 ${pm2Dir} \u662F\u5426\u5B58\u5728`);
     console.log("[pm2] \u5982\u679C\u662F\u65B0\u9879\u76EE\uFF0C\u8BF7\u5148\u524D\u53F0\u542F\u52A8\u751F\u6210\u914D\u7F6E\u6587\u4EF6: pnpm app");
     process.exit(1);
   }
+  execSync(`pm2 restart ${pm2Dir}`, { cwd: process.cwd() });
+  console.log("[pm2] \u91CD\u542F\u6210\u529F");
+  process.exit(0);
 };
 var pm2 = {
   start,

package/dist/index.d.ts

@@ -8742,14 +8742,14 @@ type AxiosFn = {
      * 对axios进行简单封装，超时、错误后返回null，不会抛出异常
      * @param param axios参数
      */
-    (param: AxiosRequestConfig): Promise<AxiosResponse<any> | null>;
+    (param: AxiosRequestConfig): Promise<AxiosResponse<any> | null | undefined>;
     /**
      * 对axios进行简单封装，超时、错误后返回null，不会抛出异常
      * @param url 请求地址
      * @param type 请求类型
      * @param param axios参数
      */
-    (url: string, type: 'get' | 'post', param?: AxiosRequestConfig): Promise<AxiosResponse<any> | null>;
+    (url: string, type: 'get' | 'post', param?: AxiosRequestConfig): Promise<AxiosResponse<any> | null | undefined>;
 };
 interface NpmInfo {
     plugin: string;
@@ -8768,6 +8768,7 @@ interface NpmInfo {
 declare const sleep: (ms: number) => Promise<unknown>;
 /**
  * axios请求
+ * @description 401时返回 `undefined`
  * @param paramOrUrl axios参数或url
  * @param type 请求类型 只有在传入url时有效
  * @param param axios参数 只有在传入url时有效

package/dist/index.js

@@ -2718,8 +2718,8 @@ __export(common_exports, {
   writeYaml: () => write
 });
 import fs13 from "node:fs";
-import Axios from "axios";
 import path9 from "node:path";
+import Axios, { AxiosError as AxiosError2 } from "axios";
 var sleep, axios3, uptime2, formatTime2, updateYaml, getNpmPlugins, getPlugins2, getGitPlugins, mergeImage, getAbsPath, getImageSize, generateLayout, buildFilterComplex;
 var init_common = __esm({
   "src/utils/common/index.ts"() {
@@ -2742,10 +2742,14 @@ var init_common = __esm({
     init_message();
     sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
     axios3 = async (paramOrUrl, type, param) => {
+      var _a;
       try {
         const config2 = typeof paramOrUrl === "string" ? { ...param, url: paramOrUrl, method: type } : paramOrUrl;
         return await Axios(config2);
       } catch (error) {
+        if (error instanceof AxiosError2) {
+          if (((_a = error.response) == null ? void 0 : _a.status) === 401) return void 0;
+        }
         logger.debug("[common] axios\u8BF7\u6C42\u5931\u8D25:");
         logger.debug(error.stack || error);
         return null;
@@ -3870,10 +3874,14 @@ var init_process = __esm({
         return;
       }
       logger.error("\u68C0\u6D4B\u5230\u540E\u53F0\u8FDB\u7A0B \u6B63\u5728\u5173\u95ED...");
-      await axios3({ url: `${host2}/exit`, method: "get", timeout: 500 });
+      const result = await axios3({ url: `${host2}/exit`, method: "get", timeout: 500 });
+      if (typeof result === "undefined") {
+        logger.fatal(logger.red(`\u5F53\u524D\u5B58\u5728\u591A\u5F00Bot\u5360\u7528 ${port2}\u7AEF\u53E3\uFF0C\u8BF7\u66F4\u6362\u7AEF\u53E3\u6216\u8005\u5173\u95ED\u5BF9\u5E94Bot`));
+        processExit(1);
+      }
       for (let i = 0; i < 100; i++) {
-        const result = await axios3({ url: `${host2}/ping`, method: "get", timeout: 100 });
-        if (result) {
+        const result2 = await axios3({ url: `${host2}/ping`, method: "get", timeout: 100 });
+        if (result2) {
           await sleep(50);
           continue;
         }
@@ -8890,12 +8898,33 @@ var init_ws2 = __esm({
 
 // src/adapter/render/connect/client.ts
 import WebSocket from "ws";
+import crypto2 from "node:crypto";
+var WebSocketClientRenderer, createWebSocketRenderClient;
 var init_client = __esm({
   async "src/adapter/render/connect/client.ts"() {
     "use strict";
     init_esm_shims();
     init_ws2();
     await init_render();
+    WebSocketClientRenderer = class extends WebSocketRender {
+    };
+    createWebSocketRenderClient = () => {
+      const cfg = render();
+      if (!cfg.ws_client || !Array.isArray(cfg.ws_client) || cfg.ws_client.length === 0) {
+        logger.trace("[render][WebSocket] \u672A\u914D\u7F6E\u4EFB\u4F55\u6B63\u5411WebSocket \u5DF2\u8DF3\u8FC7\u521B\u5EFA");
+        return;
+      }
+      return Promise.allSettled(cfg.ws_client.map(async (item) => {
+        const { url, token, enable } = item;
+        if (!enable) return;
+        const headers = { Authorization: crypto2.createHash("md5").update(`Bearer ${token}`).digest("hex") };
+        const socket = new WebSocket(url, { headers });
+        socket.once("open", async () => {
+          logger.info(`[render][WebSocket] \u8FDE\u63A5\u6210\u529F: ${url}`);
+          await new WebSocketClientRenderer(socket).init();
+        });
+      }));
+    };
   }
 });
 
@@ -8945,7 +8974,7 @@ var init_server2 = __esm({
 
 // src/adapter/render/connect/http.ts
 import axios4 from "axios";
-import crypto2 from "node:crypto";
+import crypto3 from "node:crypto";
 var createHttpRenderClient;
 var init_http = __esm({
   async "src/adapter/render/connect/http.ts"() {
@@ -8963,7 +8992,7 @@ var init_http = __esm({
         let { url, token, enable } = item;
         if (!enable) return;
         url = url.replace("/puppeteer", "");
-        const headers = { authorization: crypto2.createHash("md5").update(`Bearer ${token}`).digest("hex") };
+        const headers = { authorization: crypto3.createHash("md5").update(`Bearer ${token}`).digest("hex") };
         try {
           const result = await axios4.get(`${url}/ping`, { timeout: 5e3 });
           if (result.status !== 200 || String(result.data.status) !== "200") {
@@ -9022,7 +9051,11 @@ var init_render2 = __esm({
     await init_client();
     await init_server2();
     await init_http();
-    createHttpRenderClient();
+    await init_client();
+    setTimeout(() => {
+      createHttpRenderClient();
+      createWebSocketRenderClient();
+    }, 1e3);
   }
 });
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-karin",
-  "version": "1.0.4",
+  "version": "1.0.9",
   "description": "Lightweight, efficient, concise, and stable robot framework.",
   "keywords": [
     "node",
@@ -91,7 +91,7 @@
     "access": "public",
     "registry": "https://registry.npmjs.org"
   },
-  "time": "2025-01-15",
+  "time": "2025-01-15-2",
   "exports": {
     ".": {
       "import": "./dist/index.js",