@mrlingxd/koishi-plugin-adapter-onebot 0.1.0 → 0.2.1

package/lib/utils.js

@@ -1,92 +1,91 @@
-import { h, hyphenate, omit } from "koishi";
+import { h, omit } from "koishi";
 import * as qface from "qface";
-import { CQCode } from "./bot";
+import { CQCode } from "./bot/cqcode";
+import { EventType, GroupMemberRole } from "./types/enum";
+import { isGroupMessageEvent, isMessageEvent } from "./types/event/message";
+import { isGroupPokeNotice, isNoticeEvent, NoticeType } from "./types/event/notice";
+import { isFriendRequest, isGroupRequest, isRequestEvent } from "./types/event/request";
 export * from "./types";
-export const decodeUser = (user) => ({
-    id: user.tiny_id || user.user_id.toString(),
+export const convertUser = (user, isBot = false) => ({
+    id: user.user_id.toString(),
     name: user.nickname,
-    userId: user.tiny_id || user.user_id.toString(),
-    avatar: user.user_id ? `http://q.qlogo.cn/headimg_dl?dst_uin=${user.user_id}&spec=640` : undefined,
-    username: user.nickname
+    nick: user.remark || user.nickname,
+    avatar: `https://q.qlogo.cn/headimg_dl?dst_uin=${user.user_id}&spec=640`,
+    isBot: isBot
 });
-export const decodeGuildMember = (user) => ({
-    user: decodeUser(user),
-    nick: user.card,
-    roles: [user.role]
-});
-export const adaptQQGuildMemberInfo = (user) => ({
-    user: {
-        id: user.tiny_id,
-        name: user.nickname,
-        isBot: user.role_name === "机器人"
-    },
-    name: user.nickname,
-    roles: user.role_name ? [user.role_name] : []
+export const decodeUser = (event, isBot = false) => ({
+    id: event.user_id.toString(),
+    name: event.sender.nickname,
+    avatar: `https://q.qlogo.cn/headimg_dl?dst_uin=${event.user_id}&spec=640`,
+    isBot: isBot
 });
-export const adaptQQGuildMemberProfile = (user) => ({
-    user: {
-        id: user.tiny_id,
-        name: user.nickname,
-        isBot: user.roles?.some((r) => r.role_name === "机器人")
-    },
-    name: user.nickname,
-    roles: user.roles?.map((r) => r.role_name) || []
+export function decodeGuild(group) {
+    return {
+        id: String(group.group_id),
+        name: group.group_name,
+        avatar: `https://p.qlogo.cn/gh/${group.group_id}/${group.group_id}/640`
+    };
+}
+export const decodeGuildMember = (user, isBot = false) => ({
+    user: convertUser(user, isBot),
+    nick: user.card || user.nickname,
+    avatar: `https://q.qlogo.cn/headimg_dl?dst_uin=${user.user_id}&spec=640`,
+    roles: [user.role]
 });
-export async function adaptMessage(bot, data, message = {}, payload = message) {
-    message.id = message.messageId = data.message_id.toString();
+export async function decodeMessage(bot, event, message = {}, payload = message) {
+    const [guildId, channelId] = decodeGroupChannelId(event);
     // message content
-    const chain = CQCode.parse(data.message);
-    if (bot.config.advanced.splitMixedContent) {
-        chain.forEach((item, index) => {
-            if (item.type !== "image")
-                return;
-            const left = chain[index - 1];
-            if (left && left.type === "text" && left.attrs.content.trimEnd() === left.attrs.content) {
-                left.attrs.content += " ";
-            }
-            const right = chain[index + 1];
-            if (right && right.type === "text" && right.attrs.content.trimStart() === right.attrs.content) {
-                right.attrs.content = " " + right.attrs.content;
-            }
-        });
-    }
+    const chain = CQCode.parse(event.message);
+    // 映射
     message.elements = h.transform(chain, {
+        text(attrs) {
+            return h.text(attrs.text);
+        },
         at(attrs) {
             if (attrs.qq !== "all")
-                return h.at(attrs.qq, { name: attrs.name });
-            return h("at", { type: "all" });
+                return h.at(attrs.qq, {
+                    name: attrs.name,
+                    ...omit(attrs, [attrs.qq ? "qq" : undefined, attrs.name ? "name" : undefined])
+                });
+            return h.at("at", {
+                type: "all",
+                ...omit(attrs, [attrs.qq ? "qq" : undefined, attrs.name ? "name" : undefined])
+            });
         },
-        face({ id }) {
-            const name = qface.get(id)?.QDes.slice(1);
-            return h("face", { id, name, platform: bot.platform }, [h.image(qface.getUrl(id))]);
+        face(attrs) {
+            const name = qface.get(attrs.id)?.QDes.slice(1);
+            return h("face", { id: attrs.id, name, platform: bot.platform }, [h.image(qface.getUrl(attrs.id))]);
         },
         image(attrs) {
-            return h("img", {
-                src: attrs.url || attrs.file,
-                ...omit(attrs, ["url"])
+            return h.image(attrs.url || attrs.file, {
+                title: attrs.name || undefined,
+                ...omit(attrs, [
+                    attrs.name ? "name" : undefined,
+                    attrs.url ? "url" : undefined,
+                    attrs.file ? "file" : undefined
+                ])
             });
         },
         record(attrs) {
-            return h("audio", {
-                src: attrs.url || attrs.file,
-                ...omit(attrs, ["url"])
+            return h.audio(attrs.url || attrs.file, {
+                ...omit(attrs, [attrs.url ? "url" : undefined, attrs.file ? "file" : undefined])
             });
         },
         video(attrs) {
-            return h("video", {
-                src: attrs.url || attrs.file,
-                ...omit(attrs, ["url"])
+            return h.video(attrs.url || attrs.file, {
+                ...omit(attrs, [attrs.url ? "url" : undefined, attrs.file ? "file" : undefined])
             });
         },
         file(attrs) {
-            return h("file", {
-                src: attrs.url || attrs.file,
-                ...omit(attrs, ["url"])
+            return h.file(attrs.url || attrs.file, {
+                ...omit(attrs, [attrs.url ? "url" : undefined, attrs.file ? "file" : undefined])
             });
+        },
+        reply(attrs) {
+            return h("reply", { id: attrs.id });
         }
     });
-    const [guildId, channelId] = decodeGuildChannelId(data);
-    if (message.elements[0]?.type === "reply") {
+    if (message.elements[0].type === "reply") {
         const reply = message.elements.shift();
         message.quote = await bot.getMessage(channelId, reply.attrs.id).catch((error) => {
             bot.logger.warn(error);
@@ -94,184 +93,193 @@ export async function adaptMessage(bot, data, message = {}, payload = message) {
         });
     }
     message.content = message.elements.join("");
-    if (!payload)
-        return message;
-    payload.user = decodeUser(data.sender);
-    payload.member = decodeGuildMember(data.sender);
-    payload.timestamp = data.time * 1000;
-    payload.guild = guildId && { id: guildId };
-    payload.channel = channelId && {
+    payload.timestamp = event.time * 1000;
+    message.id = event.message_id.toString();
+    payload.channel = {
         id: channelId,
-        type: guildId ? 0 /* Universal.Channel.Type.TEXT */ : 1 /* Universal.Channel.Type.DIRECT */
+        type: event.message_type === "group" ? 0 /* Universal.Channel.Type.TEXT */ : 1 /* Universal.Channel.Type.DIRECT */,
+        name: event.message_type === "group" ? event.group_name || undefined : event.sender.nickname
     };
+    payload.user = decodeUser(event);
+    if (isGroupMessageEvent(event)) {
+        payload.guild = {
+            id: event.group_id.toString(),
+            name: event.group_name || undefined,
+            avatar: `https://p.qlogo.cn/gh/${event.group_id}/${event.group_id}/640`
+        };
+        payload.member = {
+            user: decodeUser(event),
+            name: event.sender.nickname,
+            nick: event.sender.card,
+            avatar: `https://q.qlogo.cn/headimg_dl?dst_uin=${event.user_id}&spec=640`,
+            roles: [event.sender.role]
+        };
+    }
     return message;
 }
-const decodeGuildChannelId = (data) => {
-    if (data.guild_id) {
-        return [data.guild_id, data.channel_id];
-    }
-    else if (data.group_id) {
-        return [data.group_id.toString(), data.group_id.toString()];
+const decodeGroupChannelId = (event) => {
+    if (event.message_type === "group") {
+        return [event.group_id.toString(), event.group_id.toString()];
     }
     else {
-        return [undefined, "private:" + data.sender.user_id];
+        return [undefined, "private:" + event.sender.user_id];
     }
 };
 export const adaptGuild = (info) => {
-    if (info.guild_id) {
-        const guild = info;
-        return {
-            id: guild.guild_id,
-            name: guild.guild_name
-        };
-    }
-    else {
-        const group = info;
-        return {
-            id: group.group_id.toString(),
-            name: group.group_name
-        };
-    }
+    return {
+        id: info.group_id.toString(),
+        name: info.group_name,
+        avatar: `https://p.qlogo.cn/gh/${info.group_id}/${info.group_id}/640`
+    };
 };
 export const adaptChannel = (info) => {
-    if (info.channel_id) {
-        const channel = info;
-        return {
-            id: channel.channel_id,
-            name: channel.channel_name,
-            type: 0 /* Universal.Channel.Type.TEXT */
-        };
-    }
-    else {
-        const group = info;
-        return {
-            id: group.group_id.toString(),
-            name: group.group_name,
-            type: 0 /* Universal.Channel.Type.TEXT */
-        };
-    }
+    return {
+        id: info.group_id.toString(),
+        name: info.group_name,
+        type: 0 /* Universal.Channel.Type.TEXT */
+    };
 };
 export async function dispatchSession(bot, data) {
-    if (data.self_tiny_id) {
-        // don't dispatch any guild message without guild initialization
-        bot = bot["guildBot"];
-        if (!bot)
-            return;
+    if (data.post_type === EventType.MESSAGE_SENT) {
+        bot.logger.warn("暂不支持自身消息事件的处理");
+        return;
     }
     const session = await adaptSession(bot, data);
     if (!session)
         return;
-    session.setInternal("onebot", data);
     bot.dispatch(session);
 }
-export async function adaptSession(bot, data) {
+export async function adaptSession(bot, event) {
     const session = bot.session();
-    session.selfId = data.self_tiny_id ? data.self_tiny_id : "" + data.self_id;
-    session.type = data.post_type;
-    if (data.post_type === "message" || data.post_type === "message_sent") {
-        await adaptMessage(bot, data, (session.event.message = {}), session.event);
-        if (data.post_type === "message_sent" && !session.guildId) {
-            session.channelId = "private:" + data.target_id;
-        }
+    session.setInternal("onebot", event);
+    session.selfId = event.self_id.toString();
+    session.timestamp = event.time * 1000;
+    if (isMessageEvent(event)) {
         session.type = "message";
-        session.subtype = data.message_type === "guild" ? "group" : data.message_type;
-        session.isDirect = data.message_type === "private";
-        session.subsubtype = data.message_type;
+        await decodeMessage(bot, event, (session.event.message = {}), session.event);
+        session.isDirect = event.message_type === "private";
         return session;
     }
-    session.subtype = data.sub_type;
-    if (data.user_id)
-        session.userId = "" + data.user_id;
-    if (data.group_id)
-        session.guildId = session.channelId = "" + data.group_id;
-    if (data.guild_id)
-        session.guildId = "" + data.guild_id;
-    if (data.channel_id)
-        session.channelId = "" + data.channel_id;
-    if (data.target_id)
-        session["targetId"] = "" + data.target_id;
-    if (data.operator_id)
-        session.operatorId = "" + data.operator_id;
-    if (data.message_id)
-        session.messageId = "" + data.message_id;
-    if (data.post_type === "request") {
-        session.content = data.comment;
-        session.messageId = data.flag;
-        if (data.request_type === "friend") {
+    else if (isRequestEvent(event)) {
+        session.content = event.comment;
+        session.messageId = event.flag;
+        session.userId = event.user_id.toString();
+        if (isFriendRequest(event)) {
             session.type = "friend-request";
-            session.channelId = `private:${session.userId}`;
+            session.channelId = `private:${event.user_id}`;
         }
-        else if (data.sub_type === "add") {
-            session.type = "guild-member-request";
-        }
-        else {
-            session.type = "guild-request";
+        else if (isGroupRequest(event)) {
+            session.channelId = event.group_id.toString();
+            session.guildId = event.group_id.toString();
+            if (event.sub_type === "add") {
+                session.type = "guild-member-request";
+            }
+            else if (event.sub_type === "invite") {
+                session.type = "guild-request";
+            }
         }
     }
-    else if (data.post_type === "notice") {
-        switch (data.notice_type) {
-            case "group_recall":
-                session.type = "message-deleted";
-                session.subtype = "group";
-                break;
-            case "friend_recall":
+    else if (isNoticeEvent(event)) {
+        switch (event.notice_type) {
+            case NoticeType.GROUP_RECALL:
                 session.type = "message-deleted";
-                session.subtype = "private";
-                session.channelId = `private:${session.userId}`;
+                session.userId = event.user_id.toString();
+                session.operatorId = event.operator_id.toString();
+                session.messageId = event.message_id.toString();
+                session.channelId = event.group_id.toString();
+                session.guildId = event.group_id.toString();
+                session.isDirect = false;
                 break;
-            // from go-cqhttp source code, but not mentioned in official docs
-            case "guild_channel_recall":
+            case NoticeType.FRIEND_RECALL:
                 session.type = "message-deleted";
-                session.subtype = "guild";
+                session.userId = event.user_id.toString();
+                session.operatorId = event.user_id.toString();
+                session.messageId = event.message_id.toString();
+                session.channelId = `private:${event.user_id}`;
+                session.isDirect = true;
                 break;
-            case "friend_add":
+            case NoticeType.FRIEND_ADD:
                 session.type = "friend-added";
+                session.userId = event.user_id.toString();
                 break;
-            case "group_admin":
-                session.type = "guild-member";
-                session.subtype = "role";
+            case NoticeType.GROUP_ADMIN:
+                session.type = "guild-role-updated";
+                session.userId = event.user_id.toString();
+                session.guildId = event.group_id.toString();
+                session.channelId = event.group_id.toString();
+                session.roleId = event.sub_type === "set" ? GroupMemberRole.admin : GroupMemberRole.member;
                 break;
-            case "group_ban":
-                session.type = "guild-member";
-                session.subtype = "ban";
+            case NoticeType.GROUP_BAN:
+                session.type = "guild-member-updated";
+                session.userId = event.user_id.toString();
+                session.guildId = event.group_id.toString();
+                session.channelId = event.group_id.toString();
+                session.operatorId = event.operator_id.toString();
                 break;
-            case "group_decrease":
-                session.type = session.userId === session.selfId ? "guild-deleted" : "guild-member-removed";
-                session.subtype = session.userId === session.operatorId ? "active" : "passive";
+            case NoticeType.GROUP_DECREASE:
+                session.type = event.sub_type === "kick_me" ? "guild-removed" : "guild-member-removed";
+                session.userId = event.user_id.toString();
+                session.guildId = event.group_id.toString();
+                session.channelId = event.group_id.toString();
+                session.operatorId = event.operator_id.toString();
                 break;
-            case "group_increase":
-                session.type = session.userId === session.selfId ? "guild-added" : "guild-member-added";
-                session.subtype = session.userId === session.operatorId ? "active" : "passive";
+            case NoticeType.GROUP_INCREASE:
+                session.type = event.user_id.toString() === session.selfId ? "guild-added" : "guild-member-added";
+                session.userId = event.user_id.toString();
+                session.guildId = event.group_id.toString();
+                session.channelId = event.group_id.toString();
+                session.operatorId = event.operator_id.toString();
                 break;
-            case "group_card":
+            case NoticeType.GROUP_CARD:
                 session.type = "guild-member-updated";
-                session.subtype = "nickname";
+                session.userId = event.user_id.toString();
+                session.guildId = event.group_id.toString();
+                session.channelId = event.group_id.toString();
+                session.content = event.card_new;
                 break;
-            case "notify":
-                session.type = "notice";
-                session.subtype = hyphenate(data.sub_type);
-                if (session.subtype === "poke") {
-                    session.channelId ||= `private:${session.userId}`;
-                }
-                else if (session.subtype === "honor") {
-                    session.subsubtype = hyphenate(data.honor_type);
+            case NoticeType.NOTIFY:
+                session.type = "onebot/notice";
+                switch (event.sub_type) {
+                    case "poke":
+                        session.type += "-poke";
+                        session.userId = event.target_id.toString();
+                        if (isGroupPokeNotice(event)) {
+                            session.channelId = event.group_id.toString();
+                            session.guildId = event.group_id.toString();
+                            session.isDirect = false;
+                        }
+                        session.isDirect = true;
+                        session.channelId = `private:${event.user_id}`;
+                        break;
+                    case "honor":
+                        session.type += "-honor";
+                        session.channelId = event.group_id.toString();
+                        session.guildId = event.group_id.toString();
+                        session.userId = event.user_id.toString();
+                        session.content = event.honor_type;
+                        break;
+                    case "lucky_king":
+                        session.type += "-lucky-king";
+                        session.channelId = event.group_id.toString();
+                        session.guildId = event.group_id.toString();
+                        session.userId = event.target_id.toString();
+                        break;
+                    case "title":
+                        session.type += "-title";
+                        session.channelId = event.group_id.toString();
+                        session.guildId = event.group_id.toString();
+                        session.userId = event.user_id.toString();
+                        session.content = event.title;
+                        break;
                 }
                 break;
-            case "message_reactions_updated":
-                session.type = "onebot";
-                session.subtype = "message-reactions-updated";
-                break;
-            case "channel_created":
-                session.type = "onebot";
-                session.subtype = "channel-created";
-                break;
-            case "channel_updated":
-                session.type = "onebot";
-                session.subtype = "channel-updated";
-                break;
-            case "channel_destroyed":
-                session.type = "onebot";
-                session.subtype = "channel-destroyed";
+            case NoticeType.GROUP_ESSENCE:
+                session.type = "onebot/group-essence";
+                session.userId = event.sender_id.toString();
+                session.guildId = event.group_id.toString();
+                session.channelId = event.group_id.toString();
+                session.messageId = event.message_id.toString();
+                session.operatorId = event.operator_id.toString();
                 break;
             // https://github.com/koishijs/koishi-plugin-adapter-onebot/issues/33
             // case 'offline_file':

package/lib/ws.d.ts

@@ -1,27 +1,27 @@
 import { WebSocketLayer } from "@koishijs/plugin-server";
 import { Adapter, Context, HTTP, Logger, Schema, Universal } from "koishi";
-import { OneBotBot } from "./bot";
-interface SharedConfig<T = "ws" | "ws-reverse"> {
+import { OneBot } from "./bot";
+export interface SharedConfig<T = "ws" | "ws-reverse"> {
     protocol: T;
     responseTimeout?: number;
 }
-export declare class WsClient<C extends Context = Context> extends Adapter.WsClient<C, OneBotBot<C, any>> {
-    fork(ctx: C, bot: OneBotBot<C, OneBotBot.BaseConfig & WsClient.Options>): Promise<void>;
+export declare class WsClient<C extends Context = Context> extends Adapter.WsClient<C, OneBot<C>> {
+    fork(ctx: C, bot: OneBot<C>): Promise<void>;
     accept(socket: Universal.WebSocket): void;
     prepare(): any;
-    disconnect(bot: OneBotBot<C>): Promise<void>;
+    disconnect(bot: OneBot<C>): Promise<void>;
 }
 export declare namespace WsClient {
     interface Options extends SharedConfig<"ws">, HTTP.Config, Adapter.WsClientConfig {
     }
     const Options: Schema<Options>;
 }
-export declare class WsServer<C extends Context> extends Adapter<C, OneBotBot<C, OneBotBot.BaseConfig & WsServer.Options>> {
+export declare class WsServer<C extends Context> extends Adapter<C, OneBot<C>> {
     static inject: string[];
     logger: Logger;
     wsServer?: WebSocketLayer;
-    constructor(ctx: C, bot: OneBotBot<C>);
-    disconnect(bot: OneBotBot<C>): Promise<void>;
+    constructor(ctx: C, bot: OneBot<C>);
+    disconnect(bot: OneBot<C>): Promise<void>;
 }
 export declare namespace WsServer {
     interface Options extends SharedConfig<"ws-reverse"> {
@@ -29,5 +29,4 @@ export declare namespace WsServer {
     }
     const Options: Schema<Options>;
 }
-export declare function accept(socket: Universal.WebSocket, bot: OneBotBot<Context, any>): void;
-export {};
+export declare function accept(socket: Universal.WebSocket, bot: OneBot<Context>): void;

package/lib/ws.js

@@ -47,10 +47,8 @@ export class WsServer extends Adapter {
             if (headers["x-client-role"] !== "Universal") {
                 return socket.close(1008, "invalid x-client-role");
             }
-            const selfId = headers["x-self-id"].toString();
-            const bot = this.bots.find((bot) => bot.selfId === selfId);
-            if (!bot)
-                return socket.close(1008, "invalid x-self-id");
+            // const selfId = headers["x-self-id"].toString();
+            // if (!bot) return socket.close(1008, "invalid x-self-id");
             bot[kSocket] = socket;
             accept(socket, bot);
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mrlingxd/koishi-plugin-adapter-onebot",
-  "version": "0.1.0",
+  "version": "0.2.1",
   "description": "OneBot Adapter for Koishi",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -14,7 +14,7 @@
   "homepage": "https://github.com/wling-art/koishi-plugin-adapter-onebot",
   "repository": {
     "type": "git",
-    "url": "https://github.com/wling-art/koishi-plugin-adapter-onebot.git"
+    "url": "git+https://github.com/wling-art/koishi-plugin-adapter-onebot.git"
   },
   "bugs": {
     "url": "https://github.com/wling-art/koishi-plugin-adapter-onebot/issues"
@@ -41,8 +41,7 @@
     }
   },
   "scripts": {
-    "build": "atsc -b",
-    "lint": "eslint --ext=ts --cache"
+    "build": "atsc -b"
   },
   "devDependencies": {
     "@cordisjs/eslint-config": "^1.1.1",
@@ -53,13 +52,11 @@
     "esbuild-register": "^3.6.0",
     "eslint": "^9.39.2",
     "koishi": "^4.18.9",
+    "qface": "^1.4.1",
     "typescript": "^5.9.3",
     "yml-register": "^1.2.5"
   },
   "peerDependencies": {
     "koishi": "^4.18.6"
-  },
-  "dependencies": {
-    "qface": "^1.4.1"
   }
 }

package/lib/bot/base.d.ts

@@ -1,36 +0,0 @@
-import { Bot, Context, Schema, Universal } from "koishi";
-import * as OneBot from "../utils";
-import { OneBotMessageEncoder } from "./message";
-export declare class BaseBot<C extends Context = Context, T extends BaseBot.Config = BaseBot.Config> extends Bot<C, T> {
-    static MessageEncoder: typeof OneBotMessageEncoder;
-    static inject: string[];
-    parent?: BaseBot;
-    internal: OneBot.Internal;
-    createDirectChannel(userId: string): Promise<{
-        id: string;
-        type: Universal.Channel.Type;
-    }>;
-    getMessage(channelId: string, messageId: string): Promise<Universal.Message>;
-    deleteMessage(channelId: string, messageId: string): Promise<void>;
-    getLogin(): Promise<Universal.Login>;
-    getUser(userId: string): Promise<Universal.User>;
-    getFriendList(): Promise<{
-        data: Universal.User[];
-    }>;
-    handleFriendRequest(messageId: string, approve: boolean, comment?: string): Promise<void>;
-    handleGuildRequest(messageId: string, approve: boolean, comment?: string): Promise<void>;
-    handleGuildMemberRequest(messageId: string, approve: boolean, comment?: string): Promise<void>;
-    deleteFriend(userId: string): Promise<void>;
-    getMessageList(channelId: string, before?: string, direction?: Universal.Direction): Promise<{
-        data: Universal.Message[];
-    }>;
-}
-export declare namespace BaseBot {
-    interface Config {
-        advanced?: AdvancedConfig;
-    }
-    interface AdvancedConfig {
-        splitMixedContent?: boolean;
-    }
-    const AdvancedConfig: Schema<AdvancedConfig>;
-}