@alemonjs/discord 2.1.0-alpha.2 → 2.1.0-alpha.20

package/README.md

@@ -18,12 +18,26 @@ yarn add @alemonjs/discord
 discord:
   # 令牌
   token: ''
-  # 主人
-  master_key: null
   # 前缀（非必填）
   intent: null
   # 活动 非必填）
   shard: null
+  # 使用 user_key
+  master_key:
+     - 'xxx'
+  # 使用 user_id
+  master_id:
+     - 'yyy'
+  # 请求代理（推荐使用）配置参考 axios
+  request_config:
+    proxy:
+      protocol: 'http'
+      host: 'localhost'
+      port: 7890
+  # ws 代理
+  websocket_proxy: 'http://localhost:7890'
+  # request_proxy: 'http://localhost:7890'
+
 ```
 
 ```sh

package/lib/config.d.ts

@@ -0,0 +1,14 @@
+import { DCIntentsEnum } from './sdk/types';
+export interface Options {
+    gatewayURL?: string;
+    token: string;
+    intent?: DCIntentsEnum[];
+    shard?: number[];
+    master_key?: string[];
+    master_id?: string[];
+}
+export declare const platform = "discord";
+export declare const getDiscordConfig: () => Options & {
+    [key: string]: any;
+};
+export declare const getMaster: (UserId: string) => readonly [boolean, string];

package/lib/config.js

@@ -0,0 +1,21 @@
+import { useUserHashKey, getConfigValue } from 'alemonjs';
+
+const platform = 'discord';
+const getDiscordConfig = () => {
+    const value = getConfigValue() || {};
+    const config = value[platform] || {};
+    return config;
+};
+const getMaster = (UserId) => {
+    const config = getDiscordConfig();
+    const master_key = config.master_key || [];
+    const master_id = config.master_id || [];
+    const UserKey = useUserHashKey({
+        Platform: platform,
+        UserId: UserId
+    });
+    const is = master_key.includes(UserKey) || master_id.includes(UserId);
+    return [is, UserKey];
+};
+
+export { getDiscordConfig, getMaster, platform };

package/lib/desktop.d.ts

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

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

@@ -0,0 +1,27 @@
+import { EventKeys, Events } from 'alemonjs';
+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;
+    'interaction.create': INTERACTION_CREATE_TYPE;
+    'private.interaction.create': INTERACTION_CREATE_TYPE;
+    'message.update': undefined;
+    'message.delete': undefined;
+    'message.reaction.add': undefined;
+    'message.reaction.remove': undefined;
+    'channel.create': undefined;
+    'channel.delete': undefined;
+    'guild.join': undefined;
+    'guild.exit': undefined;
+    'member.add': undefined;
+    'member.remove': undefined;
+    'private.message.update': undefined;
+    'private.message.delete': undefined;
+    'private.friend.add': undefined;
+    'private.guild.add': 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]];
+export {};

package/lib/hook.js

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

package/lib/index.d.ts

@@ -1,4 +1,6 @@
-declare const platform = "discord";
-declare const _default: () => void;
-
-export { _default as default, platform };
+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,113 +1,72 @@
-import './env.js';
-import { getConfigValue, cbpPlatform, useUserHashKey } from 'alemonjs';
 import { sendchannel, senduser } from './send.js';
 import { DCClient } from './sdk/wss.js';
-import { AvailableIntentsEventsEnum } from './sdk/types.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';
 
-const platform = 'discord';
-var index = () => {
-    let value = getConfigValue();
-    if (!value)
-        value = {};
-    const config = value[platform];
-    // 创建客户端
-    const client = new DCClient({
-        gatewayURL: config?.gatewayURL,
-        token: config.token,
-        shard: config?.shard ?? [0, 1],
-        intent: config?.intent ?? AvailableIntentsEventsEnum
-    });
-    /**
-     * 连接 alemonjs 服务器。
-     * 向 alemonjs 推送标准信息
-     */
-    const url = `ws://127.0.0.1:${process.env?.port || config?.port || 17117}`;
+const main = () => {
+    const port = process.env?.port || 17117;
+    const url = `ws://127.0.0.1:${port}`;
     const cbp = cbpPlatform(url);
-    // 连接
-    client.connect(config?.gatewayURL);
-    /**
-     * 创建用户头像
-     * @param UserId
-     * @param avatar
-     * @returns
-     */
+    const client = new DCClient();
+    void client.connect();
     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 UserKey = useUserHashKey({
-            Platform: platform,
-            UserId: UserId
-        });
-        const master_key = config?.master_key ?? [];
-        const isMaster = master_key.includes(UserKey);
+        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,
-                // user
+                SpaceId: event.channel_id,
                 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',
                 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,
-                // guild
-                // GuildId: event.guild_id,
-                // ChannelId: 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: 'private.message.create',
                 value: event
             };
@@ -116,41 +75,27 @@ var index = () => {
         else ;
     });
     client.on('INTERACTION_CREATE', event => {
-        console.log('event', event);
         const isPrivate = typeof event['user'] === 'object' ? true : false;
         const user = isPrivate ? event['user'] : event['member'].user;
         const UserId = user.id;
-        const UserKey = useUserHashKey({
-            Platform: platform,
-            UserId: UserId
-        });
         const UserAvatar = createUserAvatar(UserId, user.avatar);
         const UserName = user.username;
-        const master_key = config?.master_key ?? [];
-        const isMaster = master_key.includes(UserKey);
+        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',
                 value: event
             };
@@ -159,126 +104,149 @@ var index = () => {
         else {
             const e = {
                 name: 'interaction.create',
-                // 事件类型
                 Platform: platform,
-                // guild
                 GuildId: event['guild_id'],
                 ChannelId: event.channel_id,
-                // user
+                SpaceId: event.channel_id,
                 UserId: UserId,
                 UserKey,
                 UserName: UserName,
                 UserAvatar: UserAvatar,
                 IsMaster: isMaster,
                 IsBot: false,
-                // message
                 MessageId: event.id,
                 MessageText: MessageText,
-                OpenId: '',
+                OpenId: UserId,
                 CreateAt: Date.now(),
-                // other
                 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('ERROR', console.error);
     const api = {
         active: {
             send: {
-                channel: (channel_id, val) => {
-                    return 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) => {
-                    return 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) {
-                    return Promise.all([]);
+                if (!val || val.length <= 0) {
+                    return [];
                 }
                 const tag = event.tag;
-                if (tag == 'message.create') {
+                if (tag === 'message.create') {
                     const ChannelId = event.value.channel_id;
-                    return sendchannel(client, { channel_id: ChannelId }, val);
+                    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;
-                    return senduser(client, {
+                    const res = await senduser(client, {
                         channel_id: ChannelId,
                         author_id: UserId
                     }, val);
+                    return [createResult(ResultCode.Ok, '请求完成', res)];
                 }
-                else if (tag == 'interaction.create') {
+                else if (tag === 'interaction.create') {
                     const ChannelId = event.value.channel_id;
-                    return sendchannel(client, { channel_id: ChannelId }, val);
+                    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;
-                    return senduser(client, {
+                    const res = await senduser(client, {
                         channel_id: ChannelId,
                         author_id: UserId
                     }, val);
+                    return [createResult(ResultCode.Ok, '请求完成', res)];
                 }
-                return Promise.all([]);
+                return [];
             },
-            mention: async (e) => {
+            mention: e => {
                 const event = e.value;
                 const MessageMention = event.mentions.map(item => {
                     const UserId = item.id;
-                    const avatar = event.author.avatar;
-                    const value = getConfigValue();
-                    const config = value?.discord;
-                    const master_key = config?.master_key ?? [];
+                    const avatar = item.avatar;
                     const UserAvatar = createUserAvatar(UserId, avatar);
-                    const UserKey = useUserHashKey({
-                        Platform: platform,
-                        UserId: UserId
-                    });
+                    const [isMaster, UserKey] = getMaster(UserId);
                     return {
                         UserId: item.id,
-                        IsMaster: master_key.includes(UserId),
+                        IsMaster: isMaster,
                         IsBot: item.bot,
                         UserAvatar,
                         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);
+    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 === '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);
+        catch (error) {
+            consume([createResult(ResultCode.Fail, '请求失败', error)]);
         }
-        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);
+    };
+    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)]);
+            }
+            catch (error) {
+                consume([createResult(ResultCode.Fail, '请求失败', error)]);
+            }
         }
-        else if (data.action === 'mention.get') {
-            const event = data.payload.event;
-            const res = await api.use.mention(event);
-            consume(res);
+        else {
+            consume([createResult(ResultCode.Fail, '未知请求，请尝试升级版本', null)]);
         }
-    });
+    };
+    cbp.onapis((data, consume) => void onapis(data, consume));
 };
+var index = definePlatform({ main });
 
 export { index as default, platform };