alemonjs 1.1.14 → 1.1.16

package/lib/discord/alemon/controller.js

@@ -1,3 +1,4 @@
+import { everyoneError } from '../../log/index.js';
 import { replyController } from './reply.js';
 export const Controller = {
     Member: ({ guild_id, user_id, channel_id }) => {
@@ -37,7 +38,7 @@ export const Controller = {
     Message: ({ guild_id, channel_id, msg_id, open_id, user_id }) => {
         return {
             reply: async (content) => {
-                return await replyController(content, channel_id);
+                return await replyController(content, channel_id).catch(everyoneError);
             },
             quote: async (content) => {
                 return false;

package/lib/discord/alemon/reply.js

@@ -10,13 +10,7 @@ import { everyoneError } from '../../log/index.js';
  */
 export async function replyController(msg, channel_id, select) {
     if (Buffer.isBuffer(msg)) {
-        try {
-            return await Client.channelsMessagesImage(channel_id, msg);
-        }
-        catch (err) {
-            console.error(err);
-            return err;
-        }
+        return await Client.channelsMessagesImage(channel_id, msg).catch(everyoneError);
     }
     // arr & find buffer
     if (Array.isArray(msg) && msg.find(item => Buffer.isBuffer(item))) {
@@ -29,13 +23,7 @@ export async function replyController(msg, channel_id, select) {
         })
             .filter(element => typeof element === 'string')
             .join('');
-        try {
-            return await Client.channelsMessagesImage(channel_id, msg[isBuffer], cont);
-        }
-        catch (err) {
-            console.error(err);
-            return err;
-        }
+        return await Client.channelsMessagesImage(channel_id, msg[isBuffer], cont).catch(everyoneError);
     }
     const content = Array.isArray(msg)
         ? msg.join('')
@@ -49,9 +37,9 @@ export async function replyController(msg, channel_id, select) {
     const match = content.match(/<http>(.*?)<\/http>/);
     if (match) {
         const getUrl = match[1];
-        const msg = await getUrlbuffer(getUrl);
+        const msg = await getUrlbuffer(getUrl).catch(everyoneError);
         if (msg) {
-            return await Client.channelsMessagesImage(channel_id, msg);
+            return await Client.channelsMessagesImage(channel_id, msg).catch(everyoneError);
         }
     }
     return Client.channelsMessages(channel_id, {

package/lib/discord/sdk/wss.js

@@ -3,6 +3,9 @@ import { gateway } from './api.js';
 import { getDISCORD } from './config.js';
 /**
  * 创建ws监听
+ * @param conversation
+ * @param shard
+ * @returns
  */
 export async function createClient(conversation, shard = [0, 1]) {
     const { url } = await gateway();
@@ -15,7 +18,7 @@ export async function createClient(conversation, shard = [0, 1]) {
     let session_id = '';
     let resume_gateway_url = '';
     wsConn.on('open', async () => {
-        // 打开成功
+        console.log('[ws] open');
     });
     const call = async () => {
         wsConn.send(JSON.stringify({
@@ -36,7 +39,7 @@ export async function createClient(conversation, shard = [0, 1]) {
             }
         },
         7: () => {
-            console.info('重新请求');
+            console.info('[ws] 重新请求');
             wsConn.send(JSON.stringify({
                 op: 6,
                 d: {
@@ -48,7 +51,7 @@ export async function createClient(conversation, shard = [0, 1]) {
         },
         9: message => {
             //  6 或 2 失败
-            console.info('parameter error', message);
+            console.info('[ws] parameter error', message);
         },
         /**
          * 打招呼
@@ -57,12 +60,14 @@ export async function createClient(conversation, shard = [0, 1]) {
         10: ({ d }) => {
             const { heartbeat_interval: ih } = d;
             heartbeat_interval = ih;
+            //
             wsConn.send(JSON.stringify({
                 op: 1,
                 d: null
             }));
             setTimeout(call, heartbeat_interval);
-            const data = {
+            // 在初次握手期间启动新会话
+            wsConn.send(JSON.stringify({
                 op: 2,
                 d: {
                     shard: shard,
@@ -74,36 +79,29 @@ export async function createClient(conversation, shard = [0, 1]) {
                         device: 'alemonjs'
                     }
                 }
-            };
-            if (process.argv.includes('dev')) {
-                console.info('data', data);
-            }
-            // 在初次握手期间启动新会话
-            wsConn.send(JSON.stringify(data));
+            }));
         },
         11: ({ d }) => {
-            console.info('heartbeat transmission');
+            console.info('[ws] heartbeat transmission');
         }
     };
     wsConn.on('message', data => {
-        const jsonData = data.toString();
-        const parsedData = JSON.parse(jsonData);
-        if (process.argv.includes('dev')) {
-            console.info('parsedData', parsedData);
+        const parsedData = JSON.parse(data.toString());
+        const { op, d } = parsedData;
+        if (process.env?.DISCORD_WS == 'dev') {
+            console.info('data', d);
         }
-        const { op } = parsedData;
         if (Object.prototype.hasOwnProperty.call(map, op)) {
             map[op](parsedData);
         }
     });
     // 关闭
-    wsConn.on('close', () => {
-        console.error('ws close');
-        console.error('登录失败,TOKEN存在风险');
+    wsConn.on('close', err => {
+        console.error('[ws] 登录失败,TOKEN存在风险');
     });
     // 出错
     wsConn.on('error', error => {
-        console.error('ws error:', error);
+        console.error('[ws] error:', error);
     });
 }
 /**

package/lib/kook/alemon/controller.js

@@ -1,11 +1,14 @@
 import { ClientKOOK } from '../sdk/index.js';
 import { replyController } from './reply.js';
 import { getBotConfigByKey } from '../../config/index.js';
+import { everyoneError } from '../../log/index.js';
 export const Controller = {
     Member: ({ guild_id, user_id }) => {
         return {
             information: async () => {
-                const data = await ClientKOOK.userView(guild_id, user_id).then(res => res.data);
+                const data = await ClientKOOK.userView(guild_id, user_id)
+                    .then(res => res.data)
+                    .catch(everyoneError);
                 if (data) {
                     const cfg = getBotConfigByKey('qq');
                     const masterID = cfg.masterID;
@@ -26,7 +29,7 @@ export const Controller = {
                 return false;
             },
             remove: async () => {
-                return await ClientKOOK.guildKickout(guild_id, user_id);
+                return await ClientKOOK.guildKickout(guild_id, user_id).catch(everyoneError);
             },
             operate: async (role_id, add = true) => {
                 return false;
@@ -36,16 +39,16 @@ export const Controller = {
     Message: ({ channel_id, user_id, msg_id }) => {
         return {
             reply: async (content) => {
-                return await replyController(content, channel_id);
+                return await replyController(content, channel_id).catch(everyoneError);
             },
             quote: async (content) => {
-                return await replyController(content, channel_id);
+                return await replyController(content, channel_id).catch(everyoneError);
             },
             update: async (content) => {
-                return await ClientKOOK.messageUpdate({ msg_id, content });
+                return await ClientKOOK.messageUpdate({ msg_id, content }).catch(everyoneError);
             },
             withdraw: async (hideTip) => {
-                return await ClientKOOK.messageDelete(msg_id);
+                return await ClientKOOK.messageDelete(msg_id).catch(everyoneError);
             },
             pinning: async (cancel) => {
                 return false;
@@ -64,12 +67,12 @@ export const Controller = {
                             msg_id,
                             emoji: item,
                             user_id
-                        }));
+                        }).catch(everyoneError));
                     }
                     return arr;
                 }
                 for (const item of msg) {
-                    arr.push(await ClientKOOK.messageAddReaction({ msg_id, emoji: item }));
+                    arr.push(await ClientKOOK.messageAddReaction({ msg_id, emoji: item }).catch(everyoneError));
                 }
                 return arr;
             },
@@ -79,16 +82,16 @@ export const Controller = {
                         type: 3,
                         target_id: channel_id,
                         content: file
-                    });
+                    }).catch(everyoneError);
                 }
-                const ret = await ClientKOOK.postFile(file, name);
+                const ret = await ClientKOOK.postFile(file, name).catch(everyoneError);
                 if (!ret)
                     return false;
                 return await ClientKOOK.createMessage({
                     type: 3,
                     target_id: channel_id,
                     content: ret.data.url
-                });
+                }).catch(everyoneError);
             },
             video: async (file, name) => {
                 if (typeof file == 'string') {
@@ -96,16 +99,16 @@ export const Controller = {
                         type: 3,
                         target_id: channel_id,
                         content: file
-                    });
+                    }).catch(everyoneError);
                 }
-                const ret = await ClientKOOK.postFile(file, name);
+                const ret = await ClientKOOK.postFile(file, name).catch(everyoneError);
                 if (!ret)
                     return false;
                 return await ClientKOOK.createMessage({
                     type: 3,
                     target_id: channel_id,
                     content: ret.data.url
-                });
+                }).catch(everyoneError);
             },
             card: async (msg) => {
                 return [
@@ -113,7 +116,7 @@ export const Controller = {
                         type: 10,
                         target_id: channel_id,
                         content: JSON.stringify(msg)
-                    })
+                    }).catch(everyoneError)
                 ];
             },
             allUsers: async (emoji, options = {
@@ -121,7 +124,7 @@ export const Controller = {
                 limit: 20
             }) => {
                 // 该消息下 指定emoji的所有用户
-                return await ClientKOOK.messageReactionList({ msg_id, emoji });
+                return await ClientKOOK.messageReactionList({ msg_id, emoji }).catch(everyoneError);
             },
             article: async (msg) => {
                 return false;

package/lib/kook/alemon/conversation.js

@@ -128,7 +128,7 @@ const ConversationMap = {
  * @param req
  * @param res
  */
-export async function callBackByKOOK(event) {
+export async function conversation(event) {
     if (Object.prototype.hasOwnProperty.call(ConversationMap, event.type)) {
         if (event.channel_type == 'GROUP') {
             return await ConversationMap[event.type]['public'](event);

package/lib/kook/alemon/direct.js

@@ -43,10 +43,10 @@ const Controller = {
     Message: ({ open_id, channel_id }) => {
         return {
             reply: async (content) => {
-                return await directController(content, channel_id, open_id);
+                return await directController(content, channel_id, open_id).catch(everyoneError);
             },
             quote: async (content) => {
-                return await directController(content, channel_id, open_id);
+                return await directController(content, channel_id, open_id).catch(everyoneError);
             },
             /**
              * 更新信息
@@ -138,22 +138,16 @@ export async function directController(msg, channel_id, open_id) {
      * isbuffer
      */
     if (Buffer.isBuffer(msg)) {
-        try {
-            const ret = await ClientKOOK.postImage(msg);
-            if (ret && ret.data) {
-                return await ClientKOOK.createDirectMessage({
-                    type: 2,
-                    target_id: channel_id,
-                    chat_code: open_id,
-                    content: ret.data.url
-                }).catch(everyoneError);
-            }
-            return false;
-        }
-        catch (err) {
-            console.error(err);
-            return err;
+        const ret = await ClientKOOK.postImage(msg).catch(everyoneError);
+        if (ret && ret.data) {
+            return await ClientKOOK.createDirectMessage({
+                type: 2,
+                target_id: channel_id,
+                chat_code: open_id,
+                content: ret.data.url
+            }).catch(everyoneError);
         }
+        return false;
     }
     /**
      * string[] arr and find buffer
@@ -171,7 +165,7 @@ export async function directController(msg, channel_id, open_id) {
             .filter(element => typeof element === 'string')
             .join('');
         // 转存
-        const ret = await ClientKOOK.postImage(msg[isBuffer]);
+        const ret = await ClientKOOK.postImage(msg[isBuffer]).catch(everyoneError);
         if (!ret)
             return false;
         // 私聊
@@ -180,7 +174,7 @@ export async function directController(msg, channel_id, open_id) {
             target_id: channel_id,
             chat_code: open_id,
             content: content
-        });
+        }).catch(everyoneError);
         return await ClientKOOK.createDirectMessage({
             type: 2,
             target_id: channel_id,
@@ -200,10 +194,10 @@ export async function directController(msg, channel_id, open_id) {
     const match = content.match(/<http>(.*?)<\/http>/);
     if (match) {
         const getUrl = match[1];
-        const msg = await getUrlbuffer(getUrl);
+        const msg = await getUrlbuffer(getUrl).catch(everyoneError);
         if (!msg)
             return false;
-        const ret = await ClientKOOK.postImage(msg);
+        const ret = await ClientKOOK.postImage(msg).catch(everyoneError);
         if (!ret)
             return false;
         if (msg && ret) {

package/lib/kook/alemon/reply.js

@@ -13,21 +13,15 @@ export async function replyController(msg, channel_id) {
      * isbuffer
      */
     if (Buffer.isBuffer(msg)) {
-        try {
-            const ret = await ClientKOOK.postImage(msg);
-            if (ret && ret.data) {
-                return await ClientKOOK.createMessage({
-                    type: 2,
-                    target_id: channel_id,
-                    content: ret.data.url
-                }).catch(everyoneError);
-            }
-            return false;
-        }
-        catch (err) {
-            console.error(err);
-            return err;
+        const ret = await ClientKOOK.postImage(msg).catch(everyoneError);
+        if (ret && ret.data) {
+            return await ClientKOOK.createMessage({
+                type: 2,
+                target_id: channel_id,
+                content: ret.data.url
+            }).catch(everyoneError);
         }
+        return false;
     }
     /**
      * string[] arr and find buffer
@@ -45,7 +39,7 @@ export async function replyController(msg, channel_id) {
             .filter(element => typeof element === 'string')
             .join('');
         // 转存
-        const ret = await ClientKOOK.postImage(msg[isBuffer]);
+        const ret = await ClientKOOK.postImage(msg[isBuffer]).catch(everyoneError);
         if (!ret)
             return false;
         if (ret?.data) {
@@ -53,7 +47,7 @@ export async function replyController(msg, channel_id) {
                 type: 9,
                 target_id: channel_id,
                 content: content
-            }).catch(err => err);
+            }).catch(everyoneError);
             return await ClientKOOK.createMessage({
                 type: 2,
                 target_id: channel_id,
@@ -73,10 +67,10 @@ export async function replyController(msg, channel_id) {
     const match = content.match(/<http>(.*?)<\/http>/);
     if (match) {
         const getUrl = match[1];
-        const msg = await getUrlbuffer(getUrl);
+        const msg = await getUrlbuffer(getUrl).catch(everyoneError);
         if (!msg)
             return false;
-        const ret = await ClientKOOK.postImage(msg);
+        const ret = await ClientKOOK.postImage(msg).catch(everyoneError);
         if (!ret)
             return false;
         if (msg && ret) {

package/lib/kook/index.js

@@ -1,5 +1,5 @@
 import { checkRobotByKOOK } from './login.js';
-import { callBackByKOOK } from './alemon/conversation.js';
+import { conversation } from './alemon/conversation.js';
 import { createClient, ClientKOOK } from './sdk/index.js';
 import { setBotMsgByKOOK } from './alemon/bot.js';
 import { getBotConfigByKey } from '../config/index.js';
@@ -22,7 +22,7 @@ export async function createAlemonByKOOK() {
         /**
          * 创建连接
          */
-        await createClient(cfg.token, callBackByKOOK).then(async (res) => {
+        await createClient(cfg.token, conversation).then(async (res) => {
             const data = await ClientKOOK.userMe().then(res => res?.data);
             if (data) {
                 setBotMsgByKOOK({

package/lib/kook/sdk/ws.js

@@ -2,16 +2,14 @@ import WebSocket from 'ws';
 import axios from 'axios';
 import { setKookToken } from './config.js';
 /**
- *
+ * 获取鉴权
  * @param token  token
  * @param url 请求地址
  * @param compress 下发数据是否压缩，默认为1，代表压缩
  * @returns
  */
 export async function getGatewayUrl(token, url = 'https://www.kookapp.cn/api/v3/gateway/index', compress = 0) {
-    /**
-     * 替换为实际的接口地址
-     */
+    // 替换为实际的接口地址
     const Authorization = `Bot ${token}`;
     try {
         const response = await axios.get(url, {
@@ -36,43 +34,30 @@ export async function getGatewayUrl(token, url = 'https://www.kookapp.cn/api/v3/
 /**
  * 使用获取到的网关连接地址建立 WebSocket 连接
  * @param token
- * @param callBack
+ * @param conversation
  */
-export async function createClient(token, callBack) {
-    /**
-     * 设置token
-     */
+export async function createClient(token, conversation) {
+    // 设置token
     setKookToken(token);
-    /**
-     * 请求url
-     */
+    // 请求url
     const gatewayUrl = await getGatewayUrl(token);
     if (gatewayUrl) {
         const ws = new WebSocket(gatewayUrl);
         ws.on('open', () => {
             console.info('token ok');
         });
-        /**
-         * 标记是否已连接
-         */
+        // 标记是否已连接
         let isConnected = false;
-        /**
-         * 存储 session ID
-         */
+        // 存储 session ID
         let sessionID = '';
-        /**
-         * 存储最新的消息序号
-         */
+        // 存储最新的消息序号
         let lastMessageSN = 0;
-        ws.on('message', msg => {
-            /**
-             *
-             */
+        ws.on('message', async (msg) => {
             const message = JSON.parse(msg.toString('utf8'));
-            /**
-             *
-             */
-            const { s, d: data, sn } = message;
+            const { s, d, sn } = message;
+            if (process.env.KOOK_WS == 'dev') {
+                console.log('data', d);
+            }
             switch (s) {
                 /**
                  * 消息(包含聊天和通知消息)
@@ -82,7 +67,7 @@ export async function createClient(token, callBack) {
                      * 处理 EVENT 信令
                      * 包括按序处理消息和记录最新的消息序号
                      */
-                    if (data && sn) {
+                    if (d && sn) {
                         if (sn === lastMessageSN + 1) {
                             /**
                              * 消息序号正确
@@ -92,8 +77,8 @@ export async function createClient(token, callBack) {
                             /**
                              * 处理消息并传递给almeon
                              */
-                            const event = data;
-                            callBack(event);
+                            const event = d;
+                            await conversation(event);
                         }
                         else if (sn > lastMessageSN + 1) {
                             /**
@@ -114,13 +99,13 @@ export async function createClient(token, callBack) {
                  * 服务端返回握手结果
                  */
                 case 1: {
-                    if (data && data.code === 0) {
-                        console.info('ws ok');
-                        sessionID = data.session_id;
+                    if (d && d.code === 0) {
+                        console.info('[ws] ok');
+                        sessionID = d.session_id;
                         isConnected = true;
                     }
                     else {
-                        console.info('ws err');
+                        console.info('[ws] err');
                     }
                     break;
                 }
@@ -128,7 +113,7 @@ export async function createClient(token, callBack) {
                  * 心跳，ping
                  */
                 case 2: {
-                    console.info('ws ping');
+                    console.info('[ws] ping');
                     ws.send(JSON.stringify({
                         s: 3
                     }));
@@ -138,21 +123,21 @@ export async function createClient(token, callBack) {
                  * 心跳，pong
                  */
                 case 3: {
-                    console.info('ws pong');
+                    console.info('[ws] pong');
                     break;
                 }
                 /**
                  * resume, 恢复会话
                  */
                 case 4: {
-                    console.info('ws resume');
+                    console.info('[ws] resume');
                     break;
                 }
                 /**
                  * reconnect, 要求客户端断开当前连接重新连接
                  */
                 case 5: {
-                    console.info('ws Connection failed, reconnect');
+                    console.info('[ws] Connection failed, reconnect');
                     /**
                      * 处理 RECONNECT 信令
                      * 断开当前连接并进行重新连接
@@ -171,18 +156,16 @@ export async function createClient(token, callBack) {
                  * resume ack
                  */
                 case 6: {
-                    console.info('ws resume ack');
+                    console.info('[ws] resume ack');
                     break;
                 }
                 default: {
-                    console.info('ws define');
+                    console.info('[ws] define');
                     break;
                 }
             }
         });
-        /**
-         * 心跳定时发送
-         */
+        // 心跳定时发送
         setInterval(() => {
             if (isConnected) {
                 ws.send(JSON.stringify({
@@ -192,7 +175,10 @@ export async function createClient(token, callBack) {
             }
         }, 30000);
         ws.on('close', () => {
-            console.error('ws close');
+            console.error('[ws] close');
+        });
+        ws.on('error', err => {
+            console.error('[ws] error', err);
         });
     }
 }