@alemonjs/discord 2.1.0-alpha.13 → 2.1.0-alpha.15

package/lib/desktop.js

@@ -20,7 +20,7 @@ const activate = context => {
         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
@@ -42,8 +42,9 @@ const activate = context => {
             }
             else if (data.type === 'discord.init') {
                 let config = getConfigValue();
-                if (!config)
+                if (!config) {
                     config = {};
+                }
                 // 发送消息
                 webView.postMessage({
                     type: 'discord.init',

package/lib/index.js

@@ -17,7 +17,7 @@ var index = () => {
     // 创建客户端
     const client = new DCClient();
     // 连接
-    client.connect();
+    void client.connect();
     /**
      * 创建用户头像
      * @param UserId
@@ -28,10 +28,11 @@ var index = () => {
         return client.userAvatar(UserId, avatar);
     };
     // 监听消息
-    client.on('MESSAGE_CREATE', async (event) => {
+    client.on('MESSAGE_CREATE', event => {
         // 消除bot消息
-        if (event.author?.bot)
+        if (event.author?.bot) {
             return;
+        }
         // 艾特消息处理
         const at_users = [];
         // 获取艾特用户
@@ -42,13 +43,13 @@ var index = () => {
         }
         // 清除 @ 相关的消息
         let msg = event.content;
-        for await (const item of at_users) {
+        for (const item of at_users) {
             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',
                 // 事件类型
@@ -75,7 +76,7 @@ var index = () => {
             };
             cbp.send(e);
         }
-        else if (event.type == 0 && !event.member) {
+        else if (event.type === 0 && !event.member) {
             // 处理消息
             const e = {
                 name: 'private.message.create',
@@ -160,10 +161,8 @@ var index = () => {
             };
             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: {
@@ -183,12 +182,12 @@ var index = () => {
                     return [];
                 }
                 const tag = event.tag;
-                if (tag == 'message.create') {
+                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, {
@@ -197,12 +196,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, {
@@ -213,7 +212,7 @@ var index = () => {
                 }
                 return [];
             },
-            mention: async (e) => {
+            mention: e => {
                 const event = e.value;
                 const MessageMention = event.mentions.map(item => {
                     const UserId = item.id;
@@ -228,11 +227,13 @@ var index = () => {
                         UserKey
                     };
                 });
-                return MessageMention;
+                return new Promise(resolve => {
+                    resolve(MessageMention);
+                });
             }
         }
     };
-    cbp.onactions(async (data, consume) => {
+    const onactions = async (data, consume) => {
         if (data.action === 'message.send') {
             const event = data.payload.event;
             const paramFormat = data.payload.params.format;
@@ -256,8 +257,9 @@ var index = () => {
             const res = await api.use.mention(event);
             consume([createResult(ResultCode.Ok, '请求完成', res)]);
         }
-    });
-    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，直接调用。
@@ -265,7 +267,8 @@ var index = () => {
             const res = await client[key](...params);
             consume([createResult(ResultCode.Ok, '请求完成', res)]);
         }
-    });
+    };
+    cbp.onapis((data, consume) => void onapis(data, consume));
 };
 
 export { index as default, platform };

package/lib/sdk/api.d.ts

@@ -1,6 +1,5 @@
-import * as axios from 'axios';
-import { AxiosRequestConfig } from 'axios';
 import FormData from 'form-data';
+import { AxiosRequestConfig } from 'axios';
 import { Readable } from 'stream';
 import { MessageData } from './typings.js';
 
@@ -13,13 +12,13 @@ declare class DCAPI {
      * @param opstion
      * @returns
      */
-    request(options: AxiosRequestConfig): Promise<axios.AxiosResponse<any, any>>;
+    request(options: AxiosRequestConfig): Promise<any>;
     /**
      * cdn基础请求
      * @param options
      * @returns
      */
-    requestCDN(options: AxiosRequestConfig): Promise<axios.AxiosResponse<any, any>>;
+    requestCDN(options: AxiosRequestConfig): Promise<any>;
     /**
      * 创建用户url地址
      * @param user_id
@@ -42,6 +41,14 @@ declare class DCAPI {
      * @returns
      */
     channelsMessagesForm(channel_id: string, param?: MessageData, img?: string | Buffer | Readable): Promise<any>;
+    /**
+     *
+     * @param channel_id
+     * @param data
+     * @param headers
+     * @returns
+     */
+    channelsMessages(channel_id: string, data?: MessageData): Promise<any>;
     /**
      * ************
      * 消息-图片接口