mirai-js 2.0.1 → 2.2.0

package/src/Middleware.js

@@ -19,15 +19,11 @@ class Middleware {
      * @param {string} verifyKey  mirai-api-http server 设置的 verifyKey
      * @param {string} password 欲重新登陆的 qq 密码
      */
-    autoReLogin({ baseUrl, verifyKey, password }) {
-        const { Bot } = require('./index.js');
+    autoReLogin({ password }) {
         this.middleware.push(async (data, next) => {
             try {
-                await Bot.sendCommand({
-                    baseUrl,
-                    verifyKey,
-                    command: '/login',
-                    args: [data.qq, password],
+                await data.bot.sendCommand({
+                    command: ['/login', data.qq, password],
                 });
                 await data.bot.open();
                 await next();
@@ -538,10 +534,58 @@ class Middleware {
                 if (data.type != 'GroupMessage' && data.type != 'FriendMessage') {
                     throw new Error('Middleware.syncWrapper 消息格式出错');
                 }
+                const watiForMessageChain = async (qq) => {
+                    qq = qq ?? data?.sender?.id;
+                    if (qq == undefined) {
+                        throw new Error('Middleware.syncWrapper 消息格式出错');
+                    }
+                    do {
+                        var { messageChain, id } = await data.bot?.waiter?.wait(data.type, ({ messageChain, sender: { id } }) => ({ messageChain, id })) ?? {};
+                    } while (qq != id);
+
+                    return messageChain;
+                };
+
+                const waitForText = async (qq) => {
+                    qq = qq ?? data?.sender?.id;
+                    if (qq == undefined) {
+                        throw new Error('Middleware.syncWrapper 消息格式出错');
+                    }
+                    do {
+                        var { text, id } = await data.bot?.waiter?.wait(data.type, new Middleware().textProcessor().done(({ text, sender: { id } }) => ({ text, id }))) ?? {};
+                    } while (qq != id);
+                    return text;
+                };
+
+                const waitForCustom = async (qq, processor) => {
+                    qq = qq ?? data?.sender?.id;
+                    if (qq == undefined) {
+                        throw new Error('Middleware.syncWrapper 消息格式出错');
+                    }
+                    do {
+                        var data = await data.bot?.waiter?.wait(data.type, new Middleware().textProcessor().done((data) => data));
+                    } while (qq != data?.sender?.id);
+                    return await processor(data);
+                };
+
                 data.waitFor = {
-                    messageChain: () => data.bot?.waiter?.wait(data.type, ({ messageChain }) => messageChain),
-                    text: () => data.bot?.waiter?.wait(data.type, new Middleware().textProcessor().done(({ text }) => text)),
-                    custom: (processor) => data.bot?.waiter?.wait(data.type, processor),
+                    groupMember: (qq = undefined) => {
+                        return {
+                            messageChain: () => watiForMessageChain(qq),
+                            text: () => waitForText(qq),
+                            custom: (processor) => waitForCustom(qq, processor),
+                        };
+                    },
+                    friend: (qq) => {
+                        return {
+                            messageChain: () => watiForMessageChain(qq),
+                            text: () => waitForText(qq),
+                            custom: (processor) => waitForCustom(qq, processor),
+                        };
+                    },
+                    messageChain: () => watiForMessageChain(data.sender.id),
+                    text: () => waitForText(data.sender.id),
+                    custom: (processor) => waitForCustom(data.sender.id, processor),
                 };
 
                 await next();

package/src/core/getFriendList.js

@@ -22,7 +22,7 @@ module.exports = async ({ baseUrl, sessionKey }) => {
         // 请求
         const responseData = await axios.get(url, { params: { sessionKey } });
         try {
-            var { data, data: { msg: message, code } } = responseData;
+            var { data: { msg: message, code, data } } = responseData;
         } catch (error) {
             throw new Error('core.getFriendList 请求返回格式出错，请检查 mirai-console');
         }

package/src/core/sendCommand.js

@@ -1,4 +1,5 @@
 const axios = require('axios').default;
+const { errCodeMap } = require('../util/errCode');
 let URL;
 if (!process.browser) {
     ({ URL } = require('url'));
@@ -10,26 +11,30 @@ const errorHandler = require('../util/errorHandler');
 /**
  * @description 向 mirai-console 发送指令
  * @param {string} baseUrl mirai-api-http server 的地址
- * @param {string} verifyKey mirai-api-http server 设置的 verifyKey
+ * @param {string} sessionKey 会话标识
  * @param {string} command 指令名
- * @param {string[]} args  指令的参数
- * @returns {Object} 结构 { message }
+ * @param {MessageChain[]} args  指令的参数
+ * @returns {Object} 结构 { message, code }
  */
-module.exports = async ({ baseUrl, verifyKey, command: name, args }) => {
+module.exports = async ({ baseUrl, sessionKey, command }) => {
     try {
         // 拼接 url
-        const url = new URL('/command/send', baseUrl).toString();
+        const url = new URL('/cmd/execute', baseUrl).toString();
 
         // 请求
-        const responseData = await axios.post(url, { verifyKey, name, args, });
+        const responseData = await axios.post(url, { sessionKey, command, });
         try {
             var {
-                data: message
+                data: { msg: message, code },
             } = responseData;
         } catch (error) {
             throw new Error('core.sendCommand 请求返回格式出错，请检查 mirai-console');
         }
-        return { message };
+        // 抛出 mirai 的异常，到 catch 中处理后再抛出
+        if (code in errCodeMap) {
+            throw new Error(message);
+        }
+        return { message, code };
     } catch (error) {
         errorHandler(error);
     }

package/src/core/sendTempMessage.js

@@ -23,19 +23,19 @@ module.exports = async ({ baseUrl, sessionKey, qq, group, quote, messageChain })
         // 拼接 url
         const url = new URL('/sendTempMessage', baseUrl).toString();
 
-        // 请求
-        var responseData;
-        if (qq) {
-            responseData = await axios.post(url, {
-                sessionKey, qq, quote, messageChain
-            });
-        } else if (group) {
-            responseData = await axios.post(url, {
-                sessionKey, qq, quote, messageChain
-            });
-        } else {// 上层已经做了参数检查，这里有些多余
-            throw new Error('sendTempMessage 缺少必要的 qq 或 group 参数');
+        if (!qq || !group) {
+            throw new Error('sendTempMessage 缺少必要的 qq 和 group 参数');
         }
+
+        // 请求
+        const responseData = await axios.post(url, {
+            sessionKey,
+            qq,
+            group,
+            quote,
+            messageChain
+        });
+
         try {
             var {
                 data: { msg: message, code, messageId }

package/src/core/startListeningBrowser.js

@@ -35,7 +35,7 @@ module.exports = async ({ baseUrl, sessionKey, verifyKey, message, error, close
 
             ws.onmessage = ({ data }) => {
                 try {
-                    message(JSON.parse(data));
+                    message(JSON.parse(data)?.data);
                 } catch (error) { }// eslint-disable-line no-empty
             };