@alemonjs/kook 2.1.0-alpha.4 → 2.1.0

package/lib/index.js

@@ -12,6 +12,10 @@ const main = () => {
         token: config.token
     });
     void client.connect();
+    let botId = '';
+    client.userMe().then(res => {
+        botId = String(res?.data?.id ?? '');
+    }).catch(() => { });
     const port = process.env?.port || 17117;
     const url = `ws://127.0.0.1:${port}`;
     const cbp = cbpPlatform(url);
@@ -38,8 +42,8 @@ const main = () => {
             MessageId: event.msg_id,
             MessageText: msg,
             OpenId: data?.code,
-            CreateAt: Date.now(),
-            tag: 'MESSAGES_DIRECT',
+            BotId: botId,
+            _tag: 'MESSAGES_DIRECT',
             value: event
         };
         cbp.send(e);
@@ -51,12 +55,12 @@ const main = () => {
         const data = await client.userChatCreate(event.extra.author.id).then(res => res?.data);
         const avatar = event.extra.author.avatar;
         let msg = event.content;
-        const mention_role_part = event.extra.kmarkdown?.mention_role_part ?? [];
-        for (const item of mention_role_part) {
+        const mentionRolePart = event.extra.kmarkdown?.mention_role_part ?? [];
+        for (const item of mentionRolePart) {
             msg = msg.replace(`(rol)${item.role_id}(rol)`, '').trim();
         }
-        const mention_part = event.extra.kmarkdown?.mention_part ?? [];
-        for (const item of mention_part) {
+        const mentionPart = event.extra.kmarkdown?.mention_part ?? [];
+        for (const item of mentionPart) {
             msg = msg.replace(`(met)${item.id}(met)`, '').trim();
         }
         const UserAvatar = avatar.substring(0, avatar.indexOf('?'));
@@ -77,8 +81,8 @@ const main = () => {
             MessageId: event.msg_id,
             MessageText: msg,
             OpenId: data?.code,
-            CreateAt: Date.now(),
-            tag: 'MESSAGES_PUBLIC',
+            BotId: botId,
+            _tag: 'MESSAGES_PUBLIC',
             value: event
         };
         cbp.send(e);
@@ -86,11 +90,247 @@ const main = () => {
     client.on('ERROR', msg => {
         console.error(msg);
     });
+    client.on('REACTIONS', event => {
+        const reactionType = event.extra?.type;
+        const body = event.extra?.body;
+        if (!body) {
+            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);
+        }
+        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);
+        }
+    });
+    client.on('MEMBER_ADD', event => {
+        const body = event.extra?.body;
+        if (!body) {
+            return;
+        }
+        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);
+    });
+    client.on('MEMBER_REMOVE', event => {
+        const body = event.extra?.body;
+        if (!body) {
+            return;
+        }
+        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);
+    });
+    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);
+    });
+    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);
+    });
+    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);
+    });
+    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);
+    });
+    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);
+    });
+    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);
+    });
+    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);
+    });
+    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);
+    });
     const formatKookContent = (val) => {
         return val
-            .filter(item => item.type === 'Mention' || item.type === 'Text')
+            .filter(item => item.type === 'Mention' || item.type === 'Text' || item.type === 'Link')
             .map(item => {
-            if (item.type === 'Mention') {
+            if (item.type === 'Link') {
+                return `[${item.value}](${item?.options?.link ?? item.value})`;
+            }
+            else if (item.type === 'Mention') {
                 if (item.value === 'everyone' || item.value === 'all' || item.value === '' || typeof item.value !== 'string') {
                     return '(met)all(met)';
                 }
@@ -167,25 +407,38 @@ const main = () => {
         const url = imageRes.data?.url;
         return url || null;
     };
-    const sendChannel = async (target_id, val) => {
+    const sendChannel = async (targetId, val) => {
         if (!val || val.length <= 0) {
             return [];
         }
         const content = formatKookContent(val);
         try {
+            const imageUrl = await uploadAndGetImageUrl(val);
+            if (imageUrl && content) {
+                const imgRes = await client.createMessage({
+                    type: 2,
+                    target_id: targetId,
+                    content: imageUrl
+                });
+                const txtRes = await client.createMessage({
+                    type: 9,
+                    target_id: targetId,
+                    content: content
+                });
+                return [createResult(ResultCode.Ok, 'client.createMessage', imgRes), createResult(ResultCode.Ok, 'client.createMessage', txtRes)];
+            }
             if (content) {
                 const res = await client.createMessage({
                     type: 9,
-                    target_id: target_id,
+                    target_id: targetId,
                     content: content
                 });
                 return [createResult(ResultCode.Ok, 'client.createMessage', res)];
             }
-            const imageUrl = await uploadAndGetImageUrl(val);
             if (imageUrl) {
                 const res = await client.createMessage({
                     type: 2,
-                    target_id: target_id,
+                    target_id: targetId,
                     content: imageUrl
                 });
                 return [createResult(ResultCode.Ok, 'client.createMessage', res)];
@@ -196,25 +449,38 @@ const main = () => {
             return [createResult(ResultCode.Fail, 'client.createMessage', error)];
         }
     };
-    const sendUser = async (open_id, val) => {
+    const sendUser = async (openId, val) => {
         if (!val || val.length <= 0) {
             return [];
         }
         const content = formatKookContent(val);
         try {
+            const imageUrl = await uploadAndGetImageUrl(val);
+            if (imageUrl && content) {
+                const imgRes = await client.createDirectMessage({
+                    type: 2,
+                    chat_code: openId,
+                    content: imageUrl
+                });
+                const txtRes = await client.createDirectMessage({
+                    type: 9,
+                    chat_code: openId,
+                    content: content
+                });
+                return [createResult(ResultCode.Ok, 'client.createDirectMessage', imgRes), createResult(ResultCode.Ok, 'client.createDirectMessage', txtRes)];
+            }
             if (content) {
                 const res = await client.createDirectMessage({
                     type: 9,
-                    chat_code: open_id,
+                    chat_code: openId,
                     content: content
                 });
                 return [createResult(ResultCode.Ok, 'client.createDirectMessage', res)];
             }
-            const imageUrl = await uploadAndGetImageUrl(val);
             if (imageUrl) {
                 const res = await client.createDirectMessage({
                     type: 2,
-                    chat_code: open_id,
+                    chat_code: openId,
                     content: imageUrl
                 });
                 return [createResult(ResultCode.Ok, 'client.createDirectMessage', res)];
@@ -248,8 +514,8 @@ const main = () => {
             mention: e => {
                 const event = e.value;
                 const MessageMention = [];
-                const mention_role_part = event.extra.kmarkdown?.mention_role_part ?? [];
-                for (const item of mention_role_part) {
+                const mentionRolePart = event.extra.kmarkdown?.mention_role_part ?? [];
+                for (const item of mentionRolePart) {
                     const UserId = item.role_id;
                     const [isMaster, UserKey] = getMaster(UserId);
                     MessageMention.push({
@@ -260,8 +526,8 @@ const main = () => {
                         IsBot: true
                     });
                 }
-                const mention_part = event.extra.kmarkdown?.mention_part ?? [];
-                for (const item of mention_part) {
+                const mentionPart = event.extra.kmarkdown?.mention_part ?? [];
+                for (const item of mentionPart) {
                     const UserId = item.id;
                     const [isMaster, UserKey] = getMaster(UserId);
                     MessageMention.push({
@@ -291,9 +557,9 @@ const main = () => {
                 consume(res.map(item => createResult(ResultCode.Ok, '请求完成', item)));
             }
             else if (data.action === 'message.send.channel') {
-                const channel_id = data.payload.ChannelId;
+                const channelId = data.payload.ChannelId;
                 const val = data.payload.params.format;
-                const res = await api.active.send.channel(channel_id, val);
+                const res = await api.active.send.channel(channelId, val);
                 if (!res) {
                     consume([createResult(ResultCode.Ok, '请求完成', null)]);
                     return;

package/lib/sdk/conversation.js

@@ -39,12 +39,12 @@ const ConversationMap = {
                 return '';
             }
             else if (event.extra.type === 'exited_channel') {
-                console.info('111exited_channel');
+                console.info('exited_channel');
                 return '';
             }
             else if (event.extra.type === 'updated_channel') {
                 console.info('updated_channel');
-                return '';
+                return KOOKEventKey['CHANNEL_UPDATE'];
             }
             else if (event.extra.type === 'joined_guild') {
                 console.info('joined_guild');
@@ -54,13 +54,33 @@ const ConversationMap = {
                 console.info('exited_guild');
                 return KOOKEventKey['MEMBER_REMOVE'];
             }
+            else if (event.extra.type === 'self_joined_guild') {
+                console.info('self_joined_guild');
+                return KOOKEventKey['GUILD_JOIN'];
+            }
+            else if (event.extra.type === 'self_exited_guild') {
+                console.info('self_exited_guild');
+                return KOOKEventKey['GUILD_EXIT'];
+            }
+            else if (event.extra.type === 'added_channel') {
+                console.info('added_channel');
+                return KOOKEventKey['CHANNEL_CREATE'];
+            }
+            else if (event.extra.type === 'deleted_channel') {
+                console.info('deleted_channel');
+                return KOOKEventKey['CHANNEL_DELETE'];
+            }
             else if (event.extra.type === 'updated_message') {
                 console.info('updated_message');
-                return '';
+                return KOOKEventKey['MESSAGES_UPDATE'];
+            }
+            else if (event.extra.type === 'deleted_message') {
+                console.info('deleted_message');
+                return KOOKEventKey['MESSAGES_DELETE'];
             }
             else if (event.extra.type === 'pinned_message') {
                 console.info('pinned_message');
-                return '';
+                return KOOKEventKey['MESSAGES_PIN'];
             }
         },
         direct: (event) => {

package/lib/sdk/message.d.ts

@@ -11,6 +11,14 @@ export declare const KOOKEventKey: {
     MESSAGES_DIRECT: string;
     MESSAGES_PUBLIC: string;
     REACTIONS: string;
+    MESSAGES_UPDATE: string;
+    MESSAGES_DELETE: string;
+    MESSAGES_PIN: string;
+    CHANNEL_CREATE: string;
+    CHANNEL_DELETE: string;
+    CHANNEL_UPDATE: string;
+    GUILD_JOIN: string;
+    GUILD_EXIT: string;
     ERROR: string;
 };
 export type KOOKEventMap = {
@@ -20,5 +28,13 @@ export type KOOKEventMap = {
     MESSAGES_DIRECT: MESSAGES_DIRECT_TYPE;
     MESSAGES_PUBLIC: MESSAGES_PUBLIC_TYPE;
     REACTIONS: REACTIONS_TYPE;
+    MESSAGES_UPDATE: any;
+    MESSAGES_DELETE: any;
+    MESSAGES_PIN: any;
+    CHANNEL_CREATE: any;
+    CHANNEL_DELETE: any;
+    CHANNEL_UPDATE: any;
+    GUILD_JOIN: any;
+    GUILD_EXIT: any;
     ERROR: any;
 };

package/lib/sdk/message.js

@@ -5,6 +5,14 @@ const KOOKEventKey = {
     MESSAGES_DIRECT: 'MESSAGES_DIRECT',
     MESSAGES_PUBLIC: 'MESSAGES_PUBLIC',
     REACTIONS: 'REACTIONS',
+    MESSAGES_UPDATE: 'MESSAGES_UPDATE',
+    MESSAGES_DELETE: 'MESSAGES_DELETE',
+    MESSAGES_PIN: 'MESSAGES_PIN',
+    CHANNEL_CREATE: 'CHANNEL_CREATE',
+    CHANNEL_DELETE: 'CHANNEL_DELETE',
+    CHANNEL_UPDATE: 'CHANNEL_UPDATE',
+    GUILD_JOIN: 'GUILD_JOIN',
+    GUILD_EXIT: 'GUILD_EXIT',
     ERROR: 'ERROR'
 };
 

package/lib/sdk/typings.d.ts

@@ -255,4 +255,4 @@ export interface EditingData {
     embeds: any[];
     msg_id: string;
 }
-export declare const SystemDataEnum: readonly ["exited_guild", "joined_guild", "joined_channel", "exited_channel", "updated_channel", "pinned_message", "guild_member_online", "added_reaction", "deleted_reaction", "updated_message", "message_btn_click"];
+export declare const SystemDataEnum: readonly ["joined_guild", "exited_guild", "self_joined_guild", "self_exited_guild", "joined_channel", "exited_channel", "updated_channel", "added_channel", "deleted_channel", "pinned_message", "deleted_message", "guild_member_online", "added_reaction", "deleted_reaction", "updated_message", "message_btn_click"];

package/lib/sdk/typings.js

@@ -77,12 +77,17 @@ var ApiEnum;
     ApiEnum["GatewayIndex"] = "/api/v3/gateway/index";
 })(ApiEnum || (ApiEnum = {}));
 const SystemDataEnum = [
-    'exited_guild',
     'joined_guild',
+    'exited_guild',
+    'self_joined_guild',
+    'self_exited_guild',
     'joined_channel',
     'exited_channel',
     'updated_channel',
+    'added_channel',
+    'deleted_channel',
     'pinned_message',
+    'deleted_message',
     'guild_member_online',
     'added_reaction',
     'deleted_reaction',

package/lib/sdk/wss.js

@@ -83,7 +83,12 @@ class KOOKClient extends KOOKAPI {
                 console.info('[ws] Connection failed, reconnect');
                 this.#isConnected = false;
                 this.#sessionId = null;
-                console.info('[ws] sessionId', this.#sessionId);
+                if (this.#heartbeatInterval) {
+                    clearInterval(this.#heartbeatInterval);
+                    this.#heartbeatInterval = null;
+                }
+                this.#ws.close();
+                void this.connect();
             },
             6: () => {
                 console.info('[ws] resume ack');
@@ -120,6 +125,13 @@ class KOOKClient extends KOOKAPI {
                 this.#heartbeatInterval = null;
             }
             console.error('[ws] close');
+            if (this.#isConnected) {
+                this.#isConnected = false;
+                this.#sessionId = null;
+                setTimeout(() => {
+                    void this.connect();
+                }, 5000);
+            }
         });
         this.#ws.on('error', err => {
             console.error('[ws] error', err);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alemonjs/kook",
-  "version": "2.1.0-alpha.4",
+  "version": "2.1.0",
   "description": "kook platform connection",
   "author": "lemonade",
   "license": "MIT",