onebots 0.4.59 → 0.4.60

package/lib/adapter.d.ts

@@ -5,7 +5,7 @@ import { OneBot } from "./onebot";
 import { Dict } from "@zhinjs/shared";
 import { Logger } from "log4js";
 import { V11 } from "./service/V11";
-export declare abstract class Adapter<T extends string = string> extends EventEmitter {
+export declare abstract class Adapter<T extends string = string, Sendable = any> extends EventEmitter {
     #private;
     app: App;
     platform: T;
@@ -13,6 +13,9 @@ export declare abstract class Adapter<T extends string = string> extends EventEm
     oneBots: Map<string, OneBot>;
     icon: string;
     protected constructor(app: App, platform: T, config: Adapter.Configs[T]);
+    materialize(content: string): string;
+    toCqcode<V extends OneBot.Version>(version: V, messageArr: OneBot.Segment<V>[]): string;
+    fromCqcode<V extends OneBot.Version>(version: V, message: string): OneBot.Segment<V>[];
     transformMessage(uin: string, version: OneBot.Version, message: any): string | (import("./service/V12").V12.Segment | V11.Segment)[];
     getOneBot<C = any>(uin: string): OneBot<C>;
     get logger(): Logger;
@@ -37,15 +40,13 @@ export declare abstract class Adapter<T extends string = string> extends EventEm
     start(uin?: string): Promise<any>;
     stop(uin?: string, force?: boolean): Promise<any>;
 }
-export interface Adapter extends Adapter.Base {
+export interface Adapter<T extends string = string, Sendable = any> extends Adapter.Base<Sendable> {
     call<V extends OneBot.Version>(uin: string, version: V, method: string, args?: any[]): Promise<any>;
 }
 export declare namespace Adapter {
-    interface Base {
-        toSegment<V extends OneBot.Version, M = any>(version: V, message: M): OneBot.Segment<V>[];
-        fromSegment<V extends OneBot.Version>(version: V, segment: OneBot.Segment<V>): OneBot.MessageElement<V>[];
-        toCqcode<V extends OneBot.Version>(version: V, message: OneBot.MessageElement<V>[]): string;
-        fromCqcode<V extends OneBot.Version>(version: V, message: string): OneBot.MessageElement<V>[];
+    interface Base<Sendable = any> {
+        toSegment<V extends OneBot.Version>(version: V, message: Sendable): OneBot.Segment<V>[];
+        fromSegment<V extends OneBot.Version>(version: V, segment: OneBot.Segment<V>[]): Sendable;
         getSelfInfo<V extends OneBot.Version>(uin: string, version: V): OneBot.SelfInfo<V>;
         /** 格式化事件 */
         formatEventPayload<V extends OneBot.Version>(uin: string, version: V, event: string, payload: Dict): OneBot.Payload<V>;
@@ -57,12 +58,12 @@ export declare namespace Adapter {
         getFriendList<V extends OneBot.Version>(uin: string, version: V): Promise<OneBot.UserInfo<V>[]>;
         getGroupMemberList<V extends OneBot.Version>(uin: string, version: V, args: [string]): Promise<OneBot.GroupMemberInfo<V>[]>;
         /** 发送群消息 */
-        sendGroupMessage<V extends OneBot.Version>(uin: string, version: V, args: [string, OneBot.MessageElement<V>[], string]): Promise<OneBot.MessageRet<V>>;
+        sendGroupMessage<V extends OneBot.Version>(uin: string, version: V, args: [string, OneBot.Segment<V>[], string]): Promise<OneBot.MessageRet<V>>;
         /** 发送私聊消息 */
-        sendPrivateMessage<V extends OneBot.Version>(uin: string, version: V, args: [string, OneBot.MessageElement<V>[], string]): Promise<OneBot.MessageRet<V>>;
-        sendGuildMessage<V extends OneBot.Version>(uin: string, version: V, args: [string, OneBot.MessageElement<V>[], string]): Promise<OneBot.MessageRet<V>>;
+        sendPrivateMessage<V extends OneBot.Version>(uin: string, version: V, args: [string, OneBot.Segment<V>[], string]): Promise<OneBot.MessageRet<V>>;
+        sendGuildMessage<V extends OneBot.Version>(uin: string, version: V, args: [string, OneBot.Segment<V>[], string]): Promise<OneBot.MessageRet<V>>;
         /** 发送私聊消息 */
-        sendDirectMessage<V extends OneBot.Version>(uin: string, version: V, args: [string, OneBot.MessageElement<V>[], string]): Promise<OneBot.MessageRet<V>>;
+        sendDirectMessage<V extends OneBot.Version>(uin: string, version: V, args: [string, OneBot.Segment<V>[], string]): Promise<OneBot.MessageRet<V>>;
         /** 获取消息 */
         getMessage<V extends OneBot.Version>(uin: string, version: V, args: [string]): Promise<OneBot.Message<V>>;
         deleteMessage<V extends OneBot.Version>(uin: string, version: V, args: [string]): Promise<boolean>;

package/lib/adapter.js

@@ -24,11 +24,94 @@ class Adapter extends events_1.EventEmitter {
         this.oneBots = new Map();
         _Adapter_logger.set(this, void 0);
     }
+    materialize(content) {
+        return content
+            .replace(/&(?!(amp|#91|#93|#44);)/g, "&")
+            .replace(/\[/g, "[")
+            .replace(/]/g, "]")
+            .replace(/,/g, ",");
+    }
+    toCqcode(version, messageArr) {
+        return []
+            .concat(messageArr)
+            .map(item => {
+            if (typeof item === "string")
+                return item;
+            if (item.type === "text")
+                return item.data?.text || item.text;
+            let dataStr;
+            if (typeof item.data === "string") {
+                dataStr = [`data=${this.materialize(item.data)}`];
+            }
+            else {
+                dataStr = Object.entries(item.data || item).map(([key, value]) => {
+                    // is Buffer
+                    if (value instanceof Buffer)
+                        return `${key}=${value.toString("base64")}`;
+                    // is Object
+                    if (value instanceof Object)
+                        return `${key}=${JSON.stringify(value)}`;
+                    // is Array
+                    if (value instanceof Array)
+                        return `${key}=${value.map(v => JSON.stringify(v)).join(",")}`;
+                    // is String
+                    return `${key}=${item.data?.[key] || item[key]}`;
+                });
+            }
+            return `[CQ:${item.type},${dataStr.join(",")}]`;
+        })
+            .join("");
+    }
+    fromCqcode(version, message) {
+        const regExpMatchArray = message.match(/\[CQ:([a-z]+),([^]]+)]/);
+        if (!regExpMatchArray)
+            return [
+                {
+                    type: "text",
+                    data: {
+                        text: message,
+                    },
+                },
+            ];
+        const result = [];
+        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,
+                data: Object.fromEntries(valueArr.map(item => {
+                    const [key, value] = item.split("=");
+                    return [key, type === "reply" && key === "id" ? +value : value];
+                })),
+            });
+            message = message.substring(match.length);
+        }
+        if (message.length) {
+            result.push({
+                type: "text",
+                data: {
+                    text: message,
+                },
+            });
+        }
+        return result;
+    }
     transformMessage(uin, version, message) {
         const onebot = this.getOneBot(uin);
         const instance = onebot.instances.find(V => V.version === version);
         return instance.config.post_message_format === "string"
-            ? this.toCqcode(version, message)
+            ? this.toCqcode(version, this.toSegment(version, message))
             : this.toSegment(version, message);
     }
     getOneBot(uin) {

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

@@ -2,7 +2,7 @@ import { Adapter } from "../../adapter";
 import { App } from "../../server/app";
 import { OneBot } from "../../onebot";
 import { Bot, Sendable } from "node-dd-bot";
-export default class DingtalkAdapter extends Adapter<"dingtalk"> {
+export default class DingtalkAdapter extends Adapter<"dingtalk", Sendable> {
     #private;
     constructor(app: App, config: DingtalkAdapter.Config);
     startOneBot(oneBot: OneBot<Bot>): Promise<() => void>;
@@ -14,13 +14,12 @@ export default class DingtalkAdapter extends Adapter<"dingtalk"> {
     setOffline(uin: string): Promise<void>;
     createOneBot(uin: string, protocol: Bot.Options, versions: OneBot.Config[]): OneBot;
     call(uin: string, version: string, method: string, args?: any[]): Promise<any>;
-    sendPrivateMessage<V extends OneBot.Version>(uin: string, version: V, args: [string, OneBot.MessageElement<V>[], string]): Promise<OneBot.MessageRet<V>>;
-    sendGroupMessage<V extends OneBot.Version>(uin: string, version: V, args: [string, OneBot.MessageElement<V>[], string]): Promise<OneBot.MessageRet<V>>;
+    sendPrivateMessage<V extends OneBot.Version>(uin: string, version: V, args: [string, OneBot.Segment<V>[], string]): Promise<OneBot.MessageRet<V>>;
+    sendGroupMessage<V extends OneBot.Version>(uin: string, version: V, args: [string, OneBot.Segment<V>[], string]): Promise<OneBot.MessageRet<V>>;
     deleteMessage(uin: string, message_id: string): Promise<boolean>;
-    fromSegment<V extends OneBot.Version>(version: V, segment: OneBot.Segment<V> | OneBot.Segment<V>[]): OneBot.MessageElement<V>[];
-    toSegment<V extends OneBot.Version, M = Sendable>(version: V, message: M): OneBot.Segment<V>[];
-    fromCqcode<V extends OneBot.Version>(version: V, message: string): OneBot.MessageElement<V>[];
-    toCqcode<V extends OneBot.Version>(version: V, messageArr: OneBot.MessageElement<V>[]): string;
+    fromSegment<V extends OneBot.Version>(version: V, segment: OneBot.Segment<V> | OneBot.Segment<V>[]): Sendable;
+    toSegment<V extends OneBot.Version>(version: V, message: Sendable): OneBot.Segment<V>[];
+    fromCqcode<V extends OneBot.Version>(version: V, message: string): OneBot.Segment<V>[];
     formatEventPayload<V extends OneBot.Version>(uin: string, version: V, event: string, data: any): OneBot.Payload<V>;
     start(uin: string): Promise<void>;
     stop(uin?: string): Promise<void>;

package/lib/adapters/dingtalk/index.js

@@ -154,31 +154,27 @@ class DingtalkAdapter extends adapter_1.Adapter {
     fromSegment(version, segment) {
         return [].concat(segment).map(item => {
             if (typeof item === "string")
-                return {
-                    type: "text",
-                    data: {
-                        text: item,
-                    },
-                };
-            return item;
+                return item;
+            const { type, data } = item;
+            return {
+                type,
+                ...data,
+            };
         });
     }
     toSegment(version, message) {
         return [].concat(message).map(item => {
-            if (!item || typeof item !== "object")
+            if (typeof item !== "object")
                 return {
                     type: "text",
                     data: {
-                        text: item,
+                        text: item + "",
                     },
                 };
-            const { type, data, ...other } = item;
+            const { type, ...data } = item;
             return {
                 type,
-                data: {
-                    ...data,
-                    ...other,
-                },
+                data,
             };
         });
     }
@@ -206,31 +202,6 @@ class DingtalkAdapter extends adapter_1.Adapter {
         }
         return result;
     }
-    toCqcode(version, messageArr) {
-        return []
-            .concat(messageArr)
-            .map(item => {
-            if (typeof item === "string")
-                return item;
-            if (item.type === "text")
-                return item.data?.text || item.text;
-            const dataStr = Object.entries(item.data).map(([key, value]) => {
-                // is Buffer
-                if (value instanceof Buffer)
-                    return `${key}=${value.toString("base64")}`;
-                // is Object
-                if (value instanceof Object)
-                    return `${key}=${JSON.stringify(value)}`;
-                // is Array
-                if (value instanceof Array)
-                    return `${key}=${value.map(v => JSON.stringify(v)).join(",")}`;
-                // is String
-                return `${key}=${item[key]}`;
-            });
-            return `[CQ:${item.type},${dataStr.join(",")}]`;
-        })
-            .join("");
-    }
     formatEventPayload(uin, version, event, data) {
         const oneBot = this.getOneBot(uin);
         const result = {
@@ -249,7 +220,6 @@ class DingtalkAdapter extends adapter_1.Adapter {
         };
         delete result.bot;
         if (event === "message") {
-            result.message = this.transformMessage(uin, version, result.message);
             result.alt_message = result.raw_message || "";
         }
         if (version === "V11") {

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

@@ -1,8 +1,8 @@
 import { Adapter } from "../../adapter";
 import { App } from "../../server/app";
-import { Config as IcqqConfig } from "@icqqjs/icqq";
+import { Config as IcqqConfig, Sendable } from "@icqqjs/icqq";
 import { OneBot } from "../../onebot";
-export default class IcqqAdapter extends Adapter<"icqq"> {
+export default class IcqqAdapter extends Adapter<"icqq", Sendable> {
     #private;
     constructor(app: App, config: IcqqAdapter.Config);
     setOnline(uin: string): Promise<void>;
@@ -10,17 +10,14 @@ export default class IcqqAdapter extends Adapter<"icqq"> {
     callApi<V extends OneBot.Version>(uin: string, version: V, [name, args]: [string, any[]]): any;
     createOneBot(uin: string, protocol: IcqqConfig, versions: OneBot.Config[]): OneBot;
     formatEventPayload<V extends OneBot.Version>(uin: string, version: V, event: string, data: any): OneBot.Payload<V>;
-    sendPrivateMessage<V extends OneBot.Version>(uin: string, version: V, args: [string, OneBot.MessageElement<V>[], string?]): Promise<OneBot.MessageRet<V>>;
+    sendPrivateMessage<V extends OneBot.Version>(uin: string, version: V, args: [string, OneBot.Segment<V>[], string?]): Promise<OneBot.MessageRet<V>>;
     deleteMessage<V extends OneBot.Version>(uin: string, version: V, args: [string]): Promise<boolean>;
-    sendGroupMessage<V extends OneBot.Version>(uin: string, version: V, args: [string, OneBot.MessageElement<V>[], string?]): Promise<OneBot.MessageRet<V>>;
-    sendGuildMessage<V extends OneBot.Version>(uin: string, version: V, args: [string, OneBot.MessageElement<V>[], string?]): Promise<OneBot.MessageRet<V>>;
+    sendGroupMessage<V extends OneBot.Version>(uin: string, version: V, args: [string, OneBot.Segment<V>[], string?]): Promise<OneBot.MessageRet<V>>;
+    sendGuildMessage<V extends OneBot.Version>(uin: string, version: V, args: [string, OneBot.Segment<V>[], string?]): Promise<OneBot.MessageRet<V>>;
     getMessage<V extends OneBot.Version>(uin: string, version: V, [message_id]: [string]): Promise<OneBot.Message<V>>;
     call<V extends OneBot.Version>(uin: string, version: V, method: string, args?: any[]): Promise<any>;
-    fromSegment<V extends OneBot.Version>(version: V, segment: OneBot.Segment<V> | OneBot.Segment<V>[]): OneBot.MessageElement<V>[];
-    toSegment<V extends OneBot.Version, M = any>(version: V, message: M): OneBot.Segment<V>[];
-    fromCqcode<V extends OneBot.Version>(version: V, message: string): OneBot.MessageElement<V>[];
-    materialize(content: string): string;
-    toCqcode<V extends OneBot.Version>(version: V, messageArr: OneBot.MessageElement<V>[]): string;
+    fromSegment<V extends OneBot.Version>(version: V, segment: OneBot.Segment<V> | OneBot.Segment<V>[]): Sendable;
+    toSegment<V extends OneBot.Version>(version: V, message: Sendable): OneBot.Segment<V>[];
     getSelfInfo<V extends OneBot.Version>(uin: string, version: V): OneBot.SelfInfo<V>;
     startOneBot(oneBot: OneBot): Promise<Function>;
     start(uin?: string): Promise<void>;

package/lib/adapters/icqq/index.js

@@ -56,6 +56,7 @@ async function processMessages(uin, target_id, target_type, list) {
                 result.push({
                     type,
                     ...data,
+                    user_id: data.user_id,
                     message: await processMessages.call(this, uin, data.user_id, "private", data.content || []),
                 });
                 break;
@@ -83,7 +84,7 @@ async function processMessages(uin, target_id, target_type, list) {
                 if (item["file"]?.startsWith("base64://"))
                     item["file"] = Buffer.from(item["file"].slice(9), "base64");
                 result.push({
-                    type,
+                    type: type,
                     ...data,
                     ...other,
                 });
@@ -101,7 +102,7 @@ async function processMessages(uin, target_id, target_type, list) {
             }
             default: {
                 result.push({
-                    type,
+                    type: type,
                     ...data,
                     ...other,
                 });
@@ -185,7 +186,6 @@ class IcqqAdapter extends adapter_1.Adapter {
             }
         }
         if (event === "message") {
-            result.message = this.transformMessage(uin, version, result.message);
             result.alt_message = result.raw_message || "";
         }
         if (version === "V11" && result.message_id) {
@@ -235,11 +235,16 @@ class IcqqAdapter extends adapter_1.Adapter {
                 : message_id,
         };
     }
-    getMessage(uin, version, [message_id]) {
+    async getMessage(uin, version, [message_id]) {
         const oneBot = this.getOneBot(uin);
         if (!oneBot)
             throw new Error("No one");
-        return oneBot.internal.getMsg(message_id);
+        let { message, ...result } = await oneBot.internal.getMsg(message_id);
+        const segments = this.toSegment(version, message);
+        return {
+            ...result,
+            message: segments,
+        };
     }
     call(uin, version, method, args = []) {
         try {
@@ -254,13 +259,9 @@ class IcqqAdapter extends adapter_1.Adapter {
     fromSegment(version, segment) {
         return [].concat(segment).map(item => {
             if (typeof item === "string")
-                return {
-                    type: "text",
-                    data: {
-                        text: item,
-                    },
-                };
-            return item;
+                return item;
+            const { type, data } = item;
+            return { type, ...data };
         });
     }
     toSegment(version, message) {
@@ -279,89 +280,6 @@ class IcqqAdapter extends adapter_1.Adapter {
             };
         });
     }
-    fromCqcode(version, message) {
-        const regExpMatchArray = message.match(/\[CQ:([a-z]+),([^]]+)]/);
-        if (!regExpMatchArray)
-            return [
-                {
-                    type: "text",
-                    data: {
-                        text: message,
-                    },
-                },
-            ];
-        const result = [];
-        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,
-                data: Object.fromEntries(valueArr.map(item => {
-                    const [key, value] = item.split("=");
-                    return [key, type === "reply" && key === "id" ? +value : value];
-                })),
-            });
-            message = message.substring(match.length);
-        }
-        if (message.length) {
-            result.push({
-                type: "text",
-                data: {
-                    text: message,
-                },
-            });
-        }
-        return result;
-    }
-    materialize(content) {
-        return content
-            .replace(/&(?!(amp|#91|#93|#44);)/g, "&")
-            .replace(/\[/g, "[")
-            .replace(/]/g, "]")
-            .replace(/,/g, ",");
-    }
-    toCqcode(version, messageArr) {
-        return []
-            .concat(messageArr)
-            .map(item => {
-            if (typeof item === "string")
-                return item;
-            if (item.type === "text")
-                return item.data?.text || item.text;
-            let dataStr;
-            if (typeof item.data === "string") {
-                dataStr = [`data=${this.materialize(item.data)}`];
-            }
-            else {
-                dataStr = Object.entries(item.data || item).map(([key, value]) => {
-                    // is Buffer
-                    if (value instanceof Buffer)
-                        return `${key}=${value.toString("base64")}`;
-                    // is Object
-                    if (value instanceof Object)
-                        return `${key}=${JSON.stringify(value)}`;
-                    // is Array
-                    if (value instanceof Array)
-                        return `${key}=${value.map(v => JSON.stringify(v)).join(",")}`;
-                    // is String
-                    return `${key}=${item.data?.[key] || item[key]}`;
-                });
-            }
-            return `[CQ:${item.type},${dataStr.join(",")}]`;
-        })
-            .join("");
-    }
     getSelfInfo(uin, version) {
         const client = this.oneBots.get(uin).internal;
         return {

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

@@ -2,23 +2,21 @@ import { Adapter } from "../../adapter";
 import { App } from "../../server/app";
 import { OneBot } from "../../onebot";
 import { Bot, Sendable } from "qq-group-bot";
-export default class QQAdapter extends Adapter<"qq"> {
+export default class QQAdapter extends Adapter<"qq", Sendable> {
     #private;
     constructor(app: App, config: QQAdapter.Config);
     startOneBot(oneBot: OneBot<Bot>): Promise<() => void>;
     setOnline(uin: string): Promise<void>;
     setOffline(uin: string): Promise<void>;
     createOneBot(uin: string, protocol: Bot.Config, versions: OneBot.Config[]): OneBot;
-    sendGroupMessage<V extends OneBot.Version>(uin: string, version: V, args: [string, OneBot.MessageElement<V>[], string]): Promise<OneBot.MessageRet<V>>;
-    sendPrivateMessage<V extends OneBot.Version>(uin: string, version: V, args: [string, OneBot.MessageElement<V>[], string]): Promise<OneBot.MessageRet<V>>;
-    sendGuildMessage<V extends OneBot.Version>(uin: string, version: V, args: [string, OneBot.MessageElement<V>[], string]): Promise<OneBot.MessageRet<V>>;
-    sendDirectMessage<V extends OneBot.Version>(uin: string, version: V, args: [string, OneBot.MessageElement<V>[], string]): Promise<OneBot.MessageRet<V>>;
+    sendGroupMessage<V extends OneBot.Version>(uin: string, version: V, args: [string, OneBot.Segment<V>[], string]): Promise<OneBot.MessageRet<V>>;
+    sendPrivateMessage<V extends OneBot.Version>(uin: string, version: V, args: [string, OneBot.Segment<V>[], string]): Promise<OneBot.MessageRet<V>>;
+    sendGuildMessage<V extends OneBot.Version>(uin: string, version: V, args: [string, OneBot.Segment<V>[], string]): Promise<OneBot.MessageRet<V>>;
+    sendDirectMessage<V extends OneBot.Version>(uin: string, version: V, args: [string, OneBot.Segment<V>[], string]): Promise<OneBot.MessageRet<V>>;
     deleteMessage(uin: string, message_id: string): Promise<boolean>;
     call(uin: string, version: string, method: string, args?: any[]): Promise<any>;
-    fromSegment<V extends OneBot.Version>(version: V, segment: OneBot.Segment<V> | OneBot.Segment<V>[]): OneBot.MessageElement<V>[];
+    fromSegment<V extends OneBot.Version>(version: V, segment: OneBot.Segment<V> | OneBot.Segment<V>[]): Sendable;
     toSegment<V extends OneBot.Version, M = Sendable>(version: V, message: M): OneBot.Segment<V>[];
-    fromCqcode<V extends OneBot.Version>(version: V, message: string): OneBot.MessageElement<V>[];
-    toCqcode<V extends OneBot.Version>(version: V, messageArr: OneBot.MessageElement<V>[]): string;
     formatEventPayload<V extends OneBot.Version>(uin: string, version: V, event: string, data: any): OneBot.Payload<V>;
     start(uin: string): Promise<void>;
     stop(uin?: string): Promise<void>;

package/lib/adapters/qq/index.js

@@ -178,13 +178,12 @@ class QQAdapter extends adapter_1.Adapter {
     fromSegment(version, segment) {
         return [].concat(segment).map(item => {
             if (typeof item === "string")
-                return {
-                    type: "text",
-                    data: {
-                        text: item,
-                    },
-                };
-            return item;
+                return item;
+            const { type, data } = item;
+            return {
+                type,
+                ...data,
+            };
         });
     }
     toSegment(version, message) {
@@ -196,65 +195,13 @@ class QQAdapter extends adapter_1.Adapter {
                         text: item,
                     },
                 };
-            const { type, data, ...other } = item;
+            const { type, ...data } = item;
             return {
                 type,
-                data: {
-                    ...data,
-                    ...other,
-                },
+                data,
             };
         });
     }
-    fromCqcode(version, message) {
-        const regExpMatchArray = message.match(/\[CQ:([a-z]+),(!])+]/g);
-        if (!regExpMatchArray)
-            return [
-                {
-                    type: "text",
-                    data: {
-                        text: message,
-                    },
-                },
-            ];
-        const result = [];
-        for (const match of regExpMatchArray) {
-            const [type, ...valueArr] = match.substring(1, match.length - 1).split(",");
-            result.push({
-                type: type,
-                data: Object.fromEntries(valueArr.map(item => {
-                    const [key, value] = item.split("=");
-                    return [key, value];
-                })),
-            });
-        }
-        return result;
-    }
-    toCqcode(version, messageArr) {
-        return []
-            .concat(messageArr)
-            .map(item => {
-            if (typeof item === "string")
-                return item;
-            if (item.type === "text")
-                return item.data?.text || item.text;
-            const dataStr = Object.entries(item.data).map(([key, value]) => {
-                // is Buffer
-                if (value instanceof Buffer)
-                    return `${key}=${value.toString("base64")}`;
-                // is Object
-                if (value instanceof Object)
-                    return `${key}=${JSON.stringify(value)}`;
-                // is Array
-                if (value instanceof Array)
-                    return `${key}=${value.map(v => JSON.stringify(v)).join(",")}`;
-                // is String
-                return `${key}=${value}`;
-            });
-            return `[CQ:${item.type},${dataStr.join(",")}]`;
-        })
-            .join("");
-    }
     formatEventPayload(uin, version, event, data) {
         const result = {
             id: data.id || Math.random().toString(36).slice(2),
@@ -275,7 +222,6 @@ class QQAdapter extends adapter_1.Adapter {
         delete result.bot;
         const oneBot = this.getOneBot(uin);
         if (event === "message") {
-            result.message = this.transformMessage(uin, version, result.message);
             result.alt_message = result.raw_message || "";
         }
         switch (version) {

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

@@ -3,7 +3,7 @@ import { App } from "../../server/app";
 import { OneBot } from "../../onebot";
 import { Client, Sendable, BaseClient } from "lib-wechat";
 type WechatConfig = BaseClient.Config;
-export default class WechatAdapter extends Adapter<"wechat"> {
+export default class WechatAdapter extends Adapter<"wechat", Sendable> {
     #private;
     constructor(app: App, config: WechatAdapter.Config);
     startOneBot(oneBot: OneBot<Client>): Promise<() => void>;
@@ -11,13 +11,11 @@ export default class WechatAdapter extends Adapter<"wechat"> {
     setOffline(uin: string): Promise<void>;
     createOneBot(uin: string, protocol: WechatConfig, versions: OneBot.Config[]): OneBot;
     call(uin: string, version: string, method: string, args?: any[]): Promise<any>;
-    sendPrivateMessage<V extends OneBot.Version>(uin: string, version: V, args: [string, OneBot.MessageElement<V>[], string]): Promise<OneBot.MessageRet<V>>;
-    sendGroupMessage<V extends OneBot.Version>(uin: string, version: V, args: [string, OneBot.MessageElement<V>[], string]): Promise<OneBot.MessageRet<V>>;
+    sendPrivateMessage<V extends OneBot.Version>(uin: string, version: V, args: [string, OneBot.Segment<V>[], string]): Promise<OneBot.MessageRet<V>>;
+    sendGroupMessage<V extends OneBot.Version>(uin: string, version: V, args: [string, OneBot.Segment<V>[], string]): Promise<OneBot.MessageRet<V>>;
     deleteMessage<V extends OneBot.Version>(uin: string, version: V, [str]: [string]): Promise<boolean>;
-    fromSegment<V extends OneBot.Version>(version: V, segment: OneBot.Segment<V> | OneBot.Segment<V>[]): OneBot.MessageElement<V>[];
-    toSegment<V extends OneBot.Version, M = Sendable>(version: V, message: M): OneBot.Segment<V>[];
-    fromCqcode<V extends OneBot.Version>(version: V, message: string): OneBot.MessageElement<V>[];
-    toCqcode<V extends OneBot.Version>(version: V, messageArr: OneBot.MessageElement<V>[]): string;
+    fromSegment<V extends OneBot.Version>(version: V, segment: OneBot.Segment<V> | OneBot.Segment<V>[]): Sendable;
+    toSegment<V extends OneBot.Version>(version: V, message: Sendable): OneBot.Segment<V>[];
     getFriendList<V extends OneBot.Version>(uin: string, version: V): Promise<OneBot.UserInfo<V>[]>;
     getGroupList<V extends OneBot.Version>(uin: string, version: V): Promise<OneBot.GroupInfo<V>[]>;
     formatEventPayload<V extends OneBot.Version>(uin: string, version: V, event: string, data: any): OneBot.Payload<V>;

package/lib/adapters/wechat/index.js

@@ -158,13 +158,12 @@ class WechatAdapter extends adapter_1.Adapter {
     fromSegment(version, segment) {
         return [].concat(segment).map(item => {
             if (typeof item === "string")
-                return {
-                    type: "text",
-                    data: {
-                        text: item,
-                    },
-                };
-            return item;
+                return item;
+            const { type, data } = item;
+            return {
+                type,
+                ...data,
+            };
         });
     }
     toSegment(version, message) {
@@ -176,65 +175,13 @@ class WechatAdapter extends adapter_1.Adapter {
                         text: item,
                     },
                 };
-            const { type, data, ...other } = item;
+            const { type, ...data } = item;
             return {
                 type,
-                data: {
-                    ...data,
-                    ...other,
-                },
+                data,
             };
         });
     }
-    fromCqcode(version, message) {
-        const regExpMatchArray = message.match(/\[CQ:([a-z]+),(!])+]/g);
-        if (!regExpMatchArray)
-            return [
-                {
-                    type: "text",
-                    data: {
-                        text: message,
-                    },
-                },
-            ];
-        const result = [];
-        for (const match of regExpMatchArray) {
-            const [type, ...valueArr] = match.substring(1, match.length - 1).split(",");
-            result.push({
-                type: type,
-                data: Object.fromEntries(valueArr.map(item => {
-                    const [key, value] = item.split("=");
-                    return [key, value];
-                })),
-            });
-        }
-        return result;
-    }
-    toCqcode(version, messageArr) {
-        return []
-            .concat(messageArr)
-            .map(item => {
-            if (typeof item === "string")
-                return item;
-            if (item.type === "text")
-                return item.data?.text || item.text;
-            const dataStr = Object.entries(item.data).map(([key, value]) => {
-                // is Buffer
-                if (value instanceof Buffer)
-                    return `${key}=${value.toString("base64")}`;
-                // is Object
-                if (value instanceof Object)
-                    return `${key}=${JSON.stringify(value)}`;
-                // is Array
-                if (value instanceof Array)
-                    return `${key}=${value.map(v => JSON.stringify(v)).join(",")}`;
-                // is String
-                return `${key}=${item[key]}`;
-            });
-            return `[CQ:${item.type},${dataStr.join(",")}]`;
-        })
-            .join("");
-    }
     async getFriendList(uin, version) {
         const bot = this.getOneBot(uin);
         const result = bot.internal.getFriendList();
@@ -282,7 +229,6 @@ class WechatAdapter extends adapter_1.Adapter {
         delete result.c;
         delete result.parser;
         if (event === "message") {
-            result.message = this.transformMessage(uin, version, result.message);
             result.alt_message = result.raw_message || "";
         }
         if (version === "V11") {

package/lib/onebot.d.ts

@@ -61,7 +61,6 @@ export declare namespace OneBot {
     type GroupInfo<V extends Version> = V extends "V11" ? V11.GroupInfo : V12.GroupInfo;
     type UserInfo<V extends Version> = V extends "V11" ? V11.UserInfo : V12.UserInfo;
     type Message<V extends Version> = V extends "V11" ? V11.Message : V12.Message;
-    type MessageElement<V extends Version> = V extends "V11" ? V11.MessageElement : V12.MessageElement;
     type GroupMemberInfo<V extends Version> = V extends "V11" ? V11.GroupMemberInfo : V12.GroupMemberInfo;
     type MessageRet<V extends Version> = V extends "V11" ? V11.MessageRet : V12.MessageRet;
     interface Base {

package/lib/server/app.d.ts

@@ -62,7 +62,7 @@ export declare class App extends Koa {
     removeAccount(platform: string, uin: string, force?: boolean): void;
     createOneBot<P extends string>(platform: P, uin: string, config: Adapter.Config): import("..").OneBot<any>;
     get oneBots(): import("..").OneBot<any>[];
-    findOrCreateAdapter<P extends string>(platform: P, config?: Adapter.Config): void | Adapter<string>;
+    findOrCreateAdapter<P extends string>(platform: P, config?: Adapter.Config): void | Adapter<string, any>;
     start(): Promise<void>;
     reload(config: App.Config): Promise<void>;
     stop(): Promise<void>;
@@ -88,6 +88,6 @@ export declare namespace App {
     const defaultConfig: Config;
     function registerAdapter(name: string): void;
     function registerAdapter<T extends string>(platform: T, adapter: AdapterClass): void;
-    function loadAdapter<T extends string>(platform: string): Class<Adapter<T>>;
+    function loadAdapter<T extends string>(platform: string): Class<Adapter<T, any>>;
 }
 export {};

package/lib/server/app.js

@@ -379,16 +379,13 @@ exports.defineConfig = defineConfig;
             `onebots-adapter-${platform}`, // 别人按照规范写的
             platform, // 别人写的
         ];
-        let adapter = null;
-        for (const adapterName of maybeNames) {
-            try {
-                adapter = require(adapterName)?.default;
-                break;
-            }
-            catch { }
+        let adapter;
+        try {
+            adapter = require(path.join(__dirname, "../adapters", platform))?.default;
+        }
+        catch (e) {
+            console.error(`loadAdapter(${platform}) failed:${e.message}`);
         }
-        if (!adapter)
-            throw new Error(`找不到对应的适配器：${platform}`);
         return adapter;
     }
     App.loadAdapter = loadAdapter;

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

@@ -119,17 +119,14 @@ export declare namespace V11 {
         user_id: number;
         user_name: string;
     }
-    interface Message {
-    }
     interface Segment {
         type: string;
         data: Dict;
     }
-    interface MessageElement {
-        type: string;
-        data: Dict;
+    type Sendable = string | Segment | (string | Segment)[];
+    interface Message {
+        message: Sendable;
     }
-    type Sendable = string | MessageElement | (string | MessageElement)[];
     interface MessageRet {
         message_id: number;
     }

package/lib/service/V11/index.js

@@ -258,12 +258,7 @@ class V11 extends service_1.Service {
             return;
         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);
-            }
-            else {
-                data.message = this.adapter.toCqcode("V11", (data.message = this.adapter.toSegment("V11", data.message)));
-            }
+            data.message = this.adapter.transformMessage(this.oneBot.uin, "V11", data.message);
         }
         data.time = Math.floor(Date.now() / 1000);
         // data = transformObj(data, (key, value) => {
@@ -276,7 +271,6 @@ class V11 extends service_1.Service {
     }
     _formatEvent(data) {
         if (data.post_type === "notice") {
-            // console.log(JSON.stringify(data))
             const data1 = { ...data };
             if (data.notice_type === "group") {
                 delete data1.group;
@@ -583,13 +577,7 @@ class V11 extends service_1.Service {
                             }
                             params[k] = this.adapter.fromCqcode("V11", params[k]);
                         }
-                        else {
-                            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")?.id || params["message_id"];
                     }

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

@@ -67,76 +67,6 @@ export declare class V12 extends Service<"V12"> implements OneBot.Base {
     protected _webSocketHandler(ws: WebSocket): void;
 }
 export declare namespace V12 {
-    type Sendable = string | SegmentElem | (string | SegmentElem)[];
-    interface SegmentMap {
-        face: {
-            id: number;
-            text?: string;
-        };
-        text: {
-            text: string;
-        };
-        mention: {
-            user_id: string;
-        };
-        rps: {
-            id?: string;
-        };
-        dice: {
-            id?: string;
-        };
-        poke: {
-            user_id: string;
-        };
-        mention_all: null;
-        image: {
-            file_id: string;
-        };
-        voice: {
-            file_id: string;
-        };
-        audio: {
-            file_id: string;
-        };
-        file: {
-            file_id: string;
-        };
-        music: {
-            type: "163" | "qq" | "xm" | "custom";
-            id?: string;
-            url?: string;
-            audio?: string;
-            title?: string;
-        };
-        location: {
-            latitude: number;
-            longitude: number;
-            title?: string;
-            content?: string;
-        };
-        share: {
-            url: string;
-            title: string;
-            content?: string;
-            image?: string;
-        };
-        reply: {
-            message_id: string;
-        };
-        node: {
-            user_id: string;
-            time?: number;
-            user_name?: string;
-            message: SegmentElem[];
-        };
-        forward: {
-            nodes: SegmentElem<"node">[];
-        };
-    }
-    type SegmentElem<K extends keyof SegmentMap = keyof SegmentMap> = {
-        type: K;
-        data: SegmentMap[K];
-    };
     interface Config {
         heartbeat?: number;
         access_token?: string;
@@ -263,11 +193,14 @@ export declare namespace V12 {
         user_name: string;
     }
     interface Segment {
+        type: string;
+        data: Dict;
     }
+    type Sendable = string | Segment | (string | Segment)[];
     interface Message {
+        message: Sendable;
     }
-    interface MessageElement extends Dict {
-        type: string;
+    interface Message {
     }
     interface MessageRet {
         message_id: string;

package/lib/service/V12/index.js

@@ -394,6 +394,9 @@ class V12 extends service_1.Service {
                 user_id: `${this.oneBot.uin}`,
             },
         });
+        if (payload.message && payload.type === "message") {
+            payload.message = this.adapter.transformMessage(this.oneBot.uin, "V12", payload.message);
+        }
         if (!this.filterFn(payload))
             return;
         this.emit("dispatch", payload);
@@ -442,13 +445,7 @@ class V12 extends service_1.Service {
                             }
                             params[k] = this.adapter.fromCqcode("V12", params[k]);
                         }
-                        else {
-                            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("V12", params[k]);
-                        }
+                        params[k] = this.adapter.fromSegment("V12", params[k]);
                     }
                     args.push(params[k]);
                 }
@@ -707,7 +704,6 @@ class V12 extends service_1.Service {
 }
 exports.V12 = V12;
 (function (V12) {
-    const fileTypes = ["image", "file", "record", "video", "flash"];
     V12.defaultConfig = {
         heartbeat: 3,
         access_token: "",

package/package.json

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