kook-client 1.0.0 → 1.0.2

package/lib/entries/channel.js

@@ -1,10 +1,7 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Channel = void 0;
-const contact_1 = require("../entries/contact");
-const _1 = require("..");
-const event_1 = require("../event");
-class Channel extends contact_1.Contact {
+import { Contact } from "./contact.js";
+import { Message } from "../index.js";
+import { ChannelMessageEvent } from "../event/index.js";
+export class Channel extends Contact {
     constructor(c, info) {
         super(c);
         this.info = info;
@@ -44,7 +41,7 @@ class Channel extends contact_1.Contact {
                 msg_id: message_id
             }
         });
-        return event_1.ChannelMessageEvent.fromDetail(this.c, this.info.id, data);
+        return ChannelMessageEvent.fromDetail(this.c, this.info.id, data);
     }
     async getUserList() {
         const { data } = await this.c.request.get('/v3/channel/user-list', {
@@ -66,11 +63,11 @@ class Channel extends contact_1.Contact {
             page_size: len
         });
         return (result?.data?.items || []).map((item) => {
-            return event_1.ChannelMessageEvent.fromDetail(this.c, this.info.id, item);
+            return ChannelMessageEvent.fromDetail(this.c, this.info.id, item);
         });
     }
     async sendMsg(message, quote) {
-        const [content, quoteObj, type] = await _1.Message.processMessage.call(this.c, message, quote);
+        const [content, quoteObj, type] = await Message.processMessage.call(this.c, message, quote);
         const { data } = await this.c.request.post('/v3/message/create', {
             target_id: this.info.id,
             content, // 处理后的内容（图片URL / 文本 / Markdown / Card JSON）
@@ -89,7 +86,7 @@ class Channel extends contact_1.Contact {
         return result['code'] === 0;
     }
     async updateMsg(message_id, newMessage, quote) {
-        [newMessage, quote] = await _1.Message.processMessage.call(this.c, newMessage, quote);
+        [newMessage, quote] = await Message.processMessage.call(this.c, newMessage, quote);
         const result = await this.c.request.post('/v3/message/update', {
             msg_id: message_id,
             content: newMessage,
@@ -120,7 +117,6 @@ class Channel extends contact_1.Contact {
         });
     }
 }
-exports.Channel = Channel;
 (function (Channel) {
     Channel.map = new WeakMap();
     function as(channel_id) {
@@ -134,4 +130,4 @@ exports.Channel = Channel;
         return channel;
     }
     Channel.as = as;
-})(Channel || (exports.Channel = Channel = {}));
+})(Channel || (Channel = {}));

package/lib/entries/channelMember.js

@@ -1,8 +1,5 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ChannelMember = void 0;
-const user_1 = require("../entries/user");
-class ChannelMember extends user_1.User {
+import { User } from "./user.js";
+export class ChannelMember extends User {
     constructor(c, channel_id, info) {
         super(c, info);
         this.channel_id = channel_id;
@@ -14,7 +11,6 @@ class ChannelMember extends user_1.User {
         return this.channel.addUsers([this.info.id]);
     }
 }
-exports.ChannelMember = ChannelMember;
 (function (ChannelMember) {
     ChannelMember.map = new WeakMap();
     function as(channel_id, user_id) {
@@ -28,4 +24,4 @@ exports.ChannelMember = ChannelMember;
         return member;
     }
     ChannelMember.as = as;
-})(ChannelMember || (exports.ChannelMember = ChannelMember = {}));
+})(ChannelMember || (ChannelMember = {}));

package/lib/entries/contact.js

@@ -1,9 +1,5 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Contact = void 0;
-class Contact {
+export class Contact {
     constructor(c) {
         this.c = c;
     }
 }
-exports.Contact = Contact;

package/lib/entries/guild.js

@@ -1,9 +1,6 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Guild = void 0;
-const contact_1 = require("../entries/contact");
-const constans_1 = require("../constans");
-class Guild extends contact_1.Contact {
+import { Contact } from "./contact.js";
+import { UnsupportedMethodError } from "../constans.js";
+export class Guild extends Contact {
     constructor(c, info) {
         super(c);
         this.info = info;
@@ -79,19 +76,18 @@ class Guild extends contact_1.Contact {
         return data;
     }
     async sendMsg(message, quote) {
-        throw constans_1.UnsupportedMethodError;
+        throw UnsupportedMethodError;
     }
     recallMsg(message_id) {
-        throw constans_1.UnsupportedMethodError;
+        throw UnsupportedMethodError;
     }
     updateMsg(message_id, newMessage) {
-        throw constans_1.UnsupportedMethodError;
+        throw UnsupportedMethodError;
     }
     getMsg(message_id) {
-        throw constans_1.UnsupportedMethodError;
+        throw UnsupportedMethodError;
     }
 }
-exports.Guild = Guild;
 (function (Guild) {
     Guild.map = new WeakMap();
     function as(guild_id) {
@@ -136,4 +132,4 @@ exports.Guild = Guild;
         Permission[Permission["UpdateOtherUserNickname"] = 67108864] = "UpdateOtherUserNickname";
         Permission[Permission["PlayMusic"] = 134217728] = "PlayMusic";
     })(Permission = Guild.Permission || (Guild.Permission = {}));
-})(Guild || (exports.Guild = Guild = {}));
+})(Guild || (Guild = {}));

package/lib/entries/guildMember.js

@@ -1,8 +1,5 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.GuildMember = void 0;
-const user_1 = require("../entries/user");
-class GuildMember extends user_1.User {
+import { User } from "./user.js";
+export class GuildMember extends User {
     constructor(c, guild_id, info) {
         super(c, info);
         this.guild_id = guild_id;
@@ -56,7 +53,6 @@ class GuildMember extends user_1.User {
         return this.guild.kick(this.info.id);
     }
 }
-exports.GuildMember = GuildMember;
 (function (GuildMember) {
     GuildMember.map = new WeakMap();
     function as(guild_id, user_id) {
@@ -70,4 +66,4 @@ exports.GuildMember = GuildMember;
         return member;
     }
     GuildMember.as = as;
-})(GuildMember || (exports.GuildMember = GuildMember = {}));
+})(GuildMember || (GuildMember = {}));

package/lib/entries/user.js

@@ -1,10 +1,7 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.User = void 0;
-const contact_1 = require("../entries/contact");
-const _1 = require("..");
-const event_1 = require("../event");
-class User extends contact_1.Contact {
+import { Contact } from "./contact.js";
+import { Message } from "../index.js";
+import { PrivateMessageEvent } from "../event/index.js";
+export class User extends Contact {
     constructor(c, info) {
         super(c);
         this.info = info;
@@ -12,7 +9,7 @@ class User extends contact_1.Contact {
     async sendMsg(message, quote) {
         let isCard;
         // [message,quote,isCard]=await Message.processMessage.call(this.c,message,quote)
-        const [content, quoteObj, type] = await _1.Message.processMessage.call(this.c, message, quote);
+        const [content, quoteObj, type] = await Message.processMessage.call(this.c, message, quote);
         const { data } = await this.c.request.post('/v3/direct-message/create', {
             target_id: this.info.id,
             content, // 处理后的内容（图片URL / 文本 / Markdown / Card JSON）
@@ -53,7 +50,7 @@ class User extends contact_1.Contact {
         });
     }
     async updateMsg(message_id, newMessage, quote) {
-        [newMessage, quote] = await _1.Message.processMessage.call(this.c, newMessage, quote);
+        [newMessage, quote] = await Message.processMessage.call(this.c, newMessage, quote);
         const result = await this.c.request.post('/v3/direct-message/update', {
             msg_id: message_id,
             content: newMessage,
@@ -73,7 +70,7 @@ class User extends contact_1.Contact {
             page_size: len
         });
         return (result?.data?.items || []).map((item) => {
-            return event_1.PrivateMessageEvent.fromDetail(this.c, this.info.id, item);
+            return PrivateMessageEvent.fromDetail(this.c, this.info.id, item);
         });
     }
     async getMsg(message_id) {
@@ -82,7 +79,7 @@ class User extends contact_1.Contact {
                 msg_id: message_id
             }
         });
-        return event_1.PrivateMessageEvent.fromDetail(this.c, this.info.id, data);
+        return PrivateMessageEvent.fromDetail(this.c, this.info.id, data);
     }
     asGuildMember(guild_id) {
         return this.c.pickGuildMember(guild_id, this.info.id);
@@ -91,7 +88,6 @@ class User extends contact_1.Contact {
         return this.c.pickChannelMember(channel_id, this.info.id);
     }
 }
-exports.User = User;
 (function (User) {
     User.map = new WeakMap();
     function as(user_id, from_id) {
@@ -112,4 +108,4 @@ exports.User = User;
         Permission[Permission["owner"] = 4] = "owner";
         Permission[Permission["channelAdmin"] = 5] = "channelAdmin";
     })(Permission = User.Permission || (User.Permission = {}));
-})(User || (exports.User = User = {}));
+})(User || (User = {}));

package/lib/event/index.js

@@ -1,17 +1 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./message"), exports);
+export * from "./message.js";

package/lib/event/message.js

@@ -1,9 +1,6 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ChannelMessageEvent = exports.PrivateMessageEvent = void 0;
-const message_1 = require("../message");
-const constans_1 = require("../constans");
-class PrivateMessageEvent extends message_1.Message {
+import { Message } from "../message.js";
+import { ChannelType } from "../constans.js";
+export class PrivateMessageEvent extends Message {
     constructor(client, payload) {
         super(client, payload);
         this.message_type = 'private';
@@ -13,7 +10,7 @@ class PrivateMessageEvent extends message_1.Message {
             target_id: client.self_id === detail.author.id ? user_id : client.self_id,
             author_id: detail.author.id,
             type: detail.type,
-            channel_type: constans_1.ChannelType.Private,
+            channel_type: ChannelType.Private,
             msg_id: detail.id,
             msg_timestamp: detail.create_at,
             content: detail.content,
@@ -40,8 +37,7 @@ class PrivateMessageEvent extends message_1.Message {
         return this.author.sendMsg(message, quote && this);
     }
 }
-exports.PrivateMessageEvent = PrivateMessageEvent;
-class ChannelMessageEvent extends message_1.Message {
+export class ChannelMessageEvent extends Message {
     constructor(client, payload) {
         super(client, payload);
         this.channel_id = payload.target_id;
@@ -53,7 +49,7 @@ class ChannelMessageEvent extends message_1.Message {
             target_id: channel_id,
             author_id: detail.author.id,
             type: detail.type,
-            channel_type: constans_1.ChannelType.Channel,
+            channel_type: ChannelType.Channel,
             msg_id: detail.id,
             msg_timestamp: detail.create_at,
             content: detail.content,
@@ -83,4 +79,3 @@ class ChannelMessageEvent extends message_1.Message {
         return this.channel.deleteMsgReaction(this.message_id, emoji, user_id);
     }
 }
-exports.ChannelMessageEvent = ChannelMessageEvent;

package/lib/index.d.ts

@@ -1,8 +1,8 @@
-import * as log4js from 'log4js';
 import { EventEmitter } from 'events';
 import { BinaryLike } from 'crypto';
 import { Stream } from 'node:stream';
 import { AxiosInstance } from 'axios';
+import log4js from 'log4js';
 export type Dict<T = any, K extends string | symbol = string> = Record<K, T>;
 export type LogLevel = "trace" | "debug" | "info" | "warn" | "error" | "fatal" | "mark" | "off";
 export enum OpCode {
@@ -792,7 +792,13 @@ export interface EventMap {
     'message.channel'(e: ChannelMessageEvent): void;
     'message.private'(e: PrivateMessageEvent): void;
 }
-export class BaseClient extends EventEmitter {
+export interface EventMaps {
+    'message': [PrivateMessageEvent | ChannelMessageEvent];
+    'message.channel': [ChannelMessageEvent];
+    'message.private': [PrivateMessageEvent];
+}
+import type { EventMaps } from "event/index";
+export class BaseClient extends EventEmitter<EventMaps> {
     request: AxiosInstance;
     self_id: string;
     nickname: string;
@@ -810,24 +816,6 @@ export class BaseClient extends EventEmitter {
     uploadMedia(data: string | Buffer): Promise<string>;
     em(event: string, payload: Dict): void;
 }
-export interface KookClient {
-    on<T extends keyof EventMap>(event: T, callback: EventMap[T]): this;
-    on<S extends string | symbol>(event: S & Exclude<string | symbol, keyof EventMap>, callback: (...args: any[]) => void): this;
-    once<T extends keyof EventMap>(event: T, callback: EventMap[T]): this;
-    once<S extends string | symbol>(event: S & Exclude<string | symbol, keyof EventMap>, callback: (...args: any[]) => void): this;
-    off<T extends keyof EventMap>(event: T, callback?: EventMap[T]): this;
-    off<S extends string | symbol>(event: S & Exclude<string | symbol, keyof EventMap>, callback?: (...args: any[]) => void): this;
-    emit<T extends keyof EventMap>(event: T, ...args: Parameters<EventMap[T]>): boolean;
-    emit<S extends string | symbol>(event: S & Exclude<string | symbol, keyof EventMap>, ...args: any[]): boolean;
-    addListener<T extends keyof EventMap>(event: T, callback: EventMap[T]): this;
-    addListener<S extends string | symbol>(event: S & Exclude<string | symbol, keyof EventMap>, callback: (...args: any[]) => void): this;
-    addListenerOnce<T extends keyof EventMap>(event: T, callback: EventMap[T]): this;
-    addListenerOnce<S extends string | symbol>(event: S & Exclude<string | symbol, keyof EventMap>, callback: (...args: any[]) => void): this;
-    removeListener<T extends keyof EventMap>(event: T, callback?: EventMap[T]): this;
-    removeListener<S extends string | symbol>(event: S & Exclude<string | symbol, keyof EventMap>, callback?: (...args: any[]) => void): this;
-    removeAllListeners<T extends keyof EventMap>(event: T): this;
-    removeAllListeners<S extends string | symbol>(event: S & Exclude<string | symbol, keyof EventMap>): this;
-}
 export namespace BaseClient {
     const defaultConfig: Partial<Config>;
     interface Config {

package/lib/index.js

@@ -1,23 +1,7 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./core/baseClient"), exports);
-__exportStar(require("./core/receivers"), exports);
-__exportStar(require("./client"), exports);
-__exportStar(require("./elements"), exports);
-__exportStar(require("./types"), exports);
-__exportStar(require("./utils"), exports);
-__exportStar(require("./message"), exports);
+export * from './core/baseClient.js';
+export * from './core/receivers/index.js';
+export * from './client.js';
+export * from './elements.js';
+export * from './types.js';
+export * from './utils.js';
+export * from './message.js';

package/lib/message.js

@@ -1,9 +1,6 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Message = void 0;
-const elements_1 = require("./elements");
-const baseClient_1 = require("./core/baseClient");
-class Message {
+import { segment, validateCard } from "./elements.js";
+import { BaseClient } from "./core/baseClient.js";
+export class Message {
     get self_id() {
         return this.client.self_id;
     }
@@ -26,31 +23,30 @@ class Message {
     toJSON() {
         return Object.fromEntries(Object.keys(this)
             .filter(key => {
-            return typeof this[key] !== "function" && !(this[key] instanceof baseClient_1.BaseClient);
+            return typeof this[key] !== "function" && !(this[key] instanceof BaseClient);
         })
             .map(key => [key, this[key]]));
     }
 }
-exports.Message = Message;
 (function (Message) {
     function convertMessage(content, extra) {
         if (extra.type === 1)
-            return [elements_1.segment.text(content)];
+            return [segment.text(content)];
         if (extra.type === 2)
-            return [elements_1.segment.image(content)];
+            return [segment.image(content)];
         if (extra.type === 3)
-            return [elements_1.segment.video(content)];
+            return [segment.video(content)];
         if (extra.type === 4)
-            return [elements_1.segment.file(content)];
+            return [segment.file(content)];
         if (extra.type === 8)
-            return [elements_1.segment.audio(content)];
+            return [segment.audio(content)];
         if (extra.type === 10)
             return JSON.parse(content);
         const segments = [];
         const pushAtInfo = (atMatch) => {
             const idx = content.indexOf(atMatch[0]);
-            segments.push(elements_1.segment.markdown(content.slice(0, idx)));
-            segments.push(elements_1.segment.at(atMatch[1]));
+            segments.push(segment.markdown(content.slice(0, idx)));
+            segments.push(segment.at(atMatch[1]));
             content = content.slice(idx + atMatch[0].length);
         };
         while (content.length) {
@@ -61,7 +57,7 @@ exports.Message = Message;
                 break;
         }
         if (content.length)
-            segments.push(elements_1.segment.markdown(content));
+            segments.push(segment.markdown(content));
         return segments;
     }
     Message.convertMessage = convertMessage;
@@ -102,7 +98,7 @@ exports.Message = Message;
                     }
                 };
                 await processImages(card);
-                (0, elements_1.validateCard)(card);
+                validateCard(card);
                 result = JSON.stringify([card]);
                 messageType = 10;
                 break;
@@ -111,7 +107,7 @@ exports.Message = Message;
             if (typeof seg === 'object' && seg.__isCard) {
                 const { __isCard, ...cardData } = seg;
                 // 最终验证（确保在发送前）
-                (0, elements_1.validateCard)(cardData);
+                validateCard(cardData);
                 // 将卡片包装在数组中
                 result = JSON.stringify([cardData]);
                 messageType = 10;
@@ -142,7 +138,7 @@ exports.Message = Message;
                     throw new Error(`can't send file`);
                 case "card":
                     // 最终验证（确保在发送前）
-                    (0, elements_1.validateCard)(seg);
+                    validateCard(seg);
                     // 将卡片包装在数组中
                     result = JSON.stringify([seg]);
                     messageType = 10;
@@ -170,4 +166,4 @@ exports.Message = Message;
         return [result, quote, messageType];
     }
     Message.processMessage = processMessage;
-})(Message || (exports.Message = Message = {}));
+})(Message || (Message = {}));