@alemonjs/kook 2.1.7 → 2.1.9

package/lib/config.d.ts

@@ -6,4 +6,4 @@ export type Options = {
     hideUnsupported?: boolean | number;
 };
 export declare const getKOOKConfig: () => Options;
-export declare const getMaster: (UserId: string) => boolean;
+export declare const getMaster: (UserId: string) => readonly [boolean, string];

package/lib/config.js

@@ -1,4 +1,4 @@
-import { getConfigValue, isMaster } from 'alemonjs';
+import { getConfigValue, isMaster, createUserHashKey } from 'alemonjs';
 
 const platform = 'kook';
 const getKOOKConfig = () => {
@@ -6,7 +6,12 @@ const getKOOKConfig = () => {
     return value[platform] || {};
 };
 const getMaster = (UserId) => {
-    return isMaster(UserId, platform);
+    const isMasterUser = isMaster(UserId, platform);
+    const UserKey = createUserHashKey({
+        Platform: platform,
+        UserId
+    });
+    return [isMasterUser, UserKey];
 };
 
 export { getKOOKConfig, getMaster, platform };

package/lib/desktop.js

@@ -3,16 +3,16 @@ import { dirname, join } from 'path';
 import { fileURLToPath } from 'url';
 import { getConfig, getConfigValue } from 'alemonjs';
 
-const __dirname = dirname(fileURLToPath(import.meta.url));
+const __dirname$1 = dirname(fileURLToPath(import.meta.url));
 const activate = context => {
     const webView = context.createSidebarWebView(context);
     context.onCommand('open.kook', () => {
-        const dir = join(__dirname, '../', 'dist', 'index.html');
+        const dir = join(__dirname$1, '../', 'dist', 'index.html');
         const scriptReg = /<script.*?src="(.+?)".*?>/;
         const styleReg = /<link.*?rel="stylesheet".*?href="(.+?)".*?>/;
         const iconReg = /<link.*?rel="icon".*?href="(.+?)".*?>/g;
-        const styleUri = context.createExtensionDir(join(__dirname, '../', 'dist', 'assets', 'index.css'));
-        const scriptUri = context.createExtensionDir(join(__dirname, '../', 'dist', 'assets', 'index.js'));
+        const styleUri = context.createExtensionDir(join(__dirname$1, '../', 'dist', 'assets', 'index.css'));
+        const scriptUri = context.createExtensionDir(join(__dirname$1, '../', 'dist', 'assets', 'index.js'));
         const html = readFileSync(dir, 'utf-8')
             .replace(iconReg, '')
             .replace(scriptReg, `<script type="module" crossorigin src="${scriptUri}"></script>`)

package/lib/hook.d.ts

@@ -18,8 +18,17 @@ type MAP = {
     'member.remove': undefined;
     'private.message.update': undefined;
     'private.message.delete': undefined;
+    'message.pin': undefined;
+    'channel.update': undefined;
+    'guild.update': undefined;
+    'member.ban': undefined;
+    'member.unban': undefined;
+    'member.update': undefined;
+    'notice.create': undefined;
     'private.friend.add': undefined;
+    'private.friend.remove': undefined;
     'private.guild.add': undefined;
+    'private.notice.create': undefined;
 };
 export declare const useValue: <T extends EventKeys>(event: Events[T]) => readonly [MAP[T]];
 export declare const useClient: <T extends EventKeys>(event: Events[T]) => readonly [API, MAP[T]];

package/lib/hook.js

@@ -1,4 +1,4 @@
-import { createEventValue, useClient as useClient$1 } from 'alemonjs';
+import { useClient as useClient$1, createEventValue } from 'alemonjs';
 import { KOOKAPI } from './sdk/api.js';
 
 const useValue = (event) => {

package/lib/index.js

@@ -1,4 +1,4 @@
-import { definePlatform, cbpPlatform, createResult, ResultCode } from 'alemonjs';
+import { definePlatform, cbpPlatform, FormatEvent, createResult, ResultCode } from 'alemonjs';
 export { KOOKAPI as API } from './sdk/api.js';
 import { KOOKClient } from './sdk/wss.js';
 import { readFileSync } from 'fs';
@@ -34,23 +34,13 @@ const main = () => {
         const UserAvatar = url;
         const UserId = event.author_id;
         const [isMaster, UserKey] = getMaster(UserId);
-        const e = {
-            name: 'private.message.create',
-            Platform: platform,
-            UserId: UserId,
-            UserKey,
-            UserName: event.extra.author.username,
-            UserAvatar: UserAvatar,
-            IsMaster: isMaster,
-            IsBot: false,
-            MessageId: event.msg_id,
-            MessageText: msg,
-            OpenId: data?.code,
-            BotId: botId,
-            _tag: 'MESSAGES_DIRECT',
-            value: event
-        };
-        cbp.send(e);
+        cbp.send(FormatEvent.create('private.message.create')
+            .addPlatform({ Platform: platform, value: event, BotId: botId })
+            .addUser({ UserId, UserKey, UserName: event.extra.author.username, UserAvatar: UserAvatar, IsMaster: isMaster, IsBot: false })
+            .addMessage({ MessageId: event.msg_id })
+            .addText({ MessageText: msg })
+            .addOpen({ OpenId: data?.code })
+            .add({ tag: 'MESSAGES_DIRECT' }).value);
     });
     client.on('MESSAGES_PUBLIC', async (event) => {
         if (event.extra?.author?.bot) {
@@ -70,26 +60,15 @@ const main = () => {
         const UserAvatar = avatar.substring(0, avatar.indexOf('?'));
         const UserId = event.author_id;
         const [isMaster, UserKey] = getMaster(UserId);
-        const e = {
-            name: 'message.create',
-            Platform: platform,
-            GuildId: event.extra.guild_id,
-            ChannelId: event.target_id,
-            SpaceId: event.target_id,
-            UserId: UserId,
-            UserKey,
-            UserName: event.extra.author.username,
-            UserAvatar: UserAvatar,
-            IsMaster: isMaster,
-            IsBot: false,
-            MessageId: event.msg_id,
-            MessageText: msg,
-            OpenId: data?.code,
-            BotId: botId,
-            _tag: 'MESSAGES_PUBLIC',
-            value: event
-        };
-        cbp.send(e);
+        cbp.send(FormatEvent.create('message.create')
+            .addPlatform({ Platform: platform, value: event, BotId: botId })
+            .addGuild({ GuildId: event.extra.guild_id, SpaceId: event.target_id })
+            .addChannel({ ChannelId: event.target_id })
+            .addUser({ UserId, UserKey, UserName: event.extra.author.username, UserAvatar: UserAvatar, IsMaster: isMaster, IsBot: false })
+            .addMessage({ MessageId: event.msg_id })
+            .addText({ MessageText: msg })
+            .addOpen({ OpenId: data?.code })
+            .add({ tag: 'MESSAGES_PUBLIC' }).value);
     });
     client.on('ERROR', msg => {
         console.error(msg);
@@ -101,32 +80,20 @@ const main = () => {
             return;
         }
         if (reactionType === 'added_reaction') {
-            const e = {
-                name: 'message.reaction.add',
-                Platform: platform,
-                GuildId: body.channel_id ?? '',
-                ChannelId: body.channel_id ?? '',
-                SpaceId: body.channel_id ?? '',
-                MessageId: body.msg_id ?? '',
-                BotId: botId,
-                _tag: 'REACTIONS_ADD',
-                value: event
-            };
-            cbp.send(e);
+            cbp.send(FormatEvent.create('message.reaction.add')
+                .addPlatform({ Platform: platform, value: event, BotId: botId })
+                .addGuild({ GuildId: body.channel_id ?? '', SpaceId: body.channel_id ?? '' })
+                .addChannel({ ChannelId: body.channel_id ?? '' })
+                .addMessage({ MessageId: body.msg_id ?? '' })
+                .add({ tag: 'REACTIONS_ADD' }).value);
         }
         else if (reactionType === 'deleted_reaction') {
-            const e = {
-                name: 'message.reaction.remove',
-                Platform: platform,
-                GuildId: body.channel_id ?? '',
-                ChannelId: body.channel_id ?? '',
-                SpaceId: body.channel_id ?? '',
-                MessageId: body.msg_id ?? '',
-                BotId: botId,
-                _tag: 'REACTIONS_REMOVE',
-                value: event
-            };
-            cbp.send(e);
+            cbp.send(FormatEvent.create('message.reaction.remove')
+                .addPlatform({ Platform: platform, value: event, BotId: botId })
+                .addGuild({ GuildId: body.channel_id ?? '', SpaceId: body.channel_id ?? '' })
+                .addChannel({ ChannelId: body.channel_id ?? '' })
+                .addMessage({ MessageId: body.msg_id ?? '' })
+                .add({ tag: 'REACTIONS_REMOVE' }).value);
         }
     });
     client.on('MEMBER_ADD', event => {
@@ -136,22 +103,13 @@ const main = () => {
         }
         const UserId = body.user_id ?? event.author_id;
         const [isMaster, UserKey] = getMaster(UserId);
-        const e = {
-            name: 'member.add',
-            Platform: platform,
-            GuildId: event.target_id ?? '',
-            ChannelId: '',
-            SpaceId: event.target_id ?? '',
-            UserId: UserId,
-            UserKey,
-            IsMaster: isMaster,
-            IsBot: false,
-            MessageId: event.msg_id ?? '',
-            BotId: botId,
-            _tag: 'MEMBER_ADD',
-            value: event
-        };
-        cbp.send(e);
+        cbp.send(FormatEvent.create('member.add')
+            .addPlatform({ Platform: platform, value: event, BotId: botId })
+            .addGuild({ GuildId: event.target_id ?? '', SpaceId: event.target_id ?? '' })
+            .addChannel({ ChannelId: '' })
+            .addUser({ UserId, UserKey, IsMaster: isMaster, IsBot: false })
+            .addMessage({ MessageId: event.msg_id ?? '' })
+            .add({ tag: 'MEMBER_ADD' }).value);
     });
     client.on('MEMBER_REMOVE', event => {
         const body = event.extra?.body;
@@ -160,172 +118,106 @@ const main = () => {
         }
         const UserId = body.user_id ?? event.author_id;
         const [isMaster, UserKey] = getMaster(UserId);
-        const e = {
-            name: 'member.remove',
-            Platform: platform,
-            GuildId: event.target_id ?? '',
-            ChannelId: '',
-            SpaceId: event.target_id ?? '',
-            UserId: UserId,
-            UserKey,
-            IsMaster: isMaster,
-            IsBot: false,
-            MessageId: event.msg_id ?? '',
-            BotId: botId,
-            _tag: 'MEMBER_REMOVE',
-            value: event
-        };
-        cbp.send(e);
+        cbp.send(FormatEvent.create('member.remove')
+            .addPlatform({ Platform: platform, value: event, BotId: botId })
+            .addGuild({ GuildId: event.target_id ?? '', SpaceId: event.target_id ?? '' })
+            .addChannel({ ChannelId: '' })
+            .addUser({ UserId, UserKey, IsMaster: isMaster, IsBot: false })
+            .addMessage({ MessageId: event.msg_id ?? '' })
+            .add({ tag: 'MEMBER_REMOVE' }).value);
     });
     client.on('MESSAGES_UPDATE', event => {
         const body = event.extra?.body;
         if (!body) {
             return;
         }
-        const e = {
-            name: 'message.update',
-            Platform: platform,
-            GuildId: body.channel_id ?? event.target_id ?? '',
-            ChannelId: body.channel_id ?? event.target_id ?? '',
-            SpaceId: body.channel_id ?? event.target_id ?? '',
-            UserId: body.author_id ?? event.author_id ?? '',
-            UserKey: '',
-            IsMaster: false,
-            IsBot: false,
-            MessageId: body.msg_id ?? event.msg_id ?? '',
-            BotId: botId,
-            _tag: 'MESSAGES_UPDATE',
-            value: event
-        };
-        cbp.send(e);
+        cbp.send(FormatEvent.create('message.update')
+            .addPlatform({ Platform: platform, value: event, BotId: botId })
+            .addGuild({ GuildId: body.channel_id ?? event.target_id ?? '', SpaceId: body.channel_id ?? event.target_id ?? '' })
+            .addChannel({ ChannelId: body.channel_id ?? event.target_id ?? '' })
+            .addUser({ UserId: body.author_id ?? event.author_id ?? '', UserKey: '', IsMaster: false, IsBot: false })
+            .addMessage({ MessageId: body.msg_id ?? event.msg_id ?? '' })
+            .add({ tag: 'MESSAGES_UPDATE' }).value);
     });
     client.on('MESSAGES_DELETE', event => {
         const body = event.extra?.body;
         if (!body) {
             return;
         }
-        const e = {
-            name: 'message.delete',
-            Platform: platform,
-            GuildId: body.channel_id ?? event.target_id ?? '',
-            ChannelId: body.channel_id ?? event.target_id ?? '',
-            SpaceId: body.channel_id ?? event.target_id ?? '',
-            MessageId: body.msg_id ?? event.msg_id ?? '',
-            BotId: botId,
-            _tag: 'MESSAGES_DELETE',
-            value: event
-        };
-        cbp.send(e);
+        cbp.send(FormatEvent.create('message.delete')
+            .addPlatform({ Platform: platform, value: event, BotId: botId })
+            .addGuild({ GuildId: body.channel_id ?? event.target_id ?? '', SpaceId: body.channel_id ?? event.target_id ?? '' })
+            .addChannel({ ChannelId: body.channel_id ?? event.target_id ?? '' })
+            .addMessage({ MessageId: body.msg_id ?? event.msg_id ?? '' })
+            .add({ tag: 'MESSAGES_DELETE' }).value);
     });
     client.on('MESSAGES_PIN', event => {
         const body = event.extra?.body;
         if (!body) {
             return;
         }
-        const e = {
-            name: 'message.pin',
-            Platform: platform,
-            GuildId: body.channel_id ?? event.target_id ?? '',
-            ChannelId: body.channel_id ?? event.target_id ?? '',
-            SpaceId: body.channel_id ?? event.target_id ?? '',
-            MessageId: body.msg_id ?? event.msg_id ?? '',
-            BotId: botId,
-            _tag: 'MESSAGES_PIN',
-            value: event
-        };
-        cbp.send(e);
+        cbp.send(FormatEvent.create('message.pin')
+            .addPlatform({ Platform: platform, value: event, BotId: botId })
+            .addGuild({ GuildId: body.channel_id ?? event.target_id ?? '', SpaceId: body.channel_id ?? event.target_id ?? '' })
+            .addChannel({ ChannelId: body.channel_id ?? event.target_id ?? '' })
+            .addMessage({ MessageId: body.msg_id ?? event.msg_id ?? '' })
+            .add({ tag: 'MESSAGES_PIN' }).value);
     });
     client.on('GUILD_JOIN', event => {
         const body = event.extra?.body;
-        const e = {
-            name: 'guild.join',
-            Platform: platform,
-            GuildId: body?.guild_id ?? event.target_id ?? '',
-            ChannelId: '',
-            SpaceId: body?.guild_id ?? event.target_id ?? '',
-            UserId: event.author_id ?? '',
-            UserKey: '',
-            IsMaster: false,
-            IsBot: true,
-            MessageId: event.msg_id ?? '',
-            BotId: botId,
-            _tag: 'GUILD_JOIN',
-            value: event
-        };
-        cbp.send(e);
+        cbp.send(FormatEvent.create('guild.join')
+            .addPlatform({ Platform: platform, value: event, BotId: botId })
+            .addGuild({ GuildId: body?.guild_id ?? event.target_id ?? '', SpaceId: body?.guild_id ?? event.target_id ?? '' })
+            .addChannel({ ChannelId: '' })
+            .addUser({ UserId: event.author_id ?? '', UserKey: '', IsMaster: false, IsBot: true })
+            .addMessage({ MessageId: event.msg_id ?? '' })
+            .add({ tag: 'GUILD_JOIN' }).value);
     });
     client.on('GUILD_EXIT', event => {
         const body = event.extra?.body;
-        const e = {
-            name: 'guild.exit',
-            Platform: platform,
-            GuildId: body?.guild_id ?? event.target_id ?? '',
-            ChannelId: '',
-            SpaceId: body?.guild_id ?? event.target_id ?? '',
-            UserId: event.author_id ?? '',
-            UserKey: '',
-            IsMaster: false,
-            IsBot: true,
-            MessageId: event.msg_id ?? '',
-            BotId: botId,
-            _tag: 'GUILD_EXIT',
-            value: event
-        };
-        cbp.send(e);
+        cbp.send(FormatEvent.create('guild.exit')
+            .addPlatform({ Platform: platform, value: event, BotId: botId })
+            .addGuild({ GuildId: body?.guild_id ?? event.target_id ?? '', SpaceId: body?.guild_id ?? event.target_id ?? '' })
+            .addChannel({ ChannelId: '' })
+            .addUser({ UserId: event.author_id ?? '', UserKey: '', IsMaster: false, IsBot: true })
+            .addMessage({ MessageId: event.msg_id ?? '' })
+            .add({ tag: 'GUILD_EXIT' }).value);
     });
     client.on('CHANNEL_CREATE', event => {
         const body = event.extra?.body;
         if (!body) {
             return;
         }
-        const e = {
-            name: 'channel.create',
-            Platform: platform,
-            GuildId: body.guild_id ?? event.target_id ?? '',
-            ChannelId: body.id ?? '',
-            SpaceId: body.guild_id ?? event.target_id ?? '',
-            MessageId: event.msg_id ?? '',
-            BotId: botId,
-            _tag: 'CHANNEL_CREATE',
-            value: event
-        };
-        cbp.send(e);
+        cbp.send(FormatEvent.create('channel.create')
+            .addPlatform({ Platform: platform, value: event, BotId: botId })
+            .addGuild({ GuildId: body.guild_id ?? event.target_id ?? '', SpaceId: body.guild_id ?? event.target_id ?? '' })
+            .addChannel({ ChannelId: body.id ?? '' })
+            .addMessage({ MessageId: event.msg_id ?? '' })
+            .add({ tag: 'CHANNEL_CREATE' }).value);
     });
     client.on('CHANNEL_DELETE', event => {
         const body = event.extra?.body;
         if (!body) {
             return;
         }
-        const e = {
-            name: 'channel.delete',
-            Platform: platform,
-            GuildId: body.guild_id ?? event.target_id ?? '',
-            ChannelId: body.id ?? '',
-            SpaceId: body.guild_id ?? event.target_id ?? '',
-            MessageId: event.msg_id ?? '',
-            BotId: botId,
-            _tag: 'CHANNEL_DELETE',
-            value: event
-        };
-        cbp.send(e);
+        cbp.send(FormatEvent.create('channel.delete')
+            .addPlatform({ Platform: platform, value: event, BotId: botId })
+            .addGuild({ GuildId: body.guild_id ?? event.target_id ?? '', SpaceId: body.guild_id ?? event.target_id ?? '' })
+            .addChannel({ ChannelId: body.id ?? '' })
+            .addMessage({ MessageId: event.msg_id ?? '' })
+            .add({ tag: 'CHANNEL_DELETE' }).value);
     });
     client.on('CHANNEL_UPDATE', event => {
         const body = event.extra?.body;
         if (!body) {
             return;
         }
-        const e = {
-            name: 'channel.update',
-            Platform: platform,
-            GuildId: body.guild_id ?? event.target_id ?? '',
-            ChannelId: body.id ?? '',
-            SpaceId: body.guild_id ?? event.target_id ?? '',
-            MessageId: event.msg_id ?? '',
-            BotId: botId,
-            _tag: 'CHANNEL_UPDATE',
-            value: event
-        };
-        cbp.send(e);
+        cbp.send(FormatEvent.create('channel.update')
+            .addPlatform({ Platform: platform, value: event, BotId: botId })
+            .addGuild({ GuildId: body.guild_id ?? event.target_id ?? '', SpaceId: body.guild_id ?? event.target_id ?? '' })
+            .addChannel({ ChannelId: body.id ?? '' })
+            .addMessage({ MessageId: event.msg_id ?? '' })
+            .add({ tag: 'CHANNEL_UPDATE' }).value);
     });
     const formatKookContent = (val) => {
         const nativeItems = val.filter(item => item.type === 'Mention' || item.type === 'Text' || item.type === 'Link');
@@ -891,18 +783,26 @@ const main = () => {
     cbp.onactions((data, consume) => void onactions(data, consume));
     const onapis = async (data, consume) => {
         const key = data.payload?.key;
-        if (client[key]) {
-            const params = data.payload.params;
-            try {
-                const res = await client[key](...params);
-                consume([createResult(ResultCode.Ok, '请求完成', res)]);
+        const params = data.payload?.params;
+        try {
+            const keys = key.split('.');
+            let target = client;
+            for (const k of keys) {
+                if (target === null || target === undefined || !(k in target)) {
+                    consume([createResult(ResultCode.Fail, '未知请求，请尝试升级版本', null)]);
+                    return;
+                }
+                target = target[k];
             }
-            catch (error) {
-                consume([createResult(ResultCode.Fail, '请求失败', error)]);
+            if (typeof target !== 'function') {
+                consume([createResult(ResultCode.Fail, '目标不是可调用方法', null)]);
+                return;
             }
+            const res = await target(...params);
+            consume([createResult(ResultCode.Ok, '请求完成', res)]);
         }
-        else {
-            consume([createResult(ResultCode.Fail, '未知请求，请尝试升级版本', null)]);
+        catch (error) {
+            consume([createResult(ResultCode.Fail, '请求失败', error)]);
         }
     };
     cbp.onapis((data, consume) => void onapis(data, consume));

package/lib/sdk/wss.js

@@ -6,6 +6,7 @@ import { ConversationMap } from './conversation.js';
 class KOOKClient extends KOOKAPI {
     #isConnected = false;
     #lastMessageSN = 0;
+    #sessionId = null;
     constructor(opstion) {
         super();
         config.set('token', opstion.token);
@@ -57,7 +58,7 @@ class KOOKClient extends KOOKAPI {
                 }
             },
             1: ({ d }) => {
-                if (d && d.code === 0) {
+                if (d?.code === 0) {
                     console.info('[ws] ok');
                     this.#sessionId = d.session_id;
                     this.#isConnected = true;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alemonjs/kook",
-  "version": "2.1.7",
+  "version": "2.1.9",
   "description": "kook platform connection",
   "author": "lemonade",
   "license": "MIT",
@@ -59,5 +59,5 @@
     "type": "git",
     "url": "https://github.com/lemonade-lab/alemonjs.git"
   },
-  "gitHead": "e50477125586204c6e56a8ecfe3391136f5fe74b"
+  "gitHead": "4b0115f3dfec34c18e27f57bf5c0f0164e28394a"
 }