onebots 0.4.28 → 0.4.30

package/lib/adapters/icqq/index.d.ts

@@ -1,14 +1,12 @@
 import { Adapter } from "../../adapter";
 import { App } from "../../server/app";
 import { Config as IcqqConfig } from "icqq/lib/client";
-import { Dict } from "@zhinjs/shared";
 import { OneBot } from "../../onebot";
 export default class IcqqAdapter extends Adapter<'icqq'> {
     #private;
     constructor(app: App, config: IcqqAdapter.Config);
-    createOneBot(uin: string, protocol: Dict, versions: OneBot.Config[]): OneBot;
+    createOneBot(uin: string, protocol: IcqqConfig, versions: OneBot.Config[]): OneBot;
     formatEventPayload<V extends OneBot.Version>(version: V, event: string, data: any): OneBot.Payload<V>;
-    toMessageElement<V extends OneBot.Version>(event: any): OneBot.MessageElement<V>[];
     sendPrivateMessage<V extends OneBot.Version>(uin: string, version: V, args: [string, OneBot.MessageElement<V>[]]): Promise<OneBot.MessageRet<V>>;
     sendGroupMessage<V extends OneBot.Version>(uin: string, version: V, args: [string, OneBot.MessageElement<V>[]]): Promise<OneBot.MessageRet<V>>;
     call<V extends OneBot.Version>(uin: string, version: V, method: string, args?: any[]): Promise<any>;
@@ -28,6 +26,7 @@ declare module '../../adapter' {
         }
     }
 }
+export declare const defaultIcqqConfig: IcqqConfig;
 export declare namespace IcqqAdapter {
     interface Config extends Adapter.Config<'icqq'> {
         protocol?: IcqqConfig;

package/lib/adapters/icqq/index.js

@@ -1,4 +1,27 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
     if (kind === "m") throw new TypeError("Private method is not writable");
     if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
@@ -15,26 +38,55 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 var _IcqqAdapter_password, _IcqqAdapter_disposes;
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.defaultIcqqConfig = void 0;
 const adapter_1 = require("../../adapter");
 const icqq_1 = require("icqq");
 const process_1 = __importDefault(require("process"));
 const fs_1 = require("fs");
 const onebot_1 = require("../../onebot");
-const processMessages = (list) => {
-    return list.map(item => {
-        const { type, data } = item;
-        if (type === 'node')
-            return {
+const utils_1 = require("../../utils");
+const path = __importStar(require("path"));
+const shareMusicCustom_1 = require("../../service/shareMusicCustom");
+async function processMessages(target_id, target_type, list) {
+    let result = [];
+    for (const item of list) {
+        const { type, data, ...other } = item;
+        if (type === 'node') {
+            result.push({
                 type,
                 ...data,
-                message: processMessages(data.message || [])
-            };
-        return {
+                message: await processMessages.call(this, data.user_id, 'private', data.message || [])
+            });
+        }
+        if (type === 'music') {
+            if (String(item.data.platform) === 'custom') {
+                item.data.platform = item.data['subtype']; // gocq 的平台数据存储在 subtype 内，兼容 icqq 时要求前端必须发送 id 字段
+            }
+            const { type, data } = item;
+            await shareMusicCustom_1.shareMusic.call(this[target_type === 'private' ? 'pickFriend' : 'pickGroup'](target_id), {
+                type,
+                ...data
+            });
+            continue;
+        }
+        if (type === 'share') {
+            await this[target_type === 'private' ? 'pickFriend' : 'pickGroup'](target_id).shareUrl(item.data);
+            continue;
+        }
+        if (['image', 'video', 'audio'].includes(item.type)) {
+            if (item['file_id']?.startsWith('base64://'))
+                item['file_id'] = Buffer.from(item['file_id'].slice(9), 'base64');
+            if (item['file']?.startsWith('base64://'))
+                item['file'] = Buffer.from(item['file'].slice(9), 'base64');
+        }
+        result.push({
             type,
-            ...data
-        };
-    });
-};
+            ...data,
+            ...other
+        });
+    }
+    return result;
+}
 class IcqqAdapter extends adapter_1.Adapter {
     constructor(app, config) {
         super(app, 'icqq', config);
@@ -44,7 +96,7 @@ class IcqqAdapter extends adapter_1.Adapter {
     createOneBot(uin, protocol, versions) {
         const oneBot = super.createOneBot(uin, protocol, versions);
         __classPrivateFieldSet(this, _IcqqAdapter_password, this.app.config[`icqq.${uin}`].password, "f");
-        oneBot.internal = new icqq_1.Client(protocol);
+        oneBot.internal = new icqq_1.Client((0, utils_1.deepMerge)(protocol, (0, utils_1.deepClone)(exports.defaultIcqqConfig)));
         return oneBot;
     }
     formatEventPayload(version, event, data) {
@@ -59,48 +111,15 @@ class IcqqAdapter extends adapter_1.Adapter {
             detail_type: data.message_type || data.notice_type || data.request_type,
             platform: 'icqq',
             ...data,
-            message: this.toMessageElement(data)
         };
     }
-    toMessageElement(event) {
-        if (!event || !event.message)
-            return null;
-        const messageArr = [].concat(event.message);
-        const result = [];
-        if (event.source) {
-            result.push({
-                type: 'quote',
-                data: {
-                    id: `${event.source.rand}${event.source.seq}_${event.source.time}`,
-                }
-            });
-        }
-        for (const message of messageArr) {
-            if (typeof message === 'string') {
-                result.push({
-                    type: 'text',
-                    data: {
-                        text: message
-                    }
-                });
-            }
-            else {
-                const { type, ...data } = message;
-                result.push({
-                    type,
-                    data
-                });
-            }
-        }
-        return result;
-    }
-    sendPrivateMessage(uin, version, args) {
+    async sendPrivateMessage(uin, version, args) {
         const [user_id, message] = args;
-        return this.oneBots.get(uin)?.internal.sendPrivateMsg(user_id, processMessages(message));
+        return this.oneBots.get(uin)?.internal.sendPrivateMsg(user_id, await processMessages.call(this, user_id, 'private', message));
     }
-    sendGroupMessage(uin, version, args) {
+    async sendGroupMessage(uin, version, args) {
         const [group_id, message] = args;
-        return this.oneBots.get(uin)?.internal.sendGroupMsg(group_id, processMessages(message));
+        return this.oneBots.get(uin)?.internal.sendGroupMsg(group_id, await processMessages.call(this, group_id, 'group', message));
     }
     call(uin, version, method, args = []) {
         try {
@@ -121,10 +140,7 @@ class IcqqAdapter extends adapter_1.Adapter {
                         text: item
                     }
                 };
-            return {
-                type: item.type,
-                data: item.data
-            };
+            return item;
         });
     }
     toSegment(version, message) {
@@ -144,7 +160,7 @@ class IcqqAdapter extends adapter_1.Adapter {
         });
     }
     fromCqcode(version, message) {
-        const regExpMatchArray = message.match(/\[CQ:([a-z]+),(!])+]/g);
+        const regExpMatchArray = message.match(/\[CQ:([a-z]+),(!])+]/);
         if (!regExpMatchArray)
             return [
                 {
@@ -155,7 +171,19 @@ class IcqqAdapter extends adapter_1.Adapter {
                 }
             ];
         const result = [];
-        for (const match of regExpMatchArray) {
+        while (message.length) {
+            const [match] = message.match(/\[CQ:([a-z]+),(!])+]/) || [];
+            if (!match)
+                break;
+            const prevText = message.substring(0, match.length);
+            if (prevText) {
+                result.push({
+                    type: 'text',
+                    data: {
+                        text: prevText
+                    }
+                });
+            }
             const [type, ...valueArr] = match.substring(1, match.length - 1).split(',');
             result.push({
                 type: type,
@@ -164,11 +192,22 @@ class IcqqAdapter extends adapter_1.Adapter {
                     return [key, value];
                 }))
             });
+            message = message.substring(match.length);
+        }
+        if (message.length) {
+            result.push({
+                type: 'text',
+                data: {
+                    text: message
+                }
+            });
         }
         return result;
     }
     toCqcode(version, messageArr) {
         return [].concat(messageArr).map(item => {
+            if (item.type === 'text')
+                return item.data.text;
             const dataStr = Object.entries(item.data).map(([key, value]) => {
                 // is Buffer
                 if (value instanceof Buffer)
@@ -266,6 +305,7 @@ class IcqqAdapter extends adapter_1.Adapter {
                 }
             };
             client.trap('system.online', () => {
+                clearTimeout(timer);
                 resolve(clean);
             });
             const timer = setTimeout(() => {
@@ -301,3 +341,7 @@ class IcqqAdapter extends adapter_1.Adapter {
 }
 _IcqqAdapter_password = new WeakMap(), _IcqqAdapter_disposes = new WeakMap();
 exports.default = IcqqAdapter;
+exports.defaultIcqqConfig = {
+    platform: 2,
+    data_dir: path.join(process_1.default.cwd(), 'data')
+};

package/lib/adapters/qq/constans.d.ts

@@ -1,11 +1,11 @@
 export declare enum OpCode {
-    DISPATCH = 0,
-    HEARTBEAT = 1,
-    IDENTIFY = 2,
-    RESUME = 6,
-    RECONNECT = 7,
-    INVALID_SESSION = 9,
-    HELLO = 10,
+    DISPATCH = 0,// 服务端进行消息推送
+    HEARTBEAT = 1,// 客户端发送心跳
+    IDENTIFY = 2,// 鉴权
+    RESUME = 6,// 恢复连接
+    RECONNECT = 7,// 服务端通知客户端重连
+    INVALID_SESSION = 9,// 当identify或resume的时候，如果参数有错，服务端会返回该消息
+    HELLO = 10,// 当客户端与网关建立ws连接之后，网关下发的第一条消息
     HEARTBEAT_ACK = 11
 }
 export declare const SessionEvents: {
@@ -29,41 +29,41 @@ export declare const WebsocketCloseReason: ({
     resume: boolean;
 })[];
 export declare enum Intends {
-    GUILDS = 1,
-    GUILD_MEMBERS = 2,
-    GUILD_MESSAGES = 512,
-    GUILD_MESSAGE_REACTIONS = 1024,
-    DIRECT_MESSAGE = 4096,
+    GUILDS = 1,// 频道操作事件
+    GUILD_MEMBERS = 2,// 频道成员变更事件
+    GUILD_MESSAGES = 512,// 私域频道消息事件
+    GUILD_MESSAGE_REACTIONS = 1024,// 频道消息表态事件
+    DIRECT_MESSAGE = 4096,// 频道私信事件
     OPEN_FORUMS_EVENTS = 262144,
-    AUDIO_OR_LIVE_CHANNEL_MEMBERS = 524288,
-    C2C_MESSAGE_CREATE = 33554432,
-    GROUP_AT_MESSAGE_CREATE = 33554432,
-    INTERACTION = 67108864,
-    MESSAGE_AUDIT = 134217728,
-    FORUMS_EVENTS = 268435456,
-    AUDIO_ACTIONS = 536870912,
+    AUDIO_OR_LIVE_CHANNEL_MEMBERS = 524288,// 音频或直播频道成员
+    C2C_MESSAGE_CREATE = 33554432,// 私聊消息事件
+    GROUP_AT_MESSAGE_CREATE = 33554432,// 群聊@消息事件
+    INTERACTION = 67108864,// 互动事件
+    MESSAGE_AUDIT = 134217728,// 消息审核事件
+    FORUMS_EVENTS = 268435456,// 论坛事件(仅私域)
+    AUDIO_ACTIONS = 536870912,// 音频操作事件
     PUBLIC_GUILD_MESSAGES = 1073741824
 }
 export declare enum ChannelType {
-    Content = 0,
-    Record = 2,
-    ChannelGroup = 4,
-    Live = 10005,
-    App = 10006,
+    Content = 0,// 文本频道
+    Record = 2,// 语音频道
+    ChannelGroup = 4,// 频道分组
+    Live = 10005,// 直播频道
+    App = 10006,// 应用频道
     Forms = 10007
 }
 export declare enum ChannelSubType {
-    Chat = 0,
-    Announces = 1,
-    Strategy = 2,
+    Chat = 0,// 闲聊
+    Announces = 1,// 公告
+    Strategy = 2,// 攻略
     Black = 3
 }
 export declare enum PrivateType {
-    Public = 0,
-    Admin = 1,
+    Public = 0,// 公开
+    Admin = 1,// 频道主和管理员
     Some = 2
 }
 export declare enum SpeakPermission {
-    All = 1,
+    All = 1,// 所有人
     Some = 2
 }

package/lib/adapters/qq/constans.js

@@ -15,13 +15,13 @@ var OpCode;
 })(OpCode || (exports.OpCode = OpCode = {}));
 exports.SessionEvents = {
     CLOSED: "CLOSED",
-    READY: "READY",
-    ERROR: "ERROR",
+    READY: "READY", // 已经可以通信
+    ERROR: "ERROR", // 会话错误
     INVALID_SESSION: "INVALID_SESSION",
-    RECONNECT: "RECONNECT",
-    DISCONNECT: "DISCONNECT",
-    EVENT_WS: "EVENT_WS",
-    RESUMED: "RESUMED",
+    RECONNECT: "RECONNECT", // 服务端通知重新连接
+    DISCONNECT: "DISCONNECT", // 断线
+    EVENT_WS: "EVENT_WS", // 内部通信
+    RESUMED: "RESUMED", // 重连
     DEAD: "DEAD" // 连接已死亡，请检查网络或重启
 };
 // websocket错误原因

package/lib/adapters/qq/elements.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="node" />
+/// <reference types="node" />
 import { Dict } from './types';
 export declare enum MusicPlatform {
     qq = "qq",

package/lib/adapters/qq/sessionManager.js

@@ -155,11 +155,11 @@ class SessionManager extends events_1.EventEmitter {
     authWs() {
         // 鉴权参数
         const authOp = {
-            op: constans_1.OpCode.IDENTIFY,
+            op: constans_1.OpCode.IDENTIFY, // 鉴权参数
             d: {
                 // token: `Bot ${this.bot.appId}${this.token}`,
-                token: `QQBot ${this.access_token}`,
-                intents: this.getValidIntends(),
+                token: `QQBot ${this.access_token}`, // 根据配置转换token
+                intents: this.getValidIntends(), // todo 接受的类型
                 shard: [0, 1] // 分片信息,给一个默认值
             }
         };

package/lib/server/app.js

@@ -252,9 +252,9 @@ exports.defineConfig = defineConfig;
     App.registerAdapter = registerAdapter;
     function loadAdapter(platform) {
         const maybeNames = [
-            path.join(__dirname, '../adapters', platform),
-            `@onebots/adapter-${platform}`,
-            `onebots-adapter-${platform}`,
+            path.join(__dirname, '../adapters', platform), // 内置的
+            `@onebots/adapter-${platform}`, // 我写的
+            `onebots-adapter-${platform}`, // 别人按照规范写的
             platform // 别人写的
         ];
         let adapter = null;

package/lib/service/V11/action/friend.d.ts

@@ -6,7 +6,7 @@ export declare class FriendAction {
      * @param message {MessageElem[]} 发送的消息
      * @param message_id {string} 引用的消息ID
      */
-    sendPrivateMsg(this: V11, user_id: number, message: V11.MessageElement[], message_id?: string): Promise<any>;
+    sendPrivateMsg(this: V11, user_id: number, message: V11.Sendable, message_id?: string): Promise<any>;
     /**
      * 获取好友列表
      */

package/lib/service/V11/action/group.d.ts

@@ -6,7 +6,7 @@ export declare class GroupAction {
      * @param message {MessageElem[]} 消息
      * @param message_id {string} 引用的消息ID
      */
-    sendGroupMsg(this: V11, group_id: number, message: V11.MessageElement[], message_id?: string): Promise<any>;
+    sendGroupMsg(this: V11, group_id: number, message: V11.Sendable, message_id?: string): Promise<any>;
     /**
      * 群组踢人
      * @param group_id {number} 群id

package/lib/service/V11/index.d.ts

@@ -9,8 +9,8 @@ import { Database } from "./db_sqlite";
 import { Service } from "../../service";
 import { Dict } from "@zhinjs/shared";
 export declare class V11 extends Service<"V11"> implements OneBot.Base {
-    oneBot: OneBot<'V11'>;
-    config: OneBot.Config<'V11'>;
+    oneBot: OneBot<"V11">;
+    config: OneBot.Config<"V11">;
     action: Action;
     version: OneBot.Version;
     protected timestamp: number;
@@ -25,7 +25,7 @@ export declare class V11 extends Service<"V11"> implements OneBot.Base {
     logger: Logger;
     wss?: WebSocketServer;
     wsr: Set<WebSocket>;
-    constructor(oneBot: OneBot<'V11'>, config: OneBot.Config<'V11'>);
+    constructor(oneBot: OneBot<"V11">, config: OneBot.Config<"V11">);
     start(): void;
     private startHttp;
     private startHttpReverse;
@@ -136,6 +136,7 @@ export declare namespace V11 {
         type: string;
         data: Dict;
     }
+    type Sendable = string | MessageElement | (string | MessageElement)[];
     interface MessageRet {
         message_id: number;
     }

package/lib/service/V11/index.js

@@ -25,22 +25,22 @@ class V11 extends service_1.Service {
         super(oneBot.adapter, config);
         this.oneBot = oneBot;
         this.config = config;
-        this.version = 'V11';
+        this.version = "V11";
         this.timestamp = Date.now();
         this._queue = [];
         this.queue_running = false;
         this.wsr = new Set();
         this.action = new action_1.Action();
         this.logger = this.oneBot.adapter.getLogger(this.oneBot.uin, this.version);
-        this.db = new db_sqlite_1.Database((0, path_1.join)(app_1.App.configDir, 'data', this.oneBot.uin + '.db'), this.logger);
-        this.oneBot.on('online', async () => {
+        this.db = new db_sqlite_1.Database((0, path_1.join)(app_1.App.configDir, "data", this.oneBot.uin + ".db"), this.logger);
+        this.oneBot.on("online", async () => {
             this.logger.info("【好友列表】");
-            const friendList = await this.oneBot.getFriendList('V11');
+            const friendList = await this.oneBot.getFriendList("V11");
             friendList.forEach((item) => this.logger.info(`\t${item.user_name}(${item.user_id})`));
             this.logger.info("【群列表】");
-            const groupList = await this.oneBot.getGroupList('V11');
+            const groupList = await this.oneBot.getGroupList("V11");
             groupList.forEach(item => this.logger.info(`\t${item.group_name}(${item.group_id})`));
-            this.logger.info('');
+            this.logger.info("");
         });
     }
     start() {
@@ -53,14 +53,14 @@ class V11 extends service_1.Service {
                 config = {
                     url: config,
                     access_token: this.config.access_token,
-                    secret: this.config.secret,
+                    secret: this.config.secret
                 };
             }
             else {
                 config = {
                     access_token: this.config.access_token,
                     secret: this.config.secret,
-                    ...config,
+                    ...config
                 };
             }
             this.startHttpReverse(config);
@@ -69,26 +69,7 @@ class V11 extends service_1.Service {
             this.startWsReverse(config);
         });
         this.on("dispatch", (serialized) => {
-            for (const ws of this.wss.clients) {
-                ws.send(serialized, (err) => {
-                    if (err)
-                        this.logger.error(`正向WS(${ws.url})上报事件失败: ` + err.message);
-                    else
-                        this.logger.debug(`正向WS(${ws.url})上报事件成功: ` + serialized);
-                });
-            }
-            for (const ws of this.wsr) {
-                ws.send(serialized, (err) => {
-                    if (err) {
-                        this.logger.error(`反向WS(${ws.url})上报事件失败: ` + err.message);
-                    }
-                    else
-                        this.logger.debug(`反向WS(${ws.url})上报事件成功: ` + serialized);
-                });
-            }
-        });
-        this.on("dispatch", (serialized) => {
-            for (const ws of this.wss.clients) {
+            for (const ws of this.wss?.clients) {
                 ws.send(serialized, (err) => {
                     if (err)
                         this.logger.error(`正向WS(${ws.url})上报事件失败: ` + err.message);
@@ -111,26 +92,26 @@ class V11 extends service_1.Service {
                 this.dispatch({
                     self_id: this.oneBot.uin,
                     status: {
-                        online: this.adapter.getSelfInfo(this.oneBot.uin, 'V11').status === onebot_1.OneBotStatus.Online,
+                        online: this.adapter.getSelfInfo(this.oneBot.uin, "V11").status === onebot_1.OneBotStatus.Online,
                         good: this.oneBot.status === onebot_1.OneBotStatus.Good
                     },
                     time: Math.floor(Date.now() / 1000),
                     post_type: "meta_event",
                     meta_event_type: "heartbeat",
-                    interval: this.config.heartbeat * 1000,
+                    interval: this.config.heartbeat * 1000
                 });
             }, this.config.heartbeat * 1000);
         }
-        this.adapter.on('message.receive', (uin, event) => {
-            const payload = this.adapter.formatEventPayload('V11', 'message', event);
+        this.adapter.on("message.receive", (uin, event) => {
+            const payload = this.adapter.formatEventPayload("V11", "message", event);
             this.dispatch(payload);
         });
-        this.adapter.on('notice.receive', (uin, event) => {
-            const payload = this.adapter.formatEventPayload('V11', 'notice', event);
+        this.adapter.on("notice.receive", (uin, event) => {
+            const payload = this.adapter.formatEventPayload("V11", "notice", event);
             this.dispatch(payload);
         });
-        this.adapter.on('request.receive', (uin, event) => {
-            const payload = this.adapter.formatEventPayload('V11', 'request', event);
+        this.adapter.on("request.receive", (uin, event) => {
+            const payload = this.adapter.formatEventPayload("V11", "request", event);
             this.dispatch(payload);
         });
     }
@@ -147,8 +128,8 @@ class V11 extends service_1.Service {
                     "Content-Type": "application/json",
                     "Content-Length": Buffer.byteLength(serialized),
                     "X-Self-ID": String(this.oneBot.uin),
-                    "User-Agent": "OneBot",
-                },
+                    "User-Agent": "OneBot"
+                }
             };
             if (this.config.secret) {
                 //@ts-ignore
@@ -230,10 +211,10 @@ class V11 extends service_1.Service {
         return data;
     }
     async dispatch(data) {
-        data.post_type = data.post_type || 'system';
-        if (data.message && data.post_type === 'message') {
-            if (this.config.post_message_format === 'array') {
-                data.message = this.adapter.toSegment('V11', data.message);
+        data.post_type = data.post_type || "system";
+        if (data.message && data.post_type === "message") {
+            if (this.config.post_message_format === "array") {
+                data.message = this.adapter.toSegment("V11", data.message);
                 if (data.source) { // reply
                     let msg0 = data.message[0];
                     msg0.data["id"] = await this.getReplyMsgIdFromDB(data);
@@ -262,15 +243,15 @@ class V11 extends service_1.Service {
         this.emit("dispatch", this._formatEvent(data));
     }
     _formatEvent(data) {
-        if (data.post_type === 'notice') {
+        if (data.post_type === "notice") {
             // console.log(JSON.stringify(data))
             const data1 = { ...data };
             if (data.notice_type === "group") {
                 delete data1.group;
                 delete data1.member;
                 switch (data.sub_type) {
-                    case 'decrease':
-                        data1.sub_type = data.operator_id === data.user_id ? 'leave' : data.user_id === this.oneBot.uin ? 'kick_me' : 'kick';
+                    case "decrease":
+                        data1.sub_type = data.operator_id === data.user_id ? "leave" : data.user_id === this.oneBot.uin ? "kick_me" : "kick";
                         data1.notice_type = `${data.notice_type}_${data.sub_type}`;
                         break;
                     case "increase":
@@ -369,7 +350,7 @@ class V11 extends service_1.Service {
                 .writeHead(200, {
                 "Access-Control-Allow-Origin": "*",
                 "Access-Control-Allow-Methods": "POST, GET, OPTIONS",
-                "Access-Control-Allow-Headers": "Content-Type, authorization",
+                "Access-Control-Allow-Headers": "Content-Type, authorization"
             })
                 .end();
         }
@@ -404,7 +385,7 @@ class V11 extends service_1.Service {
             try {
                 const params = {
                     ...(ctx.request.query || {}),
-                    ...(ctx.request.body || {}),
+                    ...(ctx.request.body || {})
                 };
                 const ret = await this.apply({ action, params });
                 ctx.res.writeHead(200).end(ret);
@@ -436,7 +417,7 @@ class V11 extends service_1.Service {
                         status: "async",
                         data: null,
                         error: null,
-                        echo: data.echo,
+                        echo: data.echo
                     });
                 }
                 else {
@@ -460,11 +441,11 @@ class V11 extends service_1.Service {
                     data: null,
                     error: {
                         code,
-                        message,
+                        message
                     },
                     echo: data?.echo,
-                    msg: e.message,
-                    action: data.action,
+                    msg: e.message, // gocq 返回的消息里有这个字段且很多插件都在访问
+                    action: data.action
                 }));
             }
         });
@@ -479,7 +460,7 @@ class V11 extends service_1.Service {
         const headers = {
             "X-Self-ID": String(this.oneBot.uin),
             "X-Client-Role": "Universal",
-            "User-Agent": "OneBot",
+            "User-Agent": "OneBot"
         };
         if (this.config.access_token)
             headers.Authorization = "Bearer " + this.config.access_token;
@@ -518,16 +499,16 @@ class V11 extends service_1.Service {
             }
             if (event.message_type === "group") {
                 if (res.delete)
-                    this.adapter.deleteMessage(this.oneBot.uin, 'V11', [event.message_id]);
+                    this.adapter.deleteMessage(this.oneBot.uin, "V11", [event.message_id]);
                 if (res.kick && !event.anonymous)
-                    this.adapter.call(this.oneBot.uin, 'V11', 'setGroupKick', [event.group_id, event.user_id, res.reject_add_request]);
+                    this.adapter.call(this.oneBot.uin, "V11", "setGroupKick", [event.group_id, event.user_id, res.reject_add_request]);
                 if (res.ban)
-                    this.adapter.call(this.oneBot.uin, 'V11', 'setGroupBan', [event.group_id, event.user_id, res.ban_duration > 0 ? res.ban_duration : 1800]);
+                    this.adapter.call(this.oneBot.uin, "V11", "setGroupBan", [event.group_id, event.user_id, res.ban_duration > 0 ? res.ban_duration : 1800]);
             }
         }
         if (event.post_type === "request" && "approve" in res) {
             const action = event.request_type === "friend" ? "setFriendAddRequest" : "setGroupAddRequest";
-            this.adapter.call(this.oneBot.uin, 'V11', action, [event.flag, res.approve, res.reason ? res.reason : "", !!res.block]);
+            this.adapter.call(this.oneBot.uin, "V11", action, [event.flag, res.approve, res.reason ? res.reason : "", !!res.block]);
         }
     }
     /**
@@ -535,6 +516,9 @@ class V11 extends service_1.Service {
      */
     async apply(req) {
         let { action, params, echo } = req;
+        if (typeof params.message_id == "number" || /^\d+$/.test(params.message_id)) {
+            params.message_id = (await this.db.getMsgById(params.message_id)).id; // 调用api时把本地的数字id转为base64发给icqq
+        }
         action = (0, utils_1.toLine)(action);
         let is_async = action.includes("_async");
         if (is_async)
@@ -551,6 +535,8 @@ class V11 extends service_1.Service {
                 action = "send_group_msg";
             else if (params.discuss_id)
                 action = "send_discuss_msg";
+            else if (params.guild_id)
+                action = params.channel_id === "direct" ? "send_direct_msg" : "send_group_msg";
             else
                 throw new Error("required message_type or input (user_id/group_id)");
         }
@@ -569,21 +555,21 @@ class V11 extends service_1.Service {
                 if (Reflect.has(params, k)) {
                     if (onebot_2.BOOLS.includes(k))
                         params[k] = (0, utils_1.toBool)(params[k]);
-                    if (k === 'message') {
-                        if (typeof params[k] === 'string') {
+                    if (k === "message") {
+                        if (typeof params[k] === "string") {
                             if (/[CQ:music,type=.+,id=.+]/.test(params[k])) {
-                                params[k] = params[k].replace(',type=', ',platform=');
+                                params[k] = params[k].replace(",type=", ",platform=");
                             }
-                            params[k] = this.adapter.fromCqcode('V11', params[k]);
+                            params[k] = this.adapter.fromCqcode("V11", params[k]);
                         }
                         else {
-                            if (params[k][0].type == 'music' && params[k][0]?.data?.type) {
+                            if (params[k][0].type == "music" && params[k][0]?.data?.type) {
                                 params[k][0].data.platform = params[k][0].data.type;
                                 delete params[k][0].data.type;
                             }
-                            params[k] = this.adapter.fromSegment('V11', params[k]);
+                            params[k] = this.adapter.fromSegment("V11", params[k]);
                         }
-                        params['message_id'] = params[k].find(e => e.type === 'reply')?.message_id;
+                        params["message_id"] = params[k].find(e => e.type === "reply")?.message_id;
                     }
                     args.push(params[k]);
                 }
@@ -616,7 +602,7 @@ class V11 extends service_1.Service {
             if (result.data instanceof Map)
                 result.data = [...result.data.values()];
             if (result.data?.message)
-                result.data.message = this.adapter.toSegment('V11', result.data.message);
+                result.data.message = this.adapter.toSegment("V11", result.data.message);
             // send_msg_xxx 时提前把数据写入数据库(也有可能来的比message慢，后来的话会被数据库忽略)
             if (result.status === "ok" && action.match(sendMsgMethodRegex) && result.data?.message_id && result.data?.seq) {
                 result.data.message_id = await this.addMsgToDBFromSendMsgResult(this.oneBot.uin, // msg send resp uin is always bot uin
@@ -653,7 +639,7 @@ exports.V11 = V11;
             retcode,
             status: pending ? "async" : "ok",
             data,
-            error: null,
+            error: null
         };
     }
     V11.ok = ok;
@@ -662,7 +648,7 @@ exports.V11 = V11;
             retcode,
             status: "error",
             data: null,
-            error,
+            error
         };
     }
     V11.error = error;
@@ -679,7 +665,7 @@ exports.V11 = V11;
         enable_reissue: false,
         use_ws: true,
         http_reverse: [],
-        ws_reverse: [],
+        ws_reverse: []
     };
     function genMetaEvent(uin, type) {
         return {
@@ -687,7 +673,7 @@ exports.V11 = V11;
             time: Math.floor(Date.now() / 1000),
             post_type: "meta_event",
             meta_event_type: "lifecycle",
-            sub_type: type,
+            sub_type: type
         };
     }
     V11.genMetaEvent = genMetaEvent;

package/lib/service/V12/index.js

@@ -106,7 +106,7 @@ class V12 extends service_1.Service {
         });
         this.on('dispatch', (unserialized) => {
             const serialized = JSON.stringify(unserialized);
-            for (const ws of this.wss.clients) {
+            for (const ws of this.wss?.clients) {
                 ws.send(serialized, (err) => {
                     if (err)
                         this.logger.error(`正向WS(${ws.url})上报事件失败: ` + err.message);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "onebots",
-    "version": "0.4.28",
+    "version": "0.4.30",
     "description": "基于icqq的多例oneBot实现",
     "engines": {
         "node": ">=16"