@alemonjs/kook 0.2.9 → 2.1.0-alpha.1

package/README.md

@@ -18,7 +18,10 @@ yarn add @alemonjs/kook
 kook:
   # 令牌
   token: ''
-  # 主人
+  # 使用 user_key
   master_key:
-    - ''
+     - 'xxx'
+  # 使用 user_id
+  master_id:
+     - 'yyy'
 ```

package/lib/config.js

@@ -0,0 +1,20 @@
+import { useUserHashKey, getConfigValue } from 'alemonjs';
+
+const platform = 'telegram';
+const getKOOKConfig = () => {
+    const value = getConfigValue() || {};
+    return value[platform] || {};
+};
+const getMaster = (UserId) => {
+    const config = getKOOKConfig();
+    const master_key = config.master_key || [];
+    const master_id = config.master_id || [];
+    const UserKey = useUserHashKey({
+        Platform: platform,
+        UserId: UserId
+    });
+    const is = master_key.includes(UserKey) || master_id.includes(UserId);
+    return [is, UserKey];
+};
+
+export { getKOOKConfig, getMaster, platform };

package/lib/hook.d.ts

@@ -0,0 +1,38 @@
+import { EventKeys, Events } from 'alemonjs';
+import { EventData } from './sdk/typings.js';
+import { KOOKAPI } from './sdk/api.js';
+
+type MAP = {
+    'message.create': EventData;
+    'private.message.create': EventData;
+    'interaction.create': undefined;
+    'private.interaction.create': undefined;
+    'message.update': undefined;
+    'message.delete': undefined;
+    'message.reaction.add': undefined;
+    'message.reaction.remove': undefined;
+    'channal.create': undefined;
+    'channal.delete': undefined;
+    'guild.join': undefined;
+    'guild.exit': undefined;
+    'member.add': undefined;
+    'member.remove': undefined;
+    'private.message.update': undefined;
+    'private.message.delete': undefined;
+    'private.friend.add': undefined;
+    'private.guild.add': undefined;
+};
+/**
+ *
+ * @param event
+ * @returns
+ */
+declare const useValue: <T extends EventKeys>(event: Events[T]) => readonly [MAP[T]];
+/**
+ *
+ * @param event
+ * @returns
+ */
+declare const useClient: <T extends EventKeys>(event: Events[T]) => readonly [KOOKAPI, MAP[T]];
+
+export { useClient, useValue };

package/lib/hook.js

@@ -0,0 +1,24 @@
+import { createEventValue, useClient as useClient$1 } from 'alemonjs';
+import { KOOKAPI } from './sdk/api.js';
+
+/**
+ *
+ * @param event
+ * @returns
+ */
+const useValue = (event) => {
+    const value = createEventValue(event);
+    return [value];
+};
+/**
+ *
+ * @param event
+ * @returns
+ */
+const useClient = (event) => {
+    const [client] = useClient$1(event, KOOKAPI);
+    const value = createEventValue(event);
+    return [client, value];
+};
+
+export { useClient, useValue };

package/lib/index.d.ts

@@ -1,9 +1,8 @@
-import * as alemonjs from 'alemonjs';
-import { KOOKClient } from './sdk/platform/kook/sdk/wss.js';
+export { useClient, useValue } from './hook.js';
+export { KOOKAPI as API } from './sdk/api.js';
 
-type Client = typeof KOOKClient.prototype;
 declare const platform = "kook";
-declare const client: Client;
-declare const _default: alemonjs.DefineBotValue;
 
-export { type Client, client, _default as default, platform };
+declare const _default: () => void;
+
+export { _default as default, platform };

package/lib/index.js

@@ -1,27 +1,13 @@
-import { defineBot, getConfigValue, useUserHashKey, onProcessor } from 'alemonjs';
+import { getConfigValue, cbpPlatform, createResult, ResultCode } from 'alemonjs';
+export { KOOKAPI as API } from './sdk/api.js';
+import { KOOKClient } from './sdk/wss.js';
 import { readFileSync } from 'fs';
-import 'axios';
-import 'path';
-import 'qrcode';
-import 'public-ip';
-import 'stream';
-import 'file-type';
-import 'form-data';
-import './sdk/platform/kook/sdk/typings.js';
-import { KOOKClient } from './sdk/platform/kook/sdk/wss.js';
+import { getMaster } from './config.js';
+import { getBufferByURL } from 'alemonjs/utils';
+export { useClient, useValue } from './hook.js';
 
 const platform = 'kook';
-const client = new Proxy({}, {
-    get: (_, prop) => {
-        if (prop in global.client) {
-            const original = global.client[prop];
-            // 防止函数内this丢失
-            return typeof original === 'function' ? original.bind(global.client) : original;
-        }
-        return undefined;
-    }
-});
-var index = defineBot(() => {
+var index = () => {
     let value = getConfigValue();
     if (!value)
         value = {};
@@ -32,38 +18,22 @@ var index = defineBot(() => {
     });
     // 连接
     client.connect();
+    const url = `ws://127.0.0.1:${process.env?.port || config?.port || 17117}`;
+    const cbp = cbpPlatform(url);
     client.on('MESSAGES_DIRECT', async (event) => {
         // 过滤机器人
         if (event.extra?.author?.bot)
             return false;
         // 创建私聊标记
         const data = await client.userChatCreate(event.extra.author.id).then(res => res?.data);
-        // 主人
-        const master_key = config?.master_key ?? [];
-        const isMaster = master_key.includes(event.author_id);
         // 头像
         const avatar = event.extra.author.avatar;
         // 获取消息
         let msg = event.content;
         const url = avatar.substring(0, avatar.indexOf('?'));
-        const UserAvatar = {
-            toBuffer: async () => {
-                const arrayBuffer = await fetch(url).then(res => res.arrayBuffer());
-                return Buffer.from(arrayBuffer);
-            },
-            toBase64: async () => {
-                const arrayBuffer = await fetch(url).then(res => res.arrayBuffer());
-                return Buffer.from(arrayBuffer).toString('base64');
-            },
-            toURL: async () => {
-                return url;
-            }
-        };
+        const UserAvatar = url;
         const UserId = event.author_id;
-        const UserKey = useUserHashKey({
-            Platform: platform,
-            UserId
-        });
+        const [isMaster, UserKey] = getMaster(UserId);
         // 定义消
         const e = {
             name: 'private.message.create',
@@ -83,10 +53,9 @@ var index = defineBot(() => {
             CreateAt: Date.now(),
             //
             tag: 'MESSAGES_PUBLIC',
-            value: null
+            value: event
         };
-        // 处理消息
-        onProcessor('private.message.create', e, event);
+        cbp.send(e);
     });
     // 监听消息
     client.on('MESSAGES_PUBLIC', async (event) => {
@@ -95,9 +64,6 @@ var index = defineBot(() => {
             return false;
         // 创建私聊标记
         const data = await client.userChatCreate(event.extra.author.id).then(res => res?.data);
-        // 主人
-        const master_key = config?.master_key ?? [];
-        const isMaster = master_key.includes(event.author_id);
         // 头像
         const avatar = event.extra.author.avatar;
         // 获取消息
@@ -117,25 +83,9 @@ var index = defineBot(() => {
         for (const item of mention_part) {
             msg = msg.replace(`(met)${item.id}(met)`, '').trim();
         }
-        const url = avatar.substring(0, avatar.indexOf('?'));
-        const UserAvatar = {
-            toBuffer: async () => {
-                const arrayBuffer = await fetch(url).then(res => res.arrayBuffer());
-                return Buffer.from(arrayBuffer);
-            },
-            toBase64: async () => {
-                const arrayBuffer = await fetch(url).then(res => res.arrayBuffer());
-                return Buffer.from(arrayBuffer).toString('base64');
-            },
-            toURL: async () => {
-                return url;
-            }
-        };
+        const UserAvatar = avatar.substring(0, avatar.indexOf('?'));
         const UserId = event.author_id;
-        const UserKey = useUserHashKey({
-            Platform: platform,
-            UserId
-        });
+        const [isMaster, UserKey] = getMaster(UserId);
         // 定义消
         const e = {
             name: 'message.create',
@@ -144,6 +94,7 @@ var index = defineBot(() => {
             //
             GuildId: event.extra.guild_id,
             ChannelId: event.target_id,
+            SpaceId: event.target_id,
             // 用户Id
             UserId: UserId,
             UserKey,
@@ -158,32 +109,26 @@ var index = defineBot(() => {
             CreateAt: Date.now(),
             //
             tag: 'MESSAGES_PUBLIC',
-            value: null
+            value: event
         };
-        // 处理消息
-        onProcessor('message.create', e, event);
+        cbp.send(e);
     });
     // 发送错误时
     client.on('ERROR', msg => {
         console.error(msg);
     });
-    // 客户端全局化。
-    global.client = client;
     /**
      *
      * @param channel_id
      * @param val
      * @returns
      */
-    const sendChannel = (channel_id, val) => {
+    const sendChannel = async (target_id, val) => {
         if (val.length < 0)
             return Promise.all([]);
         const content = val
             .filter(item => item.type == 'Mention' || item.type == 'Text')
             .map(item => {
-            // if (item.type == 'Link') {
-            //   return `[${item.options?.title ?? item.value}](${item.value})`
-            // } else
             if (item.type == 'Mention') {
                 if (item.value == 'everyone' ||
                     item.value == 'all' ||
@@ -219,40 +164,54 @@ var index = defineBot(() => {
             }
         })
             .join('');
-        if (content) {
-            return Promise.all([content].map(item => client.createMessage({
-                type: 9,
-                target_id: channel_id,
-                content: item
-            })));
-        }
-        const images = val.filter(item => item.type == 'Image' || item.type == 'ImageFile' || item.type == 'ImageURL');
-        if (images) {
-            return Promise.all(images.map(async (item) => {
-                if (item.type == 'ImageURL') {
-                    return await client.createMessage({
-                        type: 2,
-                        target_id: channel_id,
-                        content: item.value
-                    });
-                }
-                let data = item.value;
-                if (item.type == 'ImageFile') {
-                    data = readFileSync(item.value);
+        try {
+            if (content) {
+                const res = await client.createMessage({
+                    type: 9,
+                    target_id: target_id,
+                    content: content
+                });
+                return [createResult(ResultCode.Ok, 'client.createMessage', res)];
+            }
+            const images = val.filter(item => item.type == 'Image' || item.type == 'ImageFile' || item.type == 'ImageURL');
+            if (images.length > 0) {
+                let bufferData = null;
+                for (let i = 0; i < images.length; i++) {
+                    if (bufferData)
+                        break;
+                    const item = images[i];
+                    if (item.type == 'Image') {
+                        bufferData = Buffer.from(item.value, 'base64');
+                    }
+                    else if (item.type == 'ImageURL') {
+                        bufferData = await getBufferByURL(item.value);
+                    }
+                    else if (item.type == 'ImageFile') {
+                        bufferData = readFileSync(item.value);
+                    }
                 }
+                if (!bufferData)
+                    return [];
                 // 上传图片
-                const res = await client.postImage(data);
-                if (!res)
-                    return Promise.resolve();
+                const imageRes = await client.postImage(bufferData);
+                if (!imageRes)
+                    return [];
+                const url = imageRes.data?.url;
+                if (!url)
+                    return [];
                 // 发送消息
-                return await client.createMessage({
+                const res = await client.createMessage({
                     type: 2,
-                    target_id: channel_id,
-                    content: res.data.url
+                    target_id: target_id,
+                    content: url
                 });
-            }));
+                return [createResult(ResultCode.Ok, 'client.createMessage', res)];
+            }
+            return [];
+        }
+        catch (error) {
+            return [createResult(ResultCode.Fail, 'client.createMessage', error)];
         }
-        return Promise.all([]);
     };
     /**
      *
@@ -260,18 +219,12 @@ var index = defineBot(() => {
      * @param val
      * @returns
      */
-    const sendUser = async (user_id, val) => {
+    const sendUser = async (open_id, val) => {
         if (val.length < 0)
-            return Promise.all([]);
-        // 创建私聊标记
-        const data = await client.userChatCreate(user_id).then(res => res?.data);
-        const open_id = data?.code;
+            return [];
         const content = val
             .filter(item => item.type == 'Mention' || item.type == 'Text')
             .map(item => {
-            // if (item.type == 'Link') {
-            //   return `[${item.options?.title ?? item.value}](${item.value})`
-            // } else
             if (item.type == 'Mention') {
                 if (item.value == 'everyone' ||
                     item.value == 'all' ||
@@ -307,103 +260,163 @@ var index = defineBot(() => {
             }
         })
             .join('');
-        if (content) {
-            return Promise.all([content].map(item => client.createDirectMessage({
-                type: 9,
-                chat_code: open_id,
-                content: item
-            })));
-        }
-        const images = val.filter(item => item.type == 'Image' || item.type == 'ImageFile' || item.type == 'ImageURL');
-        if (images) {
-            return Promise.all(images.map(async (item) => {
-                if (item.type == 'ImageURL') {
-                    return await client.createDirectMessage({
-                        type: 2,
-                        chat_code: open_id,
-                        content: item.value
-                    });
-                }
-                let data = item.value;
-                if (item.type == 'ImageFile') {
-                    data = readFileSync(item.value);
+        try {
+            if (content) {
+                const res = await client.createDirectMessage({
+                    type: 9,
+                    chat_code: open_id,
+                    content: content
+                });
+                return [createResult(ResultCode.Ok, 'client.createDirectMessage', res)];
+            }
+            const images = val.filter(item => item.type == 'Image' || item.type == 'ImageFile' || item.type == 'ImageURL');
+            if (images.length > 0) {
+                let bufferData = null;
+                for (let i = 0; i < images.length; i++) {
+                    if (bufferData)
+                        break;
+                    const item = images[i];
+                    if (item.type == 'Image') {
+                        bufferData = Buffer.from(item.value, 'base64');
+                    }
+                    else if (item.type == 'ImageURL') {
+                        bufferData = await getBufferByURL(item.value);
+                    }
+                    else if (item.type == 'ImageFile') {
+                        bufferData = readFileSync(item.value);
+                    }
                 }
+                if (!bufferData)
+                    return [];
                 // 上传图片
-                const res = await client.postImage(data);
-                if (!res)
-                    return Promise.resolve();
-                // 发送消息
-                return await client.createDirectMessage({
+                const imageRes = await client.postImage(bufferData);
+                if (!imageRes)
+                    return [];
+                const url = imageRes.data?.url;
+                if (!url)
+                    return [];
+                const res = await client.createDirectMessage({
                     type: 2,
                     chat_code: open_id,
-                    content: res.data.url
+                    content: url
                 });
-            }));
+                return [createResult(ResultCode.Ok, 'client.createDirectMessage', res)];
+            }
+            return [];
+        }
+        catch (error) {
+            return [createResult(ResultCode.Fail, 'client.createDirectMessage', error)];
         }
-        return Promise.all([]);
     };
-    return {
-        platform,
-        api: {
-            active: {
-                send: {
-                    channel: sendChannel,
-                    user: sendUser
+    /**
+     *
+     * @param user_id
+     * @param val
+     * @returns
+     */
+    // const sendUserByUserId = async (user_id: string, val: DataEnums[]) => {
+    //   if (val.length < 0) return []
+    //   // 创建私聊标记
+    //   const data = await client.userChatCreate(user_id).then(res => res?.data)
+    //   const open_id = data?.code
+    //   return await sendUser(open_id, val)
+    // }
+    const api = {
+        active: {
+            send: {
+                channel: sendChannel,
+                user: sendUser
+            }
+        },
+        use: {
+            send: async (event, val) => {
+                if (val.length < 0)
+                    return [];
+                if (event.name == 'message.create') {
+                    return await sendChannel(event.ChannelId, val);
                 }
+                else if (event.name == 'private.message.create') {
+                    return await sendUser(event.OpenId, val);
+                }
+                return [];
             },
-            use: {
-                send: (event, val) => {
-                    if (val.length < 0)
-                        return Promise.all([]);
-                    if (event.name == 'message.create') {
-                        return sendChannel(event.ChannelId, val);
-                    }
-                    else if (event.name == 'private.message.create') {
-                        return sendUser(event.UserId, val);
-                    }
-                    return Promise.all([]);
-                },
-                mention: async (e) => {
-                    const event = e.value;
-                    const MessageMention = [];
-                    /**
-                     * 艾特类型所得到的,包括机器人在内
-                     */
-                    const mention_role_part = event.extra.kmarkdown?.mention_role_part ?? [];
-                    for (const item of mention_role_part) {
-                        MessageMention.push({
-                            UserId: item.role_id,
-                            UserName: item.name,
-                            UserKey: useUserHashKey({
-                                Platform: platform,
-                                UserId: item.role_id
-                            }),
-                            IsMaster: false,
-                            IsBot: true
-                        });
-                    }
-                    /**
-                     * 艾特用户所得到的
-                     */
-                    const mention_part = event.extra.kmarkdown?.mention_part ?? [];
-                    for (const item of mention_part) {
-                        MessageMention.push({
-                            // avatar: item.avatar,
-                            UserId: item.id,
-                            UserName: item.username,
-                            UserKey: useUserHashKey({
-                                Platform: platform,
-                                UserId: item.role_id
-                            }),
-                            IsMaster: false,
-                            IsBot: false
-                        });
-                    }
-                    return MessageMention;
+            mention: async (e) => {
+                const event = e.value;
+                const MessageMention = [];
+                const mention_role_part = event.extra.kmarkdown?.mention_role_part ?? [];
+                for (const item of mention_role_part) {
+                    const UserId = item.role_id;
+                    const [isMaster, UserKey] = getMaster(UserId);
+                    MessageMention.push({
+                        UserId: UserId,
+                        UserName: item.name,
+                        UserKey: UserKey,
+                        IsMaster: isMaster,
+                        IsBot: true
+                    });
+                }
+                const mention_part = event.extra.kmarkdown?.mention_part ?? [];
+                for (const item of mention_part) {
+                    const UserId = item.id;
+                    const [isMaster, UserKey] = getMaster(UserId);
+                    MessageMention.push({
+                        UserId: UserId,
+                        UserName: item.username,
+                        UserKey: UserKey,
+                        IsMaster: isMaster,
+                        IsBot: false
+                    });
                 }
+                return MessageMention;
             }
         }
     };
-});
+    cbp.onactions(async (data, consume) => {
+        if (data.action === 'message.send') {
+            const event = data.payload.event;
+            const paramFormat = data.payload.params.format;
+            const res = await api.use.send(event, paramFormat);
+            if (!res) {
+                consume([createResult(ResultCode.Ok, '请求完成', null)]);
+                return;
+            }
+            consume(res.map(item => createResult(ResultCode.Ok, '请求完成', item)));
+        }
+        else if (data.action === 'message.send.channel') {
+            const channel_id = data.payload.ChannelId;
+            const val = data.payload.params.format;
+            const res = await api.active.send.channel(channel_id, val);
+            if (!res) {
+                consume([createResult(ResultCode.Ok, '请求完成', null)]);
+                return;
+            }
+            consume(res.map(item => createResult(ResultCode.Ok, '请求完成', item)));
+        }
+        else if (data.action === 'message.send.user') {
+            const user_id = data.payload.UserId;
+            const val = data.payload.params.format;
+            const res = await api.active.send.user(user_id, val);
+            if (!res) {
+                consume([createResult(ResultCode.Ok, '请求完成', null)]);
+                return;
+            }
+            consume(res.map(item => createResult(ResultCode.Ok, '请求完成', item)));
+        }
+        else if (data.action === 'mention.get') {
+            const event = data.payload.event;
+            const res = await api.use.mention(event);
+            consume([createResult(ResultCode.Ok, '请求完成', res)]);
+        }
+    });
+    cbp.onapis(async (data, consume) => {
+        const key = data.payload?.key;
+        if (client[key]) {
+            // 如果 client 上有对应的 key，直接调用。
+            const params = data.payload.params;
+            const res = await client[key](...params);
+            consume([createResult(ResultCode.Ok, '请求完成', res)]);
+        }
+    });
+};
 
-export { client, index as default, platform };
+export { index as default, platform };

package/lib/sdk/{platform/kook/sdk/api.d.ts → api.d.ts}

@@ -7,13 +7,12 @@ import { SendMessageParams, SendDirectMessageParams } from './typings.js';
  * api接口
  */
 declare class KOOKAPI {
-    API_URL: string;
     /**
      * KOOK服务
      * @param config
      * @returns
      */
-    kookService(opstoin: AxiosRequestConfig): Promise<axios.AxiosResponse<any, any>>;
+    service(opstoin: AxiosRequestConfig): Promise<axios.AxiosResponse<any, any>>;
     /**
      *
      * @returns