node-karin 1.10.13 → 1.10.15

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # 更新日志
 
+## [1.10.15](https://github.com/KarinJS/Karin/compare/core-v1.10.14...core-v1.10.15) (2025-06-30)
+
+
+### 🐛 Bug Fixes
+
+* `raw`原始文本 ([21cd207](https://github.com/KarinJS/Karin/commit/21cd2074ba7da1650c2ccad6d62f117a8907321f))
+* close [#474](https://github.com/KarinJS/Karin/issues/474) ([a985f0a](https://github.com/KarinJS/Karin/commit/a985f0a214ecc8fb7edefe4a00f9afe24e443e4a))
+* webui卸载插件 ([2b08c90](https://github.com/KarinJS/Karin/commit/2b08c900c9b199439e418d4f1ec76e3303704408))
+* 孤儿进程 ([f459e14](https://github.com/KarinJS/Karin/commit/f459e145480dcb8ebeddf694ca947998350183e9))
+* 更新`hooks.sendMsg.message`描述 ([9efe1d4](https://github.com/KarinJS/Karin/commit/9efe1d4378cf5df00ab6c621ead976447f906eba))
+
+## [1.10.14](https://github.com/KarinJS/Karin/compare/core-v1.10.13...core-v1.10.14) (2025-06-30)
+
+
+### 🐛 Bug Fixes
+
+* onebot 声明周期事件错误 ([7bf0152](https://github.com/KarinJS/Karin/commit/7bf0152fc1d807ea46a1f0998da78403c0883acf))
+
 ## [1.10.13](https://github.com/KarinJS/Karin/compare/core-v1.10.12...core-v1.10.13) (2025-06-30)
 
 

package/dist/index.d.ts

@@ -15914,6 +15914,7 @@ declare class OneBotWsServer extends OneBotWsBase {
     /** 请求对象 */
     private _request;
     constructor(socket: WebSocket, request: IncomingMessage, options: OneBotWsServerOptions$1);
+    init(): Promise<void>;
     /**
      * 更新socket
      */
@@ -17283,28 +17284,28 @@ declare const message: ((callback: HookCallback<Message$2>, options?: HookOption
 /** 发送消息钩子 */
 declare const sendMsg: {
     /**
-     * 添加普通消息钩子
+     * 添加普通消息钩子 `也就是调用 bot.sendMsg 时触发 此时会先进入这个 hook 才会到 bot.sendMsg`
      * @param callback 消息处理回调函数
      * @param options 钩子配置项
      * @returns 钩子ID
      */
     message: (callback: NormalMessageCallback, options?: HookOptions) => number;
     /**
-     * 添加转发消息钩子
+     * 添加转发消息钩子 `也就是调用 bot.sendForwardMsg 时触发 此时会先进入这个 hook 才会到 bot.sendForwardMsg`
      * @param callback 消息处理回调函数
      * @param options 钩子配置项
      * @returns 钩子ID
      */
     forward: (callback: ForwardMessageCallback, options?: HookOptions) => number;
     /**
-     * 添加普通消息发送后钩子
+     * 添加普通消息发送后钩子 `也就是调用 bot.sendMsg 处理完成返回结果前触发 此时会先进入这个 hook 才会正常返回结果`
      * @param callback 消息处理回调函数
      * @param options 钩子配置项
      * @returns 钩子ID
      */
     afterMessage: (callback: AfterMessageCallback, options?: HookOptions) => number;
     /**
-     * 添加转发消息发送后钩子
+     * 添加转发消息发送后钩子 `也就是调用 bot.sendForwardMsg 处理完成返回结果前触发 此时会先进入这个 hook 才会正常返回结果`
      * @param callback 消息处理回调函数
      * @param options 钩子配置项
      * @returns 钩子ID

package/dist/index.mjs

@@ -3184,6 +3184,8 @@ var init_message = __esm({
             return `[pasmsg:${v.id}]`;
           case "markdownTpl":
             return `[markdowntpl:${JSON.stringify({ templateId: v.templateId, ...v.params })}]`;
+          case "raw":
+            return `[raw:${JSON.stringify(v.data)}]`;
           default:
             return `[\u672A\u77E5:${lodash3.truncate(JSON.stringify(v), { length: 200 })}]`;
         }
@@ -5219,18 +5221,14 @@ var init_dist2 = __esm({
        * 关闭连接
        */
       close() {
-        try {
-          this._manualClosed = true;
-          this._socket.close();
-          this.emit(
-            "close",
-            1002
-            /* MANUAL_CLOSE */
-          );
-          setTimeout(() => this.removeAllListeners(), 200);
-        } finally {
-          this._manualClosed = false;
-        }
+        this._manualClosed = true;
+        this._socket.close();
+        this.emit(
+          "close",
+          1002
+          /* MANUAL_CLOSE */
+        );
+        this.removeAllListeners();
       }
       /**
        * 更新socket
@@ -5440,6 +5438,7 @@ var init_dist2 = __esm({
        * @returns 是否重连成功
        */
       async reconnect(url, options = this._options) {
+        this._manualClosed = false;
         this._options = this.getOptions(options);
         const _socket = oneBotWsClientManager.createWebSocket(url, options);
         this.setSocket(_socket)();
@@ -5462,13 +5461,7 @@ var init_dist2 = __esm({
         });
         this._socket.on("close", () => {
           if (this._setSocket) return;
-          if (this._manualClosed) {
-            this.#close(
-              1002
-              /* MANUAL_CLOSE */
-            );
-            return;
-          }
+          if (this._manualClosed) return;
           if (this._options.autoReconnect) {
             if (isConnected) {
               this.#close(
@@ -5540,7 +5533,10 @@ var init_dist2 = __esm({
         super(socket, options);
         this._options = this.getOptions(options);
         this._request = request22;
+      }
+      async init() {
         this._setupEventListeners();
+        await super.init();
       }
       /**
        * 关闭之前的一些操作
@@ -5590,15 +5586,13 @@ var init_dist2 = __esm({
        */
       _setupEventListeners() {
         this?._socket?.removeAllListeners();
+        this.emit(
+          "open"
+          /* OPEN */
+        );
         this._socket.on("close", () => {
           if (this._setSocket) return;
-          if (this._manualClosed) {
-            this.#close(
-              1002
-              /* MANUAL_CLOSE */
-            );
-            return;
-          }
+          if (this._manualClosed) return;
           this.#close(
             1001
             /* ERROR */
@@ -16905,7 +16899,7 @@ var init_sendMsg = __esm({
     };
     sendMsg = {
       /**
-       * 添加普通消息钩子
+       * 添加普通消息钩子 `也就是调用 bot.sendMsg 时触发 此时会先进入这个 hook 才会到 bot.sendMsg`
        * @param callback 消息处理回调函数
        * @param options 钩子配置项
        * @returns 钩子ID
@@ -16917,7 +16911,7 @@ var init_sendMsg = __esm({
         return id;
       },
       /**
-       * 添加转发消息钩子
+       * 添加转发消息钩子 `也就是调用 bot.sendForwardMsg 时触发 此时会先进入这个 hook 才会到 bot.sendForwardMsg`
        * @param callback 消息处理回调函数
        * @param options 钩子配置项
        * @returns 钩子ID
@@ -16929,7 +16923,7 @@ var init_sendMsg = __esm({
         return id;
       },
       /**
-       * 添加普通消息发送后钩子
+       * 添加普通消息发送后钩子 `也就是调用 bot.sendMsg 处理完成返回结果前触发 此时会先进入这个 hook 才会正常返回结果`
        * @param callback 消息处理回调函数
        * @param options 钩子配置项
        * @returns 钩子ID
@@ -16941,7 +16935,7 @@ var init_sendMsg = __esm({
         return id;
       },
       /**
-       * 添加转发消息发送后钩子
+       * 添加转发消息发送后钩子 `也就是调用 bot.sendForwardMsg 处理完成返回结果前触发 此时会先进入这个 hook 才会正常返回结果`
        * @param callback 消息处理回调函数
        * @param options 钩子配置项
        * @returns 钩子ID
@@ -18817,6 +18811,10 @@ var init_create2 = __esm({
       adapter3.adapter.address = url;
       adapter3.adapter.communication = "webSocketServer";
       adapter3.account.selfId = String(request3.headers["x-self-id"]);
+      onebot.on(OneBotEventKey.OPEN, async () => {
+        logger.debug(`[OneBot] \u670D\u52A1\u7AEF\u8FDE\u63A5\u6210\u529F: ${url}`);
+        adapter3.registerBot();
+      });
       onebot.on(OneBotEventKey.CLOSE, async (type) => {
         adapter3.unregisterBot();
         if (type === OneBotCloseType.MANUAL_CLOSE) {
@@ -18824,6 +18822,15 @@ var init_create2 = __esm({
         }
         return logger.error(`${loggerPrefix} \u8FDE\u63A5\u65AD\u5F00: ${url}`);
       });
+      onebot.on(OneBotEventKey.ERROR, async (args) => {
+        if (args.type === OneBotErrorType.AUTH_FAILED) {
+          return logger.error(`${loggerPrefix} \u9274\u6743\u5931\u8D25: ${args.error.message}`);
+        }
+        if (args.type === OneBotErrorType.AUTH_INVALID_FORMAT) {
+          return logger.error(`${loggerPrefix} \u9274\u6743\u5934\u683C\u5F0F\u9519\u8BEF: ${args.error.message}`);
+        }
+        return logger.error(new Error(`${loggerPrefix} \u53D1\u751F\u9519\u8BEF:`, { cause: args.error }));
+      });
       await adapter3.init();
       cacheMap.wsServer.set(url, adapter3);
     };
@@ -24295,28 +24302,16 @@ var init_webui = __esm({
     };
     getWebuiPluginList = async (_, res) => {
       try {
-        const updatedPlugins = await Promise.all(plugins.map(async (plugin) => {
-          const modulePath = path4.join(process.cwd(), "node_modules", plugin.name);
-          const isInstalled = fs5.existsSync(modulePath);
-          let version2;
-          if (isInstalled) {
-            try {
-              const pkgPath = path4.join(modulePath, "package.json");
-              if (fs5.existsSync(pkgPath)) {
-                const pkgContent = fs5.readFileSync(pkgPath, "utf-8");
-                const pkg2 = JSON.parse(pkgContent);
-                version2 = pkg2.version;
-              }
-            } catch (error) {
-              logger.error(`[webui] \u8BFB\u53D6\u63D2\u4EF6\u7248\u672C\u5931\u8D25: ${plugin.name}`);
-            }
-          }
+        const pkg2 = JSON.parse(fs5.readFileSync(path4.join(process.cwd(), "package.json"), "utf-8"));
+        const updatedPlugins = plugins.map((plugin) => {
+          const isInstalled = pkg2.dependencies?.[plugin.name] || pkg2.devDependencies?.[plugin.name] || pkg2.peerDependencies?.[plugin.name];
+          const version2 = isInstalled || null;
           return {
             ...plugin,
-            installed: isInstalled,
+            installed: typeof version2 === "string",
             version: version2
           };
-        }));
+        });
         return createSuccessResponse(res, updatedPlugins);
       } catch (error) {
         logger.error("[webui] \u83B7\u53D6\u63D2\u4EF6\u5217\u8868\u5931\u8D25");
@@ -25007,7 +25002,23 @@ var init_uninstall = __esm({
           }
           notExist.push(v.name);
         });
-        await spawnProcess("pnpm", ["remove", ...npm2, "--save"], { timeout: 60 * 1e3 }, emitLog);
+        await spawnProcess("pnpm", ["remove", ...npm2], { timeout: 60 * 1e3 }, emitLog);
+        const pkg2 = path4.join(process.cwd(), "package.json");
+        if (fs5.existsSync(pkg2)) {
+          const content = fs5.readFileSync(pkg2, "utf-8");
+          const data = JSON.parse(content);
+          const delDep = (obj) => {
+            Object.keys(obj).forEach((key) => {
+              if (npm2.includes(key)) {
+                delete obj[key];
+              }
+            });
+          };
+          delDep(data.dependencies);
+          delDep(data.devDependencies);
+          delDep(data.peerDependencies);
+          fs5.writeFileSync(pkg2, JSON.stringify(data, null, 2), "utf-8");
+        }
         for (const v of git2) {
           emitLog("-----------------------");
           emitLog(`\u5F00\u59CB\u5378\u8F7D git \u63D2\u4EF6: ${v}`);
@@ -25036,16 +25047,16 @@ var init_uninstall = __esm({
             continue;
           }
           const arr = v.split("/");
-          const [pkg2, file2] = arr;
-          if (arr.length !== 2 || !pkg2 || !file2) {
+          const [pkg3, file2] = arr;
+          if (arr.length !== 2 || !pkg3 || !file2) {
             emitLog(`\u5378\u8F7D ${v} \u5931\u8D25: \u683C\u5F0F\u9519\u8BEF`);
             continue;
           }
-          if (!list2.includes(`app:${pkg2}`)) {
+          if (!list2.includes(`app:${pkg3}`)) {
             emitLog(`\u5378\u8F7D ${v} \u5931\u8D25: \u63D2\u4EF6\u4E0D\u5B58\u5728`);
             continue;
           }
-          const dir = path4.join(karinPathPlugins, pkg2);
+          const dir = path4.join(karinPathPlugins, pkg3);
           if (!fs5.existsSync(path4.join(dir, file2))) {
             emitLog(`\u5378\u8F7D ${v} \u5931\u8D25: \u6587\u4EF6\u4E0D\u5B58\u5728`);
             continue;
@@ -26829,6 +26840,12 @@ var processHandler = () => {
     logger.error(...args);
   });
   if (process.env.pm_id) process.env.RUNTIME = "pm2";
+  if (typeof process.send === "function") {
+    process.on("disconnect", () => {
+      logger.fatal("IPC\u901A\u9053\u5DF2\u65AD\u5F00\uFF0C\u7236\u8FDB\u7A0B\u53EF\u80FD\u5DF2\u9000\u51FA\uFF0CKarin\u5C06\u7ED3\u675F\u8FD0\u884C");
+      process.exit(1);
+    });
+  }
 };
 
 // src/service/process/index.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-karin",
-  "version": "1.10.13",
+  "version": "1.10.15",
   "description": "Lightweight, efficient, concise, and stable robot framework.",
   "keywords": [
     "node",