@alemonjs/kook 0.2.6 → 0.2.9

package/lib/desktop.js

@@ -13,12 +13,14 @@ const activate = context => {
     context.onCommand('open.kook', () => {
         const dir = join(__dirname, '../', 'dist', 'index.html');
         const scriptReg = /<script.*?src="(.+?)".*?>/;
-        const styleReg = /<link.*?href="(.+?)".*?>/;
+        const styleReg = /<link.*?rel="stylesheet".*?href="(.+?)".*?>/;
+        const iconReg = /<link.*?rel="icon".*?href="(.+?)".*?>/g;
         // 创建 webview 路径
         const styleUri = context.createExtensionDir(join(__dirname, '../', 'dist', 'assets', 'index.css'));
         const scriptUri = context.createExtensionDir(join(__dirname, '../', 'dist', 'assets', 'index.js'));
         // 确保路径存在
         const html = readFileSync(dir, 'utf-8')
+            .replace(iconReg, ``)
             .replace(scriptReg, `<script type="module" crossorigin src="${scriptUri}"></script>`)
             .replace(styleReg, `<link rel="stylesheet" crossorigin href="${styleUri}">`);
         // 立即渲染 webview

package/lib/index.d.ts

@@ -4,6 +4,6 @@ import { KOOKClient } from './sdk/platform/kook/sdk/wss.js';
 type Client = typeof KOOKClient.prototype;
 declare const platform = "kook";
 declare const client: Client;
-declare const _default: () => alemonjs.ClientAPI;
+declare const _default: alemonjs.DefineBotValue;
 
 export { type Client, client, _default as default, platform };

package/lib/index.js

@@ -1,5 +1,5 @@
-import { defineBot, getConfigValue, useUserHashKey, OnProcessor } from 'alemonjs';
-import 'fs';
+import { defineBot, getConfigValue, useUserHashKey, onProcessor } from 'alemonjs';
+import { readFileSync } from 'fs';
 import 'axios';
 import 'path';
 import 'qrcode';
@@ -36,6 +36,8 @@ var index = defineBot(() => {
         // 过滤机器人
         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);
@@ -77,20 +79,14 @@ var index = defineBot(() => {
             // message
             MessageId: event.msg_id,
             MessageText: msg,
-            OpenId: '',
+            OpenId: data?.code,
             CreateAt: Date.now(),
             //
             tag: 'MESSAGES_PUBLIC',
             value: null
         };
-        // 当访问的时候获取
-        Object.defineProperty(e, 'value', {
-            get() {
-                return event;
-            }
-        });
         // 处理消息
-        OnProcessor(e, 'private.message.create');
+        onProcessor('private.message.create', e, event);
     });
     // 监听消息
     client.on('MESSAGES_PUBLIC', async (event) => {
@@ -164,14 +160,8 @@ var index = defineBot(() => {
             tag: 'MESSAGES_PUBLIC',
             value: null
         };
-        // 当访问的时候获取
-        Object.defineProperty(e, 'value', {
-            get() {
-                return event;
-            }
-        });
         // 处理消息
-        OnProcessor(e, 'message.create');
+        onProcessor('message.create', e, event);
     });
     // 发送错误时
     client.on('ERROR', msg => {
@@ -179,74 +169,197 @@ var index = defineBot(() => {
     });
     // 客户端全局化。
     global.client = client;
+    /**
+     *
+     * @param channel_id
+     * @param val
+     * @returns
+     */
+    const sendChannel = (channel_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' ||
+                    item.value == '' ||
+                    typeof item.value != 'string') {
+                    return `(met)all(met)`;
+                }
+                if (item.options?.belong == 'user') {
+                    return `(met)${item.value}(met)`;
+                }
+                else if (item.options?.belong == 'channel') {
+                    return `(chn)${item.value}(chn)`;
+                }
+                return '';
+            }
+            else if (item.type == 'Text') {
+                if (item.options?.style == 'block') {
+                    return `\`${item.value}\``;
+                }
+                else if (item.options?.style == 'italic') {
+                    return `*${item.value}*`;
+                }
+                else if (item.options?.style == 'bold') {
+                    return `**${item.value}**`;
+                }
+                else if (item.options?.style == 'strikethrough') {
+                    return `~~${item.value}~~`;
+                }
+                else if (item.options?.style == 'boldItalic') {
+                    return `***${item.value}***`;
+                }
+                return item.value;
+            }
+        })
+            .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);
+                }
+                // 上传图片
+                const res = await client.postImage(data);
+                if (!res)
+                    return Promise.resolve();
+                // 发送消息
+                return await client.createMessage({
+                    type: 2,
+                    target_id: channel_id,
+                    content: res.data.url
+                });
+            }));
+        }
+        return Promise.all([]);
+    };
+    /**
+     *
+     * @param channel_id
+     * @param val
+     * @returns
+     */
+    const sendUser = async (user_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;
+        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' ||
+                    item.value == '' ||
+                    typeof item.value != 'string') {
+                    return `(met)all(met)`;
+                }
+                if (item.options?.belong == 'user') {
+                    return `(met)${item.value}(met)`;
+                }
+                else if (item.options?.belong == 'channel') {
+                    return `(chn)${item.value}(chn)`;
+                }
+                return '';
+            }
+            else if (item.type == 'Text') {
+                if (item.options?.style == 'block') {
+                    return `\`${item.value}\``;
+                }
+                else if (item.options?.style == 'italic') {
+                    return `*${item.value}*`;
+                }
+                else if (item.options?.style == 'bold') {
+                    return `**${item.value}**`;
+                }
+                else if (item.options?.style == 'strikethrough') {
+                    return `~~${item.value}~~`;
+                }
+                else if (item.options?.style == 'boldItalic') {
+                    return `***${item.value}***`;
+                }
+                return item.value;
+            }
+        })
+            .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);
+                }
+                // 上传图片
+                const res = await client.postImage(data);
+                if (!res)
+                    return Promise.resolve();
+                // 发送消息
+                return await client.createDirectMessage({
+                    type: 2,
+                    chat_code: open_id,
+                    content: res.data.url
+                });
+            }));
+        }
+        return Promise.all([]);
+    };
     return {
+        platform,
         api: {
+            active: {
+                send: {
+                    channel: sendChannel,
+                    user: sendUser
+                }
+            },
             use: {
                 send: (event, val) => {
                     if (val.length < 0)
                         return Promise.all([]);
-                    const content = val
-                        .filter(item => item.type == 'Link' || 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' ||
-                                item.value == '' ||
-                                typeof item.value != 'string') {
-                                return `(met)all(met)`;
-                            }
-                            if (item.options?.belong == 'user') {
-                                return `(met)${item.value}(met)`;
-                            }
-                            else if (item.options?.belong == 'channel') {
-                                return `(chn)${item.value}(chn)`;
-                            }
-                            return '';
-                        }
-                        else if (item.type == 'Text') {
-                            if (item.options?.style == 'block') {
-                                return `\`${item.value}\``;
-                            }
-                            else if (item.options?.style == 'italic') {
-                                return `*${item.value}*`;
-                            }
-                            else if (item.options?.style == 'bold') {
-                                return `**${item.value}**`;
-                            }
-                            else if (item.options?.style == 'strikethrough') {
-                                return `~~${item.value}~~`;
-                            }
-                            else if (item.options?.style == 'boldItalic') {
-                                return `***${item.value}***`;
-                            }
-                            return item.value;
-                        }
-                    })
-                        .join('');
-                    if (content) {
-                        return Promise.all([content].map(item => client.createMessage({
-                            type: 9,
-                            target_id: event.ChannelId,
-                            content: item
-                        })));
+                    if (event.name == 'message.create') {
+                        return sendChannel(event.ChannelId, val);
                     }
-                    const images = val.filter(item => item.type == 'Image').map(item => item.value);
-                    if (images) {
-                        return Promise.all(images.map(async (item) => {
-                            // 上传图片
-                            const res = await client.postImage(item);
-                            if (!res)
-                                return Promise.resolve();
-                            // 发送消息
-                            return await client.createMessage({
-                                type: 2,
-                                target_id: event.ChannelId,
-                                content: res.data.url
-                            });
-                        }));
+                    else if (event.name == 'private.message.create') {
+                        return sendUser(event.UserId, val);
                     }
                     return Promise.all([]);
                 },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alemonjs/kook",
-  "version": "0.2.6",
+  "version": "0.2.9",
   "description": "阿柠檬kook平台连接",
   "author": "lemonade",
   "license": "MIT",
@@ -26,15 +26,18 @@
           "value": "@alemonjs/kook"
         }
       ],
+      "logo": "antd.RobotOutlined",
       "commond": [
         {
           "name": "kook",
+          "icon": "antd.RobotOutlined",
           "commond": "open.kook"
         }
       ],
       "sidebars": [
         {
           "name": "kook",
+          "icon": "antd.RobotOutlined",
           "commond": "open.kook"
         }
       ]