onebots 0.4.62 → 0.4.64

package/lib/adapter.d.ts

@@ -46,7 +46,7 @@ export interface Adapter<T extends string = string, Sendable = any> extends Adap
 export declare namespace Adapter {
     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;
+        fromSegment<V extends OneBot.Version>(onebot: OneBot, 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>;

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

@@ -17,7 +17,7 @@ export default class DingtalkAdapter extends Adapter<"dingtalk", Sendable> {
     sendPrivateMessage<V extends OneBot.Version>(uin: string, version: V, args: [string, Sendable, string]): Promise<OneBot.MessageRet<V>>;
     sendGroupMessage<V extends OneBot.Version>(uin: string, version: V, args: [string, Sendable, 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>[]): Sendable;
+    fromSegment<V extends OneBot.Version>(onebot: OneBot<Bot>, 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>;

package/lib/adapters/dingtalk/index.js

@@ -139,8 +139,15 @@ class DingtalkAdapter extends adapter_1.Adapter {
                 throw new Error(`暂不支持撤回${from_type}类型的消息`);
         }
     }
-    fromSegment(version, segment) {
-        return [].concat(segment).map(item => {
+    fromSegment(onebot, version, segment) {
+        return []
+            .concat(segment)
+            .map(segment => {
+            if (version === "V12" && ["image", "video", "audio"].includes(segment.type))
+                return onebot.V12.transformMedia(segment);
+            return segment;
+        })
+            .map(item => {
             if (typeof item === "string")
                 return item;
             const { type, data } = item;
@@ -204,6 +211,10 @@ class DingtalkAdapter extends adapter_1.Adapter {
             platform: "dingtalk",
             time: data.timestamp,
             ...data,
+            sender: {
+                ...(data?.sender || {}),
+            },
+            user_id: data.user_id || data.sender?.user_id,
             message_id: `${data.message_type}:${data.group_id || data.user_id}:${data.message_id}`,
         };
         delete result.bot;

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

@@ -1,6 +1,6 @@
 import { Adapter } from "../../adapter";
 import { App } from "../../server/app";
-import { Config as IcqqConfig, Sendable } from "@icqqjs/icqq";
+import { Client, Config as IcqqConfig, Sendable } from "@icqqjs/icqq";
 import { OneBot } from "../../onebot";
 export default class IcqqAdapter extends Adapter<"icqq", Sendable> {
     #private;
@@ -16,7 +16,7 @@ export default class IcqqAdapter extends Adapter<"icqq", Sendable> {
     sendGuildMessage<V extends OneBot.Version>(uin: string, version: V, args: [string, Sendable, 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>[]): Sendable;
+    fromSegment<V extends OneBot.Version>(onebot: OneBot<Client>, 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>;

package/lib/adapters/icqq/index.js

@@ -45,72 +45,8 @@ const process_1 = __importDefault(require("process"));
 const fs_1 = require("fs");
 const onebot_1 = require("../../onebot");
 const path = __importStar(require("path"));
-const shareMusicCustom_1 = require("../../service/shareMusicCustom");
 const message_1 = require("@icqqjs/icqq/lib/message");
-async function processMessages(uin, target_id, target_type, list) {
-    let result = [];
-    for (const item of list) {
-        const { type, data, ...other } = item;
-        switch (type) {
-            case "node": {
-                result.push({
-                    type,
-                    ...data,
-                    user_id: data.user_id,
-                    message: await processMessages.call(this, uin, data.user_id, "private", data.content || []),
-                });
-                break;
-            }
-            case "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,
-                });
-                break;
-            }
-            case "share": {
-                await this[target_type === "private" ? "pickFriend" : "pickGroup"](target_id).shareUrl(item.data);
-                break;
-            }
-            case "video":
-            case "audio":
-            case "image": {
-                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: type,
-                    ...data,
-                    ...other,
-                });
-                break;
-            }
-            case "reply": {
-                const oneBot = this.getOneBot(uin);
-                const message_id = oneBot.V11.getStrByInt("message_id", data.id);
-                const msg = await oneBot.internal.getMsg(message_id);
-                result.push({
-                    type: "quote",
-                    ...msg,
-                });
-                break;
-            }
-            default: {
-                result.push({
-                    type: type,
-                    ...data,
-                    ...other,
-                });
-            }
-        }
-    }
-    return result;
-}
+const utils_1 = require("../../adapters/icqq/utils");
 class IcqqAdapter extends adapter_1.Adapter {
     constructor(app, config) {
         super(app, "icqq", config);
@@ -166,6 +102,10 @@ class IcqqAdapter extends adapter_1.Adapter {
             detail_type: data.message_type || data.notice_type || data.request_type,
             platform: "qq",
             ...data,
+            sender: {
+                ...(data?.sender || {}),
+            },
+            user_id: data.user_id || data.sender?.user_id,
         };
         if (data.source) {
             const message_id = data.message_type === "group"
@@ -199,7 +139,7 @@ class IcqqAdapter extends adapter_1.Adapter {
         let quote;
         if (source)
             quote = await client.getMsg(source);
-        const result = await client.sendPrivateMsg(parseInt(user_id), await processMessages.call(this, uin, user_id, "private", message), quote);
+        const result = await client.sendPrivateMsg(parseInt(user_id), await utils_1.processMessages.call(this, uin, user_id, "private", message), quote);
         return {
             message_id: version === "V11"
                 ? this.oneBots.get(uin).V11.transformToInt("message_id", result.message_id)
@@ -216,7 +156,7 @@ class IcqqAdapter extends adapter_1.Adapter {
         let quote;
         if (source)
             quote = await client.getMsg(source);
-        const result = await client.sendGroupMsg(parseInt(group_id), await processMessages.call(this, uin, group_id, "group", message), quote);
+        const result = await client.sendGroupMsg(parseInt(group_id), await utils_1.processMessages.call(this, uin, group_id, "group", message), quote);
         return {
             message_id: version === "V11"
                 ? this.oneBots.get(uin).V11.transformToInt("message_id", result.message_id)
@@ -227,7 +167,7 @@ class IcqqAdapter extends adapter_1.Adapter {
         const [target_id, message, source] = args;
         const client = this.oneBots.get(uin)?.internal;
         const [guild_id, channel_id] = target_id.split(":");
-        const result = await client.sendGuildMsg(guild_id, channel_id, await processMessages.call(this, uin, target_id, "channel", message));
+        const result = await client.sendGuildMsg(guild_id, channel_id, await utils_1.processMessages.call(this, uin, target_id, "channel", message));
         const message_id = `${result.seq}:${result.rand}:${result.time}`;
         return {
             message_id: version === "V11"
@@ -256,8 +196,15 @@ class IcqqAdapter extends adapter_1.Adapter {
             throw onebot_1.OneBot.UnsupportedMethodError;
         }
     }
-    fromSegment(version, segment) {
-        return [].concat(segment).map(item => {
+    fromSegment(onebot, version, segment) {
+        return []
+            .concat(segment)
+            .map(segment => {
+            if (version === "V12" && ["image", "video", "audio"].includes(segment.type))
+                return onebot.V12.transformMedia(segment);
+            return segment;
+        })
+            .map(item => {
             if (typeof item === "string")
                 return item;
             const { type, data } = item;

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

@@ -1,6 +1,4 @@
-import { Client, MessageElem, ShareElem } from "@icqqjs/icqq";
-export declare function processMessage(this: Client, elements: MessageElem[]): Promise<{
-    element: MessageElem[];
-    music?: MessageElem;
-    share?: ShareElem;
-}>;
+import { MessageElem } from "@icqqjs/icqq";
+import { OneBot } from "../../onebot";
+import IcqqAdapter from "../../adapters/icqq/index";
+export declare function processMessages(this: IcqqAdapter, uin: string, target_id: number, target_type: "group" | "private", list: OneBot.Segment<OneBot.Version>[]): Promise<MessageElem[]>;

package/lib/adapters/icqq/utils.js

@@ -1,26 +1,68 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.processMessage = void 0;
-const utils_1 = require("../../utils");
-async function processMessage(elements) {
-    let music = elements.find(e => e.type === "music");
-    if (music) {
-        (0, utils_1.remove)(elements, music);
-        if (String(music.platform) === "custom") {
-            music.platform = music["subtype"]; // gocq 的平台数据存储在 subtype 内，兼容 icqq 时要求前端必须发送 id 字段
+exports.processMessages = void 0;
+const shareMusicCustom_1 = require("./shareMusicCustom");
+async function processMessages(uin, target_id, target_type, list) {
+    let result = [];
+    for (const item of list) {
+        const { type, data, ...other } = item;
+        switch (type) {
+            case "node": {
+                result.push({
+                    type,
+                    ...data,
+                    user_id: data.user_id,
+                    message: await processMessages.call(this, uin, data.user_id, "private", data.content || []),
+                });
+                break;
+            }
+            case "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,
+                });
+                break;
+            }
+            case "share": {
+                await this[target_type === "private" ? "pickFriend" : "pickGroup"](target_id).shareUrl(item.data);
+                break;
+            }
+            case "video":
+            case "audio":
+            case "image": {
+                item["file"] = item["file"] || item["file_id"] || item["url"];
+                if (item["file"]?.startsWith("base64://"))
+                    item["file"] = Buffer.from(item["file"].slice(9), "base64");
+                result.push({
+                    type: type,
+                    ...data,
+                    ...other,
+                });
+                break;
+            }
+            case "reply": {
+                const oneBot = this.getOneBot(uin);
+                const message_id = oneBot.V11.getStrByInt("message_id", data.id);
+                const msg = await oneBot.internal.getMsg(message_id);
+                result.push({
+                    type: "quote",
+                    ...msg,
+                });
+                break;
+            }
+            default: {
+                result.push({
+                    type: type,
+                    ...data,
+                    ...other,
+                });
+            }
         }
     }
-    let share = elements.find(e => e.type === "share");
-    if (share)
-        (0, utils_1.remove)(elements, share);
-    for (const element of elements) {
-        if (["image", "video", "audio"].includes(element.type)) {
-            if (element["file_id"]?.startsWith("base64://"))
-                element["file_id"] = Buffer.from(element["file_id"].slice(9), "base64");
-            if (element["file"]?.startsWith("base64://"))
-                element["file"] = Buffer.from(element["file"].slice(9), "base64");
-        }
-    }
-    return { element: elements, share, music };
+    return result;
 }
-exports.processMessage = processMessage;
+exports.processMessages = processMessages;

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

@@ -15,7 +15,7 @@ export default class QQAdapter extends Adapter<"qq", Sendable> {
     sendDirectMessage<V extends OneBot.Version>(uin: string, version: V, args: [string, Sendable, 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>[]): Sendable;
+    fromSegment<V extends OneBot.Version>(onebot: OneBot<Bot>, version: V, segment: OneBot.Segment<V> | OneBot.Segment<V>[]): Sendable;
     toSegment<V extends OneBot.Version, M = Sendable>(version: V, message: M): OneBot.Segment<V>[];
     formatEventPayload<V extends OneBot.Version>(uin: string, version: V, event: string, data: any): OneBot.Payload<V>;
     start(uin: string): Promise<void>;

package/lib/adapters/qq/index.js

@@ -175,8 +175,15 @@ class QQAdapter extends adapter_1.Adapter {
             throw new Error(`call internal method error:${e.message}`);
         }
     }
-    fromSegment(version, segment) {
-        return [].concat(segment).map(item => {
+    fromSegment(onebot, version, segment) {
+        return []
+            .concat(segment)
+            .map(segment => {
+            if (version === "V12" && ["image", "video", "audio"].includes(segment.type))
+                return onebot.V12.transformMedia(segment);
+            return segment;
+        })
+            .map(item => {
             if (typeof item === "string")
                 return item;
             const { type, data } = item;
@@ -215,6 +222,10 @@ class QQAdapter extends adapter_1.Adapter {
             platform: "qq",
             time: data.timestamp,
             ...data,
+            sender: {
+                ...(data?.sender || {}),
+            },
+            user_id: data.user_id || data.sender?.user_id,
         };
         if (data.message_id) {
             data.message_id = `${data.message_type}:${data.channel_id || data.guild_id || data.group_id || data.user_id}:${data.message_id}`;

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

@@ -14,7 +14,7 @@ export default class WechatAdapter extends Adapter<"wechat", Sendable> {
     sendPrivateMessage<V extends OneBot.Version>(uin: string, version: V, args: [string, Sendable, string]): Promise<OneBot.MessageRet<V>>;
     sendGroupMessage<V extends OneBot.Version>(uin: string, version: V, args: [string, Sendable, 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>[]): Sendable;
+    fromSegment<V extends OneBot.Version>(onebot: OneBot<Client>, 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>[]>;

package/lib/adapters/wechat/index.js

@@ -143,8 +143,15 @@ class WechatAdapter extends adapter_1.Adapter {
             return bot.internal.recallMsg(username, message_idArr.join(":"));
         }
     }
-    fromSegment(version, segment) {
-        return [].concat(segment).map(item => {
+    fromSegment(onebot, version, segment) {
+        return []
+            .concat(segment)
+            .map(segment => {
+            if (version === "V12" && ["image", "video", "audio"].includes(segment.type))
+                return onebot.V12.transformMedia(segment);
+            return segment;
+        })
+            .map(item => {
             if (typeof item === "string")
                 return item;
             const { type, data } = item;
@@ -212,6 +219,10 @@ class WechatAdapter extends adapter_1.Adapter {
             friend: data.friend?.info,
             time: data.timestamp,
             ...data,
+            sender: {
+                ...(data?.sender || {}),
+            },
+            user_id: data.user_id || data.sender?.user_id,
         };
         delete result.bot;
         delete result.c;

package/lib/service/V11/index.js

@@ -503,7 +503,7 @@ class V11 extends service_1.Service {
                         res.reply[0].data.platform = res.reply[0].data.type;
                         delete res.reply[0].data.type;
                     }
-                    res.reply = this.adapter.fromSegment("V11", res.reply);
+                    res.reply = this.adapter.fromSegment(this.oneBot, "V11", res.reply);
                 }
                 this.action[action].apply(this, [id, res.reply, res.auto_escape]);
             }
@@ -577,7 +577,7 @@ class V11 extends service_1.Service {
                             }
                             params[k] = this.adapter.fromCqcode("V11", params[k]);
                         }
-                        params[k] = this.adapter.fromSegment("V11", params[k]);
+                        params[k] = this.adapter.fromSegment(this.oneBot, "V11", params[k]);
                         params["message_id"] =
                             params[k].find(e => e.type === "reply")?.id || params["message_id"];
                     }
@@ -668,7 +668,6 @@ exports.V11 = V11;
         reconnect_interval: 3,
         use_http: true,
         enable_cors: true,
-        enable_reissue: false,
         use_ws: true,
         http_reverse: [],
         ws_reverse: [],

package/lib/service/V12/action/common.d.ts

@@ -44,4 +44,5 @@ export declare class CommonAction {
     uploadFileFragmented(this: V12, stage: "prepare" | "transfer" | "finish", name?: string, total_size?: number, file_id?: string, offset?: number, data?: string, sha256?: string): string | true;
     getFile(this: V12, file_id: string): V12.FileInfo;
     sendLike(this: V12, user_id: string, times?: number): Promise<any>;
+    imageOcr(this: V12, file: string): Promise<any>;
 }

package/lib/service/V12/action/common.js

@@ -133,5 +133,8 @@ class CommonAction {
     sendLike(user_id, times = 1) {
         return this.adapter.call(this.oneBot.uin, "V12", "sendLike", [user_id, times]);
     }
+    imageOcr(file) {
+        return this.adapter.call(this.oneBot.uin, "V12", "imageOcr", [file]);
+    }
 }
 exports.CommonAction = CommonAction;

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

@@ -49,6 +49,7 @@ export declare class V12 extends Service<"V12"> implements OneBot.Base {
     };
     system_online(data: any): void;
     dispatch(data: Record<string, any>): Promise<void>;
+    transformMedia(segment: V12.Segment): V12.Segment;
     apply(req: V12.RequestAction): Promise<string>;
     private httpAuth;
     private httpRequestHandler;

package/lib/service/V12/index.js

@@ -401,6 +401,18 @@ class V12 extends service_1.Service {
             return;
         this.emit("dispatch", payload);
     }
+    transformMedia(segment) {
+        const file = this.getFile(segment.data.file_id);
+        if (file)
+            return {
+                type: segment.type,
+                data: {
+                    ...segment.data,
+                    file_id: `base64://${file.data}`,
+                },
+            };
+        return segment;
+    }
     async apply(req) {
         let { action = "", params = {}, echo } = req;
         action = (0, utils_2.toLine)(action);
@@ -445,7 +457,7 @@ class V12 extends service_1.Service {
                             }
                             params[k] = this.adapter.fromCqcode("V12", params[k]);
                         }
-                        params[k] = this.adapter.fromSegment("V12", params[k]);
+                        params[k] = this.adapter.fromSegment(this.oneBot, "V12", params[k]);
                     }
                     args.push(params[k]);
                 }

package/package.json

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