@alemonjs/kook 2.1.0-alpha.0 → 2.1.0-alpha.2

package/lib/desktop.js

@@ -20,7 +20,7 @@ const activate = context => {
         const scriptUri = context.createExtensionDir(join(__dirname, '../', 'dist', 'assets', 'index.js'));
         // 确保路径存在
         const html = readFileSync(dir, 'utf-8')
-            .replace(iconReg, ``)
+            .replace(iconReg, '')
             .replace(scriptReg, `<script type="module" crossorigin src="${scriptUri}"></script>`)
             .replace(styleReg, `<link rel="stylesheet" crossorigin href="${styleUri}">`);
         // 立即渲染 webview
@@ -42,8 +42,9 @@ const activate = context => {
             }
             else if (data.type === 'kook.init') {
                 let config = getConfigValue();
-                if (!config)
+                if (!config) {
                     config = {};
+                }
                 // 发送消息
                 webView.postMessage({
                     type: 'kook.init',

package/lib/hook.d.ts

@@ -1,6 +1,6 @@
 import { EventKeys, Events } from 'alemonjs';
-import API from 'node-telegram-bot-api';
 import { EventData } from './sdk/typings.js';
+import { KOOKAPI } from './sdk/api.js';
 
 type MAP = {
     'message.create': EventData;
@@ -33,6 +33,6 @@ declare const useValue: <T extends EventKeys>(event: Events[T]) => readonly [MAP
  * @param event
  * @returns
  */
-declare const useClient: <T extends EventKeys>(event: Events[T]) => readonly [API, MAP[T]];
+declare const useClient: <T extends EventKeys>(event: Events[T]) => readonly [KOOKAPI, MAP[T]];
 
 export { useClient, useValue };

package/lib/hook.js

@@ -1,5 +1,5 @@
 import { createEventValue, useClient as useClient$1 } from 'alemonjs';
-import API from 'node-telegram-bot-api';
+import { KOOKAPI } from './sdk/api.js';
 
 /**
  *
@@ -16,7 +16,7 @@ const useValue = (event) => {
  * @returns
  */
 const useClient = (event) => {
-    const [client] = useClient$1(event, API);
+    const [client] = useClient$1(event, KOOKAPI);
     const value = createEventValue(event);
     return [client, value];
 };

package/lib/index.d.ts

@@ -1,8 +1,7 @@
 export { useClient, useValue } from './hook.js';
+export { Options, platform } from './config.js';
 export { KOOKAPI as API } from './sdk/api.js';
 
-declare const platform = "kook";
+declare const main: () => void;
 
-declare const _default: () => void;
-
-export { _default as default, platform };
+export { main as default };

package/lib/index.js

@@ -1,35 +1,33 @@
-import { getConfigValue, cbpPlatform, createResult, ResultCode } from 'alemonjs';
+import { cbpPlatform, createResult, ResultCode } from 'alemonjs';
 export { KOOKAPI as API } from './sdk/api.js';
 import { KOOKClient } from './sdk/wss.js';
 import { readFileSync } from 'fs';
-import { getMaster } from './config.js';
+import { getKOOKConfig, getMaster, platform } from './config.js';
 import { getBufferByURL } from 'alemonjs/utils';
 export { useClient, useValue } from './hook.js';
 
-const platform = 'kook';
-var index = () => {
-    let value = getConfigValue();
-    if (!value)
-        value = {};
-    const config = value[platform];
+const main = () => {
+    const config = getKOOKConfig();
     // 创建客户端
     const client = new KOOKClient({
         token: config.token
     });
     // 连接
-    client.connect();
-    const url = `ws://127.0.0.1:${process.env?.port || config?.port || 17117}`;
+    void client.connect();
+    const port = process.env?.port || 17117;
+    const url = `ws://127.0.0.1:${port}`;
     const cbp = cbpPlatform(url);
     client.on('MESSAGES_DIRECT', async (event) => {
         // 过滤机器人
-        if (event.extra?.author?.bot)
+        if (event.extra?.author?.bot) {
             return false;
+        }
         // 创建私聊标记
         const data = await client.userChatCreate(event.extra.author.id).then(res => res?.data);
         // 头像
         const avatar = event.extra.author.avatar;
         // 获取消息
-        let msg = event.content;
+        const msg = event.content;
         const url = avatar.substring(0, avatar.indexOf('?'));
         const UserAvatar = url;
         const UserId = event.author_id;
@@ -60,8 +58,9 @@ var index = () => {
     // 监听消息
     client.on('MESSAGES_PUBLIC', async (event) => {
         // 过滤机器人
-        if (event.extra?.author?.bot)
+        if (event.extra?.author?.bot) {
             return false;
+        }
         // 创建私聊标记
         const data = await client.userChatCreate(event.extra.author.id).then(res => res?.data);
         // 头像
@@ -124,40 +123,38 @@ var index = () => {
      * @returns
      */
     const sendChannel = async (target_id, val) => {
-        if (val.length < 0)
+        if (val.length < 0) {
             return Promise.all([]);
+        }
         const content = val
-            .filter(item => item.type == 'Mention' || item.type == 'Text')
+            .filter(item => item.type === 'Mention' || item.type === 'Text')
             .map(item => {
-            if (item.type == 'Mention') {
-                if (item.value == 'everyone' ||
-                    item.value == 'all' ||
-                    item.value == '' ||
-                    typeof item.value != 'string') {
-                    return `(met)all(met)`;
+            if (item.type === 'Mention') {
+                if (item.value === 'everyone' || item.value === 'all' || item.value === '' || typeof item.value !== 'string') {
+                    return '(met)all(met)';
                 }
-                if (item.options?.belong == 'user') {
+                if (item.options?.belong === 'user') {
                     return `(met)${item.value}(met)`;
                 }
-                else if (item.options?.belong == 'channel') {
+                else if (item.options?.belong === 'channel') {
                     return `(chn)${item.value}(chn)`;
                 }
                 return '';
             }
-            else if (item.type == 'Text') {
-                if (item.options?.style == 'block') {
+            else if (item.type === 'Text') {
+                if (item.options?.style === 'block') {
                     return `\`${item.value}\``;
                 }
-                else if (item.options?.style == 'italic') {
+                else if (item.options?.style === 'italic') {
                     return `*${item.value}*`;
                 }
-                else if (item.options?.style == 'bold') {
+                else if (item.options?.style === 'bold') {
                     return `**${item.value}**`;
                 }
-                else if (item.options?.style == 'strikethrough') {
+                else if (item.options?.style === 'strikethrough') {
                     return `~~${item.value}~~`;
                 }
-                else if (item.options?.style == 'boldItalic') {
+                else if (item.options?.style === 'boldItalic') {
                     return `***${item.value}***`;
                 }
                 return item.value;
@@ -173,32 +170,36 @@ var index = () => {
                 });
                 return [createResult(ResultCode.Ok, 'client.createMessage', res)];
             }
-            const images = val.filter(item => item.type == 'Image' || item.type == 'ImageFile' || item.type == 'ImageURL');
+            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)
+                    if (bufferData) {
                         break;
+                    }
                     const item = images[i];
-                    if (item.type == 'Image') {
+                    if (item.type === 'Image') {
                         bufferData = Buffer.from(item.value, 'base64');
                     }
-                    else if (item.type == 'ImageURL') {
+                    else if (item.type === 'ImageURL') {
                         bufferData = await getBufferByURL(item.value);
                     }
-                    else if (item.type == 'ImageFile') {
+                    else if (item.type === 'ImageFile') {
                         bufferData = readFileSync(item.value);
                     }
                 }
-                if (!bufferData)
+                if (!bufferData) {
                     return [];
+                }
                 // 上传图片
                 const imageRes = await client.postImage(bufferData);
-                if (!imageRes)
+                if (!imageRes) {
                     return [];
+                }
                 const url = imageRes.data?.url;
-                if (!url)
+                if (!url) {
                     return [];
+                }
                 // 发送消息
                 const res = await client.createMessage({
                     type: 2,
@@ -220,40 +221,38 @@ var index = () => {
      * @returns
      */
     const sendUser = async (open_id, val) => {
-        if (val.length < 0)
+        if (val.length < 0) {
             return [];
+        }
         const content = val
-            .filter(item => item.type == 'Mention' || item.type == 'Text')
+            .filter(item => item.type === 'Mention' || item.type === 'Text')
             .map(item => {
-            if (item.type == 'Mention') {
-                if (item.value == 'everyone' ||
-                    item.value == 'all' ||
-                    item.value == '' ||
-                    typeof item.value != 'string') {
-                    return `(met)all(met)`;
+            if (item.type === 'Mention') {
+                if (item.value === 'everyone' || item.value === 'all' || item.value === '' || typeof item.value !== 'string') {
+                    return '(met)all(met)';
                 }
-                if (item.options?.belong == 'user') {
+                if (item.options?.belong === 'user') {
                     return `(met)${item.value}(met)`;
                 }
-                else if (item.options?.belong == 'channel') {
+                else if (item.options?.belong === 'channel') {
                     return `(chn)${item.value}(chn)`;
                 }
                 return '';
             }
-            else if (item.type == 'Text') {
-                if (item.options?.style == 'block') {
+            else if (item.type === 'Text') {
+                if (item.options?.style === 'block') {
                     return `\`${item.value}\``;
                 }
-                else if (item.options?.style == 'italic') {
+                else if (item.options?.style === 'italic') {
                     return `*${item.value}*`;
                 }
-                else if (item.options?.style == 'bold') {
+                else if (item.options?.style === 'bold') {
                     return `**${item.value}**`;
                 }
-                else if (item.options?.style == 'strikethrough') {
+                else if (item.options?.style === 'strikethrough') {
                     return `~~${item.value}~~`;
                 }
-                else if (item.options?.style == 'boldItalic') {
+                else if (item.options?.style === 'boldItalic') {
                     return `***${item.value}***`;
                 }
                 return item.value;
@@ -269,32 +268,36 @@ var index = () => {
                 });
                 return [createResult(ResultCode.Ok, 'client.createDirectMessage', res)];
             }
-            const images = val.filter(item => item.type == 'Image' || item.type == 'ImageFile' || item.type == 'ImageURL');
+            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)
+                    if (bufferData) {
                         break;
+                    }
                     const item = images[i];
-                    if (item.type == 'Image') {
+                    if (item.type === 'Image') {
                         bufferData = Buffer.from(item.value, 'base64');
                     }
-                    else if (item.type == 'ImageURL') {
+                    else if (item.type === 'ImageURL') {
                         bufferData = await getBufferByURL(item.value);
                     }
-                    else if (item.type == 'ImageFile') {
+                    else if (item.type === 'ImageFile') {
                         bufferData = readFileSync(item.value);
                     }
                 }
-                if (!bufferData)
+                if (!bufferData) {
                     return [];
+                }
                 // 上传图片
                 const imageRes = await client.postImage(bufferData);
-                if (!imageRes)
+                if (!imageRes) {
                     return [];
+                }
                 const url = imageRes.data?.url;
-                if (!url)
+                if (!url) {
                     return [];
+                }
                 const res = await client.createDirectMessage({
                     type: 2,
                     chat_code: open_id,
@@ -330,17 +333,18 @@ var index = () => {
         },
         use: {
             send: async (event, val) => {
-                if (val.length < 0)
+                if (val.length < 0) {
                     return [];
-                if (event.name == 'message.create') {
+                }
+                if (event.name === 'message.create') {
                     return await sendChannel(event.ChannelId, val);
                 }
-                else if (event.name == 'private.message.create') {
+                else if (event.name === 'private.message.create') {
                     return await sendUser(event.OpenId, val);
                 }
                 return [];
             },
-            mention: async (e) => {
+            mention: e => {
                 const event = e.value;
                 const MessageMention = [];
                 const mention_role_part = event.extra.kmarkdown?.mention_role_part ?? [];
@@ -367,11 +371,13 @@ var index = () => {
                         IsBot: false
                     });
                 }
-                return MessageMention;
+                return new Promise(resolve => {
+                    resolve(MessageMention);
+                });
             }
         }
     };
-    cbp.onactions(async (data, consume) => {
+    const onactions = async (data, consume) => {
         if (data.action === 'message.send') {
             const event = data.payload.event;
             const paramFormat = data.payload.params.format;
@@ -407,8 +413,9 @@ var index = () => {
             const res = await api.use.mention(event);
             consume([createResult(ResultCode.Ok, '请求完成', res)]);
         }
-    });
-    cbp.onapis(async (data, consume) => {
+    };
+    cbp.onactions((data, consume) => void onactions(data, consume));
+    const onapis = async (data, consume) => {
         const key = data.payload?.key;
         if (client[key]) {
             // 如果 client 上有对应的 key，直接调用。
@@ -416,7 +423,37 @@ var index = () => {
             const res = await client[key](...params);
             consume([createResult(ResultCode.Ok, '请求完成', res)]);
         }
+    };
+    cbp.onapis((data, consume) => void onapis(data, consume));
+};
+const mainProcess = () => {
+    ['SIGINT', 'SIGTERM', 'SIGQUIT', 'disconnect'].forEach(sig => {
+        process?.on?.(sig, () => {
+            logger?.info?.(`[alemonjs][${sig}] 收到信号，正在关闭...`);
+            setImmediate(() => process.exit(0));
+        });
+    });
+    process?.on?.('exit', code => {
+        logger?.info?.(`[alemonjs][exit] 进程退出，code=${code}`);
+    });
+    // 监听主进程消息
+    process.on('message', msg => {
+        try {
+            const data = typeof msg === 'string' ? JSON.parse(msg) : msg;
+            if (data?.type === 'start') {
+                main();
+            }
+            else if (data?.type === 'stop') {
+                process.exit(0);
+            }
+        }
+        catch { }
     });
+    // 主动发送 ready 消息
+    if (process.send) {
+        process.send(JSON.stringify({ type: 'ready' }));
+    }
 };
+mainProcess();
 
-export { index as default, platform };
+export { main as default, platform };

package/lib/sdk/api.d.ts

@@ -1,4 +1,3 @@
-import * as axios from 'axios';
 import { AxiosRequestConfig } from 'axios';
 import { Readable } from 'stream';
 import { SendMessageParams, SendDirectMessageParams } from './typings.js';
@@ -12,7 +11,7 @@ declare class KOOKAPI {
      * @param config
      * @returns
      */
-    service(opstoin: AxiosRequestConfig): Promise<axios.AxiosResponse<any, any>>;
+    service(opstoin: AxiosRequestConfig): Promise<any>;
     /**
      *
      * @returns

package/lib/sdk/api.js

@@ -3,6 +3,7 @@ import FormData from 'form-data';
 import { ApiEnum } from './typings.js';
 import { config } from './config.js';
 import { createPicFrom } from 'alemonjs/utils';
+import { createAxiosInstance } from './instance.js';
 
 const API_URL = 'https://www.kookapp.cn';
 /**
@@ -23,20 +24,20 @@ class KOOKAPI {
                 Authorization: `Bot ${token}`
             }
         });
-        return req(opstoin);
+        return createAxiosInstance(req, opstoin);
     }
     /**
      *
      * @returns
      */
-    async gateway() {
+    gateway() {
         return this.service({
             baseURL: 'https://www.kookapp.cn/api/v3/gateway/index',
             method: 'get',
             params: {
                 compress: 0
             }
-        }).then(res => res.data);
+        });
     }
     /**
      * ************
@@ -54,14 +55,16 @@ class KOOKAPI {
             image: file,
             name: Name
         });
-        if (!from)
+        if (!from) {
             return false;
+        }
         const { picData, name } = from;
         const formdata = new FormData();
         formdata.append('file', picData, name);
         const url = await this.createUrl(formdata);
-        if (url)
+        if (url) {
             return url;
+        }
         return false;
     }
     /**
@@ -74,8 +77,9 @@ class KOOKAPI {
         const formdata = new FormData();
         formdata.append('file', [file], Name);
         const url = await this.createUrl(formdata);
-        if (url)
+        if (url) {
             return url;
+        }
         return false;
     }
     /**
@@ -89,7 +93,7 @@ class KOOKAPI {
             url: ApiEnum.AssetCreate,
             data: formdata,
             headers: formdata.getHeaders()
-        }).then(res => res?.data);
+        });
     }
     /**
      * *********
@@ -106,7 +110,7 @@ class KOOKAPI {
             method: 'post',
             url: ApiEnum.MessageCreate,
             data
-        }).then(res => res?.data);
+        });
     }
     /**
      * 创建私聊消息
@@ -116,88 +120,88 @@ class KOOKAPI {
      * @param target_id
      * @returns
      */
-    async userChatCreate(target_id) {
+    userChatCreate(target_id) {
         return this.service({
             method: 'post',
             url: ApiEnum.UserChatCreate,
             data: {
                 target_id
             }
-        }).then(res => res?.data);
+        });
     }
     /**
      * 创建消息
      * @param data
      * @returns
      */
-    async createDirectMessage(data) {
+    createDirectMessage(data) {
         return this.service({
             method: 'post',
             url: ApiEnum.DirectMessageCreate,
             data
-        }).then(res => res?.data);
+        });
     }
     /**
      * 删除指定消息
      * @param msg_id
      * @returns
      */
-    async messageDelete(msg_id) {
+    messageDelete(msg_id) {
         return this.service({
             method: 'post',
             url: ApiEnum.MessageDelete,
             data: {
                 msg_id
             }
-        }).then(res => res?.data);
+        });
     }
     /**
      * 重编辑指定消息
      * @param data
      * @returns
      */
-    async messageUpdate(data) {
+    messageUpdate(data) {
         return this.service({
             method: 'post',
             url: ApiEnum.MessageUpdate,
             data
-        }).then(res => res?.data);
+        });
     }
     /**
      * 删回应
      * @param data
      * @returns
      */
-    async messageDeleteReaction(data) {
+    messageDeleteReaction(data) {
         return this.service({
             method: 'post',
             url: ApiEnum.MessageDeleteReaction,
             data
-        }).then(res => res?.data);
+        });
     }
     /**
      * 发回应
      * @param data
      * @returns
      */
-    async messageAddReaction(data) {
+    messageAddReaction(data) {
         return this.service({
             method: 'post',
             url: ApiEnum.MessageAddReaction,
             data
-        }).then(res => res?.data);
+        });
     }
     /**
      * 某个回应的所有用户
      * @param data
      * @returns
      */
-    async messageReactionList(params) {
+    messageReactionList(params) {
         return this.service({
             method: 'get',
             url: ApiEnum.MessageReactionList,
             params
-        }).then(res => res?.data);
+        });
     }
     /**
      * **********
@@ -210,11 +214,11 @@ class KOOKAPI {
      * @param user_id
      * @returns
      */
-    async userMe() {
+    userMe() {
         return this.service({
             method: 'get',
             url: ApiEnum.UserMe
-        }).then(res => res?.data);
+        });
     }
     /**
      * 得到用户信息
@@ -222,7 +226,7 @@ class KOOKAPI {
      * @param user_id
      * @returns
      */
-    async userView(guild_id, user_id) {
+    userView(guild_id, user_id) {
         return this.service({
             method: 'get',
             url: ApiEnum.UserView,
@@ -230,7 +234,7 @@ class KOOKAPI {
                 guild_id,
                 user_id
             }
-        }).then(res => res?.data);
+        });
     }
     /**
      * 踢出
@@ -238,7 +242,7 @@ class KOOKAPI {
      * @param user_id
      * @returns
      */
-    async guildKickout(guild_id, user_id) {
+    guildKickout(guild_id, user_id) {
         return this.service({
             method: 'post',
             url: ApiEnum.GuildKickout,
@@ -246,7 +250,7 @@ class KOOKAPI {
                 guild_id,
                 target_id: user_id
             }
-        }).then(res => res?.data);
+        });
     }
     /**
      * 创建角色
@@ -255,7 +259,7 @@ class KOOKAPI {
      * @param value
      * @returns
      */
-    async channelRoleCreate(channel_id, type, value) {
+    channelRoleCreate(channel_id, type, value) {
         return this.service({
             method: 'post',
             url: ApiEnum.ChannelRoleCreate,
@@ -264,7 +268,7 @@ class KOOKAPI {
                 type,
                 value
             }
-        }).then(res => res?.data);
+        });
     }
 }