@alemonjs/kook 0.2.6 → 0.2.7

package/lib/desktop.js

@@ -1,58 +1,61 @@
-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.*?href="(.+?)".*?>/;
-        // 创建 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(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 ?? {}
-                });
-            }
+  // 创建一个 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
         }
-        catch (e) {
-            console.error(e);
-        }
-    });
-};
+        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)
+    }
+  })
+}
 
-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.ClientAPI;
+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

@@ -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';
@@ -83,14 +83,8 @@ var index = defineBot(() => {
             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 +158,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 => {
@@ -180,18 +168,105 @@ var index = defineBot(() => {
     // 客户端全局化。
     global.client = client;
     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([]);
+                    }
+                }
+            },
             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')
+                        .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.type == 'Link') {
+                        //   return `[${item.options?.title ?? item.value}](${item.value})`
+                        // } else
+                        if (item.type == 'Mention') {
                             if (item.value == 'everyone' ||
                                 item.value == 'all' ||
                                 item.value == '' ||
@@ -233,11 +308,22 @@ var index = defineBot(() => {
                             content: item
                         })));
                     }
-                    const images = val.filter(item => item.type == 'Image').map(item => item.value);
+                    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(item);
+                            const res = await client.postImage(data);
                             if (!res)
                                 return Promise.resolve();
                             // 发送消息