@alemonjs/kook 2.1.0-alpha.1 → 2.1.0-alpha.2

package/lib/sdk/conversation.js

@@ -8,50 +8,50 @@ const ConversationMap = {
      * 文字消息
      */
     [1]: {
-        public: e => KOOKEventKey['MESSAGES_PUBLIC'],
-        direct: e => KOOKEventKey['MESSAGES_DIRECT']
+        public: () => KOOKEventKey['MESSAGES_PUBLIC'],
+        direct: () => KOOKEventKey['MESSAGES_DIRECT']
     },
     /**
      * 图片消息，
      */
     [2]: {
-        public: e => KOOKEventKey['MESSAGES_PUBLIC'],
-        direct: e => KOOKEventKey['MESSAGES_DIRECT']
+        public: () => KOOKEventKey['MESSAGES_PUBLIC'],
+        direct: () => KOOKEventKey['MESSAGES_DIRECT']
     },
     /**
      * 视频消息，
      */
     [3]: {
-        public: e => KOOKEventKey['MESSAGES_PUBLIC'],
-        direct: e => KOOKEventKey['MESSAGES_DIRECT']
+        public: () => KOOKEventKey['MESSAGES_PUBLIC'],
+        direct: () => KOOKEventKey['MESSAGES_DIRECT']
     },
     /**
      * 文件消息，
      */
     [4]: {
-        public: e => KOOKEventKey['MESSAGES_PUBLIC'],
-        direct: e => KOOKEventKey['MESSAGES_DIRECT']
+        public: () => KOOKEventKey['MESSAGES_PUBLIC'],
+        direct: () => KOOKEventKey['MESSAGES_DIRECT']
     },
     /**
      * 音频消息，
      */
     [8]: {
-        public: e => KOOKEventKey['MESSAGES_PUBLIC'],
-        direct: e => KOOKEventKey['MESSAGES_DIRECT']
+        public: () => KOOKEventKey['MESSAGES_PUBLIC'],
+        direct: () => KOOKEventKey['MESSAGES_DIRECT']
     },
     /**
      * mk消息
      */
     [9]: {
-        public: e => KOOKEventKey['MESSAGES_PUBLIC'],
-        direct: e => KOOKEventKey['MESSAGES_DIRECT']
+        public: () => KOOKEventKey['MESSAGES_PUBLIC'],
+        direct: () => KOOKEventKey['MESSAGES_DIRECT']
     },
     /**
      * card消息，
      */
     [10]: {
-        public: e => KOOKEventKey['MESSAGES_PUBLIC'],
-        direct: e => KOOKEventKey['MESSAGES_DIRECT']
+        public: () => KOOKEventKey['MESSAGES_PUBLIC'],
+        direct: () => KOOKEventKey['MESSAGES_DIRECT']
     },
     /**
      * 系统消息
@@ -59,18 +59,18 @@ const ConversationMap = {
      */
     [255]: {
         public: (event) => {
-            if (event.extra.type == 'added_reaction' || event.extra.type == 'deleted_reaction') {
+            if (event.extra.type === 'added_reaction' || event.extra.type === 'deleted_reaction') {
                 return KOOKEventKey['REACTIONS'];
             }
-            else if (event.extra.type == 'joined_channel') {
+            else if (event.extra.type === 'joined_channel') {
                 console.info('joined_channel');
                 return '';
             }
-            else if (event.extra.type == 'exited_channel') {
+            else if (event.extra.type === 'exited_channel') {
                 console.info('111exited_channel');
                 return '';
             }
-            else if (event.extra.type == 'updated_channel') {
+            else if (event.extra.type === 'updated_channel') {
                 // ChannelData
                 console.info('updated_channel');
                 return '';
@@ -80,11 +80,11 @@ const ConversationMap = {
                  * *******
                  */
             }
-            else if (event.extra.type == 'joined_guild') {
+            else if (event.extra.type === 'joined_guild') {
                 console.info('joined_guild');
                 return KOOKEventKey['MEMBER_ADD'];
             }
-            else if (event.extra.type == 'exited_guild') {
+            else if (event.extra.type === 'exited_guild') {
                 console.info('exited_guild');
                 return KOOKEventKey['MEMBER_REMOVE'];
                 /**
@@ -93,13 +93,13 @@ const ConversationMap = {
                  * ********
                  */
             }
-            else if (event.extra.type == 'updated_message') {
+            else if (event.extra.type === 'updated_message') {
                 // 消息更新
                 // EditingData
                 console.info('updated_message');
                 return '';
             }
-            else if (event.extra.type == 'pinned_message') {
+            else if (event.extra.type === 'pinned_message') {
                 // 顶置消息
                 // overheadData
                 console.info('pinned_message');
@@ -107,13 +107,13 @@ const ConversationMap = {
             }
         },
         direct: (event) => {
-            if (event.extra.type == 'guild_member_online') {
-                //OnLineData
+            if (event.extra.type === 'guild_member_online') {
+                // OnLineData
                 console.info('exited_guild');
                 return '';
             }
-            else if (event.extra.type == 'message_btn_click') {
-                //按钮事件
+            else if (event.extra.type === 'message_btn_click') {
+                // 按钮事件
                 console.info('message_btn_click');
                 return KOOKEventKey['INTERACTION'];
             }

package/lib/sdk/instance.js

@@ -0,0 +1,109 @@
+const 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; // 跳过 _ 开头
+        }
+        // 去掉 Symbol 类型的 key
+        if (typeof key === 'symbol') {
+            continue;
+        }
+        // 去掉函数
+        if (typeof headers[key] === 'function') {
+            continue;
+        }
+        // 如果是敏感字段全部替换为 ******
+        if (sensitiveKeys.some(re => re.test(key))) {
+            filtered[key] = '******';
+        }
+        else {
+            filtered[key] = headers[key];
+        }
+    }
+    return filtered;
+};
+const filterConfig = (config = {}) => {
+    if (!config) {
+        return config;
+    }
+    const filtered = {};
+    for (const key in config) {
+        if (/^_/.test(key)) {
+            continue; // 跳过 _ 开头
+        }
+        // 去掉 Symbol 类型的 key
+        if (typeof key === 'symbol') {
+            continue;
+        }
+        // 去掉函数
+        if (typeof config[key] === 'function') {
+            continue;
+        }
+        filtered[key] = config[key];
+    }
+    return filtered;
+};
+const filterRequest = (request = {}) => {
+    if (!request) {
+        return request;
+    }
+    const filtered = {};
+    for (const key in request) {
+        if (/^_/.test(key)) {
+            continue; // 跳过 _ 开头
+        }
+        // 去掉 Symbol 类型的 key
+        if (typeof key === 'symbol') {
+            continue;
+        }
+        // 去掉函数
+        if (typeof request[key] === 'function') {
+            continue;
+        }
+        filtered[key] = request[key];
+    }
+    return filtered;
+};
+// 处理axios错误
+const loggerError = (err) => {
+    // 错误时的请求头
+    logger.error('[axios] error', {
+        config: {
+            headers: filterHeaders(err?.config?.headers),
+            params: err?.config?.params,
+            data: err?.config?.data
+        },
+        response: {
+            status: err?.response?.status,
+            statusText: err?.response?.statusText,
+            headers: filterHeaders(err?.response?.headers),
+            config: filterConfig(err?.response?.config),
+            request: filterRequest(err?.response?.request),
+            data: err?.response?.data
+        },
+        message: err?.message
+    });
+};
+/**
+ * 基础请求
+ * @param service
+ * @param options
+ * @returns
+ */
+const createAxiosInstance = (service, options) => {
+    return new Promise((resolve, reject) => {
+        service(options)
+            .then(res => resolve(res?.data ?? {}))
+            .catch(err => {
+            loggerError(err);
+            // 丢出错误中携带的响应数据
+            reject(err?.response?.data);
+        });
+    });
+};
+
+export { createAxiosInstance };

package/lib/sdk/typings.d.ts

@@ -1,6 +1,6 @@
 type MessageType = 1 | 2 | 3 | 4 | 8 | 9 | 10 | 255;
 /**
- * 	消息通道类型, GROUP 为组播消息, PERSON 为单播消息, BROADCAST 为广播消息
+ * 消息通道类型, GROUP 为组播消息, PERSON 为单播消息, BROADCAST 为广播消息
  */
 type MessageChannelType = 'GROUP' | 'PERSON' | 'BROADCAST';
 /**

package/lib/sdk/wss.js

@@ -39,11 +39,13 @@ class KOOKClient extends KOOKAPI {
         const gatewayUrl = await this.gateway()
             .then(res => res?.data?.url)
             .catch(err => {
-            if (this.#events['ERROR'])
+            if (this.#events['ERROR']) {
                 this.#events['ERROR'](err);
+            }
         });
-        if (!gatewayUrl && gatewayUrl == '')
+        if (!gatewayUrl && gatewayUrl === '') {
             return;
+        }
         // 建立连接
         const map = {
             0: async ({ d, sn }) => {
@@ -59,20 +61,23 @@ class KOOKClient extends KOOKAPI {
                          */
                         this.#lastMessageSN = sn;
                         try {
-                            if (d.channel_type == 'GROUP') {
+                            if (d.channel_type === 'GROUP') {
                                 const t = ConversationMap[d.type]['public'](d);
-                                if (this.#events[t])
+                                if (this.#events[t]) {
                                     await this.#events[t](d);
+                                }
                             }
                             else {
                                 const t = ConversationMap[d.type]['direct'](d);
-                                if (this.#events[t])
+                                if (this.#events[t]) {
                                     await this.#events[t](d);
+                                }
                             }
                         }
                         catch (err) {
-                            if (this.#events['ERROR'])
+                            if (this.#events['ERROR']) {
                                 this.#events['ERROR'](err);
+                            }
                         }
                         //
                     }
@@ -123,13 +128,16 @@ class KOOKClient extends KOOKAPI {
         this.#ws.on('open', () => {
             console.info('[ws] open');
         });
-        this.#ws.on('message', async (msg) => {
+        const onMessage = msg => {
             const message = JSON.parse(msg.toString('utf8'));
-            if (process.env.KOOK_WS == 'dev')
+            if (process.env.KOOK_WS === 'dev') {
                 console.info('message', message);
-            if (map[message.s])
+            }
+            if (map[message.s]) {
                 map[message.s](message);
-        });
+            }
+        };
+        this.#ws.on('message', msg => void onMessage(msg));
         // 心跳定时发送
         setInterval(() => {
             if (this.#isConnected) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alemonjs/kook",
-  "version": "2.1.0-alpha.1",
+  "version": "2.1.0-alpha.2",
   "description": "kook platform connection",
   "author": "lemonade",
   "license": "MIT",
@@ -18,6 +18,9 @@
     "./package": "./package.json",
     "./desktop": "./lib/desktop.js"
   },
+  "peerDependencies": {
+    "alemonjs": "^2.1.0-alpha.15"
+  },
   "alemonjs": {
     "desktop": {
       "platform": [