@alemonjs/kook 0.2.7 → 0.2.9

package/lib/desktop.d.ts

@@ -1,3 +1,3 @@
-declare const activate: (context: any) => void
+declare const activate: (context: any) => void;
 
-export { activate }
+export { activate };

package/lib/desktop.js

@@ -1,61 +1,60 @@
-import { readFileSync } from 'fs'
-import { dirname, join } from 'path'
-import { fileURLToPath } from 'url'
-import { getConfig, getConfigValue } from 'alemonjs'
+import { readFileSync } from 'fs';
+import { dirname, join } from 'path';
+import { fileURLToPath } from 'url';
+import { getConfig, getConfigValue } from 'alemonjs';
 
 // 当前目录
-const __dirname = dirname(fileURLToPath(import.meta.url))
+const __dirname = dirname(fileURLToPath(import.meta.url));
 // 被激活的时候。
 const activate = context => {
-  // 创建一个 webview。
-  const webView = context.createSidebarWebView(context)
-  // 当命令被触发的时候。
-  context.onCommand('open.kook', () => {
-    const dir = join(__dirname, '../', 'dist', 'index.html')
-    const scriptReg = /<script.*?src="(.+?)".*?>/
-    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
-    webView.loadWebView(html)
-  })
-  // 监听 webview 的消息。
-  webView.onMessage(data => {
-    try {
-      if (data.type === 'kook.form.save') {
-        const db = data.data
-        const config = getConfig()
-        const value = config.value ?? {}
-        value['kook'] = {
-          token: db.token ?? '',
-          master_key: db.master_key?.split(',') ?? null
+    // 创建一个 webview。
+    const webView = context.createSidebarWebView(context);
+    // 当命令被触发的时候。
+    context.onCommand('open.kook', () => {
+        const dir = join(__dirname, '../', 'dist', 'index.html');
+        const scriptReg = /<script.*?src="(.+?)".*?>/;
+        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
+        webView.loadWebView(html);
+    });
+    // 监听 webview 的消息。
+    webView.onMessage(data => {
+        try {
+            if (data.type === 'kook.form.save') {
+                const db = data.data;
+                const config = getConfig();
+                const value = config.value ?? {};
+                value['kook'] = {
+                    token: db.token ?? '',
+                    master_key: db.master_key?.split(',') ?? null
+                };
+                config.saveValue(value);
+                context.notification('KOOK 配置保存成功～');
+            }
+            else if (data.type === 'kook.init') {
+                let config = getConfigValue();
+                if (!config)
+                    config = {};
+                // 发送消息
+                webView.postMessage({
+                    type: 'kook.init',
+                    data: config.kook ?? {}
+                });
+            }
         }
-        config.saveValue(value)
-        context.notification('KOOK 配置保存成功～')
-      } else if (data.type === 'kook.init') {
-        let config = getConfigValue()
-        if (!config) config = {}
-        // 发送消息
-        webView.postMessage({
-          type: 'kook.init',
-          data: config.kook ?? {}
-        })
-      }
-    } catch (e) {
-      console.error(e)
-    }
-  })
-}
+        catch (e) {
+            console.error(e);
+        }
+    });
+};
 
-export { activate }
+export { activate };

package/lib/index.d.ts

@@ -1,9 +1,9 @@
-import * as alemonjs from 'alemonjs'
-import { KOOKClient } from './sdk/platform/kook/sdk/wss.js'
+import * as alemonjs from 'alemonjs';
+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.DefineBotValue
+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 }
+export { type Client, client, _default as default, platform };

package/lib/index.js

@@ -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,7 +79,7 @@ var index = defineBot(() => {
             // message
             MessageId: event.msg_id,
             MessageText: msg,
-            OpenId: '',
+            OpenId: data?.code,
             CreateAt: Date.now(),
             //
             tag: 'MESSAGES_PUBLIC',
@@ -167,172 +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: (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([]);
-                    },
-                    user: (channel_id, val) => {
-                        return Promise.all([]);
-                    }
+                    channel: sendChannel,
+                    user: sendUser
                 }
             },
             use: {
                 send: (event, 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: event.ChannelId,
-                            content: item
-                        })));
+                    if (event.name == 'message.create') {
+                        return sendChannel(event.ChannelId, val);
                     }
-                    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: event.ChannelId,
-                                    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: event.ChannelId,
-                                content: res.data.url
-                            });
-                        }));
+                    else if (event.name == 'private.message.create') {
+                        return sendUser(event.UserId, val);
                     }
                     return Promise.all([]);
                 },