@mrlingxd/koishi-plugin-adapter-onebot 0.2.5 → 0.2.8

package/lib/bot/cqcode.d.ts

@@ -1,7 +1,13 @@
-import { Dict, h } from "koishi";
+import type { Dict } from "koishi";
+import { h } from "koishi";
 export declare function CQCode(type: string, attrs: Dict<string>): string;
+/** CQ 码接口 */
 export interface CQCode<T extends string = string, D = Dict<string>> {
+    /**
+     * 消息类型
+     */
     type: T;
+    /** 消息数据 */
     data: D;
 }
 export declare namespace CQCode {

package/lib/bot/cqcode.js

@@ -47,7 +47,9 @@ export function CQCode(type, attrs) {
         while ((result = from(source))) {
             const { type, data, capture } = result;
             if (capture.index) {
-                elements.push(h("text", { content: unescape(source.slice(0, capture.index)) }));
+                elements.push(h("text", {
+                    content: unescape(source.slice(0, capture.index))
+                }));
             }
             elements.push(h(type, data));
             source = source.slice(capture.index + capture[0].length);

package/lib/bot/index.d.ts

@@ -1,8 +1,10 @@
-import { Bot, Context, Schema, Session, Universal } from "koishi";
+import type { Context } from "koishi";
+import { Bot, Schema, type Session, Universal } from "koishi";
 import { HttpServer } from "../http";
 import { Internal } from "../internal";
 import { WsClient, WsServer } from "../ws";
 import { OneBotMessageEncoder } from "./message";
+export { CQCode } from "./cqcode";
 export declare class OneBot<C extends Context = Context> extends Bot<C> {
     static MessageEncoder: typeof OneBotMessageEncoder;
     static inject: string[];

package/lib/bot/index.js

@@ -1,9 +1,11 @@
-import { Bot, Schema } from "koishi";
+import { Bot, Schema, Universal } from "koishi";
 import { HttpServer } from "../http";
 import { Internal } from "../internal";
+import {} from "../types/event/message";
 import { adaptChannel, adaptGuild, convertUser, decodeGuildMember, decodeMessage } from "../utils";
 import { WsClient, WsServer } from "../ws";
 import { OneBotMessageEncoder, PRIVATE_PFX } from "./message";
+export { CQCode } from "./cqcode";
 export class OneBot extends Bot {
     static MessageEncoder = OneBotMessageEncoder;
     static inject = ["http"];
@@ -30,7 +32,10 @@ export class OneBot extends Bot {
         await Promise.all([this.getLogin()]).then(() => this.online(), (error) => this.offline(error));
     }
     async createDirectChannel(userId) {
-        return { id: `${PRIVATE_PFX}${userId}`, type: 1 /* Universal.Channel.Type.DIRECT */ };
+        return {
+            id: `${PRIVATE_PFX}${userId}`,
+            type: Universal.Channel.Type.DIRECT
+        };
     }
     async getMessage(channelId, messageId) {
         const data = await this.internal.getMsg(Number(messageId));
@@ -55,7 +60,9 @@ export class OneBot extends Bot {
     }
     async getFriendList() {
         const data = await this.internal.getFriendList();
-        return { data: data.map((item) => convertUser(item, this.selfId === item.user_id.toString())) };
+        return {
+            data: data.map((item) => convertUser(item, this.selfId === item.user_id.toString()))
+        };
     }
     async handleFriendRequest(messageId, approve, comment) {
         await this.internal.setFriendAddRequest(messageId, approve, comment);
@@ -84,7 +91,9 @@ export class OneBot extends Bot {
             list = (await this.internal.getGroupMsgHistory(Number(channelId))).messages;
         }
         // 从旧到新
-        return { data: await Promise.all(list.map((item) => decodeMessage(this, item))) };
+        return {
+            data: await Promise.all(list.map((item) => decodeMessage(this, item)))
+        };
     }
     async getChannel(channelId) {
         const data = await this.internal.getGroupInfo(Number(channelId));

package/lib/bot/message.d.ts

@@ -1,6 +1,7 @@
-import { Context, h, MessageEncoder, Universal } from "koishi";
-import { OneBot } from ".";
-import { CQCode } from "./cqcode";
+import type { Context, h } from "koishi";
+import { MessageEncoder, Universal } from "koishi";
+import type { OneBot } from ".";
+import type { CQCode } from "./cqcode";
 export interface Author extends Universal.User {
     time?: string | number;
     messageId?: string;

package/lib/bot/message.js

@@ -1,4 +1,4 @@
-import { MessageEncoder, pick } from "koishi";
+import { MessageEncoder, pick, Universal } from "koishi";
 import { fileURLToPath } from "node:url";
 class State {
     type;
@@ -13,24 +13,24 @@ export class OneBotMessageEncoder extends MessageEncoder {
     stack = [new State("message")];
     children = [];
     async prepare() {
-        super.prepare();
+        await super.prepare();
         const { event: { channel } } = this.session;
-        if (!channel.type) {
+        if (channel && !channel.type) {
             channel.type = channel.id.startsWith(PRIVATE_PFX)
-                ? 1 /* Universal.Channel.Type.DIRECT */
-                : 0 /* Universal.Channel.Type.TEXT */;
+                ? Universal.Channel.Type.DIRECT
+                : Universal.Channel.Type.TEXT;
         }
         if (!this.session.isDirect) {
             this.session.guildId ??= this.channelId;
         }
     }
     async forward() {
-        if (!this.stack[0].children.length)
+        if (!this.stack[0] || !this.stack[0].children.length)
             return;
         const session = this.bot.session();
         session.content = "";
         session.messageId =
-            this.session.event.channel.type === 1 /* Universal.Channel.Type.DIRECT */
+            this.session.event.channel?.type === Universal.Channel.Type.DIRECT
                 ? (await this.bot.internal.sendPrivateForwardMsg(Number(this.channelId.slice(PRIVATE_PFX.length)), this.stack[0].children)).toString()
                 : (await this.bot.internal.sendGroupForwardMsg(Number(this.channelId), this.stack[0].children)).toString();
         session.userId = this.bot.selfId;
@@ -69,9 +69,9 @@ export class OneBotMessageEncoder extends MessageEncoder {
             this.stack[1].children.push({
                 type: "node",
                 data: {
-                    user_id: author.messageId,
+                    user_id: author.id,
                     nickname: author.nick || author.name,
-                    content: []
+                    content: this.children
                 }
             });
             this.children = [];
@@ -80,7 +80,7 @@ export class OneBotMessageEncoder extends MessageEncoder {
         const session = this.bot.session();
         session.content = "";
         session.messageId =
-            this.session.event.channel.type === 1 /* Universal.Channel.Type.DIRECT */
+            this.session.event.channel.type === Universal.Channel.Type.DIRECT
                 ? (await this.bot.internal.sendPrivateMsg(Number(this.channelId.slice(PRIVATE_PFX.length)), this.children)).toString()
                 : (await this.bot.internal.sendGroupMsg(Number(this.channelId), this.children)).toString();
         session.userId = this.bot.selfId;
@@ -96,7 +96,7 @@ export class OneBotMessageEncoder extends MessageEncoder {
         const name = attrs.title || (await this.bot.ctx.http.file(src)).filename;
         // 本地文件路径
         const file = src.startsWith("file:") ? fileURLToPath(src) : await this.bot.internal.downloadFile(src);
-        if (this.session.event.channel.type === 1 /* Universal.Channel.Type.DIRECT */) {
+        if (this.session.event.channel.type === Universal.Channel.Type.DIRECT) {
             await this.bot.internal.uploadPrivateFile(Number(this.channelId.slice(PRIVATE_PFX.length)), file, name);
         }
         else {
@@ -142,7 +142,10 @@ export class OneBotMessageEncoder extends MessageEncoder {
                 this.children.push({ type: "at", data: { qq: "all" } });
             }
             else {
-                this.children.push({ type: "at", data: { qq: attrs.id, name: attrs.name } });
+                this.children.push({
+                    type: "at",
+                    data: { qq: attrs.id, name: attrs.name }
+                });
             }
         }
         else if (type === "sharp") {
@@ -164,7 +167,12 @@ export class OneBotMessageEncoder extends MessageEncoder {
                 this.text(`（${attrs.href}）`);
         }
         else if (["video", "audio", "image", "img"].includes(type)) {
-            const typeMap = { video: "video", audio: "record", img: "image", image: "image" };
+            const typeMap = {
+                video: "video",
+                audio: "record",
+                img: "image",
+                image: "image"
+            };
             const childrenType = typeMap[type];
             if (type === "video" || type === "audio") {
                 await this.flush();
@@ -246,7 +254,6 @@ export class OneBotMessageEncoder extends MessageEncoder {
         }
         else if (type === "message") {
             await this.flush();
-            // qqguild does not support forward messages
             if ("forward" in attrs && !this.bot.parent) {
                 this.stack.unshift(new State("forward"));
                 await this.render(children);

package/lib/http.d.ts

@@ -1,5 +1,6 @@
-import { Adapter, Context, HTTP, Schema } from "koishi";
-import { OneBot } from "./bot";
+import type { Context } from "koishi";
+import { Adapter, HTTP, Schema } from "koishi";
+import type { OneBot } from "./bot";
 export declare class HttpServer<C extends Context = Context> extends Adapter<C, OneBot<C>> {
     static inject: string[];
     fork(ctx: C, bot: OneBot<C>): Promise<void>;

package/lib/http.js

@@ -1,5 +1,6 @@
+import {} from "@koishijs/plugin-server";
 import { createHmac } from "crypto";
-import { Adapter, HTTP, Schema } from "koishi";
+import { Adapter, HTTP, Schema, Universal } from "koishi";
 import { isBaseEvent } from "./types/event/base";
 import { dispatchSession } from "./utils";
 export class HttpServer extends Adapter {
@@ -23,7 +24,7 @@ export class HttpServer extends Adapter {
     }
     async connect(bot) {
         const { secret, path = "/onebot" } = bot.config;
-        this.ctx.server.post(path, (ctx) => {
+        this.ctx.server.post(path, async (ctx) => {
             if (secret) {
                 // no signature
                 const signature = ctx.headers["x-signature"];
@@ -41,11 +42,11 @@ export class HttpServer extends Adapter {
                 return (ctx.status = 403);
             if (!isBaseEvent(ctx.request.response.body))
                 return (ctx.status = 400);
-            dispatchSession(bot, ctx.request.response.body);
+            void dispatchSession(bot, ctx.request.response.body);
         });
     }
     async disconnect(bot) {
-        bot.status = 4 /* Universal.Status.RECONNECT */;
+        bot.status = Universal.Status.RECONNECT;
     }
 }
 (function (HttpServer) {

package/lib/index.d.ts

@@ -1,12 +1,11 @@
-import { Session } from "koishi";
 import { OneBot } from "./bot";
-import { Internal } from "./internal";
+import type { Internal } from "./internal";
 export { OneBot };
 export * from "./bot";
 export * from "./http";
 export * from "./ws";
 export default OneBot;
-declare module "@satorijs/core" {
+declare module "koishi" {
     interface Session {
         onebot?: Internal & {
             targetId?: string;

package/lib/internal.d.ts

@@ -1,38 +1,27 @@
-import { Dict } from "koishi";
-import { OneBot } from "./bot";
-import { CQCode } from "./bot/cqcode";
-import { EssenceMessage, FriendInfo, GetCredentialsResponse, GroupAtAllRemain, GroupFileList, GroupFileSystemInfo, GroupHonorInfo, GroupNotice, GroupSystemMsgResponse, ImageOcrResult, LoginInfo, ModelVariant, UnidirectionalFriendInfo } from "./types";
-import { Device } from "./types/device";
-import { HonorType, SafetyLevel } from "./types/enum";
-import { GroupMessageEvent, MessageEvent } from "./types/event/message";
-import { GroupInfo, GroupMemberInfo } from "./types/group";
-import { UserInfo } from "./types/user";
+import { type Dict } from "koishi";
+import type { OneBot } from "./bot";
+import type { CQCode } from "./bot/cqcode";
+import type { EssenceMessage, FriendInfo, GetCredentialsResponse, GroupAtAllRemain, GroupFileList, GroupFileSystemInfo, GroupHonorInfo, GroupNotice, GroupSystemMsgResponse, ImageOcrResult, LoginInfo, ModelVariant, UnidirectionalFriendInfo } from "./types";
+import type { Device } from "./types/device";
+import type { HonorType, SafetyLevel } from "./types/enum";
+import type { GroupMessageEvent, MessageEvent } from "./types/event/message";
+import type { GroupInfo, GroupMemberInfo } from "./types/group";
+import type { UserInfo } from "./types/user";
 export declare class Internal {
     readonly bot: OneBot;
-    _request: (action: string, params: Dict) => Promise<any>;
+    _request?: (action: string, params: Dict) => Promise<any>;
     constructor(bot: OneBot);
     private _get;
-    setGroupAnonymousBan(group_id: string, meta: string | object, duration?: number): Promise<void>;
-    setGroupAnonymousBanAsync(group_id: string, meta: string | object, duration?: number): Promise<void>;
     sendPrivateMsg(user_id: number, message: string | readonly CQCode.CQCodeUnion[], auto_escape?: boolean): Promise<number>;
-    sendPrivateMsgAsync(user_id: number, message: string | readonly CQCode.CQCodeUnion[], auto_escape?: boolean): Promise<void>;
     sendGroupMsg(group_id: number, message: string | readonly CQCode.CQCodeUnion[], auto_escape?: boolean): Promise<number>;
-    sendGroupMsgAsync(group_id: number, message: string | readonly CQCode.CQCodeUnion[], auto_escape?: boolean): Promise<void>;
-    sendGroupForwardMsg(group_id: number, messages: readonly CQCode.CQCodeUnion[]): Promise<number>;
-    sendGroupForwardMsgAsync(group_id: number, messages: readonly CQCode.CQCodeUnion[]): Promise<void>;
-    sendPrivateForwardMsg(user_id: number, messages: readonly CQCode.CQCodeUnion[]): Promise<number>;
-    sendPrivateForwardMsgAsync(user_id: number, messages: readonly CQCode.CQCodeUnion[]): Promise<void>;
+    sendGroupForwardMsg(group_id: number, messages: readonly CQCode.MergeForward[] | CQCode.Forward): Promise<number>;
+    sendPrivateForwardMsg(user_id: number, messages: readonly CQCode.MergeForward[] | CQCode.Forward): Promise<number>;
     deleteMsg(message_id: number): Promise<void>;
-    deleteMsgAsync(message_id: number): Promise<void>;
     setEssenceMsg(message_id: number): Promise<void>;
-    setEssenceMsgAsync(message_id: number): Promise<void>;
     deleteEssenceMsg(message_id: number): Promise<void>;
-    deleteEssenceMsgAsync(message_id: number): Promise<void>;
     markMsgAsRead(message_id: number): Promise<void>;
     sendLike(user_id: number, times?: number): Promise<void>;
-    sendLikeAsync(user_id: number, times?: number): Promise<void>;
     sendGroupSign(group_id: number): Promise<void>;
-    sendGroupSignAsync(group_id: number): Promise<void>;
     getMsg(message_id: number): Promise<MessageEvent>;
     getForwardMsg(message_id: number): Promise<CQCode.MergeForward>;
     getEssenceMsgList(group_id: number): Promise<EssenceMessage[]>;
@@ -42,41 +31,25 @@ export declare class Internal {
         messages: GroupMessageEvent[];
     }>;
     deleteFriend(user_id: number): Promise<void>;
-    deleteFriendAsync(user_id: number): Promise<void>;
     deleteUnidirectionalFriend(user_id: number): Promise<void>;
-    deleteUnidirectionalFriendAsync(user_id: number): Promise<void>;
     setFriendAddRequest(flag: string, approve: boolean, remark?: string): Promise<void>;
-    setFriendAddRequestAsync(flag: string, approve: boolean, remark?: string): Promise<void>;
     setGroupAddRequest(flag: string, subType: "add" | "invite", approve: boolean, reason?: string): Promise<void>;
-    setGroupAddRequestAsync(flag: string, subType: "add" | "invite", approve: boolean, reason?: string): Promise<void>;
     setGroupKick(group_id: number, user_id: number, reject_add_request?: boolean): Promise<void>;
-    setGroupKickAsync(group_id: number, user_id: number, reject_add_request?: boolean): Promise<void>;
     setGroupBan(group_id: number, user_id: number, duration?: number): Promise<void>;
-    setGroupBanAsync(group_id: number, user_id: number, duration?: number): Promise<void>;
     setGroupWholeBan(group_id: number, enable?: boolean): Promise<void>;
-    setGroupWholeBanAsync(group_id: number, enable?: boolean): Promise<void>;
     setGroupAdmin(group_id: number, user_id: number, enable?: boolean): Promise<void>;
-    setGroupAdminAsync(group_id: number, user_id: number, enable?: boolean): Promise<void>;
     setGroupAnonymous(group_id: number, enable?: boolean): Promise<void>;
-    setGroupAnonymousAsync(group_id: number, enable?: boolean): Promise<void>;
     setGroupCard(group_id: number, user_id: number, card?: string): Promise<void>;
-    setGroupCardAsync(group_id: number, user_id: number, card?: string): Promise<void>;
     setGroupLeave(group_id: number, is_dismiss?: boolean): Promise<void>;
-    setGroupLeaveAsync(group_id: number, is_dismiss?: boolean): Promise<void>;
     setGroupSpecialTitle(group_id: number, user_id: number, special_title?: string, duration?: number): Promise<void>;
-    setGroupSpecialTitleAsync(group_id: number, user_id: number, special_title?: string, duration?: number): Promise<void>;
     setGroupName(group_id: number, name: string): Promise<void>;
-    setGroupNameAsync(group_id: number, name: string): Promise<void>;
     setGroupPortrait(group_id: number, file: string, cache?: boolean): Promise<void>;
-    setGroupPortraitAsync(group_id: number, file: string, cache?: boolean): Promise<void>;
     getGroupAtAllRemain(group_id: number): Promise<GroupAtAllRemain>;
     sendGroupNotice(group_id: number, content: string, image?: string, pinned?: number, confirm_required?: number): Promise<void>;
-    sendGroupNoticeAsync(group_id: number, content: string, image?: string, pinned?: number, confirm_required?: number): Promise<void>;
     getGroupNotice(group_id: number): Promise<GroupNotice[]>;
     delGroupNotice(group_id: number, notice_id: number): Promise<void>;
     getLoginInfo(): Promise<LoginInfo>;
     setQqProfile(nickname: string, company: string, email: string, college: string, personal_note: string): Promise<void>;
-    setQqProfileAsync(nickname: string, company: string, email: string, college: string, personal_note: string): Promise<void>;
     setQqAvatar(file: string): Promise<void>;
     setOnlineStatus(status: string, extStatus: string, batteryStatus: string): Promise<void>;
     getStrangerInfo(user_id: number, no_cache?: boolean): Promise<UserInfo>;
@@ -105,7 +78,7 @@ export declare class Internal {
     getCookies(domain?: string): Promise<string>;
     getCsrfToken(): Promise<number>;
     getCredentials(domain?: string): Promise<GetCredentialsResponse>;
-    getRecord(file: string, out_format: "mp3" | "amr" | "wma" | "m4a" | "spx" | "ogg" | "wav" | "flac" | string, full_path?: boolean): Promise<{
+    getRecord(file: string, out_format: string, full_path?: boolean): Promise<{
         /** 转换后的语音文件路径 */
         file: string;
     }>;

package/lib/internal.js

@@ -1,3 +1,4 @@
+import {} from "koishi";
 import { SenderError } from "./types/sender";
 export class Internal {
     bot;
@@ -7,6 +8,9 @@ export class Internal {
     }
     async _get(action, params = {}) {
         this.bot.logger.debug("[request] %s %o", action, params);
+        if (!this._request) {
+            throw new Error("适配器未连接");
+        }
         const response = await this._request(action, params);
         this.bot.logger.debug("[response] %o", response);
         const { data, retcode } = response;
@@ -15,78 +19,55 @@ export class Internal {
         }
         return data;
     }
-    async setGroupAnonymousBan(group_id, meta, duration) {
-        const args = { group_id, duration };
-        args[typeof meta === "string" ? "flag" : "anonymous"] = meta;
-        await this._get("set_group_anonymous_ban", args);
-    }
-    async setGroupAnonymousBanAsync(group_id, meta, duration) {
-        const args = { group_id, duration };
-        args[typeof meta === "string" ? "flag" : "anonymous"] = meta;
-        await this._get("set_group_anonymous_ban_async", args);
-    }
     // Messages
     async sendPrivateMsg(user_id, message, auto_escape) {
-        const data = await this._get("send_private_msg", { user_id, message, auto_escape });
+        const data = await this._get("send_private_msg", {
+            user_id,
+            message,
+            auto_escape
+        });
         return data.message_id;
     }
-    async sendPrivateMsgAsync(user_id, message, auto_escape) {
-        await this._get("send_private_msg_async", { user_id, message, auto_escape });
-    }
     async sendGroupMsg(group_id, message, auto_escape) {
-        const data = await this._get("send_group_msg", { group_id, message, auto_escape });
+        const data = await this._get("send_group_msg", {
+            group_id,
+            message,
+            auto_escape
+        });
         return data.message_id;
     }
-    async sendGroupMsgAsync(group_id, message, auto_escape) {
-        await this._get("send_group_msg_async", { group_id, message, auto_escape });
-    }
     async sendGroupForwardMsg(group_id, messages) {
-        const data = await this._get("send_group_forward_msg", { group_id, messages });
+        const data = await this._get("send_group_forward_msg", {
+            group_id,
+            messages
+        });
         return data.message_id;
     }
-    async sendGroupForwardMsgAsync(group_id, messages) {
-        await this._get("send_group_forward_msg_async", { group_id, messages });
-    }
     async sendPrivateForwardMsg(user_id, messages) {
-        const data = await this._get("send_private_forward_msg", { user_id, messages });
+        const data = await this._get("send_private_forward_msg", {
+            user_id,
+            messages
+        });
         return data.message_id;
     }
-    async sendPrivateForwardMsgAsync(user_id, messages) {
-        await this._get("send_private_forward_msg_async", { user_id, messages });
-    }
     async deleteMsg(message_id) {
         await this._get("delete_msg", { message_id });
     }
-    async deleteMsgAsync(message_id) {
-        await this._get("delete_msg_async", { message_id });
-    }
     async setEssenceMsg(message_id) {
         await this._get("set_essence_msg", { message_id });
     }
-    async setEssenceMsgAsync(message_id) {
-        await this._get("set_essence_msg_async", { message_id });
-    }
     async deleteEssenceMsg(message_id) {
         await this._get("delete_essence_msg", { message_id });
     }
-    async deleteEssenceMsgAsync(message_id) {
-        await this._get("delete_essence_msg_async", { message_id });
-    }
     async markMsgAsRead(message_id) {
         await this._get("mark_msg_as_read", { message_id });
     }
     async sendLike(user_id, times) {
         await this._get("send_like", { user_id, times });
     }
-    async sendLikeAsync(user_id, times) {
-        await this._get("send_like_async", { user_id, times });
-    }
     async sendGroupSign(group_id) {
         await this._get("send_group_sign", { group_id });
     }
-    async sendGroupSignAsync(group_id) {
-        await this._get("send_group_sign_async", { group_id });
-    }
     async getMsg(message_id) {
         return await this._get("get_msg", { message_id });
     }
@@ -105,101 +86,79 @@ export class Internal {
         return await this._get("ocr_image", { image });
     }
     async getGroupMsgHistory(group_id, message_seq) {
-        return await this._get("get_group_msg_history", { group_id, message_seq });
+        return await this._get("get_group_msg_history", {
+            group_id,
+            message_seq
+        });
     }
     async deleteFriend(user_id) {
         await this._get("delete_friend", { user_id });
     }
-    async deleteFriendAsync(user_id) {
-        await this._get("delete_friend_async", { user_id });
-    }
     async deleteUnidirectionalFriend(user_id) {
         await this._get("delete_unidirectional_friend", { user_id });
     }
-    async deleteUnidirectionalFriendAsync(user_id) {
-        await this._get("delete_unidirectional_friend_async", { user_id });
-    }
     async setFriendAddRequest(flag, approve, remark) {
         await this._get("set_friend_add_request", { flag, approve, remark });
     }
-    async setFriendAddRequestAsync(flag, approve, remark) {
-        await this._get("set_friend_add_request_async", { flag, approve, remark });
-    }
     async setGroupAddRequest(flag, subType, approve, reason) {
-        await this._get("set_group_add_request", { flag, sub_type: subType, approve, reason });
-    }
-    async setGroupAddRequestAsync(flag, subType, approve, reason) {
-        await this._get("set_group_add_request_async", { flag, sub_type: subType, approve, reason });
+        await this._get("set_group_add_request", {
+            flag,
+            sub_type: subType,
+            approve,
+            reason
+        });
     }
     // Group operations
     async setGroupKick(group_id, user_id, reject_add_request) {
-        await this._get("set_group_kick", { group_id, user_id, reject_add_request });
-    }
-    async setGroupKickAsync(group_id, user_id, reject_add_request) {
-        await this._get("set_group_kick_async", { group_id, user_id, reject_add_request });
+        await this._get("set_group_kick", {
+            group_id,
+            user_id,
+            reject_add_request
+        });
     }
     async setGroupBan(group_id, user_id, duration) {
         await this._get("set_group_ban", { group_id, user_id, duration });
     }
-    async setGroupBanAsync(group_id, user_id, duration) {
-        await this._get("set_group_ban_async", { group_id, user_id, duration });
-    }
     async setGroupWholeBan(group_id, enable) {
         await this._get("set_group_whole_ban", { group_id, enable });
     }
-    async setGroupWholeBanAsync(group_id, enable) {
-        await this._get("set_group_whole_ban_async", { group_id, enable });
-    }
     async setGroupAdmin(group_id, user_id, enable) {
         await this._get("set_group_admin", { group_id, user_id, enable });
     }
-    async setGroupAdminAsync(group_id, user_id, enable) {
-        await this._get("set_group_admin_async", { group_id, user_id, enable });
-    }
     async setGroupAnonymous(group_id, enable) {
         await this._get("set_group_anonymous", { group_id, enable });
     }
-    async setGroupAnonymousAsync(group_id, enable) {
-        await this._get("set_group_anonymous_async", { group_id, enable });
-    }
     async setGroupCard(group_id, user_id, card) {
         await this._get("set_group_card", { group_id, user_id, card });
     }
-    async setGroupCardAsync(group_id, user_id, card) {
-        await this._get("set_group_card_async", { group_id, user_id, card });
-    }
     async setGroupLeave(group_id, is_dismiss) {
         await this._get("set_group_leave", { group_id, is_dismiss });
     }
-    async setGroupLeaveAsync(group_id, is_dismiss) {
-        await this._get("set_group_leave_async", { group_id, is_dismiss });
-    }
     async setGroupSpecialTitle(group_id, user_id, special_title, duration) {
-        await this._get("set_group_special_title", { group_id, user_id, special_title, duration });
-    }
-    async setGroupSpecialTitleAsync(group_id, user_id, special_title, duration) {
-        await this._get("set_group_special_title_async", { group_id, user_id, special_title, duration });
+        await this._get("set_group_special_title", {
+            group_id,
+            user_id,
+            special_title,
+            duration
+        });
     }
     async setGroupName(group_id, name) {
         await this._get("set_group_name", { group_id, group_name: name });
     }
-    async setGroupNameAsync(group_id, name) {
-        await this._get("set_group_name_async", { group_id, group_name: name });
-    }
     async setGroupPortrait(group_id, file, cache) {
         await this._get("set_group_portrait", { group_id, file, cache });
     }
-    async setGroupPortraitAsync(group_id, file, cache) {
-        await this._get("set_group_portrait_async", { group_id, file, cache });
-    }
     async getGroupAtAllRemain(group_id) {
         return await this._get("get_group_at_all_remain", { group_id });
     }
     async sendGroupNotice(group_id, content, image, pinned, confirm_required) {
-        await this._get("_send_group_notice", { group_id, content, image, pinned, confirm_required });
-    }
-    async sendGroupNoticeAsync(group_id, content, image, pinned, confirm_required) {
-        await this._get("_send_group_notice_async", { group_id, content, image, pinned, confirm_required });
+        await this._get("_send_group_notice", {
+            group_id,
+            content,
+            image,
+            pinned,
+            confirm_required
+        });
     }
     async getGroupNotice(group_id) {
         return await this._get("_get_group_notice", { group_id });
@@ -212,16 +171,23 @@ export class Internal {
         return await this._get("get_login_info");
     }
     async setQqProfile(nickname, company, email, college, personal_note) {
-        await this._get("set_qq_profile", { nickname, company, email, college, personal_note });
-    }
-    async setQqProfileAsync(nickname, company, email, college, personal_note) {
-        await this._get("set_qq_profile_async", { nickname, company, email, college, personal_note });
+        await this._get("set_qq_profile", {
+            nickname,
+            company,
+            email,
+            college,
+            personal_note
+        });
     }
     async setQqAvatar(file) {
         await this._get("set_qq_avatar", { file });
     }
     async setOnlineStatus(status, extStatus, batteryStatus) {
-        await this._get("set_online_status", { status, ext_status: extStatus, battery_status: batteryStatus });
+        await this._get("set_online_status", {
+            status,
+            ext_status: extStatus,
+            battery_status: batteryStatus
+        });
     }
     async getStrangerInfo(user_id, no_cache) {
         return await this._get("get_stranger_info", { user_id, no_cache });
@@ -239,7 +205,11 @@ export class Internal {
         return await this._get("get_group_list", { no_cache });
     }
     async getGroupMemberInfo(group_id, user_id, no_cache) {
-        return await this._get("get_group_member_info", { group_id, user_id, no_cache });
+        return await this._get("get_group_member_info", {
+            group_id,
+            user_id,
+            no_cache
+        });
     }
     async getGroupMemberList(group_id, no_cache) {
         return await this._get("get_group_member_list", { group_id, no_cache });
@@ -258,14 +228,25 @@ export class Internal {
         return await this._get("get_group_root_files", { group_id });
     }
     async getGroupFilesByFolder(group_id, folder_id) {
-        return await this._get("get_group_files_by_folder", { group_id, folder_id });
+        return await this._get("get_group_files_by_folder", {
+            group_id,
+            folder_id
+        });
     }
     async getGroupFileUrl(group_id, file_id, busid) {
-        const data = await this._get("get_group_file_url", { group_id, file_id, busid });
+        const data = await this._get("get_group_file_url", {
+            group_id,
+            file_id,
+            busid
+        });
         return data.url;
     }
     async downloadFile(url, headers, thread_count) {
-        const data = await this._get("download_file", { url, headers, thread_count });
+        const data = await this._get("download_file", {
+            url,
+            headers,
+            thread_count
+        });
         return data.file;
     }
     async uploadPrivateFile(user_id, file, name) {
@@ -275,13 +256,22 @@ export class Internal {
         await this._get("upload_group_file", { group_id, file, name, folder });
     }
     async createGroupFileFolder(group_id, folder_id, name) {
-        await this._get("create_group_file_folder", { group_id, folder_id, name });
+        await this._get("create_group_file_folder", {
+            group_id,
+            folder_id,
+            name
+        });
     }
     async deleteGroupFolder(group_id, folder_id) {
         await this._get("delete_group_folder", { group_id, folder_id });
     }
     async deleteGroupFile(group_id, folder_id, file_id, busid) {
-        await this._get("delete_group_file", { group_id, folder_id, file_id, busid });
+        await this._get("delete_group_file", {
+            group_id,
+            folder_id,
+            file_id,
+            busid
+        });
     }
     async getOnlineClients(no_cache) {
         const data = await this._get("get_online_clients", { no_cache });
@@ -343,16 +333,29 @@ export class Internal {
         return await this._get("upload_image", { file });
     }
     async getPrivateFileUrl(user_id, file_id, file_hash) {
-        const data = await this._get("get_private_file_url", { user_id, file_id, file_hash });
+        const data = await this._get("get_private_file_url", {
+            user_id,
+            file_id,
+            file_hash
+        });
         return data.url;
     }
     async moveGroupFile(group_id, file_id, parent_directory, target_directory) {
-        await this._get("move_group_file", { group_id, file_id, parent_directory, target_directory });
+        await this._get("move_group_file", {
+            group_id,
+            file_id,
+            parent_directory,
+            target_directory
+        });
     }
     async deleteGroupFileFolder(group_id, folder_id) {
         await this._get("delete_group_file_folder", { group_id, folder_id });
     }
     async renameGroupFileFolder(group_id, folder_id, new_folder_name) {
-        await this._get("rename_group_file_folder", { group_id, folder_id, new_folder_name });
+        await this._get("rename_group_file_folder", {
+            group_id,
+            folder_id,
+            new_folder_name
+        });
     }
 }

package/lib/types/event/base.d.ts

@@ -1,4 +1,4 @@
-import { EventType } from "../enum";
+import type { EventType } from "../enum";
 /** 消息子类型 */
 export declare enum SubType {
     /** 好友 */

package/lib/types/event/message.d.ts

@@ -1,7 +1,7 @@
-import { CQCode } from "../../bot/cqcode";
+import type { CQCode } from "../../bot/cqcode";
 import { EventType } from "../enum";
-import { Anonymous, GroupSender, Sender } from "../sender";
-import { BaseEvent, SubType } from "./base";
+import type { Anonymous, GroupSender, Sender } from "../sender";
+import type { BaseEvent, SubType } from "./base";
 /** 消息事件接口 */
 interface BaseMessageEvent<S extends Sender | GroupSender, M extends "private" | "group"> extends BaseEvent<EventType.MESSAGE | EventType.MESSAGE_SENT> {
     /** 消息类型 */

package/lib/types/event/meta.d.ts

@@ -1,5 +1,5 @@
-import { EventType } from "../enum";
-import { BaseEvent } from "./base";
+import type { EventType } from "../enum";
+import type { BaseEvent } from "./base";
 /** 元事件 */
 interface MetaEvent<meta_event_type extends "lifecycle" | "heartbeat"> extends BaseEvent<EventType.META> {
     /** 元事件类型 */

package/lib/types/event/notice.d.ts

@@ -1,6 +1,6 @@
-import { Device } from "../device";
+import type { Device } from "../device";
 import { EventType } from "../enum";
-import { BaseEvent } from "./base";
+import type { BaseEvent } from "./base";
 /**
  * 通知事件类型
  */

package/lib/types/event/request.d.ts

@@ -1,5 +1,5 @@
 import { EventType } from "../enum";
-import { BaseEvent } from "./base";
+import type { BaseEvent } from "./base";
 /** 请求事件 */
 export interface RequestEvent<request_type extends "friend" | "group"> extends BaseEvent<EventType.REQUEST> {
     /** 请求类型 */

package/lib/types/group.d.ts

@@ -1,5 +1,5 @@
-import { GroupMemberRole } from "./enum";
-import { UserInfo } from "./user";
+import type { GroupMemberRole } from "./enum";
+import type { UserInfo } from "./user";
 export interface GroupInfo {
     /** 群号 */
     group_id: number;

package/lib/types/index.d.ts

@@ -1,5 +1,5 @@
-import { Dict } from "koishi";
-import { CQCode } from "../bot/cqcode";
+import type { Dict } from "koishi";
+import type { CQCode } from "../bot/cqcode";
 /** OneBot API 响应格式 */
 export interface ApiResponse<T = Dict> {
     /** 请求状态 */

package/lib/types/sender.d.ts

@@ -1,5 +1,5 @@
-import { Dict } from "koishi";
-import { GroupMemberRole, UserSex } from "./enum";
+import type { Dict } from "koishi";
+import type { GroupMemberRole, UserSex } from "./enum";
 /** 发送者信息
  *
  * 每一个字段不一定存在，具体取决于 OneBot 实现

package/lib/types/user.d.ts

@@ -1,4 +1,4 @@
-import { UserSex } from "./enum";
+import type { UserSex } from "./enum";
 /** 账号信息 */
 export interface UserInfo {
     /** 账号 ID */

package/lib/utils.d.ts

@@ -1,10 +1,10 @@
 import { Universal } from "koishi";
-import { OneBot } from "./bot";
+import type { OneBot } from "./bot";
 import { EventType } from "./types/enum";
-import { BaseEvent } from "./types/event/base";
-import { MessageEvent } from "./types/event/message";
-import { GroupInfo, GroupMemberInfo } from "./types/group";
-import { UserInfo } from "./types/user";
+import type { BaseEvent } from "./types/event/base";
+import { type MessageEvent } from "./types/event/message";
+import type { GroupInfo, GroupMemberInfo } from "./types/group";
+import type { UserInfo } from "./types/user";
 export * from "./types";
 export declare const convertUser: (user: UserInfo, isBot?: boolean) => Universal.User;
 export declare const decodeUser: (event: MessageEvent, isBot?: boolean) => Universal.User;

package/lib/utils.js

@@ -1,4 +1,4 @@
-import { h, omit } from "koishi";
+import { h, omit, Universal } from "koishi";
 import * as qface from "qface";
 import { CQCode } from "./bot/cqcode";
 import { EventType, GroupMemberRole } from "./types/enum";
@@ -35,7 +35,7 @@ export const decodeGuildMember = (user, isBot = false) => ({
     roles: [user.role]
 });
 export async function decodeMessage(bot, event, message = {}, payload = message) {
-    const [guildId, channelId] = decodeGroupChannelId(event);
+    const [_, channelId] = decodeGroupChannelId(event);
     // message content
     const chain = CQCode.parse(event.message);
     // 映射
@@ -47,59 +47,61 @@ export async function decodeMessage(bot, event, message = {}, payload = message)
             if (attrs.qq !== "all")
                 return h.at(attrs.qq, {
                     name: attrs.name,
-                    ...omit(attrs, [attrs.qq ? "qq" : undefined, attrs.name ? "name" : undefined])
+                    ...omit(attrs, [attrs.qq ? "qq" : undefined, attrs.name ? "name" : undefined].filter((k) => !!k))
                 });
             return h.at("at", {
                 type: "all",
-                ...omit(attrs, [attrs.qq ? "qq" : undefined, attrs.name ? "name" : undefined])
+                ...omit(attrs, [attrs.qq ? "qq" : undefined, attrs.name ? "name" : undefined].filter((k) => !!k))
             });
         },
         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))]);
+            return h("face", { id: attrs.id, name }, [h.image(qface.getUrl(attrs.id))]);
         },
         image(attrs) {
             return h.image(attrs.url || attrs.file, {
                 title: attrs.name || undefined,
-                ...omit(attrs, [
+                ...omit([
                     attrs.name ? "name" : undefined,
                     attrs.url ? "url" : undefined,
                     attrs.file ? "file" : undefined
-                ])
+                ].filter((k) => !!k))
             });
         },
         record(attrs) {
             return h.audio(attrs.url || attrs.file, {
-                ...omit(attrs, [attrs.url ? "url" : undefined, attrs.file ? "file" : undefined])
+                ...omit([attrs.url ? "url" : undefined, attrs.file ? "file" : undefined].filter((k) => !!k))
             });
         },
         video(attrs) {
             return h.video(attrs.url || attrs.file, {
-                ...omit(attrs, [attrs.url ? "url" : undefined, attrs.file ? "file" : undefined])
+                ...omit([attrs.url ? "url" : undefined, attrs.file ? "file" : undefined].filter((k) => !!k))
             });
         },
         file(attrs) {
             return h.file(attrs.url || attrs.file, {
-                ...omit(attrs, [attrs.url ? "url" : undefined, attrs.file ? "file" : undefined])
+                ...omit([attrs.url ? "url" : undefined, attrs.file ? "file" : undefined].filter((k) => !!k))
             });
         },
         reply(attrs) {
             return h("reply", { id: attrs.id });
         }
     });
-    if (message.elements[0].type === "reply") {
+    if (message.elements[0] && 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);
-            return undefined;
-        });
+        if (reply) {
+            message.quote = await bot.getMessage(channelId, reply.attrs.id).catch((error) => {
+                bot.logger.warn(error);
+                return undefined;
+            });
+        }
     }
     message.content = message.elements.join("");
     payload.timestamp = event.time * 1000;
     message.id = event.message_id.toString();
     payload.channel = {
         id: channelId,
-        type: event.message_type === "group" ? 0 /* Universal.Channel.Type.TEXT */ : 1 /* Universal.Channel.Type.DIRECT */,
+        type: event.message_type === "group" ? Universal.Channel.Type.TEXT : Universal.Channel.Type.DIRECT,
         name: event.message_type === "group" ? event.group_name || undefined : event.sender.nickname
     };
     payload.user = decodeUser(event);
@@ -114,7 +116,7 @@ export async function decodeMessage(bot, event, message = {}, payload = message)
             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]
+            roles: event.sender.role ? [event.sender.role] : []
         };
     }
     return message;
@@ -123,9 +125,7 @@ const decodeGroupChannelId = (event) => {
     if (event.message_type === "group") {
         return [event.group_id.toString(), event.group_id.toString()];
     }
-    else {
-        return [undefined, "private:" + event.sender.user_id];
-    }
+    return [undefined, "private:" + event.sender.user_id];
 };
 export const adaptGuild = (info) => {
     return {
@@ -138,7 +138,7 @@ export const adaptChannel = (info) => {
     return {
         id: info.group_id.toString(),
         name: info.group_name,
-        type: 0 /* Universal.Channel.Type.TEXT */
+        type: Universal.Channel.Type.TEXT
     };
 };
 export async function dispatchSession(bot, data) {

package/lib/ws.d.ts

@@ -1,6 +1,7 @@
-import { WebSocketLayer } from "@koishijs/plugin-server";
-import { Adapter, Context, HTTP, Logger, Schema, Universal } from "koishi";
-import { OneBot } from "./bot";
+import type { WebSocketLayer } from "@koishijs/plugin-server";
+import type { Context, Logger } from "koishi";
+import { Adapter, HTTP, Schema, Universal } from "koishi";
+import type { OneBot } from "./bot";
 export interface SharedConfig<T = "ws" | "ws-reverse"> {
     protocol: T;
     responseTimeout?: number;

package/lib/ws.js

@@ -1,4 +1,4 @@
-import { Adapter, HTTP, Schema, Time } from "koishi";
+import { Adapter, HTTP, Schema, Time, Universal } from "koishi";
 import { dispatchSession, TimeoutError } from "./utils";
 let counter = 0;
 const listeners = {};
@@ -17,7 +17,7 @@ export class WsClient extends Adapter.WsClient {
         return http.ws(endpoint);
     }
     async disconnect(bot) {
-        bot.status = 4 /* Universal.Status.RECONNECT */;
+        bot.status = Universal.Status.RECONNECT;
     }
 }
 (function (WsClient) {
@@ -53,16 +53,16 @@ export class WsServer extends Adapter {
             bot[kSocket] = socket;
             accept(socket, bot);
         });
-        ctx.on("dispose", () => {
+        ctx.on("dispose", async () => {
             this.logger.debug("ws server closing");
             this.wsServer.close();
-            this.disconnect(bot);
+            await this.disconnect(bot);
         });
     }
     async disconnect(bot) {
         bot[kSocket]?.close();
         bot[kSocket] = null;
-        bot.status = 4 /* Universal.Status.RECONNECT */;
+        bot.status = Universal.Status.RECONNECT;
     }
 }
 (function (WsServer) {
@@ -83,19 +83,19 @@ export function accept(socket, bot) {
         }
         if ("post_type" in parsed) {
             bot.logger.debug("[receive] %o", parsed);
-            await dispatchSession(bot, parsed);
+            void dispatchSession(bot, parsed);
         }
         else if (parsed.echo in listeners) {
             listeners[parsed.echo](parsed);
             delete listeners[parsed.echo];
         }
     });
-    socket.addEventListener("close", () => {
+    socket.addEventListener("close", async () => {
         delete bot.internal._request;
         Object.keys(listeners).forEach((echo) => {
             delete listeners[Number(echo)];
         });
-        bot.adapter.disconnect(bot);
+        await bot.adapter.disconnect(bot);
     });
     bot.internal._request = (action, params) => {
         const echo = ++counter;
@@ -119,5 +119,5 @@ export function accept(socket, bot) {
             })
         ]);
     };
-    bot.initialize();
+    void bot.initialize();
 }

package/package.json

@@ -1,62 +1,62 @@
 {
-  "name": "@mrlingxd/koishi-plugin-adapter-onebot",
-  "version": "0.2.5",
-  "description": "OneBot Adapter for Koishi",
-  "main": "lib/index.js",
-  "typings": "lib/index.d.ts",
-  "files": [
-    "lib"
-  ],
-  "contributors": [
-    "MrlingXD <90316914+CrashVibe@users.noreply.github.com>"
-  ],
-  "license": "MIT",
-  "homepage": "https://github.com/CrashVibe/koishi-plugin-adapter-onebot",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/CrashVibe/koishi-plugin-adapter-onebot.git"
-  },
-  "bugs": {
-    "url": "https://github.com/CrashVibe/koishi-plugin-adapter-onebot/issues"
-  },
-  "keywords": [
-    "bot",
-    "chatbot",
-    "koishi",
-    "plugin",
-    "adapter",
-    "onebot",
-    "im",
-    "chat"
-  ],
-  "koishi": {
-    "description": {
-      "en": "OneBot Adapter for Koishi",
-      "zh": "OneBot 适配器"
+    "name": "@mrlingxd/koishi-plugin-adapter-onebot",
+    "version": "0.2.8",
+    "description": "OneBot Adapter for Koishi",
+    "keywords": [
+        "adapter",
+        "bot",
+        "chat",
+        "chatbot",
+        "im",
+        "koishi",
+        "onebot",
+        "plugin"
+    ],
+    "homepage": "https://github.com/CrashVibe/koishi-plugin-adapter-onebot",
+    "bugs": {
+        "url": "https://github.com/CrashVibe/koishi-plugin-adapter-onebot/issues"
     },
-    "service": {
-      "implements": [
-        "adapter"
-      ]
+    "license": "MIT",
+    "contributors": [
+        "MrlingXD <90316914+CrashVibe@users.noreply.github.com>"
+    ],
+    "repository": {
+        "type": "git",
+        "url": "git+https://github.com/CrashVibe/koishi-plugin-adapter-onebot.git"
+    },
+    "files": [
+        "lib"
+    ],
+    "main": "lib/index.js",
+    "typings": "lib/index.d.ts",
+    "scripts": {
+        "build": "atsc -b"
+    },
+    "dependencies": {
+        "qface": "^1.4.1"
+    },
+    "devDependencies": {
+        "@koishijs/plugin-server": "^3.2.7",
+        "@types/node": "^25.0.10",
+        "atsc": "^2.1.0",
+        "esbuild": "^0.27.2",
+        "esbuild-register": "^3.6.0",
+        "koishi": "^4.18.10",
+        "typescript": "^5.9.3",
+        "yml-register": "^1.2.5"
+    },
+    "peerDependencies": {
+        "koishi": "^4.18.6"
+    },
+    "koishi": {
+        "description": {
+            "en": "OneBot Adapter for Koishi",
+            "zh": "OneBot 适配器"
+        },
+        "service": {
+            "implements": [
+                "adapter"
+            ]
+        }
     }
-  },
-  "scripts": {
-    "build": "atsc -b"
-  },
-  "devDependencies": {
-    "@cordisjs/eslint-config": "^1.1.1",
-    "@koishijs/plugin-server": "^3.2.7",
-    "@types/node": "^25.0.9",
-    "atsc": "^2.1.0",
-    "esbuild": "^0.27.2",
-    "esbuild-register": "^3.6.0",
-    "eslint": "^9.39.2",
-    "koishi": "^4.18.10",
-    "qface": "^1.4.1",
-    "typescript": "^5.9.3",
-    "yml-register": "^1.2.5"
-  },
-  "peerDependencies": {
-    "koishi": "^4.18.6"
-  }
 }