@kotori-bot/kotori-plugin-adapter-onebot 2.0.0 → 2.1.1

package/lib/api.d.ts

@@ -1,77 +1,114 @@
-import { Api, MessageRaw } from 'kotori-bot';
+import { Api, type Message } from 'kotori-bot';
+import type OnebotAdapter from './adapter';
 export declare class OnebotApi extends Api {
-    sendPrivateMsg(message: MessageRaw, userId: number): void;
+    private factory;
+    readonly adapter: OnebotAdapter;
+    constructor(adapter: OnebotAdapter);
+    getSupportedEvents(): ReturnType<Api['getSupportedEvents']>;
+    sendPrivateMsg(message: Message, userId: string): Promise<{
+        messageId: string;
+        time: number;
+    }>;
     /**
      * @description: 发送私聊消息
-     * @param {Msg} message 要发送的内容
-     * @param {groupId} groupId 群号
-     * @return {void}
+     * @param message 要发送的内容
+     * @param groupId 群号
      */
-    sendGroupMsg(message: MessageRaw, groupId: number): void;
+    sendGroupMsg(message: Message, groupId: string): Promise<{
+        messageId: string;
+        time: number;
+    }>;
     /**
      * @description: 撤回消息
-     * @param {number} messageId 消息id
-     * @return {void}
+     * @param messageId 消息id
      */
-    deleteMsg(messageId: number): void;
+    deleteMsg(messageId: string): void;
+    getSelfInfo(): Promise<{
+        userId: string;
+        username: string;
+        userDisplayname: string;
+    }>;
+    getUserInfo(userId: string): Promise<{
+        userId: string;
+        username: string;
+        userDisplayname: string;
+        userRemark: string;
+    }>;
+    getFriendList(): Promise<{
+        userId: string;
+        username: string;
+        userDisplayname: string;
+        userRemark: string;
+    }[]>;
+    getGroupInfo(groupId: string): Promise<{
+        groupId: string;
+        groupName: string;
+    }>;
+    getGroupList(): Promise<{
+        groupId: string;
+        groupName: string;
+    }[]>;
+    getGroupMemberInfo(groupId: string, userId: string): Promise<{
+        userId: string;
+        username: string;
+        userDisplayname: string;
+    }>;
+    getGroupMemberList(groupId: string): Promise<{
+        userId: string;
+        username: string;
+        userDisplayname: string;
+    }[]>;
     /**
      * @description: 设置群名
-     * @param {number} groupId 群号
-     * @param {string} groupName 新群名
-     * @return {void}
+     * @param groupId 群号
+     * @param groupName 新群名
      */
-    setGroupName(groupId: number, groupName: string): void;
+    setGroupName(groupId: string, groupName: string): void;
+    /**
+     * @description: 退出群组
+     * @param groupId 群号
+     */
+    leaveGroup(groupId: string): void;
     /**
      * @description: 设置群头像
-     * @param {number} groupId 群号
-     * @param {string} image 图片路径
-     * @return {void}
+     * @param groupId 群号
+     * @param image 图片路径
      */
-    setGroupAvatar(groupId: number, image: string): void;
+    setGroupAvatar(groupId: string, image: string): void;
     /**
      * @description: 设置群管理员
-     * @param {number} groupId 群号
-     * @param {number} userId 要设置的管理员的QQ号
-     * @param {boolean} enable true为设置,false取消,默认true
-     * @return {void}
+     * @param groupId 群号
+     * @param userId 要设置的管理员的QQ号
+     * @param enable true为设置,false取消,默认true
      */
-    setGroupAdmin(groupId: number, userId: number, enable?: boolean): void;
+    setGroupAdmin(groupId: string, userId: string, enable?: boolean): void;
     /**
      * @description: 设置群名片(群备注)
-     * @param {number} groupId 群号
-     * @param {number} userId 要设置的QQ号
-     * @param {string} card 群名片内容,不填或空字符串表示删除群名片
-     * @return {void}
+     * @param groupId 群号
+     * @param userId 要设置的QQ号
+     * @param card 群名片内容,不填或空字符串表示删除群名片
      */
-    setGroupCard(groupId: number, userId: number, card: string): void;
+    setGroupCard(groupId: string, userId: string, card: string): void;
     /**
      * @description: 群禁言
-     * @param {number} groupId 群号
-     * @param {number} userId 要禁言的QQ号,不填则为群禁言
-     * @param {number} time 禁言时长,单位秒,0表示取消禁言
-     * @return {void}
+     * @param groupId 群号
+     * @param userId 要禁言的QQ号,不填则为群禁言
+     * @param time 禁言时长,单位秒,0表示取消禁言
      */
-    setGroupBan(groupId: number, userId?: number, time?: number): void;
+    setGroupBan(groupId: string, userId?: string, time?: number): void;
+    setGroupWholeBan(groupId: string, enable?: boolean): void;
     /**
      * @description: 发送群公告
-     * @param {number} groupId 群号
-     * @param {string} content 公告内容
-     * @param {string} image 图片路径(可选)
-     * @return {void}
+     * @param groupId 群号
+     * @param content 公告内容
+     * @param image 图片路径(可选)
      */
-    sendGroupNotice(groupId: number, content: string, image?: string): void;
+    sendGroupNotice(groupId: string, content: string, image?: string): void;
     /**
      * @description: 群组踢人
-     * @param {number} groupId 群号
-     * @param {number} userId 要踢的QQ号
-     * @return {void}
-     */
-    setGroupKick(groupId: number, userId: number): void;
-    /**
-     * @description: 退出群组
-     * @param {number} groupId 群号
-     * @return {void}
+     * @param groupId 群号
+     * @param userId 要踢的QQ号
      */
-    setGroupLeave(groupId: number): void;
+    setGroupKick(groupId: string, userId: string): void;
 }
 export default OnebotApi;

package/lib/api.js

@@ -1,14 +1,12 @@
-
 /**
- * @Package @kotori-bot/kotori-plugin-adapter-onebot
- * @Version 2.0.0
- * @Author Hotaru <biyuehuya@gmail.com>
- * @Copyright 2024 Hotaru. All rights reserved.
- * @License GPL-3.0
- * @Link https://github.com/kotorijs/kotori
- * @Date 2024/6/7 21:36:06
- */
-
+* @Package @kotori-bot/kotori-plugin-adapter-onebot
+* @Version 2.1.1
+* @Author Hotaru <me@hotaru.icu>
+* @Copyright 2024-2025 Hotaru. All rights reserved.
+* @License BAN-ZHINESE-USING
+* @Link https://github.com/kotorijs/kotori
+* @Date 16:14:08
+*/
 "use strict";
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
@@ -35,110 +33,264 @@ __export(api_exports, {
 module.exports = __toCommonJS(api_exports);
 var import_kotori_bot = require("kotori-bot");
 class OnebotApi extends import_kotori_bot.Api {
+  factory(callback) {
+    return new Promise((resolve, reject) => {
+      const timer = setTimeout(() => {
+        reject(new import_kotori_bot.KotoriError("data response timeout"));
+        this.adapter.ctx.off("literal_onebot_raw_data", handler);
+      }, 10 * 1e3);
+      const handler = (data) => {
+        const result = callback(data);
+        if (!result) return;
+        this.adapter.ctx.off("literal_onebot_raw_data", handler);
+        clearTimeout(timer);
+        resolve(result);
+      };
+      this.adapter.ctx.on("literal_onebot_raw_data", handler);
+    });
+  }
+  adapter;
+  constructor(adapter) {
+    super(adapter);
+    this.adapter = adapter;
+  }
+  getSupportedEvents() {
+    return [
+      "on_message",
+      "on_message_delete",
+      "on_request",
+      "on_group_increase",
+      "on_group_decrease",
+      "on_group_ban",
+      "on_group_admin",
+      "onebot_poke"
+    ];
+  }
   sendPrivateMsg(message, userId) {
-    this.adapter.status.lastMsgTime = /* @__PURE__ */ new Date();
-    this.adapter.status.sentMsg += 1;
-    this.adapter.send("send_private_msg", { user_id: userId, message, auto_escape: false });
+    this.adapter.send("send_private_msg", {
+      user_id: Number(userId),
+      message: this.adapter.elements.decode(message),
+      auto_escape: false
+    });
+    return this.factory((data) => {
+      if (Object.keys(data).length !== 1 || !("message_id" in data)) return null;
+      this.adapter.ctx.emit("send", { api: this, messageId: String(data.message_id) });
+      return { messageId: String(data.message_id), time: Date.now() };
+    });
   }
   /**
    * @description: 发送私聊消息
-   * @param {Msg} message 要发送的内容
-   * @param {groupId} groupId 群号
-   * @return {void}
+   * @param message 要发送的内容
+   * @param groupId 群号
    */
   sendGroupMsg(message, groupId) {
-    this.adapter.status.lastMsgTime = /* @__PURE__ */ new Date();
-    this.adapter.status.sentMsg += 1;
-    this.adapter.send("send_group_msg", { group_id: groupId, message, auto_escape: false });
+    this.adapter.send("send_group_msg", {
+      group_id: Number(groupId),
+      message: this.adapter.elements.decode(message),
+      auto_escape: false
+    });
+    return this.factory((data) => {
+      if (Object.keys(data).length !== 1 || !("message_id" in data)) return null;
+      this.adapter.ctx.emit("send", { api: this, messageId: String(data.message_id) });
+      return { messageId: String(data.message_id), time: Date.now() };
+    });
   }
   /**
    * @description: 撤回消息
-   * @param {number} messageId 消息id
-   * @return {void}
+   * @param messageId 消息id
    */
   deleteMsg(messageId) {
     this.adapter.send("delete_msg", { messageId });
   }
+  getSelfInfo() {
+    this.adapter.send("get_login_info");
+    return this.factory((data) => {
+      if (Object.keys(data).length !== 2 || !("user_id" in data) || !("nickname" in data)) return null;
+      return {
+        userId: String(data.user_id),
+        username: String(data.nickname),
+        userDisplayname: String(data.nickname)
+      };
+    });
+  }
+  getUserInfo(userId) {
+    this.adapter.send("get_stranger_info", { user_id: Number(userId) });
+    return this.factory((data) => {
+      const result = import_kotori_bot.Tsu.Object({
+        user_Id: import_kotori_bot.Tsu.Number(),
+        nickname: import_kotori_bot.Tsu.String(),
+        sex: import_kotori_bot.Tsu.String(),
+        qid: import_kotori_bot.Tsu.String()
+      }).parseSafe(data);
+      if (!result.value) return null;
+      return {
+        userId: result.data.user_Id.toString(),
+        username: result.data.nickname,
+        userDisplayname: result.data.nickname,
+        userRemark: ""
+      };
+    });
+  }
+  getFriendList() {
+    this.adapter.send("get_friend_list");
+    return this.factory((data) => {
+      const result = import_kotori_bot.Tsu.Array(
+        import_kotori_bot.Tsu.Object({
+          user_id: import_kotori_bot.Tsu.Number(),
+          nickname: import_kotori_bot.Tsu.String(),
+          remark: import_kotori_bot.Tsu.String()
+        })
+      ).parseSafe(data);
+      if (!result.value) return null;
+      return result.data.map((item) => ({
+        userId: item.user_id.toString(),
+        username: item.nickname,
+        userDisplayname: item.nickname,
+        userRemark: ""
+      }));
+    });
+  }
+  getGroupInfo(groupId) {
+    this.adapter.send("get_group_info", { group_id: Number(groupId) });
+    return this.factory((data) => {
+      const result = import_kotori_bot.Tsu.Object({
+        group_id: import_kotori_bot.Tsu.Number(),
+        group_name: import_kotori_bot.Tsu.String(),
+        group_memo: import_kotori_bot.Tsu.String()
+      }).parseSafe(data);
+      if (!result.value) return null;
+      return { groupId: result.data.group_id.toString(), groupName: result.data.group_name };
+    });
+  }
+  getGroupList() {
+    this.adapter.send("get_group_list");
+    return this.factory((data) => {
+      const result = import_kotori_bot.Tsu.Array(
+        import_kotori_bot.Tsu.Object({
+          group_id: import_kotori_bot.Tsu.Number(),
+          group_name: import_kotori_bot.Tsu.String(),
+          group_memo: import_kotori_bot.Tsu.String()
+        })
+      ).parseSafe(data);
+      if (!result.value) return null;
+      return result.data.map((item) => ({
+        groupId: item.group_id.toString(),
+        groupName: item.group_name
+      }));
+    });
+  }
+  getGroupMemberInfo(groupId, userId) {
+    this.adapter.send("get_group_member_info", { group_id: Number(groupId), user_id: Number(userId) });
+    return this.factory((data) => {
+      const result = import_kotori_bot.Tsu.Object({
+        group_id: import_kotori_bot.Tsu.Number(),
+        user_id: import_kotori_bot.Tsu.Number(),
+        nickname: import_kotori_bot.Tsu.String(),
+        card: import_kotori_bot.Tsu.String(),
+        join_time: import_kotori_bot.Tsu.Number(),
+        role: import_kotori_bot.Tsu.String()
+      }).parseSafe(data);
+      if (!result.value) return null;
+      return {
+        userId: result.data.user_id.toString(),
+        username: result.data.nickname,
+        userDisplayname: result.data.card
+      };
+    });
+  }
+  getGroupMemberList(groupId) {
+    this.adapter.send("get_group_member_list", { group_id: Number(groupId) });
+    return this.factory((data) => {
+      const result = import_kotori_bot.Tsu.Array(
+        import_kotori_bot.Tsu.Object({
+          group_id: import_kotori_bot.Tsu.Number(),
+          user_id: import_kotori_bot.Tsu.Number(),
+          nickname: import_kotori_bot.Tsu.String(),
+          card: import_kotori_bot.Tsu.String()
+        })
+      ).parseSafe(data);
+      if (!result.value) return null;
+      return result.data.map((item) => ({
+        userId: item.user_id.toString(),
+        username: item.nickname,
+        userDisplayname: item.card
+      }));
+    });
+  }
   /**
    * @description: 设置群名
-   * @param {number} groupId 群号
-   * @param {string} groupName 新群名
-   * @return {void}
+   * @param groupId 群号
+   * @param groupName 新群名
    */
   setGroupName(groupId, groupName) {
-    this.adapter.send("set_group_name", { group_id: groupId, group_name: groupName });
+    this.adapter.send("set_group_name", { group_id: Number(groupId), group_name: groupName });
+  }
+  /**
+   * @description: 退出群组
+   * @param groupId 群号
+   */
+  leaveGroup(groupId) {
+    this.adapter.send("set_group_leave", { group_id: Number(groupId), is_dismiss: false });
   }
   /**
    * @description: 设置群头像
-   * @param {number} groupId 群号
-   * @param {string} image 图片路径
-   * @return {void}
+   * @param groupId 群号
+   * @param image 图片路径
    */
   setGroupAvatar(groupId, image) {
-    this.adapter.send("set_group_portrait", { group_id: groupId, file: image, cache: false });
+    this.adapter.send("set_group_portrait", { group_id: Number(groupId), file: image, cache: false });
   }
   /**
    * @description: 设置群管理员
-   * @param {number} groupId 群号
-   * @param {number} userId 要设置的管理员的QQ号
-   * @param {boolean} enable true为设置,false取消,默认true
-   * @return {void}
+   * @param groupId 群号
+   * @param userId 要设置的管理员的QQ号
+   * @param enable true为设置,false取消,默认true
    */
   setGroupAdmin(groupId, userId, enable = true) {
-    this.adapter.send("set_group_admin", { group_id: groupId, user_id: userId, enable });
+    this.adapter.send("set_group_admin", { group_id: Number(groupId), user_id: Number(userId), enable });
   }
   /**
    * @description: 设置群名片(群备注)
-   * @param {number} groupId 群号
-   * @param {number} userId 要设置的QQ号
-   * @param {string} card 群名片内容,不填或空字符串表示删除群名片
-   * @return {void}
+   * @param groupId 群号
+   * @param userId 要设置的QQ号
+   * @param card 群名片内容,不填或空字符串表示删除群名片
    */
   setGroupCard(groupId, userId, card) {
-    this.adapter.send("set_group_card", { group_id: groupId, user_id: userId, card });
+    this.adapter.send("set_group_card", { group_id: Number(groupId), user_id: Number(userId), card });
   }
   /**
    * @description: 群禁言
-   * @param {number} groupId 群号
-   * @param {number} userId 要禁言的QQ号,不填则为群禁言
-   * @param {number} time 禁言时长,单位秒,0表示取消禁言
-   * @return {void}
+   * @param groupId 群号
+   * @param userId 要禁言的QQ号,不填则为群禁言
+   * @param time 禁言时长,单位秒,0表示取消禁言
    */
   setGroupBan(groupId, userId, time = 0) {
-    if (userId) {
-      this.adapter.send("setGroupBan", { group_id: groupId, user_id: userId, duration: time });
-    } else {
-      this.adapter.send("set_group_whole_ban", { group_id: groupId, enable: !!time });
-    }
+    this.adapter.send("set_group_ban", { group_id: Number(groupId), user_id: Number(userId), duration: time });
+  }
+  setGroupWholeBan(groupId, enable = true) {
+    this.adapter.send("set_group_whole_ban", { group_id: Number(groupId), enable });
   }
   /**
    * @description: 发送群公告
-   * @param {number} groupId 群号
-   * @param {string} content 公告内容
-   * @param {string} image 图片路径(可选)
-   * @return {void}
+   * @param groupId 群号
+   * @param content 公告内容
+   * @param image 图片路径(可选)
    */
   sendGroupNotice(groupId, content, image) {
-    this.adapter.send("_sendGroupNotice", { group_id: groupId, content, image });
+    this.adapter.send("_send_group_notice", { group_id: Number(groupId), content, image });
   }
   /**
    * @description: 群组踢人
-   * @param {number} groupId 群号
-   * @param {number} userId 要踢的QQ号
-   * @return {void}
+   * @param groupId 群号
+   * @param userId 要踢的QQ号
    */
   setGroupKick(groupId, userId) {
-    this.adapter.send("setGroupKick", { group_id: groupId, user_id: userId, reject_add_request: false });
-  }
-  /**
-   * @description: 退出群组
-   * @param {number} groupId 群号
-   * @return {void}
-   */
-  setGroupLeave(groupId) {
-    this.adapter.send("setGroupLeave", { group_id: groupId, is_dismiss: false });
+    this.adapter.send("set_group_kick", {
+      group_id: Number(groupId),
+      user_id: Number(userId),
+      reject_add_request: false
+    });
   }
-  /* extra: ApiExtraValue = { type: 'onebot', image, at, poke }; */
 }
 var api_default = OnebotApi;
 // Annotate the CommonJS export names for ESM import in node:

package/lib/elements.d.ts

@@ -1,11 +1,9 @@
-import { Elements, EventDataTargetId } from 'kotori-bot';
-import { MessageCqType } from './types';
+import { Elements, type Message, type MessageMapping } from 'kotori-bot';
+import type { MessageCqType } from './types';
 export declare class OnebotElements extends Elements {
+    getSupportsElements(): (keyof MessageMapping)[];
+    decode(message: Message): string;
+    encode(raw: string): Message;
     cq(type: MessageCqType, data: string): string;
-    at(target: EventDataTargetId): string;
-    image(url: string): string;
-    voice(url: string): string;
-    video(url: string): string;
-    face(id: number): string;
 }
 export default OnebotElements;

package/lib/elements.js

@@ -1,14 +1,12 @@
-
 /**
- * @Package @kotori-bot/kotori-plugin-adapter-onebot
- * @Version 2.0.0
- * @Author Hotaru <biyuehuya@gmail.com>
- * @Copyright 2024 Hotaru. All rights reserved.
- * @License GPL-3.0
- * @Link https://github.com/kotorijs/kotori
- * @Date 2024/6/7 21:36:06
- */
-
+* @Package @kotori-bot/kotori-plugin-adapter-onebot
+* @Version 2.1.1
+* @Author Hotaru <me@hotaru.icu>
+* @Copyright 2024-2025 Hotaru. All rights reserved.
+* @License BAN-ZHINESE-USING
+* @Link https://github.com/kotorijs/kotori
+* @Date 16:14:08
+*/
 "use strict";
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
@@ -35,24 +33,38 @@ __export(elements_exports, {
 module.exports = __toCommonJS(elements_exports);
 var import_kotori_bot = require("kotori-bot");
 class OnebotElements extends import_kotori_bot.Elements {
-  cq(type, data) {
-    (0, import_kotori_bot.none)(this);
-    return `[CQ:${type},${data}]`;
-  }
-  at(target) {
-    return this.cq("at", `qq=${target}`);
+  getSupportsElements() {
+    return ["mention", "mentionAll", "image", "voice", "video", "text", "reply"];
   }
-  image(url) {
-    return this.cq("image", `file=${url},cache=0`);
+  decode(message) {
+    if (typeof message === "string") return message;
+    if (!(message instanceof import_kotori_bot.MessageSingle)) {
+      return Array.from(message).map((el) => this.decode(el)).join("");
+    }
+    switch (message.data.type) {
+      case "text":
+        return message.toString();
+      case "image":
+        return this.cq("image", `file=${message.data.content},cache=0`);
+      case "voice":
+        return this.cq("record", `file=${message.data.content}`);
+      case "video":
+        return this.cq("video", `file=${message.data.content}`);
+      case "mention":
+        return this.cq("at", `qq=${message.data.userId}`);
+      case "mentionAll":
+        return this.cq("at", "qq=all");
+      case "reply":
+        return this.cq("reply", `id=${message.data.messageId}`);
+      default:
+        return "";
+    }
   }
-  voice(url) {
-    return this.cq("record", `file=${url}`);
+  encode(raw) {
+    return new import_kotori_bot.MessageSingle("text", { text: raw });
   }
-  video(url) {
-    return this.cq("video", `file=${url}`);
-  }
-  face(id) {
-    return this.cq("face", `id=${id}`);
+  cq(type, data) {
+    return `[CQ:${type},${data}]`;
   }
 }
 var elements_default = OnebotElements;

package/lib/index.d.ts

@@ -1,2 +1,6 @@
 import { OnebotAdapter } from './adapter';
+export * from './adapter';
+export * from './api';
+export * from './elements';
+export * from './types';
 export default OnebotAdapter;

package/lib/index.js

@@ -1,14 +1,12 @@
-
 /**
- * @Package @kotori-bot/kotori-plugin-adapter-onebot
- * @Version 2.0.0
- * @Author Hotaru <biyuehuya@gmail.com>
- * @Copyright 2024 Hotaru. All rights reserved.
- * @License GPL-3.0
- * @Link https://github.com/kotorijs/kotori
- * @Date 2024/6/7 21:36:06
- */
-
+* @Package @kotori-bot/kotori-plugin-adapter-onebot
+* @Version 2.1.1
+* @Author Hotaru <me@hotaru.icu>
+* @Copyright 2024-2025 Hotaru. All rights reserved.
+* @License BAN-ZHINESE-USING
+* @Link https://github.com/kotorijs/kotori
+* @Date 16:14:08
+*/
 "use strict";
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
@@ -26,6 +24,7 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var src_exports = {};
 __export(src_exports, {
@@ -33,4 +32,15 @@ __export(src_exports, {
 });
 module.exports = __toCommonJS(src_exports);
 var import_adapter = require("./adapter");
+__reExport(src_exports, require("./adapter"), module.exports);
+__reExport(src_exports, require("./api"), module.exports);
+__reExport(src_exports, require("./elements"), module.exports);
+__reExport(src_exports, require("./types"), module.exports);
 var src_default = import_adapter.OnebotAdapter;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  ...require("./adapter"),
+  ...require("./api"),
+  ...require("./elements"),
+  ...require("./types")
+});