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

package/lib/adapter.d.ts

@@ -1,4 +1,5 @@
-import { Adapter, AdapterConfig, Context, EventDataApiBase, EventDataTargetId, Tsu } from 'kotori-bot';
+import { Adapters, AdapterConfig, Context, EventDataApiBase, EventDataTargetId, Tsu } from 'kotori-bot';
+import OnebotApi from './api';
 import { EventDataType } from './types';
 interface EventDataPoke extends EventDataApiBase {
     targetId: EventDataTargetId;
@@ -9,18 +10,18 @@ declare module 'kotori-bot' {
         poke(session: EventDataPoke): void;
     }
 }
-export declare const config: import("kotori-bot").IntersectionParser<[import("kotori-bot").ObjectParser<{
+export declare const config: import("kotori-bot").UnionParser<[import("kotori-bot").ObjectParser<{
+    mode: import("kotori-bot").LiteralParser<"ws">;
     port: import("kotori-bot").NumberParser;
     address: import("kotori-bot").StringParser;
     retry: import("kotori-bot").NumberParser;
-}>, import("kotori-bot").UnionParser<[import("kotori-bot").ObjectParser<{
-    mode: import("kotori-bot").LiteralParser<"ws">;
 }>, import("kotori-bot").ObjectParser<{
     mode: import("kotori-bot").LiteralParser<"ws-reverse">;
-}>]>]>;
+}>]>;
 type OnebotConfig = Tsu.infer<typeof config> & AdapterConfig;
-export declare class OnebotAdapter extends Adapter {
+export declare class OnebotAdapter extends Adapters.WebSocket<OnebotApi> {
     private readonly address;
+    private readonly isReverse;
     readonly config: OnebotConfig;
     constructor(ctx: Context, config: OnebotConfig, identity: string);
     handle(data: EventDataType): void;
@@ -28,7 +29,6 @@ export declare class OnebotAdapter extends Adapter {
     stop(): void;
     send(action: string, params?: object): void;
     private socket;
-    private connectWss;
     private onlineTimerId;
 }
 export {};

package/lib/adapter.js

@@ -1,241 +1,232 @@
+
+/**
+ * @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
+ */
+
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
 };
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.OnebotAdapter = exports.config = void 0;
-/*
- * @Author: Hotaru biyuehuya@gmail.com
- * @Blog: https://hotaru.icu
- * @Date: 2023-09-29 14:31:09
- * @LastEditors: Hotaru biyuehuya@gmail.com
- * @LastEditTime: 2024-02-16 15:33:09
- */
-const kotori_bot_1 = require("kotori-bot");
-const ws_1 = __importDefault(require("ws"));
-const api_1 = __importDefault(require("./api"));
-const wsserver_1 = __importDefault(require("./services/wsserver"));
-const elements_1 = __importDefault(require("./elements"));
-exports.config = kotori_bot_1.Tsu.Intersection([
-    kotori_bot_1.Tsu.Object({
-        port: kotori_bot_1.Tsu.Number().int().range(1, 65535),
-        address: kotori_bot_1.Tsu.String()
-            .regexp(/^ws(s)?:\/\/([\w-]+\.)+[\w-]+(\/[\w-./?%&=]*)?$/)
-            .default('ws://127.0.0.1'),
-        retry: kotori_bot_1.Tsu.Number().int().min(1).default(10)
-    }),
-    kotori_bot_1.Tsu.Union([
-        kotori_bot_1.Tsu.Object({
-            mode: kotori_bot_1.Tsu.Literal('ws')
-        }),
-        kotori_bot_1.Tsu.Object({
-            mode: kotori_bot_1.Tsu.Literal('ws-reverse')
-        })
-    ])
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var adapter_exports = {};
+__export(adapter_exports, {
+  OnebotAdapter: () => OnebotAdapter,
+  config: () => config
+});
+module.exports = __toCommonJS(adapter_exports);
+var import_kotori_bot = require("kotori-bot");
+var import_ws = __toESM(require("ws"));
+var import_api = __toESM(require("./api"));
+var import_elements = __toESM(require("./elements"));
+const config = import_kotori_bot.Tsu.Union([
+  import_kotori_bot.Tsu.Object({
+    mode: import_kotori_bot.Tsu.Literal("ws"),
+    port: import_kotori_bot.Tsu.Number().int().range(1, 65535),
+    address: import_kotori_bot.Tsu.String().regexp(/^ws(s)?:\/\/([\w-]+\.)+[\w-]+(\/[\w-./?%&=]*)?$/).default("ws://127.0.0.1"),
+    retry: import_kotori_bot.Tsu.Number().int().min(1).default(10)
+  }),
+  import_kotori_bot.Tsu.Object({
+    mode: import_kotori_bot.Tsu.Literal("ws-reverse")
+  })
 ]);
-const handleMsg = (msg) => msg.replace(/\[CQ:at,qq=(.*?)\]/g, '$1');
-class OnebotAdapter extends kotori_bot_1.Adapter {
-    address;
-    config;
-    constructor(ctx, config, identity) {
-        super(ctx, config, identity, api_1.default, new elements_1.default());
-        this.config = config;
-        this.address = `${this.config.address ?? 'ws://127.0.0.1'}:${this.config.port}`;
-    }
-    handle(data) {
-        if (data.post_type === 'message' && data.message_type === 'private') {
-            this.session('on_message', {
-                type: kotori_bot_1.MessageScope.PRIVATE,
-                userId: data.user_id,
-                messageId: data.message_id,
-                message: handleMsg(data.message),
-                sender: {
-                    nickname: data.sender.nickname,
-                    age: data.sender.age,
-                    sex: data.sender.sex
-                },
-                groupId: data.group_id
-            });
-        }
-        else if (data.post_type === 'message' && data.message_type === 'group') {
-            this.session('on_message', {
-                type: kotori_bot_1.MessageScope.GROUP,
-                userId: data.user_id,
-                messageId: data.message_id,
-                message: handleMsg(data.message),
-                sender: {
-                    nickname: data.sender.nickname,
-                    age: data.sender.age,
-                    sex: data.sender.sex,
-                    level: data.sender.level,
-                    role: data.sender.role,
-                    title: data.sender.title
-                },
-                groupId: data.group_id
-            });
-        }
-        else if (data.post_type === 'notice' && data.notice_type === 'private_recall') {
-            this.session('on_recall', {
-                type: kotori_bot_1.MessageScope.PRIVATE,
-                userId: data.user_id,
-                messageId: data.message_id
-            });
-        }
-        else if (data.post_type === 'notice' && data.notice_type === 'group_recall') {
-            this.session('on_recall', {
-                type: kotori_bot_1.MessageScope.GROUP,
-                userId: data.user_id,
-                messageId: data.message_id,
-                groupId: data.group_id,
-                operatorId: data.user_id
-            });
-        }
-        else if (data.post_type === 'request' && data.request_type === 'private') {
-            this.session('on_request', {
-                type: kotori_bot_1.MessageScope.PRIVATE,
-                userId: data.user_id
-            });
-        }
-        else if (data.post_type === 'request' && data.request_type === 'group') {
-            this.session('on_request', {
-                type: kotori_bot_1.MessageScope.GROUP,
-                userId: data.user_id,
-                groupId: data.group_id,
-                operatorId: data.operator_id || data.user_id
-            });
-        }
-        else if (data.post_type === 'notice' && data.notice_type === 'private_add') {
-            this.session('on_private_add', {
-                userId: data.user_id
-            });
-        }
-        else if (data.post_type === 'notice' && data.notice_type === 'group_increase') {
-            this.session('on_group_increase', {
-                userId: data.user_id,
-                groupId: data.group_id,
-                operatorId: data.operator_id || data.user_id
-            });
-        }
-        else if (data.post_type === 'notice' && data.notice_type === 'group_decrease') {
-            this.session('on_group_decrease', {
-                userId: data.user_id,
-                groupId: data.group_id,
-                operatorId: data.operator_id || data.user_id
-            });
-        }
-        else if (data.post_type === 'notice' && data.notice_type === 'group_admin') {
-            this.session('on_group_admin', {
-                userId: data.user_id,
-                groupId: data.group_id,
-                operation: data.sub_type === 'set' ? 'set' : 'unset'
-            });
-        }
-        else if (data.post_type === 'notice' && data.notice_type === 'group_ban') {
-            this.session('on_group_ban', {
-                userId: data.user_id,
-                groupId: data.group_id,
-                operatorId: data.operator_id,
-                time: data.duration
-            });
-        }
-        else if (data.post_type === 'meta_event' && data.meta_event_type === 'heartbeat') {
-            if (data.status.online) {
-                this.online();
-                if (this.onlineTimerId)
-                    clearTimeout(this.onlineTimerId);
-            }
-            if (this.selfId === -1 && typeof data.self_id === 'number') {
-                this.selfId = data.self_id;
-                // this.avatar = `https://q.qlogo.cn/g?b=qq&s=640&nk=${this.selfId}`;
-            }
-        }
-        else if (data.data instanceof Object && typeof data.data.message_id === 'number') {
-            this.ctx.emit('send', {
-                api: this.api,
-                messageId: data.data.message_id
-            });
-        }
-        else if (data.post_type === 'notice' &&
-            data.notice_type === 'notify' &&
-            data.sub_type === 'poke' &&
-            data.target_id) {
-            this.session('poke', {
-                userId: data.user_id,
-                targetId: data.target_id,
-                groupId: data.group_id
-            });
-        }
-        if (!this.onlineTimerId)
-            this.onlineTimerId = setTimeout(() => this.offline, 50 * 1000);
-    }
-    start() {
-        if (this.config.mode === 'ws-reverse') {
-            this.ctx.emit('connect', {
-                type: 'connect',
-                mode: 'ws-reverse',
-                adapter: this,
-                normal: true,
-                address: this.address
-            });
-        }
-        this.connectWss();
-    }
-    stop() {
-        this.ctx.emit('connect', {
-            type: 'disconnect',
-            adapter: this,
-            normal: true,
-            address: this.address,
-            mode: this.config.mode
-        });
-        this.socket?.close();
-        this.offline();
+const handleMsg = (msg) => msg.replace(/\[CQ:at,qq=(.*?)\]/g, "$1");
+class OnebotAdapter extends import_kotori_bot.Adapters.WebSocket {
+  address;
+  isReverse;
+  config;
+  constructor(ctx, config2, identity) {
+    super(ctx, config2, identity, import_api.default, new import_elements.default());
+    this.config = config2;
+    this.address = this.config.mode === "ws" ? `${this.config.address ?? "ws://127.0.0.1"}:${this.config.port}` : "";
+    this.isReverse = !this.address;
+    if (!this.isReverse) return;
+    this.connection = (ws) => {
+      this.socket = ws;
+    };
+  }
+  handle(data) {
+    if (data.post_type === "message" && data.message_type === "private") {
+      this.session("on_message", {
+        type: import_kotori_bot.MessageScope.PRIVATE,
+        userId: data.user_id,
+        messageId: data.message_id,
+        message: handleMsg(data.message),
+        sender: {
+          nickname: data.sender.nickname,
+          age: data.sender.age,
+          sex: data.sender.sex
+        },
+        groupId: data.group_id
+      });
+    } else if (data.post_type === "message" && data.message_type === "group") {
+      this.session("on_message", {
+        type: import_kotori_bot.MessageScope.GROUP,
+        userId: data.user_id,
+        messageId: data.message_id,
+        message: handleMsg(data.message),
+        sender: {
+          nickname: data.sender.nickname,
+          age: data.sender.age,
+          sex: data.sender.sex,
+          level: data.sender.level,
+          role: data.sender.role,
+          title: data.sender.title
+        },
+        groupId: data.group_id
+      });
+    } else if (data.post_type === "notice" && data.notice_type === "private_recall") {
+      this.session("on_recall", {
+        type: import_kotori_bot.MessageScope.PRIVATE,
+        userId: data.user_id,
+        messageId: data.message_id
+      });
+    } else if (data.post_type === "notice" && data.notice_type === "group_recall") {
+      this.session("on_recall", {
+        type: import_kotori_bot.MessageScope.GROUP,
+        userId: data.user_id,
+        messageId: data.message_id,
+        groupId: data.group_id,
+        operatorId: data.user_id
+      });
+    } else if (data.post_type === "request" && data.request_type === "private") {
+      this.session("on_request", {
+        type: import_kotori_bot.MessageScope.PRIVATE,
+        userId: data.user_id
+      });
+    } else if (data.post_type === "request" && data.request_type === "group") {
+      this.session("on_request", {
+        type: import_kotori_bot.MessageScope.GROUP,
+        userId: data.user_id,
+        groupId: data.group_id,
+        operatorId: data.operator_id || data.user_id
+      });
+    } else if (data.post_type === "notice" && data.notice_type === "private_add") {
+      this.session("on_private_add", {
+        userId: data.user_id
+      });
+    } else if (data.post_type === "notice" && data.notice_type === "group_increase") {
+      this.session("on_group_increase", {
+        userId: data.user_id,
+        groupId: data.group_id,
+        operatorId: data.operator_id || data.user_id
+      });
+    } else if (data.post_type === "notice" && data.notice_type === "group_decrease") {
+      this.session("on_group_decrease", {
+        userId: data.user_id,
+        groupId: data.group_id,
+        operatorId: data.operator_id || data.user_id
+      });
+    } else if (data.post_type === "notice" && data.notice_type === "group_admin") {
+      this.session("on_group_admin", {
+        userId: data.user_id,
+        groupId: data.group_id,
+        operation: data.sub_type === "set" ? "set" : "unset"
+      });
+    } else if (data.post_type === "notice" && data.notice_type === "group_ban") {
+      this.session("on_group_ban", {
+        userId: data.user_id,
+        groupId: data.group_id,
+        operatorId: data.operator_id,
+        time: data.duration
+      });
+    } else if (data.post_type === "meta_event" && data.meta_event_type === "heartbeat") {
+      if (data.status.online) {
+        this.online();
+        if (this.onlineTimerId) clearTimeout(this.onlineTimerId);
+      }
+      if (this.selfId === -1 && typeof data.self_id === "number") {
+        this.selfId = data.self_id;
+      }
+    } else if (data.data instanceof Object && typeof data.data.message_id === "number") {
+      this.ctx.emit("send", {
+        api: this.api,
+        messageId: data.data.message_id
+      });
+    } else if (data.post_type === "notice" && data.notice_type === "notify" && data.sub_type === "poke" && data.target_id) {
+      this.session("poke", {
+        userId: data.user_id,
+        targetId: data.target_id,
+        groupId: data.group_id
+      });
     }
-    send(action, params) {
-        this.socket?.send(JSON.stringify({ action, params }));
+    if (!this.onlineTimerId) this.onlineTimerId = setTimeout(() => this.offline(), 50 * 1e3);
+  }
+  start() {
+    if (this.isReverse) {
+      this.setup();
+      return;
     }
-    socket = null;
-    async connectWss() {
-        if (this.config.mode === 'ws-reverse') {
-            const wss = await (0, wsserver_1.default)(this.config.port);
-            const [socket] = wss;
-            this.socket = socket;
-        }
-        else {
-            this.ctx.emit('connect', {
-                type: 'connect',
-                mode: 'ws',
-                adapter: this,
-                normal: true,
-                address: this.address
-            });
-            this.socket = new ws_1.default(`${this.address}`);
-            this.socket.on('close', () => {
-                this.ctx.emit('connect', {
-                    type: 'disconnect',
-                    adapter: this,
-                    normal: false,
-                    mode: 'ws',
-                    address: this.address
-                });
-                setTimeout(() => {
-                    if (!this.socket)
-                        return;
-                    this.socket.close();
-                    this.ctx.emit('connect', {
-                        type: 'connect',
-                        mode: 'ws-reverse',
-                        adapter: this,
-                        normal: false,
-                        address: this.address
-                    });
-                    this.connectWss();
-                }, this.config.retry * 1000);
-            });
-        }
-        this.socket.on('message', (data) => this.handle(JSON.parse(data.toString())));
+    this.ctx.emit("connect", {
+      type: "connect",
+      mode: "ws",
+      adapter: this,
+      normal: true,
+      address: this.address
+    });
+    this.socket = new import_ws.default(`${this.address}`);
+    this.socket.on("close", () => {
+      this.ctx.emit("connect", {
+        type: "disconnect",
+        adapter: this,
+        normal: false,
+        mode: "ws",
+        address: this.address
+      });
+    });
+    this.socket.on("message", (raw) => this.handle(JSON.parse(raw.toString())));
+  }
+  stop() {
+    if (this.isReverse) {
+      super.stop();
+      return;
     }
-    /* global NodeJS */
-    onlineTimerId = null;
+    this.ctx.emit("connect", {
+      type: "disconnect",
+      adapter: this,
+      normal: true,
+      address: this.address,
+      mode: "ws"
+    });
+    this.socket?.close();
+  }
+  send(action, params) {
+    this.socket?.send(JSON.stringify({ action, params }));
+  }
+  socket = null;
+  /* global NodeJS */
+  onlineTimerId = null;
 }
-exports.OnebotAdapter = OnebotAdapter;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  OnebotAdapter,
+  config
+});

package/lib/api.js

@@ -1,119 +1,147 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.OnebotApi = void 0;
-/*
- * @Author: Hotaru biyuehuya@gmail.com
- * @Blog: https://hotaru.icu
- * @Date: 2023-09-29 14:31:13
- * @LastEditors: Hotaru biyuehuya@gmail.com
- * @LastEditTime: 2024-02-21 10:40:20
+
+/**
+ * @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
  */
-const kotori_bot_1 = require("kotori-bot");
-class OnebotApi extends kotori_bot_1.Api {
-    sendPrivateMsg(message, userId) {
-        this.adapter.status.lastMsgTime = new Date();
-        this.adapter.status.sentMsg += 1;
-        this.adapter.send('send_private_msg', { user_id: userId, message, auto_escape: false });
-    }
-    /**
-     * @description: 发送私聊消息
-     * @param {Msg} message 要发送的内容
-     * @param {groupId} groupId 群号
-     * @return {void}
-     */
-    sendGroupMsg(message, groupId) {
-        this.adapter.status.lastMsgTime = new Date();
-        this.adapter.status.sentMsg += 1;
-        this.adapter.send('send_group_msg', { group_id: groupId, message, auto_escape: false });
-    }
-    /**
-     * @description: 撤回消息
-     * @param {number} messageId 消息id
-     * @return {void}
-     */
-    deleteMsg(messageId) {
-        this.adapter.send('delete_msg', { messageId });
-    }
-    /**
-     * @description: 设置群名
-     * @param {number} groupId 群号
-     * @param {string} groupName 新群名
-     * @return {void}
-     */
-    setGroupName(groupId, groupName) {
-        this.adapter.send('set_group_name', { group_id: groupId, group_name: groupName });
-    }
-    /**
-     * @description: 设置群头像
-     * @param {number} groupId 群号
-     * @param {string} image 图片路径
-     * @return {void}
-     */
-    setGroupAvatar(groupId, image) {
-        this.adapter.send('set_group_portrait', { group_id: groupId, file: image, cache: false });
-    }
-    /**
-     * @description: 设置群管理员
-     * @param {number} groupId 群号
-     * @param {number} userId 要设置的管理员的QQ号
-     * @param {boolean} enable true为设置,false取消,默认true
-     * @return {void}
-     */
-    setGroupAdmin(groupId, userId, enable = true) {
-        this.adapter.send('set_group_admin', { group_id: groupId, user_id: userId, enable });
-    }
-    /**
-     * @description: 设置群名片(群备注)
-     * @param {number} groupId 群号
-     * @param {number} userId 要设置的QQ号
-     * @param {string} card 群名片内容,不填或空字符串表示删除群名片
-     * @return {void}
-     */
-    setGroupCard(groupId, userId, card) {
-        this.adapter.send('set_group_card', { group_id: groupId, user_id: userId, card });
-    }
-    /**
-     * @description: 群禁言
-     * @param {number} groupId 群号
-     * @param {number} userId 要禁言的QQ号,不填则为群禁言
-     * @param {number} time 禁言时长,单位秒,0表示取消禁言
-     * @return {void}
-     */
-    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 });
-        }
-    }
-    /**
-     * @description: 发送群公告
-     * @param {number} groupId 群号
-     * @param {string} content 公告内容
-     * @param {string} image 图片路径(可选)
-     * @return {void}
-     */
-    sendGroupNotice(groupId, content, image) {
-        this.adapter.send('_sendGroupNotice', { group_id: groupId, content, image });
-    }
-    /**
-     * @description: 群组踢人
-     * @param {number} groupId 群号
-     * @param {number} userId 要踢的QQ号
-     * @return {void}
-     */
-    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 });
+
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var api_exports = {};
+__export(api_exports, {
+  OnebotApi: () => OnebotApi,
+  default: () => api_default
+});
+module.exports = __toCommonJS(api_exports);
+var import_kotori_bot = require("kotori-bot");
+class OnebotApi extends import_kotori_bot.Api {
+  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 });
+  }
+  /**
+   * @description: 发送私聊消息
+   * @param {Msg} message 要发送的内容
+   * @param {groupId} groupId 群号
+   * @return {void}
+   */
+  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 });
+  }
+  /**
+   * @description: 撤回消息
+   * @param {number} messageId 消息id
+   * @return {void}
+   */
+  deleteMsg(messageId) {
+    this.adapter.send("delete_msg", { messageId });
+  }
+  /**
+   * @description: 设置群名
+   * @param {number} groupId 群号
+   * @param {string} groupName 新群名
+   * @return {void}
+   */
+  setGroupName(groupId, groupName) {
+    this.adapter.send("set_group_name", { group_id: groupId, group_name: groupName });
+  }
+  /**
+   * @description: 设置群头像
+   * @param {number} groupId 群号
+   * @param {string} image 图片路径
+   * @return {void}
+   */
+  setGroupAvatar(groupId, image) {
+    this.adapter.send("set_group_portrait", { group_id: groupId, file: image, cache: false });
+  }
+  /**
+   * @description: 设置群管理员
+   * @param {number} groupId 群号
+   * @param {number} userId 要设置的管理员的QQ号
+   * @param {boolean} enable true为设置,false取消,默认true
+   * @return {void}
+   */
+  setGroupAdmin(groupId, userId, enable = true) {
+    this.adapter.send("set_group_admin", { group_id: groupId, user_id: userId, enable });
+  }
+  /**
+   * @description: 设置群名片(群备注)
+   * @param {number} groupId 群号
+   * @param {number} userId 要设置的QQ号
+   * @param {string} card 群名片内容,不填或空字符串表示删除群名片
+   * @return {void}
+   */
+  setGroupCard(groupId, userId, card) {
+    this.adapter.send("set_group_card", { group_id: groupId, user_id: userId, card });
+  }
+  /**
+   * @description: 群禁言
+   * @param {number} groupId 群号
+   * @param {number} userId 要禁言的QQ号,不填则为群禁言
+   * @param {number} time 禁言时长,单位秒,0表示取消禁言
+   * @return {void}
+   */
+  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 });
     }
+  }
+  /**
+   * @description: 发送群公告
+   * @param {number} groupId 群号
+   * @param {string} content 公告内容
+   * @param {string} image 图片路径(可选)
+   * @return {void}
+   */
+  sendGroupNotice(groupId, content, image) {
+    this.adapter.send("_sendGroupNotice", { group_id: groupId, content, image });
+  }
+  /**
+   * @description: 群组踢人
+   * @param {number} groupId 群号
+   * @param {number} userId 要踢的QQ号
+   * @return {void}
+   */
+  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 });
+  }
+  /* extra: ApiExtraValue = { type: 'onebot', image, at, poke }; */
 }
-exports.OnebotApi = OnebotApi;
-exports.default = OnebotApi;
+var api_default = OnebotApi;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  OnebotApi
+});

package/lib/elements.js

@@ -1,27 +1,62 @@
+
+/**
+ * @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
+ */
+
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.OnebotElements = void 0;
-const kotori_bot_1 = require("kotori-bot");
-class OnebotElements extends kotori_bot_1.Elements {
-    cq(type, data) {
-        (0, kotori_bot_1.none)(this);
-        return `[CQ:${type},${data}]`;
-    }
-    at(target) {
-        return this.cq('at', `qq=${target}`);
-    }
-    image(url) {
-        return this.cq('image', `file=${url},cache=0`);
-    }
-    voice(url) {
-        return this.cq('record', `file=${url}`);
-    }
-    video(url) {
-        return this.cq('video', `file=${url}`);
-    }
-    face(id) {
-        return this.cq('face', `id=${id}`);
-    }
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var elements_exports = {};
+__export(elements_exports, {
+  OnebotElements: () => OnebotElements,
+  default: () => elements_default
+});
+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}`);
+  }
+  image(url) {
+    return this.cq("image", `file=${url},cache=0`);
+  }
+  voice(url) {
+    return this.cq("record", `file=${url}`);
+  }
+  video(url) {
+    return this.cq("video", `file=${url}`);
+  }
+  face(id) {
+    return this.cq("face", `id=${id}`);
+  }
 }
-exports.OnebotElements = OnebotElements;
-exports.default = OnebotElements;
+var elements_default = OnebotElements;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  OnebotElements
+});

package/lib/index.js

@@ -1,4 +1,36 @@
+
+/**
+ * @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
+ */
+
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const adapter_1 = require("./adapter");
-exports.default = adapter_1.OnebotAdapter;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var src_exports = {};
+__export(src_exports, {
+  default: () => src_default
+});
+module.exports = __toCommonJS(src_exports);
+var import_adapter = require("./adapter");
+var src_default = import_adapter.OnebotAdapter;

package/lib/types.js

@@ -1,9 +1,27 @@
-"use strict";
-/*
- * @Author: hotaru biyuehuya@gmail.com
- * @Blog: https://hotaru.icu
- * @Date: 2023-07-12 15:42:18
- * @LastEditors: Hotaru biyuehuya@gmail.com
- * @LastEditTime: 2024-02-04 16:13:40
+
+/**
+ * @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
  */
-Object.defineProperty(exports, "__esModule", { value: true });
+
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var types_exports = {};
+module.exports = __toCommonJS(types_exports);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kotori-bot/kotori-plugin-adapter-onebot",
-  "version": "1.2.1",
+  "version": "2.0.0",
   "description": "Adapter For Onebot (go-cqhttp)",
   "main": "lib/index.js",
   "keywords": [
@@ -17,13 +17,10 @@
   ],
   "author": "Hotaru <biyuehuya@gmail.com>",
   "peerDependencies": {
-    "kotori-bot": "^1.3.0"
+    "kotori-bot": "^1.5.4"
   },
   "dependencies": {
     "@types/ws": "^8.5.8",
     "ws": "^8.14.2"
-  },
-  "scripts": {
-    "build": "tsc --build"
   }
 }

package/lib/services/wsserver.d.ts

@@ -1,4 +0,0 @@
-/// <reference types="node" />
-import WebSocket from 'ws';
-export declare const WsServer: (port: number) => Promise<[WebSocket, WebSocket.Server<typeof WebSocket, typeof import("http").IncomingMessage>]>;
-export default WsServer;

package/lib/services/wsserver.js

@@ -1,27 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.WsServer = void 0;
-/*
- * @Author: hotaru biyuehuya@gmail.com
- * @Blog: https://hotaru.icu
- * @Date: 2023-06-24 15:12:55
- * @LastEditors: Hotaru biyuehuya@gmail.com
- * @LastEditTime: 2024-02-20 20:17:46
- */
-const ws_1 = __importDefault(require("ws"));
-const WsServer = async (port) => new Promise((resolve, reject) => {
-    try {
-        const WebSocketServer = new ws_1.default.Server({ port });
-        WebSocketServer.on('connection', (ws) => {
-            resolve([ws, WebSocketServer]);
-        });
-    }
-    catch (e) {
-        reject(e);
-    }
-});
-exports.WsServer = WsServer;
-exports.default = exports.WsServer;