@alemonjs/discord 2.1.0-alpha.16 → 2.1.0-alpha.18

package/lib/index.js

@@ -284,6 +284,18 @@ const mainProcess = () => {
     if (process.send) {
         process.send(JSON.stringify({ type: 'ready' }));
     }
+    process.on('message', msg => {
+        try {
+            const data = typeof msg === 'string' ? JSON.parse(msg) : msg;
+            if (data?.type === 'start') {
+                main();
+            }
+            else if (data?.type === 'stop') {
+                process.exit(0);
+            }
+        }
+        catch { }
+    });
 };
 mainProcess();
 

package/lib/sdk/api.js

@@ -6,6 +6,36 @@ import { createPicFrom } from './createPicFrom.js';
 
 const API_URL = 'https://discord.com/api/v10';
 const CDN_URL = 'https://cdn.discordapp.com';
+function filterHeaders(headers) {
+    if (!headers) {
+        return headers;
+    }
+    const filtered = {};
+    const sensitiveKeys = [
+        /^authorization$/i,
+        /^cookie$/i,
+        /^set-cookie$/i,
+        /token/i,
+        /key/i,
+        /jwt/i,
+        /^session[-_]id$/i,
+        /^uid$/i,
+        /^user[-_]id$/i
+    ];
+    for (const key in headers) {
+        if (/^_/.test(key)) {
+            continue; // 跳过 _ 开头
+        }
+        // 如果是敏感字段全部替换为 ******
+        if (sensitiveKeys.some(re => re.test(key))) {
+            filtered[key] = '******';
+        }
+        else {
+            filtered[key] = headers[key];
+        }
+    }
+    return filtered;
+}
 /**
  * api接口
  */
@@ -33,18 +63,12 @@ class DCAPI {
         });
         return new Promise((resolve, reject) => {
             service(options)
-                .then(res => resolve(res?.data || {}))
+                .then(res => resolve(res?.data ?? {}))
                 .catch(err => {
-                logger.error(err);
                 // 错误时的请求头
                 logger.error('[axios] error', {
                     config: {
-                        // headers: err?.config?.headers,
-                        // 如果存在 token 要隐藏调。
-                        headers: {
-                            ...err?.config?.headers,
-                            Authorization: `Bot ${value.token ? '******' : value.token}`
-                        },
+                        headers: filterHeaders(err?.config?.headers),
                         params: err?.config?.params,
                         data: err?.config?.data
                     },
@@ -928,7 +952,7 @@ class DCAPI {
     getChannelInvites(channel_id) {
         return this.request({
             method: 'get',
-            url: `/channels/ ${channel_id} /invites`
+            url: `/channels/${channel_id}/invites`
         });
     }
     /**
@@ -939,7 +963,7 @@ class DCAPI {
     createChannelInvites(channel_id) {
         return this.request({
             method: 'POST',
-            url: `/channels/ ${channel_id} /invites`
+            url: `/channels/${channel_id}/invites`
         });
     }
     /**
@@ -950,7 +974,7 @@ class DCAPI {
     deleteChannelInvites(channel_id) {
         return this.request({
             method: 'POST',
-            url: `/channels/ ${channel_id} /invites`
+            url: `/channels/${channel_id}/invites`
         });
     }
     /**
@@ -961,7 +985,7 @@ class DCAPI {
     triggerTypingIndicator(channel_id) {
         return this.request({
             method: 'POST',
-            url: `/channels/ ${channel_id} /typing`
+            url: `/channels/${channel_id}/typing`
         });
     }
     /**
@@ -972,7 +996,7 @@ class DCAPI {
     groupDMAddRecipient(channel_id, user_id) {
         return this.request({
             method: 'put',
-            url: `/channels/ ${channel_id} /recipients/${user_id}`
+            url: `/channels/${channel_id}/recipients/${user_id}`
         });
     }
     /**
@@ -983,7 +1007,7 @@ class DCAPI {
     groupDMdeleteRecipient(channel_id, user_id) {
         return this.request({
             method: 'delete',
-            url: `/channels/ ${channel_id} /recipients/${user_id}`
+            url: `/channels/${channel_id}/recipients/${user_id}`
         });
     }
     /**
@@ -994,7 +1018,7 @@ class DCAPI {
     startThreadfromMessage(channel_id, message_id) {
         return this.request({
             method: 'post',
-            url: `/channels/${channel_id} /messages/${message_id} /threads`
+            url: `/channels/${channel_id}/messages/${message_id}/threads`
         });
     }
     /**
@@ -1136,7 +1160,7 @@ class DCAPI {
     editChannelPermissions(channel_id, overwrite_id) {
         return this.request({
             method: 'PATCH',
-            url: `/channels/ ${channel_id} /permissions/ ${overwrite_id}`
+            url: `/channels/${channel_id}/permissions/${overwrite_id}`
         });
     }
     /**
@@ -1147,7 +1171,7 @@ class DCAPI {
     deleteChannelPermissions(channel_id, overwrite_id) {
         return this.request({
             method: 'delete',
-            url: `/channels/ ${channel_id} /permissions/ ${overwrite_id}`
+            url: `/channels/${channel_id}/permissions/${overwrite_id}`
         });
     }
     /**
@@ -1196,7 +1220,7 @@ class DCAPI {
     crosspostmessages(channel_id, message_id) {
         return this.request({
             method: 'POST',
-            url: `/channels/ ${channel_id} /messages/ ${message_id} /crosspost`
+            url: `/channels/${channel_id}/messages/${message_id}/crosspost`
         });
     }
     /**
@@ -1207,7 +1231,7 @@ class DCAPI {
     createareaction(channel_id, message_id, emoji) {
         return this.request({
             method: 'PUT',
-            url: `/channels/ ${channel_id} /messages/ ${message_id} /reactions/${emoji}/@me`
+            url: `/channels/${channel_id}/messages/${message_id}/reactions/${emoji}/@me`
         });
     }
     /**
@@ -1218,7 +1242,7 @@ class DCAPI {
     deleteownreaction(channel_id, message_id, emoji) {
         return this.request({
             method: 'DELETE',
-            url: `/channels/ ${channel_id} /messages/ ${message_id} /reactions/${emoji}/@me`
+            url: `/channels/${channel_id}/messages/${message_id}/reactions/${emoji}/@me`
         });
     }
     /**
@@ -1229,7 +1253,7 @@ class DCAPI {
     deleteareuserction(channel_id, message_id, emoji, user_id) {
         return this.request({
             method: 'DELETE',
-            url: `/channels/ ${channel_id} /messages/ ${message_id} /reactions/${emoji}/${user_id}`
+            url: `/channels/${channel_id}/messages/${message_id}/reactions/${emoji}/${user_id}`
         });
     }
     /**
@@ -1240,7 +1264,7 @@ class DCAPI {
     getownreaction(channel_id, message_id, emoji) {
         return this.request({
             method: 'get',
-            url: `/channels/ ${channel_id} /messages/ ${message_id} /reactions/${emoji}`
+            url: `/channels/${channel_id}/messages/${message_id}/reactions/${emoji}`
         });
     }
     /**
@@ -1251,7 +1275,7 @@ class DCAPI {
     deleteAllreaction(channel_id, message_id) {
         return this.request({
             method: 'DELETE',
-            url: `/channels/ ${channel_id} /messages/ ${message_id} /reactions`
+            url: `/channels/${channel_id}/messages/${message_id}/reactions`
         });
     }
     /**
@@ -1262,7 +1286,7 @@ class DCAPI {
     deleteAllreactionforEmoji(channel_id, message_id, emoji) {
         return this.request({
             method: 'DELETE',
-            url: `/channels/ ${channel_id} /messages/ ${message_id} /reactions/${emoji}`
+            url: `/channels/${channel_id}/messages/${message_id}/reactions/${emoji}`
         });
     }
     /**
@@ -1326,7 +1350,7 @@ class DCAPI {
     followAnnouncementChannel(channel_id) {
         return this.request({
             method: 'POST',
-            url: `/channels/ ${channel_id} /followers`
+            url: `/channels/${channel_id}/followers`
         });
     }
     /**
@@ -1342,7 +1366,7 @@ class DCAPI {
     getPinnedMessages(channel_id) {
         return this.request({
             method: 'get',
-            url: `/channels/ ${channel_id}/pins`
+            url: `/channels/${channel_id}/pins`
         });
     }
     /**
@@ -1353,7 +1377,7 @@ class DCAPI {
     pinMessage(channel_id, message_id) {
         return this.request({
             method: 'put',
-            url: `/channels/ ${channel_id}/${message_id}`
+            url: `/channels/${channel_id}/${message_id}`
         });
     }
     /**
@@ -1364,7 +1388,7 @@ class DCAPI {
     deletepinMessage(channel_id, message_id) {
         return this.request({
             method: 'delete',
-            url: `/channels/ ${channel_id}/${message_id}`
+            url: `/channels/${channel_id}/${message_id}`
         });
     }
     /**
@@ -1462,7 +1486,7 @@ class DCAPI {
     listGuildEmojis(guild_id) {
         return this.request({
             method: 'get',
-            url: `/guilds/ ${guild_id} /emojis`
+            url: `/guilds/${guild_id}/emojis`
         });
     }
     /**
@@ -1473,7 +1497,7 @@ class DCAPI {
     getGuildEmoji(guild_id, emoji_id) {
         return this.request({
             method: 'get',
-            url: `/guilds/ ${guild_id} /emojis/ ${emoji_id}`
+            url: `/guilds/${guild_id}/emojis/${emoji_id}`
         });
     }
     /**
@@ -1484,7 +1508,7 @@ class DCAPI {
     createGuildEmoji(guild_id) {
         return this.request({
             method: 'post',
-            url: `/guilds/ ${guild_id} /emojis`
+            url: `/guilds/${guild_id}/emojis`
         });
     }
     /**
@@ -1495,7 +1519,7 @@ class DCAPI {
     modifyGuildEmoji(guild_id, emoji_id) {
         return this.request({
             method: 'PATCH',
-            url: `/guilds/ ${guild_id} /emojis/ ${emoji_id}`
+            url: `/guilds/${guild_id}/emojis/${emoji_id}`
         });
     }
     /**
@@ -1506,7 +1530,7 @@ class DCAPI {
     deleteGuildEmoji(guild_id, emoji_id) {
         return this.request({
             method: 'delete',
-            url: `/guilds/ ${guild_id} /emojis/ ${emoji_id}`
+            url: `/guilds/${guild_id}/emojis/${emoji_id}`
         });
     }
     /**

package/package.json

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