@zhin.js/adapter-icqq 1.0.16 → 1.0.18

package/CHANGELOG.md

@@ -0,0 +1,158 @@
+# @zhin.js/adapter-icqq
+
+## 1.0.18
+
+### Patch Changes
+
+- Updated dependencies [8f75b7f]
+  - @zhin.js/console@1.0.11
+
+## 1.0.17
+
+### Patch Changes
+
+- f4a7dd7: fix: force build
+
+## 1.0.16
+
+### Patch Changes
+
+- 547028f: fix: 优化包结构,优化客户端支持
+- Updated dependencies [547028f]
+  - @zhin.js/console@1.0.10
+  - @zhin.js/types@1.0.5
+  - @zhin.js/http@1.0.7
+  - zhin.js@1.0.14
+
+## 1.0.15
+
+### Patch Changes
+
+- Updated dependencies [4034b94]
+  - @zhin.js/console@1.0.9
+  - zhin.js@1.0.13
+
+## 1.0.14
+
+### Patch Changes
+
+- zhin.js@1.0.12
+
+## 1.0.13
+
+### Patch Changes
+
+- zhin.js@1.0.11
+
+## 1.0.12
+
+### Patch Changes
+
+- Updated dependencies [c1a539e]
+- Updated dependencies [c8c3996]
+  - @zhin.js/console@1.0.8
+  - @zhin.js/types@1.0.4
+  - zhin.js@1.0.10
+
+## 1.0.11
+
+### Patch Changes
+
+- c490260: fix: 更新脚手架结构,优化包依赖
+- Updated dependencies [c490260]
+  - @zhin.js/console@1.0.7
+  - @zhin.js/client@1.0.5
+  - @zhin.js/http@1.0.6
+  - zhin.js@1.0.9
+
+## 1.0.10
+
+### Patch Changes
+
+- 551c4d2: fix: 插件支持配置文件读取,优化 test 用例
+- Updated dependencies [551c4d2]
+  - @zhin.js/console@1.0.6
+  - @zhin.js/types@1.0.3
+  - @zhin.js/client@1.0.4
+  - zhin.js@1.0.8
+  - @zhin.js/http@1.0.5
+
+## 1.0.9
+
+### Patch Changes
+
+- Updated dependencies [47845fb]
+  - @zhin.js/console@1.0.5
+  - zhin.js@1.0.7
+
+## 1.0.8
+
+### Patch Changes
+
+- Updated dependencies [c2d9047]
+- Updated dependencies [c2d9047]
+- Updated dependencies [b213bbc]
+  - @zhin.js/console@1.0.4
+  - @zhin.js/client@1.0.3
+  - @zhin.js/http@1.0.4
+  - zhin.js@1.0.6
+
+## 1.0.7
+
+### Patch Changes
+
+- Updated dependencies [5e2bddc]
+  - @zhin.js/console@1.0.3
+
+## 1.0.6
+
+### Patch Changes
+
+- Updated dependencies [f347667]
+  - @zhin.js/http@1.0.3
+  - zhin.js@1.0.5
+
+## 1.0.5
+
+### Patch Changes
+
+- Updated dependencies [d291005]
+  - @zhin.js/console@1.0.2
+  - @zhin.js/client@1.0.2
+  - @zhin.js/http@1.0.2
+
+## 1.0.4
+
+### Patch Changes
+
+- zhin.js@1.0.4
+
+## 1.0.3
+
+### Patch Changes
+
+- 89bc676: fix: 类型反射优化
+- Updated dependencies [727963c]
+- Updated dependencies [89bc676]
+  - @zhin.js/console@1.0.1
+  - @zhin.js/client@1.0.1
+  - @zhin.js/types@1.0.2
+  - zhin.js@1.0.3
+
+## 1.0.2
+
+### Patch Changes
+
+- 3ecd487: fix: 函数式组件,更新文档
+- Updated dependencies [15fc934]
+  - zhin.js@1.0.2
+
+## 1.0.1
+
+### Patch Changes
+
+- efdd58a: fix: init
+- Updated dependencies [efdd58a]
+  - @zhin.js/types@1.0.1
+  - zhin.js@1.0.1
+  - @zhin.js/http@1.0.1

package/dist/index.js

@@ -0,0 +1 @@
+import{jsx as e}from"react/jsx-runtime";import{addPage as t}from"@zhin.js/client";import{Bot as m}from"lucide-react";function n(){return e("div",{children:"ICQQManagement"})}t({key:"icqq-management",path:"/icqq",title:"ICQQ管理",icon:e(m,{className:"w-5 h-5"}),element:e(n,{})});

package/package.json

@@ -1,15 +1,10 @@
 {
   "name": "@zhin.js/adapter-icqq",
-  "version": "1.0.16",
+  "version": "1.0.18",
   "description": "zhin adapter for icqq",
   "type": "module",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
-  "files": [
-    "lib",
-    "client",
-    "README.md"
-  ],
   "exports": {
     ".": {
       "types": "./lib/index.d.ts",
@@ -28,6 +23,14 @@
     "type": "git",
     "directory": "plugins/adapters/icqq"
   },
+  "files": [
+    "lib",
+    "README.md",
+    "CHANGELOG.md",
+    "client",
+    "src",
+    "dist"
+  ],
   "dependencies": {
     "@icqqjs/icqq": "latest"
   },
@@ -41,10 +44,10 @@
   },
   "peerDependencies": {
     "zhin.js": "1.0.14",
-    "@zhin.js/client": "1.0.5",
+    "@zhin.js/types": "1.0.5",
     "@zhin.js/http": "1.0.7",
-    "@zhin.js/console": "1.0.10",
-    "@zhin.js/types": "1.0.5"
+    "@zhin.js/client": "1.0.5",
+    "@zhin.js/console": "1.0.11"
   },
   "peerDependenciesMeta": {
     "@zhin.js/client": {
@@ -61,7 +64,7 @@
     }
   },
   "scripts": {
-    "build": "tsc && (zhin-console build || echo 'Skipping client build: zhin-console not found')",
+    "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

@@ -0,0 +1,247 @@
+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
+} from "zhin.js";
+declare module '@zhin.js/types'{
+    interface RegisteredAdapters{
+        icqq:Adapter<IcqqBot>
+    }
+}
+const plugin =usePlugin()
+export interface IcqqBotConfig extends Bot.Config,Config{
+    context:'icqq'
+    name:`${number}`
+    password?:string
+    scope?:string
+}
+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,
+            $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 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
+        })
+    }
+}
+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
+});
+useContext('router','icqq', (router,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机器人实例' 
+                }
+                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()
+            }
+        }
+    })
+})