@alemonjs/discord 2.1.0-alpha.9 → 2.1.0

package/lib/desktop.js

@@ -3,30 +3,22 @@ import { dirname, join } from 'path';
 import { fileURLToPath } from 'url';
 import { getConfig, getConfigValue } from 'alemonjs';
 
-// 当前目录
 const __dirname = dirname(fileURLToPath(import.meta.url));
-// 被激活的时候。
 const activate = context => {
-    // 创建一个 webview。
     const webView = context.createSidebarWebView(context);
-    // 当命令被触发的时候。
     context.onCommand('open.discord', () => {
         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(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 === 'discord.form.save') {
@@ -42,9 +34,9 @@ const activate = context => {
             }
             else if (data.type === 'discord.init') {
                 let config = getConfigValue();
-                if (!config)
+                if (!config) {
                     config = {};
-                // 发送消息
+                }
                 webView.postMessage({
                     type: 'discord.init',
                     data: config.discord ?? {}
@@ -52,7 +44,7 @@ const activate = context => {
             }
         }
         catch (e) {
-            console.error(e);
+            logger.error(e);
         }
     });
 };

package/lib/hook.d.ts

@@ -1,8 +1,7 @@
 import { EventKeys, Events } from 'alemonjs';
-import { DCAPI } from './sdk/api.js';
-import { MESSAGE_CREATE_TYPE } from './sdk/message/MESSAGE_CREATE.js';
-import { INTERACTION_CREATE_TYPE } from './sdk/message/INTERACTION_CREATE.js';
-
+import { DCAPI as API } from './sdk/api';
+import { MESSAGE_CREATE_TYPE } from './sdk/message/MESSAGE_CREATE';
+import { INTERACTION_CREATE_TYPE } from './sdk/message/INTERACTION_CREATE';
 type MAP = {
     'message.create': MESSAGE_CREATE_TYPE;
     'private.message.create': MESSAGE_CREATE_TYPE;
@@ -12,8 +11,8 @@ type MAP = {
     'message.delete': undefined;
     'message.reaction.add': undefined;
     'message.reaction.remove': undefined;
-    'channal.create': undefined;
-    'channal.delete': undefined;
+    'channel.create': undefined;
+    'channel.delete': undefined;
     'guild.join': undefined;
     'guild.exit': undefined;
     'member.add': undefined;
@@ -23,17 +22,6 @@ type MAP = {
     'private.friend.add': undefined;
     'private.guild.add': undefined;
 };
-/**
- *
- * @param event
- * @returns
- */
-declare const useValue: <T extends EventKeys>(event: Events[T]) => readonly [MAP[T]];
-/**
- *
- * @param event
- * @returns
- */
-declare const useClient: <T extends EventKeys>(event: Events[T]) => readonly [DCAPI, MAP[T]];
-
-export { useClient, useValue };
+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]];
+export {};

package/lib/hook.js

@@ -1,20 +1,10 @@
 import { createEventValue, useClient as useClient$1 } from 'alemonjs';
 import { DCAPI } from './sdk/api.js';
 
-/**
- *
- * @param event
- * @returns
- */
 const useValue = (event) => {
     const value = createEventValue(event);
     return [value];
 };
-/**
- *
- * @param event
- * @returns
- */
 const useClient = (event) => {
     const [client] = useClient$1(event, DCAPI);
     const value = createEventValue(event);

package/lib/index.d.ts

@@ -1,7 +1,6 @@
-export { platform } from './config.js';
-export { DCAPI as API } from './sdk/api.js';
-export { useClient, useValue } from './hook.js';
-
-declare const _default: () => void;
-
-export { _default as default };
+export { platform } from './config';
+export { DCAPI as API } from './sdk/api';
+export * from './hook';
+export { type Options } from './config';
+declare const _default: () => any;
+export default _default;

package/lib/index.js

@@ -1,102 +1,79 @@
-import './env.js';
-import { cbpPlatform, createResult, ResultCode } from 'alemonjs';
 import { sendchannel, senduser } from './send.js';
 import { DCClient } from './sdk/wss.js';
-import { getDiscordConfig, getMaster, platform } from './config.js';
+import { definePlatform, cbpPlatform, createResult, ResultCode } from 'alemonjs';
+import { getMaster, platform } from './config.js';
 export { DCAPI as API } from './sdk/api.js';
 export { useClient, useValue } from './hook.js';
 
-// main
-var index = () => {
-    const value = getDiscordConfig();
-    const port = process.env?.port || value?.port || 17117;
-    /**
-     * 连接 alemonjs 服务器。
-     * 向 alemonjs 推送标准信息
-     */
+const main = () => {
+    const port = process.env?.port || 17117;
     const url = `ws://127.0.0.1:${port}`;
     const cbp = cbpPlatform(url);
-    // 创建客户端
     const client = new DCClient();
-    // 连接
-    client.connect();
-    /**
-     * 创建用户头像
-     * @param UserId
-     * @param avatar
-     * @returns
-     */
+    void client.connect();
+    let botId = '';
+    client.on('READY', event => {
+        if (event?.user?.id) {
+            botId = String(event.user.id);
+        }
+    });
     const createUserAvatar = (UserId, avatar) => {
         return client.userAvatar(UserId, avatar);
     };
-    // 监听消息
-    client.on('MESSAGE_CREATE', async (event) => {
-        // 消除bot消息
-        if (event.author?.bot)
+    client.on('MESSAGE_CREATE', event => {
+        if (event.author?.bot) {
             return;
-        // 艾特消息处理
-        const at_users = [];
-        // 获取艾特用户
+        }
+        const atUsers = [];
         for (const item of event.mentions) {
-            at_users.push({
+            atUsers.push({
                 id: item.id
             });
         }
-        // 清除 @ 相关的消息
         let msg = event.content;
-        for await (const item of at_users) {
+        for (const item of atUsers) {
             msg = msg.replace(`<@${item.id}>`, '').trim();
         }
         const UserId = event.author.id;
         const [isMaster, UserKey] = getMaster(UserId);
         const UserAvatar = createUserAvatar(UserId, event.author.avatar);
-        if (event.type == 0 && event.member) {
+        if (event.type === 0 && event.member) {
             const e = {
                 name: 'message.create',
-                // 事件类型
                 Platform: platform,
-                // guild
                 GuildId: event.guild_id,
                 ChannelId: event.channel_id,
                 SpaceId: event.channel_id,
-                // user
                 UserId: UserId,
                 UserKey,
                 UserName: event.author.username,
                 UserAvatar: UserAvatar,
                 IsMaster: isMaster,
                 IsBot: false,
-                // message
+                OpenId: UserId,
                 MessageId: event.id,
                 MessageText: msg,
-                OpenId: '',
-                CreateAt: Date.now(),
-                // other
-                tag: 'message.create',
+                BotId: botId,
+                _tag: 'message.create',
                 value: event
             };
             cbp.send(e);
         }
-        else if (event.type == 0 && !event.member) {
-            // 处理消息
+        else if (event.type === 0 && !event.member) {
             const e = {
                 name: 'private.message.create',
-                // 事件类型
                 Platform: platform,
-                // user
                 UserId: UserId,
                 UserKey,
                 UserName: event.author.username,
                 UserAvatar: UserAvatar,
                 IsMaster: isMaster,
                 IsBot: false,
-                // message
+                OpenId: UserId,
                 MessageId: event.id,
                 MessageText: msg,
-                OpenId: '',
-                CreateAt: Date.now(),
-                // other
-                tag: 'private.message.create',
+                BotId: botId,
+                _tag: 'private.message.create',
                 value: event
             };
             cbp.send(e);
@@ -112,28 +89,20 @@ var index = () => {
         const [isMaster, UserKey] = getMaster(UserId);
         const MessageText = event.data.custom_id;
         if (isPrivate) {
-            // 处理消息
             const e = {
                 name: 'private.interaction.create',
-                // 事件类型
                 Platform: platform,
-                // guild
-                // GuildId: event['guild_id'],
-                // ChannelId: event.channel_id,
-                // user
                 UserId: UserId,
                 UserKey,
                 UserName: UserName,
                 UserAvatar: UserAvatar,
                 IsMaster: isMaster,
                 IsBot: false,
-                // message
+                OpenId: UserId,
                 MessageId: event.id,
                 MessageText: MessageText,
-                OpenId: '',
-                CreateAt: Date.now(),
-                // other
-                tag: 'private.interaction.create',
+                BotId: botId,
+                _tag: 'private.interaction.create',
                 value: event
             };
             cbp.send(e);
@@ -141,59 +110,230 @@ var index = () => {
         else {
             const e = {
                 name: 'interaction.create',
-                // 事件类型
                 Platform: platform,
-                // guild
                 GuildId: event['guild_id'],
                 ChannelId: event.channel_id,
                 SpaceId: event.channel_id,
-                // user
                 UserId: UserId,
                 UserKey,
                 UserName: UserName,
                 UserAvatar: UserAvatar,
                 IsMaster: isMaster,
                 IsBot: false,
-                // message
                 MessageId: event.id,
                 MessageText: MessageText,
-                OpenId: '',
-                CreateAt: Date.now(),
-                // other
-                tag: 'interaction.create',
+                OpenId: UserId,
+                BotId: botId,
+                _tag: 'interaction.create',
                 value: event
             };
             cbp.send(e);
         }
-        client.interactionsCallback(event.id, event.token, MessageText);
+        void client.interactionsCallback(event.id, event.token, MessageText);
+    });
+    client.on('MESSAGE_UPDATE', event => {
+        if (!event.author) {
+            return;
+        }
+        const UserId = event.author.id;
+        const [isMaster, UserKey] = getMaster(UserId);
+        const UserAvatar = createUserAvatar(UserId, event.author.avatar);
+        const e = {
+            name: 'message.update',
+            Platform: platform,
+            GuildId: event.guild_id,
+            ChannelId: event.channel_id,
+            SpaceId: event.channel_id,
+            UserId: UserId,
+            UserKey,
+            UserName: event.author.username,
+            UserAvatar: UserAvatar,
+            IsMaster: isMaster,
+            IsBot: event.author.bot ?? false,
+            MessageId: event.id,
+            BotId: botId,
+            _tag: 'MESSAGE_UPDATE',
+            value: event
+        };
+        cbp.send(e);
+    });
+    client.on('MESSAGE_DELETE', event => {
+        const e = {
+            name: 'message.delete',
+            Platform: platform,
+            GuildId: event.guild_id,
+            ChannelId: event.channel_id,
+            SpaceId: event.channel_id,
+            MessageId: event.id,
+            BotId: botId,
+            _tag: 'MESSAGE_DELETE',
+            value: event
+        };
+        cbp.send(e);
+    });
+    client.on('MESSAGE_REACTION_ADD', event => {
+        const e = {
+            name: 'message.reaction.add',
+            Platform: platform,
+            GuildId: event.guild_id,
+            ChannelId: event.channel_id,
+            SpaceId: event.channel_id,
+            MessageId: event.message_id,
+            BotId: botId,
+            _tag: 'MESSAGE_REACTION_ADD',
+            value: event
+        };
+        cbp.send(e);
+    });
+    client.on('MESSAGE_REACTION_REMOVE', event => {
+        const e = {
+            name: 'message.reaction.remove',
+            Platform: platform,
+            GuildId: event['guild_id'],
+            ChannelId: event['channel_id'],
+            SpaceId: event['channel_id'],
+            MessageId: event['message_id'],
+            BotId: botId,
+            _tag: 'MESSAGE_REACTION_REMOVE',
+            value: event
+        };
+        cbp.send(e);
+    });
+    client.on('GUILD_MEMBER_ADD', event => {
+        const UserId = event.user.id;
+        const [isMaster, UserKey] = getMaster(UserId);
+        const UserAvatar = createUserAvatar(UserId, event.user.avatar);
+        const e = {
+            name: 'member.add',
+            Platform: platform,
+            GuildId: event.guild_id,
+            ChannelId: '',
+            SpaceId: event.guild_id,
+            UserId: UserId,
+            UserKey,
+            UserName: event.user.username,
+            UserAvatar: UserAvatar,
+            IsMaster: isMaster,
+            IsBot: false,
+            MessageId: '',
+            BotId: botId,
+            _tag: 'GUILD_MEMBER_ADD',
+            value: event
+        };
+        cbp.send(e);
+    });
+    client.on('GUILD_MEMBER_REMOVE', event => {
+        const UserId = event.user.id;
+        const [isMaster, UserKey] = getMaster(UserId);
+        const UserAvatar = createUserAvatar(UserId, event.user.avatar);
+        const e = {
+            name: 'member.remove',
+            Platform: platform,
+            GuildId: event.guild_id,
+            ChannelId: '',
+            SpaceId: event.guild_id,
+            UserId: UserId,
+            UserKey,
+            UserName: event.user.username,
+            UserAvatar: UserAvatar,
+            IsMaster: isMaster,
+            IsBot: false,
+            MessageId: '',
+            BotId: botId,
+            _tag: 'GUILD_MEMBER_REMOVE',
+            value: event
+        };
+        cbp.send(e);
+    });
+    client.on('CHANNEL_CREATE', event => {
+        const e = {
+            name: 'channel.create',
+            Platform: platform,
+            GuildId: event.guild_id ?? '',
+            ChannelId: event.id ?? '',
+            SpaceId: event.guild_id ?? '',
+            MessageId: '',
+            BotId: botId,
+            _tag: 'CHANNEL_CREATE',
+            value: event
+        };
+        cbp.send(e);
+    });
+    client.on('CHANNEL_DELETE', event => {
+        const e = {
+            name: 'channel.delete',
+            Platform: platform,
+            GuildId: event.guild_id ?? '',
+            ChannelId: event.id ?? '',
+            SpaceId: event.guild_id ?? '',
+            MessageId: '',
+            BotId: botId,
+            _tag: 'CHANNEL_DELETE',
+            value: event
+        };
+        cbp.send(e);
+    });
+    client.on('GUILD_CREATE', event => {
+        const e = {
+            name: 'guild.join',
+            Platform: platform,
+            GuildId: event.id ?? '',
+            ChannelId: '',
+            SpaceId: event.id ?? '',
+            UserId: '',
+            UserKey: '',
+            IsMaster: false,
+            IsBot: false,
+            MessageId: '',
+            BotId: botId,
+            _tag: 'GUILD_CREATE',
+            value: event
+        };
+        cbp.send(e);
+    });
+    client.on('GUILD_DELETE', event => {
+        const e = {
+            name: 'guild.exit',
+            Platform: platform,
+            GuildId: event.id ?? '',
+            ChannelId: '',
+            SpaceId: event.id ?? '',
+            UserId: '',
+            UserKey: '',
+            IsMaster: false,
+            IsBot: false,
+            MessageId: '',
+            BotId: botId,
+            _tag: 'GUILD_DELETE',
+            value: event
+        };
+        cbp.send(e);
     });
-    // 发送错误时
-    client.on('ERROR', console.error);
     const api = {
         active: {
             send: {
-                channel: async (channel_id, val) => {
-                    const res = await sendchannel(client, { channel_id }, val);
+                channel: async (UserId, val) => {
+                    const res = await sendchannel(client, { channel_id: UserId }, val);
                     return [createResult(ResultCode.Ok, '请求完成', res)];
                 },
-                user: async (author_id, val) => {
-                    const res = await senduser(client, { author_id: author_id }, val);
+                user: async (OpenId, val) => {
+                    const res = await senduser(client, { author_id: OpenId }, val);
                     return [createResult(ResultCode.Ok, '请求完成', res)];
                 }
             }
         },
         use: {
             send: async (event, val) => {
-                if (val.length < 0) {
+                if (!val || val.length <= 0) {
                     return [];
                 }
-                const tag = event.tag;
-                if (tag == 'message.create') {
+                const tag = event._tag;
+                if (tag === 'message.create') {
                     const ChannelId = event.value.channel_id;
                     const res = await sendchannel(client, { channel_id: ChannelId }, val);
                     return [createResult(ResultCode.Ok, '请求完成', res)];
                 }
-                else if (tag == 'private.message.create') {
+                else if (tag === 'private.message.create') {
                     const UserId = event.value.author.id;
                     const ChannelId = event.value.channel_id;
                     const res = await senduser(client, {
@@ -202,12 +342,12 @@ var index = () => {
                     }, val);
                     return [createResult(ResultCode.Ok, '请求完成', res)];
                 }
-                else if (tag == 'interaction.create') {
+                else if (tag === 'interaction.create') {
                     const ChannelId = event.value.channel_id;
                     const res = await sendchannel(client, { channel_id: ChannelId }, val);
                     return [createResult(ResultCode.Ok, '请求完成', res)];
                 }
-                else if (tag == 'private.interaction.create') {
+                else if (tag === 'private.interaction.create') {
                     const UserId = event.value.user.id;
                     const ChannelId = event.value.channel_id;
                     const res = await senduser(client, {
@@ -218,11 +358,14 @@ var index = () => {
                 }
                 return [];
             },
-            mention: async (e) => {
+            mention: e => {
                 const event = e.value;
+                if (!event?.mentions) {
+                    return new Promise(resolve => resolve([]));
+                }
                 const MessageMention = event.mentions.map(item => {
                     const UserId = item.id;
-                    const avatar = event.author.avatar;
+                    const avatar = item.avatar;
                     const UserAvatar = createUserAvatar(UserId, avatar);
                     const [isMaster, UserKey] = getMaster(UserId);
                     return {
@@ -233,44 +376,64 @@ var index = () => {
                         UserKey
                     };
                 });
-                return MessageMention;
+                return new Promise(resolve => {
+                    resolve(MessageMention);
+                });
             }
         }
     };
-    cbp.onactions(async (data, consume) => {
-        if (data.action === 'message.send') {
-            const event = data.payload.event;
-            const paramFormat = data.payload.params.format;
-            const res = await api.use.send(event, paramFormat);
-            consume(res);
-        }
-        else if (data.action === 'message.send.channel') {
-            const channel_id = data.payload.ChannelId;
-            const val = data.payload.params.format;
-            const res = await api.active.send.channel(channel_id, val);
-            consume(res);
-        }
-        else if (data.action === 'message.send.user') {
-            const user_id = data.payload.UserId;
-            const val = data.payload.params.format;
-            const res = await api.active.send.user(user_id, val);
-            consume(res);
+    const onactions = async (data, consume) => {
+        try {
+            if (data.action === 'message.send') {
+                const event = data.payload.event;
+                const paramFormat = data.payload.params.format;
+                const res = await api.use.send(event, paramFormat);
+                consume(res);
+            }
+            else if (data.action === 'message.send.channel') {
+                const channelId = data.payload.ChannelId;
+                const val = data.payload.params.format;
+                const res = await api.active.send.channel(channelId, val);
+                consume(res);
+            }
+            else if (data.action === 'message.send.user') {
+                const userId = data.payload.UserId;
+                const val = data.payload.params.format;
+                const res = await api.active.send.user(userId, val);
+                consume(res);
+            }
+            else if (data.action === 'mention.get') {
+                const event = data.payload.event;
+                const res = await api.use.mention(event);
+                consume([createResult(ResultCode.Ok, '请求完成', res)]);
+            }
+            else {
+                consume([createResult(ResultCode.Fail, '未知请求，请尝试升级版本', null)]);
+            }
         }
-        else if (data.action === 'mention.get') {
-            const event = data.payload.event;
-            const res = await api.use.mention(event);
-            consume([createResult(ResultCode.Ok, '请求完成', res)]);
+        catch (error) {
+            consume([createResult(ResultCode.Fail, '请求失败', error)]);
         }
-    });
-    cbp.onapis(async (data, consume) => {
+    };
+    cbp.onactions((data, consume) => void onactions(data, consume));
+    const onapis = async (data, consume) => {
         const key = data.payload?.key;
         if (client[key]) {
-            // 如果 client 上有对应的 key，直接调用。
             const params = data.payload.params;
-            const res = await client[key](...params);
-            consume([createResult(ResultCode.Ok, '请求完成', res)]);
+            try {
+                const res = await client[key](...params);
+                consume([createResult(ResultCode.Ok, '请求完成', res)]);
+            }
+            catch (error) {
+                consume([createResult(ResultCode.Fail, '请求失败', error)]);
+            }
         }
-    });
+        else {
+            consume([createResult(ResultCode.Fail, '未知请求，请尝试升级版本', null)]);
+        }
+    };
+    cbp.onapis((data, consume) => void onapis(data, consume));
 };
+var index = definePlatform({ main });
 
 export { index as default, platform };