@zhin.js/adapter-icqq 1.0.22 → 1.0.24

package/CHANGELOG.md

@@ -1,5 +1,29 @@
 # @zhin.js/adapter-icqq
 
+## 1.0.24
+
+### Patch Changes
+
+- f9faa1d: fix: test release
+- Updated dependencies [f9faa1d]
+  - @zhin.js/client@1.0.7
+  - @zhin.js/core@1.0.19
+  - zhin.js@1.0.19
+  - @zhin.js/console@1.0.15
+  - @zhin.js/http@1.0.10
+
+## 1.0.23
+
+### Patch Changes
+
+- d16a69c: fix: test trust publish
+- Updated dependencies [d16a69c]
+  - @zhin.js/client@1.0.6
+  - @zhin.js/core@1.0.18
+  - zhin.js@1.0.18
+  - @zhin.js/console@1.0.14
+  - @zhin.js/http@1.0.9
+
 ## 1.0.22
 
 ### Patch Changes

package/lib/index.d.ts

@@ -1,12 +1,20 @@
 import { Config, Client, PrivateMessageEvent, GroupMessageEvent, Sendable } from "@icqqjs/icqq";
-import { Bot, Adapter, Message, SendOptions, MessageSegment, SendContent } from "zhin.js";
-declare module '@zhin.js/types' {
+import { Bot, Adapter, Plugin, Message, SendOptions, MessageSegment, SendContent } from "zhin.js";
+import { Router } from "@zhin.js/http";
+declare module "zhin.js" {
+    namespace Plugin {
+        interface Contexts {
+            icqq: IcqqAdapter;
+            web: any;
+            router: Router;
+        }
+    }
     interface RegisteredAdapters {
-        icqq: Adapter<IcqqBot>;
+        icqq: IcqqAdapter;
     }
 }
-export interface IcqqBotConfig extends Bot.Config, Config {
-    context: 'icqq';
+export interface IcqqBotConfig extends Config {
+    context: "icqq";
     name: `${number}`;
     password?: string;
     scope?: string;
@@ -14,9 +22,11 @@ export interface IcqqBotConfig extends Bot.Config, Config {
 export interface IcqqBot {
     $config: IcqqBotConfig;
 }
-export declare class IcqqBot extends Client implements Bot<PrivateMessageEvent | GroupMessageEvent, IcqqBotConfig> {
-    $connected?: boolean;
-    constructor(config: IcqqBotConfig);
+export declare class IcqqBot extends Client implements Bot<IcqqBotConfig, PrivateMessageEvent | GroupMessageEvent> {
+    adapter: IcqqAdapter;
+    $connected: boolean;
+    get $id(): `${number}`;
+    constructor(adapter: IcqqAdapter, config: IcqqBotConfig);
     private handleIcqqMessage;
     $connect(): Promise<void>;
     $disconnect(): Promise<void>;
@@ -28,4 +38,9 @@ export declare namespace IcqqBot {
     function toSegments(message: Sendable): MessageSegment[];
     function toSendable(content: SendContent): Sendable;
 }
+declare class IcqqAdapter extends Adapter<IcqqBot> {
+    constructor(plugin: Plugin);
+    createBot(config: IcqqBotConfig): IcqqBot;
+}
+export {};
 //# sourceMappingURL=index.d.ts.map

package/lib/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,mBAAmB,EAAE,iBAAiB,EAAE,QAAQ,EAAc,MAAM,cAAc,CAAC;AAE5G,OAAO,EACH,GAAG,EAGH,OAAO,EAGP,OAAO,EACP,WAAW,EACX,cAAc,EACd,WAAW,EAEd,MAAM,SAAS,CAAC;AACjB,OAAO,QAAQ,gBAAgB,CAAA;IAC3B,UAAU,kBAAkB;QACxB,IAAI,EAAC,OAAO,CAAC,OAAO,CAAC,CAAA;KACxB;CACJ;AAED,MAAM,WAAW,aAAc,SAAQ,GAAG,CAAC,MAAM,EAAC,MAAM;IACpD,OAAO,EAAC,MAAM,CAAA;IACd,IAAI,EAAC,GAAG,MAAM,EAAE,CAAA;IAChB,QAAQ,CAAC,EAAC,MAAM,CAAA;IAChB,KAAK,CAAC,EAAC,MAAM,CAAA;CAChB;AACD,MAAM,WAAW,OAAO;IACpB,OAAO,EAAC,aAAa,CAAA;CACxB;AACD,qBAAa,OAAQ,SAAQ,MAAO,YAAW,GAAG,CAAC,mBAAmB,GAAC,iBAAiB,EAAC,aAAa,CAAC;IACnG,UAAU,CAAC,EAAC,OAAO,CAAA;gBACP,MAAM,EAAC,aAAa;IAOhC,OAAO,CAAC,iBAAiB;IAMnB,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IA8BzB,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAIlC,cAAc,CAAC,GAAG,EAAC,mBAAmB,GAAC,iBAAiB;IAgClD,cAAc,CAAC,EAAE,EAAC,MAAM,GAAE,OAAO,CAAC,IAAI,CAAC;IAGvC,YAAY,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,MAAM,CAAC;CAoB5D;AACD,yBAAiB,OAAO,CAAA;IAqBpB,SAAgB,UAAU,CAAC,OAAO,EAAC,QAAQ,GAAE,cAAc,EAAE,CAS5D;IACD,SAAgB,UAAU,CAAC,OAAO,EAAC,WAAW,GAAE,QAAQ,CASvD;CACJ"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,mBAAmB,EAAE,iBAAiB,EAAE,QAAQ,EAAe,MAAM,cAAc,CAAC;AAE7G,OAAO,EACL,GAAG,EAEH,OAAO,EACP,MAAM,EACN,OAAO,EACP,WAAW,EACX,cAAc,EACd,WAAW,EAEZ,MAAM,SAAS,CAAC;AACjB,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAEvC,OAAO,QAAQ,SAAS,CAAC;IACvB,UAAU,MAAM,CAAC;QACf,UAAU,QAAQ;YAChB,IAAI,EAAE,WAAW,CAAC;YAClB,GAAG,EAAE,GAAG,CAAC;YACT,MAAM,EAAE,MAAM,CAAC;SAChB;KACF;IAED,UAAU,kBAAkB;QAC1B,IAAI,EAAE,WAAW,CAAC;KACnB;CACF;AAKD,MAAM,WAAW,aAAc,SAAQ,MAAM;IAC3C,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,GAAG,MAAM,EAAE,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,OAAO;IACtB,OAAO,EAAE,aAAa,CAAC;CACxB;AAED,qBAAa,OAAQ,SAAQ,MAAO,YAAW,GAAG,CAAC,aAAa,EAAE,mBAAmB,GAAG,iBAAiB,CAAC;IAOrF,OAAO,EAAE,WAAW;IANvC,UAAU,EAAE,OAAO,CAAS;IAE5B,IAAI,GAAG,gBAEN;gBAEkB,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,aAAa;IAQ9D,OAAO,CAAC,iBAAiB;IAMnB,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IA8BzB,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAKlC,cAAc,CAAC,GAAG,EAAE,mBAAmB,GAAG,iBAAiB;IAiCrD,cAAc,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAIzC,YAAY,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,MAAM,CAAC;CAgB1D;AAED,yBAAiB,OAAO,CAAC;IAGvB,SAAgB,UAAU,CAAC,OAAO,EAAE,QAAQ,GAAG,cAAc,EAAE,CAW9D;IAED,SAAgB,UAAU,CAAC,OAAO,EAAE,WAAW,GAAG,QAAQ,CASzD;CACF;AAED,cAAM,WAAY,SAAQ,OAAO,CAAC,OAAO,CAAC;gBAC5B,MAAM,EAAE,MAAM;IAI1B,SAAS,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO;CAG1C"}

package/lib/index.js

@@ -1,48 +1,53 @@
 import { Client } from "@icqqjs/icqq";
 import path from "path";
-import { usePlugin, useContext, Adapter, registerAdapter, Message, segment } from "zhin.js";
+import { usePlugin, Adapter, Message, segment, } from "zhin.js";
 const plugin = usePlugin();
+const { useContext } = plugin;
 export class IcqqBot extends Client {
-    $connected;
-    constructor(config) {
+    adapter;
+    $connected = false;
+    get $id() {
+        return this.$config.name;
+    }
+    constructor(adapter, config) {
         if (!config.scope)
-            config.scope = 'icqqjs';
+            config.scope = "icqqjs";
         if (!config.data_dir)
-            config.data_dir = path.join(process.cwd(), 'data');
-        if (config.scope.startsWith('@'))
+            config.data_dir = path.join(process.cwd(), "data");
+        if (config.scope.startsWith("@"))
             config.scope = config.scope.slice(1);
         super(config);
+        this.adapter = adapter;
         this.$config = config;
     }
     handleIcqqMessage(msg) {
         const message = this.$formatMessage(msg);
-        plugin.dispatch('message.receive', message);
-        plugin.logger.info(`${this.$config.name} recv  ${message.$channel.type}(${message.$channel.id}):${segment.raw(message.$content)}`);
-        plugin.dispatch(`message.${message.$channel.type}.receive`, message);
+        this.adapter.emit("message.receive", message);
+        plugin.logger.debug(`${this.$config.name} recv  ${message.$channel.type}(${message.$channel.id}):${segment.raw(message.$content)}`);
     }
     async $connect() {
-        this.on('message', this.handleIcqqMessage.bind(this));
-        this.on('system.login.device', async (e) => {
+        this.on("message", this.handleIcqqMessage.bind(this));
+        this.on("system.login.device", async (e) => {
             await this.sendSmsCode();
-            plugin.logger.info('请输入短信验证码:');
-            process.stdin.once('data', (data) => {
+            plugin.logger.info("请输入短信验证码:");
+            process.stdin.once("data", (data) => {
                 this.submitSmsCode(data.toString().trim());
             });
         });
-        this.on('system.login.qrcode', (e) => {
+        this.on("system.login.qrcode", (e) => {
             plugin.logger.info(`取码地址：${e.image}\n请扫码完成后回车继续:`);
-            process.stdin.once('data', () => {
+            process.stdin.once("data", () => {
                 this.login();
             });
         });
-        this.on('system.login.slider', (e) => {
+        this.on("system.login.slider", (e) => {
             plugin.logger.info(`取码地址：${e.url}\n请输入滑块验证ticket:`);
-            process.stdin.once('data', (e) => {
+            process.stdin.once("data", (e) => {
                 this.submitSlider(e.toString().trim());
             });
         });
         return new Promise((resolve) => {
-            this.once('system.online', () => {
+            this.once("system.online", () => {
                 this.$connected = true;
                 resolve();
             });
@@ -56,15 +61,15 @@ export class IcqqBot extends Client {
     $formatMessage(msg) {
         const result = Message.from(msg, {
             $id: msg.message_id.toString(),
-            $adapter: 'icqq',
+            $adapter: "icqq",
             $bot: `${this.$config.name}`,
             $sender: {
                 id: msg.sender.user_id.toString(),
                 name: msg.sender.nickname.toString(),
             },
             $channel: {
-                id: msg.message_type === 'group' ? msg.group_id.toString() : msg.from_id.toString(),
-                type: msg.message_type
+                id: msg.message_type === "group" ? msg.group_id.toString() : msg.from_id.toString(),
+                type: msg.message_type,
             },
             $content: IcqqBot.toSegments(msg.message),
             $raw: msg.raw_message,
@@ -76,14 +81,14 @@ export class IcqqBot extends Client {
                 if (!Array.isArray(content))
                     content = [content];
                 if (quote)
-                    content.unshift({ type: 'reply', data: { id: typeof quote === "boolean" ? result.$id : quote } });
+                    content.unshift({ type: "reply", data: { id: typeof quote === "boolean" ? result.$id : quote } });
                 return await this.$sendMessage({
                     ...result.$channel,
-                    context: 'icqq',
+                    context: "icqq",
                     bot: `${this.uin}`,
-                    content
+                    content,
                 });
-            }
+            },
         });
         return result;
     }
@@ -91,19 +96,16 @@ export class IcqqBot extends Client {
         await this.deleteMsg(id);
     }
     async $sendMessage(options) {
-        options = await plugin.app.handleBeforeSend(options);
         switch (options.type) {
-            case 'private': {
+            case "private": {
                 const result = await this.sendPrivateMsg(Number(options.id), IcqqBot.toSendable(options.content));
-                plugin.logger.info(`${this.$config.name} send ${options.type}(${options.id}):${segment.raw(options.content)}`);
+                plugin.logger.debug(`${this.$config.name} send ${options.type}(${options.id}):${segment.raw(options.content)}`);
                 return result.message_id.toString();
-                break;
             }
             case "group": {
                 const result = await this.sendGroupMsg(Number(options.id), IcqqBot.toSendable(options.content));
-                plugin.logger.info(`${this.$config.name} send ${options.type}(${options.id}):${segment.raw(options.content)}`);
+                plugin.logger.debug(`${this.$config.name} send ${options.type}(${options.id}):${segment.raw(options.content)}`);
                 return result.message_id.toString();
-                break;
             }
             default:
                 throw new Error(`unsupported channel type ${options.type}`);
@@ -111,34 +113,17 @@ export class IcqqBot extends Client {
     }
 }
 (function (IcqqBot) {
-    const allowTypes = [
-        'text',
-        'face',
-        'image',
-        'record',
-        'audio',
-        'dice',
-        'rps',
-        'video',
-        'file',
-        'location',
-        'share',
-        'json',
-        'at',
-        'reply',
-        'long_msg',
-        'button',
-        'markdown',
-        'xml',
-    ];
+    const allowTypes = ["text", "face", "image", "record", "audio", "dice", "rps", "video", "file", "location", "share", "json", "at", "reply", "long_msg", "button", "markdown", "xml"];
     function toSegments(message) {
         if (!Array.isArray(message))
             message = [message];
-        return message.filter((item, index) => {
-            return typeof item === "string" || (item.type !== 'long_msg' || index !== 0);
-        }).map((item) => {
+        return message
+            .filter((item, index) => {
+            return typeof item === "string" || item.type !== "long_msg" || index !== 0;
+        })
+            .map((item) => {
             if (typeof item === "string")
-                return { type: 'text', data: { text: item } };
+                return { type: "text", data: { text: item } };
             const { type, ...data } = item;
             return { type, data };
         });
@@ -149,39 +134,60 @@ export class IcqqBot extends Client {
             content = [content];
         return content.map((seg) => {
             if (typeof seg === "string")
-                return { type: 'text', text: seg };
+                return { type: "text", text: seg };
             let { type, data } = seg;
-            if (typeof type === 'function')
+            if (typeof type === "function")
                 type = type.name;
             if (!allowTypes.includes(type))
-                return { type: 'text', text: segment.toString(seg) };
+                return { type: "text", text: segment.toString(seg) };
             return { type, ...data };
         });
     }
     IcqqBot.toSendable = toSendable;
 })(IcqqBot || (IcqqBot = {}));
-registerAdapter(new Adapter('icqq', IcqqBot));
-useContext('web', (web) => {
+class IcqqAdapter extends Adapter {
+    constructor(plugin) {
+        super(plugin, "icqq", []);
+    }
+    createBot(config) {
+        return new IcqqBot(this, config);
+    }
+}
+const { provide } = usePlugin();
+provide({
+    name: "icqq",
+    description: "ICQQ Adapter",
+    mounted: async (p) => {
+        const adapter = new IcqqAdapter(p);
+        await adapter.start();
+        return adapter;
+    },
+    dispose: async (adapter) => {
+        await adapter.stop();
+    },
+});
+useContext("web", (web) => {
     // 注册ICQQ适配器的客户端入口文件
     const dispose = web.addEntry({
-        production: path.resolve(import.meta.dirname, '../dist/index.js'),
-        development: path.resolve(import.meta.dirname, '../client/index.tsx')
+        production: path.resolve(import.meta.dirname, "../dist/index.js"),
+        development: path.resolve(import.meta.dirname, "../client/index.tsx"),
     });
     return dispose;
 });
-useContext('router', 'icqq', (router, icqq) => {
-    router.get('/api/icqq/bots', async (ctx) => {
+useContext("router", async (router) => {
+    const icqq = plugin.root.inject("icqq");
+    router.get("/api/icqq/bots", async (ctx) => {
         try {
             const bots = Array.from(icqq.bots.values());
             if (bots.length === 0) {
                 ctx.body = {
                     success: true,
                     data: [],
-                    message: '暂无ICQQ机器人实例'
+                    message: "暂无ICQQ机器人实例",
                 };
                 return;
             }
-            const result = bots.map(bot => {
+            const result = bots.map((bot) => {
                 try {
                     return {
                         name: bot.$config.name,
@@ -190,14 +196,13 @@ useContext('router', 'icqq', (router, icqq) => {
                         friendCount: bot.fl?.size || 0,
                         receiveCount: bot.stat?.recv_msg_cnt || 0,
                         sendCount: bot.stat?.sent_msg_cnt || 0,
-                        loginMode: bot.$config.password ? 'password' : 'qrcode',
-                        status: bot.$connected ? 'online' : 'offline',
-                        lastActivity: new Date().toISOString()
+                        loginMode: bot.$config.password ? "password" : "qrcode",
+                        status: bot.$connected ? "online" : "offline",
+                        lastActivity: new Date().toISOString(),
                     };
                 }
                 catch (botError) {
                     // 单个机器人数据获取失败时的处理
-                    // 获取机器人数据失败，返回错误状态
                     return {
                         name: bot.$config.name,
                         connected: false,
@@ -205,27 +210,26 @@ useContext('router', 'icqq', (router, icqq) => {
                         friendCount: 0,
                         receiveCount: 0,
                         sendCount: 0,
-                        loginMode: 'unknown',
-                        status: 'error',
-                        error: '数据获取失败'
+                        loginMode: "unknown",
+                        status: "error",
+                        error: "数据获取失败",
                     };
                 }
             });
             ctx.body = {
                 success: true,
                 data: result,
-                timestamp: new Date().toISOString()
+                timestamp: new Date().toISOString(),
             };
         }
         catch (error) {
-            // ICQQ API调用失败
             ctx.status = 500;
             ctx.body = {
                 success: false,
-                error: 'ICQQ_API_ERROR',
-                message: '获取机器人数据失败',
-                details: process.env.NODE_ENV === 'development' ? error.message : undefined,
-                timestamp: new Date().toISOString()
+                error: "ICQQ_API_ERROR",
+                message: "获取机器人数据失败",
+                details: process.env.NODE_ENV === "development" ? error.message : undefined,
+                timestamp: new Date().toISOString(),
             };
         }
     });

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhin.js/adapter-icqq",
-  "version": "1.0.22",
+  "version": "1.0.24",
   "description": "zhin adapter for icqq",
   "type": "module",
   "main": "./lib/index.js",
@@ -43,11 +43,11 @@
     "typescript": "^5.3.0"
   },
   "peerDependencies": {
-    "zhin.js": "1.0.17",
-    "@zhin.js/http": "1.0.7",
-    "@zhin.js/client": "1.0.5",
-    "@zhin.js/types": "1.0.5",
-    "@zhin.js/console": "1.0.13"
+    "@zhin.js/core": "1.0.19",
+    "@zhin.js/client": "1.0.7",
+    "@zhin.js/http": "1.0.10",
+    "@zhin.js/console": "1.0.15",
+    "zhin.js": "1.0.19"
   },
   "peerDependenciesMeta": {
     "@zhin.js/client": {
@@ -58,11 +58,12 @@
     },
     "@zhin.js/console": {
       "optional": true
-    },
-    "@zhin.js/types": {
-      "optional": true
     }
   },
+  "publishConfig": {
+    "access": "public",
+    "registry": "https://registry.npmjs.org"
+  },
   "scripts": {
     "build": "tsc && (test -f ../../services/console/lib/bin.js && node ../../services/console/lib/bin.js build || echo 'Skipping client build: console not built yet')",
     "clean": "rm -rf lib"

package/src/index.ts

@@ -1,250 +1,277 @@
-import { Config, Client, PrivateMessageEvent, GroupMessageEvent, Sendable, MessageElem} from "@icqqjs/icqq";
+import { Config, Client, PrivateMessageEvent, GroupMessageEvent, Sendable, MessageElem } from "@icqqjs/icqq";
 import path from "path";
 import {
-    Bot,
-    usePlugin,
-    useContext,
-    Adapter,
-    Plugin,
-    registerAdapter,
-    Message,
-    SendOptions,
-    MessageSegment,
-    SendContent,
-    segment
+  Bot,
+  usePlugin,
+  Adapter,
+  Plugin,
+  Message,
+  SendOptions,
+  MessageSegment,
+  SendContent,
+  segment,
 } from "zhin.js";
-declare module '@zhin.js/types'{
-    interface RegisteredAdapters{
-        icqq:Adapter<IcqqBot>
+import { Router } from "@zhin.js/http";
+
+declare module "zhin.js" {
+  namespace Plugin {
+    interface Contexts {
+      icqq: IcqqAdapter;
+      web: any;
+      router: Router;
     }
+  }
+  
+  interface RegisteredAdapters {
+    icqq: IcqqAdapter;
+  }
 }
-const plugin =usePlugin()
-export interface IcqqBotConfig extends Bot.Config,Config{
-    context:'icqq'
-    name:`${number}`
-    password?:string
-    scope?:string
+
+const plugin = usePlugin();
+const { useContext } = plugin;
+
+export interface IcqqBotConfig extends Config {
+  context: "icqq";
+  name: `${number}`;
+  password?: string;
+  scope?: string;
 }
-export interface IcqqBot{
-    $config:IcqqBotConfig
+
+export interface IcqqBot {
+  $config: IcqqBotConfig;
 }
-export class IcqqBot extends Client implements Bot<PrivateMessageEvent|GroupMessageEvent,IcqqBotConfig>{
-    $connected?:boolean
-    constructor(config:IcqqBotConfig) {
-        if(!config.scope) config.scope='icqqjs'
-        if(!config.data_dir) config.data_dir=path.join(process.cwd(),'data')
-        if(config.scope.startsWith('@')) config.scope=config.scope.slice(1)
-        super(config);
-        this.$config=config
-    }
-    private handleIcqqMessage(msg: PrivateMessageEvent|GroupMessageEvent): void {
-        const message =this.$formatMessage(msg) ;
-        plugin.dispatch('message.receive',message)
-        plugin.logger.info(`${this.$config.name} recv  ${message.$channel.type}(${message.$channel.id}):${segment.raw(message.$content)}`)
-        plugin.dispatch(`message.${message.$channel.type}.receive`,message)
-    }
-    async $connect(): Promise<void> {
-        this.on('message',this.handleIcqqMessage.bind(this))
-        this.on('system.login.device',async (e:unknown)=>{
-            await this.sendSmsCode()
-            plugin.logger.info('请输入短信验证码:')
-            process.stdin.once('data',(data)=>{
-                this.submitSmsCode(data.toString().trim())
-            })
-        })
-        this.on('system.login.qrcode',(e)=>{
-            plugin.logger.info(`取码地址：${e.image}\n请扫码完成后回车继续:`)
-            process.stdin.once('data',()=>{
-                this.login()
-            })
-        })
-        this.on('system.login.slider',(e)=>{
-            plugin.logger.info(`取码地址：${e.url}\n请输入滑块验证ticket:`)
-            process.stdin.once('data',(e)=>{
-                this.submitSlider(e.toString().trim())
-            })
-        })
-        return new Promise((resolve)=>{
-            this.once('system.online',()=>{
-                this.$connected=true;
-                resolve()
-            })
-            this.login(Number(this.$config.name),this.$config.password)
-        })
-    }
 
-    async $disconnect(): Promise<void> {
-        await this.logout()
-        this.$connected=false;
-    }
-    $formatMessage(msg:PrivateMessageEvent|GroupMessageEvent){
-        const result= Message.from(msg,{
-            $id: msg.message_id.toString(),
-            $adapter:'icqq',
-            $bot:`${this.$config.name}`,
-            $sender:{
-                id:msg.sender.user_id.toString(),
-                name:msg.sender.nickname.toString(),
-            },
-            $channel:{
-                id:msg.message_type==='group'?msg.group_id.toString():msg.from_id.toString(),
-                type:msg.message_type
-            },
-            $content: IcqqBot.toSegments(msg.message),
-            $raw: msg.raw_message,
-            $timestamp: msg.time,
-            $recall: async () => {
-                await this.$recallMessage(result.$id)
-            },
-            $reply:async (content: SendContent, quote?: boolean|string):Promise<string>=> {
-                if(!Array.isArray(content)) content=[content];
-                if(quote) content.unshift({type:'reply',data:{id:typeof quote==="boolean"?result.$id:quote}})
-                return await this.$sendMessage({
-                    ...result.$channel,
-                    context:'icqq',
-                    bot:`${this.uin}`,
-                    content
-                })
-            }
-        })
-        return result
-    }
-    async $recallMessage(id:string):Promise<void> {
-        await this.deleteMsg(id)
-    }
-    async $sendMessage(options: SendOptions): Promise<string> {
-        options=await plugin.app.handleBeforeSend(options)
-        switch (options.type){
-            case 'private':{
-                const result= await this.sendPrivateMsg(Number(options.id),IcqqBot.toSendable(options.content))
-                plugin.logger.info(`${this.$config.name} send ${options.type}(${options.id}):${segment.raw(options.content)}`)
-                return result.message_id.toString()
-                break;
-            }
-            case "group":{
-                const result=await this.sendGroupMsg(Number(options.id),IcqqBot.toSendable(options.content))
-                plugin.logger.info(`${this.$config.name} send ${options.type}(${options.id}):${segment.raw(options.content)}`)
-                return result.message_id.toString()
-                break;
-            }
-            default:
-                throw new Error(`unsupported channel type ${options.type}`)
-        }
+export class IcqqBot extends Client implements Bot<IcqqBotConfig, PrivateMessageEvent | GroupMessageEvent> {
+  $connected: boolean = false;
+
+  get $id() {
+    return this.$config.name;
+  }
+
+  constructor(public adapter: IcqqAdapter, config: IcqqBotConfig) {
+    if (!config.scope) config.scope = "icqqjs";
+    if (!config.data_dir) config.data_dir = path.join(process.cwd(), "data");
+    if (config.scope.startsWith("@")) config.scope = config.scope.slice(1);
+    super(config);
+    this.$config = config;
+  }
+
+  private handleIcqqMessage(msg: PrivateMessageEvent | GroupMessageEvent): void {
+    const message = this.$formatMessage(msg);
+    this.adapter.emit("message.receive", message);
+    plugin.logger.debug(`${this.$config.name} recv  ${message.$channel.type}(${message.$channel.id}):${segment.raw(message.$content)}`);
+  }
+
+  async $connect(): Promise<void> {
+    this.on("message", this.handleIcqqMessage.bind(this));
+    this.on("system.login.device", async (e: unknown) => {
+      await this.sendSmsCode();
+      plugin.logger.info("请输入短信验证码:");
+      process.stdin.once("data", (data) => {
+        this.submitSmsCode(data.toString().trim());
+      });
+    });
+    this.on("system.login.qrcode", (e) => {
+      plugin.logger.info(`取码地址：${e.image}\n请扫码完成后回车继续:`);
+      process.stdin.once("data", () => {
+        this.login();
+      });
+    });
+    this.on("system.login.slider", (e) => {
+      plugin.logger.info(`取码地址：${e.url}\n请输入滑块验证ticket:`);
+      process.stdin.once("data", (e) => {
+        this.submitSlider(e.toString().trim());
+      });
+    });
+    return new Promise((resolve) => {
+      this.once("system.online", () => {
+        this.$connected = true;
+        resolve();
+      });
+      this.login(Number(this.$config.name), this.$config.password);
+    });
+  }
+
+  async $disconnect(): Promise<void> {
+    await this.logout();
+    this.$connected = false;
+  }
+
+  $formatMessage(msg: PrivateMessageEvent | GroupMessageEvent) {
+    const result = Message.from(msg, {
+      $id: msg.message_id.toString(),
+      $adapter: "icqq" as const,
+      $bot: `${this.$config.name}`,
+      $sender: {
+        id: msg.sender.user_id.toString(),
+        name: msg.sender.nickname.toString(),
+      },
+      $channel: {
+        id: msg.message_type === "group" ? msg.group_id.toString() : msg.from_id.toString(),
+        type: msg.message_type,
+      },
+      $content: IcqqBot.toSegments(msg.message),
+      $raw: msg.raw_message,
+      $timestamp: msg.time,
+      $recall: async () => {
+        await this.$recallMessage(result.$id);
+      },
+      $reply: async (content: SendContent, quote?: boolean | string): Promise<string> => {
+        if (!Array.isArray(content)) content = [content];
+        if (quote) content.unshift({ type: "reply", data: { id: typeof quote === "boolean" ? result.$id : quote } });
+        return await this.$sendMessage({
+          ...result.$channel,
+          context: "icqq",
+          bot: `${this.uin}`,
+          content,
+        });
+      },
+    });
+    return result;
+  }
+
+  async $recallMessage(id: string): Promise<void> {
+    await this.deleteMsg(id);
+  }
+
+  async $sendMessage(options: SendOptions): Promise<string> {
+    switch (options.type) {
+      case "private": {
+        const result = await this.sendPrivateMsg(Number(options.id), IcqqBot.toSendable(options.content));
+        plugin.logger.debug(`${this.$config.name} send ${options.type}(${options.id}):${segment.raw(options.content)}`);
+        return result.message_id.toString();
+      }
+      case "group": {
+        const result = await this.sendGroupMsg(Number(options.id), IcqqBot.toSendable(options.content));
+        plugin.logger.debug(`${this.$config.name} send ${options.type}(${options.id}):${segment.raw(options.content)}`);
+        return result.message_id.toString();
+      }
+      default:
+        throw new Error(`unsupported channel type ${options.type}`);
     }
+  }
+}
+
+export namespace IcqqBot {
+  const allowTypes = ["text", "face", "image", "record", "audio", "dice", "rps", "video", "file", "location", "share", "json", "at", "reply", "long_msg", "button", "markdown", "xml"];
 
+  export function toSegments(message: Sendable): MessageSegment[] {
+    if (!Array.isArray(message)) message = [message];
+    return message
+      .filter((item, index) => {
+        return typeof item === "string" || item.type !== "long_msg" || index !== 0;
+      })
+      .map((item): MessageSegment => {
+        if (typeof item === "string") return { type: "text", data: { text: item } };
+        const { type, ...data } = item;
+        return { type, data };
+      });
+  }
+
+  export function toSendable(content: SendContent): Sendable {
+    if (!Array.isArray(content)) content = [content];
+    return content.map((seg): MessageElem => {
+      if (typeof seg === "string") return { type: "text", text: seg };
+      let { type, data } = seg;
+      if (typeof type === "function") type = type.name;
+      if (!allowTypes.includes(type)) return { type: "text", text: segment.toString(seg) };
+      return { type, ...data } as MessageElem;
+    });
+  }
 }
-export namespace IcqqBot{
-    const allowTypes=[
-        'text',
-        'face',
-        'image',
-        'record',
-        'audio',
-        'dice',
-        'rps',
-        'video',
-        'file',
-        'location',
-        'share',
-        'json',
-        'at',
-        'reply',
-        'long_msg',
-        'button',
-        'markdown',
-        'xml',
-    ]
-    export function toSegments(message:Sendable):MessageSegment[]{
-        if(!Array.isArray(message)) message=[message]
-        return message.filter((item,index)=>{
-            return typeof item==="string"||(item.type!=='long_msg'||index!==0)
-        }).map((item):MessageSegment=>{
-            if(typeof item==="string") return {type:'text',data:{text:item}}
-            const {type,...data}=item
-            return {type,data}
-        })
-    }
-    export function toSendable(content:SendContent):Sendable{
-        if(!Array.isArray(content)) content=[content]
-        return content.map((seg):MessageElem=>{
-            if(typeof seg==="string") return {type:'text',text:seg}
-            let {type,data}=seg
-            if(typeof type==='function') type=type.name
-            if(!allowTypes.includes(type)) return {type:'text',text:segment.toString(seg)}
-            return {type,...data} as MessageElem
-        })
-    }
+
+class IcqqAdapter extends Adapter<IcqqBot> {
+  constructor(plugin: Plugin) {
+    super(plugin, "icqq", []);
+  }
+
+  createBot(config: IcqqBotConfig): IcqqBot {
+    return new IcqqBot(this, config);
+  }
 }
-registerAdapter(new Adapter('icqq',IcqqBot))
-
-useContext('web', (web) => {
-    // 注册ICQQ适配器的客户端入口文件
-    const dispose = web.addEntry({
-        production: path.resolve(import.meta.dirname, '../dist/index.js'),
-        development: path.resolve(import.meta.dirname, '../client/index.tsx')
-    })
-    return dispose
+
+const { provide } = usePlugin();
+
+provide({
+  name: "icqq",
+  description: "ICQQ Adapter",
+  mounted: async (p) => {
+    const adapter = new IcqqAdapter(p);
+    await adapter.start();
+    return adapter;
+  },
+  dispose: async (adapter) => {
+    await adapter.stop();
+  },
+});
+
+useContext("web", (web: any) => {
+  // 注册ICQQ适配器的客户端入口文件
+  const dispose = web.addEntry({
+    production: path.resolve(import.meta.dirname, "../dist/index.js"),
+    development: path.resolve(import.meta.dirname, "../client/index.tsx"),
+  });
+  return dispose;
 });
-useContext('router','icqq', (router,icqq) => {
-    router.get('/api/icqq/bots', async (ctx) => {
+
+useContext("router", async (router: Router) => {
+  const icqq = plugin.root.inject("icqq") as IcqqAdapter;
+  router.get("/api/icqq/bots", async (ctx: any) => {
+    try {
+      const bots = Array.from(icqq.bots.values());
+
+      if (bots.length === 0) {
+        ctx.body = {
+          success: true,
+          data: [],
+          message: "暂无ICQQ机器人实例",
+        };
+        return;
+      }
+
+      const result = bots.map((bot) => {
         try {
-            const bots = Array.from(icqq.bots.values())
-            
-            if (bots.length === 0) {
-                ctx.body = { 
-                    success: true, 
-                    data: [], 
-                    message: '暂无ICQQ机器人实例' 
-                }
-                return
-            }
-            
-            const result = bots.map(bot => {
-                try {
-                    return {
-                        name: bot.$config.name,
-                        connected: bot.$connected || false,
-                        groupCount: bot.gl?.size || 0,
-                        friendCount: bot.fl?.size || 0,
-                        receiveCount: bot.stat?.recv_msg_cnt || 0,
-                        sendCount: bot.stat?.sent_msg_cnt || 0,
-                        loginMode: bot.$config.password ? 'password' : 'qrcode',
-                        status: bot.$connected ? 'online' : 'offline',
-                        lastActivity: new Date().toISOString()
-                    }
-                } catch (botError) {
-                    // 单个机器人数据获取失败时的处理
-                    // 获取机器人数据失败，返回错误状态
-                    return {
-                        name: bot.$config.name,
-                        connected: false,
-                        groupCount: 0,
-                        friendCount: 0,
-                        receiveCount: 0,
-                        sendCount: 0,
-                        loginMode: 'unknown',
-                        status: 'error',
-                        error: '数据获取失败'
-                    }
-                }
-            })
-            
-            ctx.body = { 
-                success: true, 
-                data: result,
-                timestamp: new Date().toISOString()
-            }
-        } catch (error) {
-            // ICQQ API调用失败
-            
-            ctx.status = 500
-            ctx.body = { 
-                success: false,
-                error: 'ICQQ_API_ERROR',
-                message: '获取机器人数据失败',
-                details: process.env.NODE_ENV === 'development' ? (error as Error).message : undefined,
-                timestamp: new Date().toISOString()
-            }
+          return {
+            name: bot.$config.name,
+            connected: bot.$connected || false,
+            groupCount: bot.gl?.size || 0,
+            friendCount: bot.fl?.size || 0,
+            receiveCount: bot.stat?.recv_msg_cnt || 0,
+            sendCount: bot.stat?.sent_msg_cnt || 0,
+            loginMode: bot.$config.password ? "password" : "qrcode",
+            status: bot.$connected ? "online" : "offline",
+            lastActivity: new Date().toISOString(),
+          };
+        } catch (botError) {
+          // 单个机器人数据获取失败时的处理
+          return {
+            name: bot.$config.name,
+            connected: false,
+            groupCount: 0,
+            friendCount: 0,
+            receiveCount: 0,
+            sendCount: 0,
+            loginMode: "unknown",
+            status: "error",
+            error: "数据获取失败",
+          };
         }
-    })
-})
+      });
+
+      ctx.body = {
+        success: true,
+        data: result,
+        timestamp: new Date().toISOString(),
+      };
+    } catch (error) {
+      ctx.status = 500;
+      ctx.body = {
+        success: false,
+        error: "ICQQ_API_ERROR",
+        message: "获取机器人数据失败",
+        details: process.env.NODE_ENV === "development" ? (error as Error).message : undefined,
+        timestamp: new Date().toISOString(),
+      };
+    }
+  });
+});