node-karin 0.12.2-5.pr.206.e09f093 → 0.12.2-5.pr.206.e2e1f8d

package/dist/cli/index.cjs

@@ -268,7 +268,6 @@ var modifyPackageJson = () => {
     "rs",
     "log",
     "up",
-    "init",
     "dev",
     "ts",
     "watch"

package/dist/cli/index.js

@@ -259,7 +259,6 @@ var modifyPackageJson = () => {
     "rs",
     "log",
     "up",
-    "init",
     "dev",
     "ts",
     "watch"

package/dist/index.js

@@ -8850,14 +8850,277 @@ var init_types = __esm({
   }
 });
 
+// src/utils/fs/static.ts
+var isStatic;
+var init_static = __esm({
+  "src/utils/fs/static.ts"() {
+    "use strict";
+    init_esm_shims();
+    init_cache();
+    init_path();
+    isStatic = (filePath) => {
+      try {
+        for (const item of cache9.static) {
+          if (isSubPath(item, filePath)) {
+            return true;
+          }
+        }
+        return false;
+      } catch (error) {
+        logger.error("isStatic", error);
+        return false;
+      }
+    };
+  }
+});
+
+// src/adapter/render/connect/ws.ts
+import fs18 from "node:fs";
+import crypto from "node:crypto";
+var WebSocketRender;
+var init_ws2 = __esm({
+  "src/adapter/render/connect/ws.ts"() {
+    "use strict";
+    init_esm_shims();
+    init_template();
+    init_cache2();
+    init_static();
+    WebSocketRender = class {
+      /** websocket实例 */
+      socket;
+      /** 唯一标识符 */
+      echo = 0;
+      /** 索引 */
+      index;
+      constructor(socket) {
+        this.socket = socket;
+        this.index = -1;
+      }
+      async init() {
+        this.socket.on("close", () => {
+          unregisterRender(this.index);
+          this.socket.removeAllListeners();
+          this.socket.close();
+        });
+        this.socket.on("message", (event) => {
+          const raw2 = event.toString();
+          const { echo, action, status, data } = JSON.parse(raw2);
+          logger.debug(`[WebSocket] ${echo} ${action} ${status}`);
+          logger.trace(`[WebSocket] ${echo} ${raw2}`);
+          if (action === "response") {
+            this.socket.emit(echo, { action, status, data });
+          } else if (action === "close") {
+            logger.error(`[WebSocket] \u6536\u5230\u65AD\u5F00\u8FDE\u63A5\u8BF7\u6C42: ${raw2}`);
+            this.socket.close();
+          } else if (action === "static") {
+            return this.static(echo, data);
+          } else {
+            logger.error(`[WebSocket] \u672A\u77E5\u7684\u8BF7\u6C42: ${raw2}`);
+          }
+        });
+        this.index = registerRender("puppeteer", this.render.bind(this));
+      }
+      /**
+       * @description 鉴权
+       * @param token
+       * @param targetToken 目标的token
+       * @returns 是否鉴权成功
+       */
+      auth(token, targetToken) {
+        if (token !== targetToken) {
+          if (token.length !== 32) {
+            token = crypto.createHash("md5").update(`Bearer ${token}`).digest("hex");
+          }
+          if (targetToken.length !== 32) {
+            targetToken = crypto.createHash("md5").update(`Bearer ${targetToken}`).digest("hex");
+          }
+          if (token !== targetToken) {
+            return false;
+          }
+        }
+        return true;
+      }
+      /**
+       * @description 处理静态资源请求
+       * @param echo 唯一标识符
+       * @param data 数据
+       */
+      async static(echo, data) {
+        const result = isStatic(data.file);
+        if (!result) {
+          logger.warn(`[WebSocket] \u8BBF\u95EE\u7684\u8DEF\u5F84\u975E\u6CD5: echo: ${echo} data: ${JSON.stringify(data)}`);
+          return this.socket.send(JSON.stringify({ echo, status: "error", data: "\u975E\u6CD5\u7684\u8BBF\u95EE\u8DEF\u5F84" }));
+        }
+        const fileData = fs18.readFileSync(data.file);
+        return this.socket.send(JSON.stringify({ echo, status: "ok", data: fileData }));
+      }
+      render(data) {
+        const options = renderTpl(data);
+        return this.sendApi("render", options);
+      }
+      async sendApi(action, data) {
+        const echo = ++this.echo;
+        const str = JSON.stringify({ echo, action, data });
+        logger.debug(`[sendApi][WebSocket] ${echo} ${action} ${str}`);
+        this.socket.send(str);
+        return new Promise((resolve, reject) => {
+          const timeoutId = setTimeout(() => {
+            reject(new Error(`[sendApi] \u8BF7\u6C42\u9519\u8BEF:
+  action: ${action}
+  params: ${str}
+  error: \u8BF7\u6C42\u8D85\u65F6}`));
+          }, 120 * 1e3);
+          this.socket.once(echo + "", ({ status, data: data2 }) => {
+            clearTimeout(timeoutId);
+            if (status === "ok") {
+              return resolve(data2);
+            }
+            reject(new Error(`[sendApi] \u8BF7\u6C42\u9519\u8BEF:
+  action: ${action}
+  params: ${str}
+  error: ${data2}}`));
+          });
+        });
+      }
+    };
+  }
+});
+
+// src/adapter/render/connect/client.ts
+import WebSocket from "ws";
+var init_client = __esm({
+  async "src/adapter/render/connect/client.ts"() {
+    "use strict";
+    init_esm_shims();
+    init_ws2();
+    await init_render();
+  }
+});
+
+// src/adapter/render/connect/server.ts
+var WebSocketServerRenderer;
+var init_server2 = __esm({
+  async "src/adapter/render/connect/server.ts"() {
+    "use strict";
+    init_esm_shims();
+    init_ws2();
+    await init_render();
+    init_internal();
+    WebSocketServerRenderer = class extends WebSocketRender {
+      /** 请求实例 */
+      request;
+      constructor(socket, request) {
+        super(socket);
+        this.request = request;
+      }
+      connection() {
+        const cfg = render();
+        if (!cfg.ws_server.enable) {
+          logger.warn("[WebSocket] \u53CD\u5411ws\u672A\u542F\u7528");
+          this.socket.close();
+          return false;
+        }
+        const url = `ws://${this.request.headers.host}${this.request.url}`;
+        if (process.env.WS_SERVER_AUTH_KEY) {
+          const token = this.request.headers["authorization"];
+          if (!token || !this.auth(process.env.WS_SERVER_AUTH_KEY, token)) {
+            logger.error(`[WebSocket] \u9274\u6743\u5931\u8D25: authorization: ${token} url: ${url}`);
+            this.socket.close();
+            return false;
+          }
+        }
+        logger.info(`[WebSocket] \u8FDE\u63A5\u6210\u529F: url: ${url}`);
+        return true;
+      }
+    };
+    listeners.on("ws:connection:puppeteer", (socket, request) => {
+      const server2 = new WebSocketServerRenderer(socket, request);
+      if (!server2.connection()) return;
+      server2.init();
+    });
+  }
+});
+
+// src/adapter/render/connect/http.ts
+import axios4 from "axios";
+import crypto2 from "node:crypto";
+var createHttpRenderClient;
+var init_http = __esm({
+  async "src/adapter/render/connect/http.ts"() {
+    "use strict";
+    init_esm_shims();
+    init_cache2();
+    await init_render();
+    createHttpRenderClient = () => {
+      const cfg = render();
+      if (!cfg.http_server || !Array.isArray(cfg.http_server) || cfg.http_server.length === 0) {
+        logger.trace("[render][http] \u672A\u914D\u7F6E\u4EFB\u4F55\u6B63\u5411HTTP \u5DF2\u8DF3\u8FC7\u521B\u5EFA");
+        return;
+      }
+      return Promise.allSettled(cfg.http_server.map(async (item) => {
+        let { url, token, enable } = item;
+        if (!enable) return;
+        url = url.replace("/puppeteer", "");
+        const headers = { authorization: crypto2.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") {
+            logger.error(`[render][http] \u521B\u5EFA\u6E32\u67D3\u5668\u5931\u8D25: \u65E0\u6CD5\u8FDE\u63A5 ${url}`);
+          }
+          const auth2 = await axios4.get(`${url}/auth`, { headers, timeout: 5e3 });
+          if (auth2.status !== 200 || String(auth2.data.status) !== "200") {
+            logger.error(`[render][http] \u521B\u5EFA\u6E32\u67D3\u5668\u5931\u8D25: \u9274\u6743\u9519\u8BEF ${url}`);
+            return;
+          }
+        } catch (error) {
+          if (axios4.isAxiosError(error)) {
+            const { response } = error;
+            logger.error(`[render][http] \u521B\u5EFA\u6E32\u67D3\u5668\u5931\u8D25: ${response == null ? void 0 : response.status} ${response == null ? void 0 : response.statusText} - ${JSON.stringify((response == null ? void 0 : response.data) || "\u672A\u77E5\u9519\u8BEF")}`);
+          } else {
+            logger.error(`[render][http] \u521B\u5EFA\u6E32\u67D3\u5668\u5931\u8D25: ${error}`);
+          }
+          return;
+        }
+        const index4 = registerRender("puppeteer", async (options) => {
+          var _a;
+          try {
+            const result = await axios4.post(`${url}/puppeteer`, options, { headers });
+            if (result.status !== 200) {
+              throw new Error(`[render][http] \u6E32\u67D3\u5931\u8D25: ${result.status} ${result.statusText} - ${((_a = result.data) == null ? void 0 : _a.message) || "\u672A\u77E5\u9519\u8BEF"}`);
+            }
+            return result.data;
+          } catch (error) {
+            if (axios4.isAxiosError(error)) {
+              if (!error.response) {
+                unregisterRender(index4);
+                throw new Error(`[render][http] \u7F51\u7EDC\u8FDE\u63A5\u5931\u8D25: ${error.message}`);
+              }
+              const { response } = error;
+              throw new Error(`[render][http] \u6E32\u67D3\u5931\u8D25: ${response == null ? void 0 : response.status} ${response == null ? void 0 : response.statusText} - ${JSON.stringify((response == null ? void 0 : response.data) || "\u672A\u77E5\u9519\u8BEF")}`);
+            }
+            if (error instanceof Error) {
+              throw error;
+            }
+            throw new Error(`[render][unknown] \u672A\u77E5\u9519\u8BEF: ${error}`);
+          }
+        });
+      }));
+    };
+  }
+});
+
 // src/adapter/render/index.ts
 var init_render2 = __esm({
-  "src/adapter/render/index.ts"() {
+  async "src/adapter/render/index.ts"() {
     "use strict";
     init_esm_shims();
     init_cache2();
     init_template();
     init_types();
+    await init_client();
+    await init_server2();
+    await init_http();
+    createHttpRenderClient();
   }
 });
 
@@ -9177,7 +9440,7 @@ var button2 = (reg, fnc2, options = {}) => {
 
 // src/core/karin/render.ts
 init_esm_shims();
-init_render2();
+await init_render2();
 var render3 = (options, multiPageOrId, id) => {
   if (options === "opt") {
     return callRender(multiPageOrId, id);
@@ -9632,26 +9895,7 @@ init_json();
 init_path();
 init_pkg();
 init_require();
-
-// src/utils/fs/static.ts
-init_esm_shims();
-init_cache();
-init_path();
-var isStatic = (filePath) => {
-  try {
-    for (const item of cache9.static) {
-      if (isSubPath(item, filePath)) {
-        return true;
-      }
-    }
-    return false;
-  } catch (error) {
-    logger.error("isStatic", error);
-    return false;
-  }
-};
-
-// src/utils/fs/fs.ts
+init_static();
 init_yaml();
 init_watch();
 init_lock();
@@ -9779,7 +10023,7 @@ init_esm_shims();
 init_exec();
 init_require();
 init_list();
-import fs18 from "node:fs";
+import fs19 from "node:fs";
 var getPkg = (isForcibly = false) => {
   return requireFile("package.json", { force: isForcibly });
 };
@@ -9909,8 +10153,8 @@ var checkGitPluginUpdate = async (filePath, time2 = 120) => {
   var _a;
   const logger3 = (global == null ? void 0 : global.logger) || console;
   try {
-    if (!fs18.existsSync(filePath)) return { status: "error", data: new Error("\u8DEF\u5F84\u4E0D\u5B58\u5728") };
-    if (!fs18.existsSync(`${filePath}/.git`)) return { status: "error", data: new Error("\u8BE5\u8DEF\u5F84\u4E0D\u662F\u4E00\u4E2Agit\u4ED3\u5E93") };
+    if (!fs19.existsSync(filePath)) return { status: "error", data: new Error("\u8DEF\u5F84\u4E0D\u5B58\u5728") };
+    if (!fs19.existsSync(`${filePath}/.git`)) return { status: "error", data: new Error("\u8BE5\u8DEF\u5F84\u4E0D\u662F\u4E00\u4E2Agit\u4ED3\u5E93") };
     const timer = setTimeout(() => {
       return { status: "failed", data: "\u6267\u884C\u8D85\u65F6" };
     }, time2 * 1e3);
@@ -9961,8 +10205,8 @@ var getTime = async (filePath) => {
 var updateGitPlugin = async (filePath, cmd = "git pull", time2 = 120) => {
   const logger3 = (global == null ? void 0 : global.logger) || console;
   try {
-    if (!fs18.existsSync(filePath)) return { status: "failed", data: "\u8DEF\u5F84\u4E0D\u5B58\u5728" };
-    if (!fs18.existsSync(`${filePath}/.git`)) return { status: "failed", data: "\u8BE5\u8DEF\u5F84\u4E0D\u662F\u4E00\u4E2Agit\u4ED3\u5E93" };
+    if (!fs19.existsSync(filePath)) return { status: "failed", data: "\u8DEF\u5F84\u4E0D\u5B58\u5728" };
+    if (!fs19.existsSync(`${filePath}/.git`)) return { status: "failed", data: "\u8BE5\u8DEF\u5F84\u4E0D\u662F\u4E00\u4E2Agit\u4ED3\u5E93" };
     const timer = setTimeout(() => {
       return { status: "failed", data: "\u6267\u884C\u8D85\u65F6" };
     }, time2 * 1e3);
@@ -10223,7 +10467,7 @@ init_esm_shims();
 // src/adapter/onebot/core/convert.ts
 init_esm_shims();
 init_message2();
-import fs19 from "node:fs";
+import fs20 from "node:fs";
 var buildError = (selfId, action, request, error) => {
   if (error) {
     const err = JSON.stringify(error, null, 2).replace(/\\n/g, "\n");
@@ -10288,7 +10532,7 @@ var fileToBase64 = (file, url) => {
   if (!url || !file.startsWith("file://")) return file;
   const list4 = ["127.0.0.1", "localhost"];
   const link = new URL(url);
-  return list4.includes(link.hostname) ? file : `base64://${fs19.readFileSync(file.replace("file://", "")).toString("base64")}`;
+  return list4.includes(link.hostname) ? file : `base64://${fs20.readFileSync(file.replace("file://", "")).toString("base64")}`;
 };
 var KarinConvertAdapter = (data, onebot) => {
   var _a, _b, _c;
@@ -12085,7 +12329,7 @@ var WsAdapterOneBot11 = class extends AdapterOneBot {
 
 // src/adapter/onebot/connect/http.ts
 init_esm_shims();
-import axios4 from "axios";
+import axios5 from "axios";
 init_listeners();
 init_bot();
 var HttpAdapterOneBot11 = class extends AdapterOneBot {
@@ -12148,13 +12392,13 @@ var HttpAdapterOneBot11 = class extends AdapterOneBot {
     logger.bot("debug", this.selfId, `\u53D1\u9001Api\u8BF7\u6C42 ${action}: ${request}`);
     try {
       const headers = this.#token ? { Authorization: `Bearer ${this.#token}` } : {};
-      const { data } = await axios4.post(`${this.adapter.address}/${action}`, params, { headers, timeout: time2 * 1e3 });
+      const { data } = await axios5.post(`${this.adapter.address}/${action}`, params, { headers, timeout: time2 * 1e3 });
       if (data.status === "ok") {
         return data.data;
       }
       throw buildError(this.selfId, action, request, data);
     } catch (error) {
-      if (axios4.isAxiosError(error) && error.code === "ECONNABORTED") {
+      if (axios5.isAxiosError(error) && error.code === "ECONNABORTED") {
         throw buildError(this.selfId, action, request, "\u8BF7\u6C42\u8D85\u65F6");
       }
       buildError(this.selfId, action, request);
@@ -12165,7 +12409,7 @@ var HttpAdapterOneBot11 = class extends AdapterOneBot {
 
 // src/adapter/onebot/connect/client.ts
 init_esm_shims();
-import WebSocket from "ws";
+import WebSocket2 from "ws";
 init_bot();
 var AdapterClientOneBot11 = class _AdapterClientOneBot11 extends WsAdapterOneBot11 {
   token;
@@ -12186,7 +12430,7 @@ var AdapterClientOneBot11 = class _AdapterClientOneBot11 extends WsAdapterOneBot
   }
   static async init(url, token) {
     const authorization = token ? `Bearer ${token}` : void 0;
-    const socket = authorization ? new WebSocket(url, { headers: { authorization } }) : new WebSocket(url);
+    const socket = authorization ? new WebSocket2(url, { headers: { authorization } }) : new WebSocket2(url);
     socket.on("open", async () => {
       await new _AdapterClientOneBot11(socket, token).init("\u83B7\u53D6\u4E2D...", url, "webSocketClient");
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-karin",
-  "version": "0.12.25.pr.206.e09f093",
+  "version": "0.12.25.pr.206.e2e1f8d",
   "description": "Lightweight, efficient, concise, and stable robot framework.",
   "keywords": [
     "node",