mirai-js 2.0.1 → 2.2.0

package/dist/node/Bot.js

@@ -97,8 +97,7 @@ const {
 
 class Bot extends BotConfigGetable {
   constructor() {
-    super(); // 实例化一个内部类 Waiter
-
+    super();
     this.waiter = new Waiter(this);
     this.config = undefined;
     this.eventProcessorMap = {};
@@ -434,14 +433,14 @@ class Bot extends BotConfigGetable {
       });
     } // 发给好友
     else if (friend) {
-        await _sendNudge({
-          baseUrl,
-          sessionKey,
-          target,
-          subject: friend,
-          kind: 'Friend'
-        });
-      }
+      await _sendNudge({
+        baseUrl,
+        sessionKey,
+        target,
+        subject: friend,
+        kind: 'Friend'
+      });
+    }
   }
   /**
    * @description 添加一个事件处理器
@@ -1325,6 +1324,48 @@ class Bot extends BotConfigGetable {
       target: messageId
     });
   }
+  /**
+   * @description 向 mirai-console 发送指令
+   * @param {string[]}   command 必选，指令和参数
+   * @returns {Object} 结构 { message }，注意查看 message 的内容，已知的问题：
+   * 'Login failed: Mirai 无法完成滑块验证. 使用协议 ANDROID_PHONE 强制要求滑块验证, 
+   * 请更换协议后重试. 另请参阅: https://github.com/project-mirai/mirai-login-solver-selenium'
+   */
+
+
+  async sendCommand({
+    command
+  }) {
+    // 检查对象状态
+    if (!this.config) {
+      throw new Error('setEssence 请先调用 open，建立一个会话');
+    } // 检查参数
+
+
+    if (!command) {
+      throw new Error(`sendCommand 缺少必要的 ${getInvalidParamsString({
+        command
+      })} 参数`);
+    }
+
+    const {
+      Message
+    } = require('./Message');
+
+    const {
+      baseUrl,
+      sessionKey
+    } = this.config;
+    return await _sendCommand({
+      baseUrl,
+      sessionKey,
+      command: command.map(v => {
+        var _v$toString;
+
+        return (_v$toString = v === null || v === void 0 ? void 0 : v.toString()) !== null && _v$toString !== void 0 ? _v$toString : '';
+      }).reduce((acc, cur) => acc.addText(cur), new Message()).messageChain
+    });
+  }
   /**
    * @description 检测该账号是否已经在 mirai-console 登录
    * @param {string} baseUrl 必选，mirai-api-http server 的地址
@@ -1373,40 +1414,6 @@ class Bot extends BotConfigGetable {
       return true;
     }
   }
-  /**
-   * @description 向 mirai-console 发送指令
-   * @param {string}   baseUrl 必选，mirai-api-http server 的地址
-   * @param {string}   verifyKey 必选，mirai-api-http server 设置的 verifyKey
-   * @param {string}   command 必选，指令名
-   * @param {string[]} args    可选，指令的参数
-   * @returns {Object} 结构 { message }，注意查看 message 的内容，已知的问题：
-   * 'Login failed: Mirai 无法完成滑块验证. 使用协议 ANDROID_PHONE 强制要求滑块验证, 
-   * 请更换协议后重试. 另请参阅: https://github.com/project-mirai/mirai-login-solver-selenium'
-   */
-
-
-  static async sendCommand({
-    baseUrl,
-    verifyKey,
-    command,
-    args
-  }) {
-    // 检查参数
-    if (!baseUrl || !verifyKey || !command) {
-      throw new Error(`sendCommand 缺少必要的 ${getInvalidParamsString({
-        baseUrl,
-        verifyKey,
-        command
-      })} 参数`);
-    }
-
-    return await _sendCommand({
-      baseUrl,
-      verifyKey,
-      command,
-      args
-    });
-  }
 
 } // 静态属性: 群成员的权限
 

package/dist/node/Middleware.js

@@ -26,21 +26,12 @@ class Middleware {
 
 
   autoReLogin({
-    baseUrl,
-    verifyKey,
     password
   }) {
-    const {
-      Bot
-    } = require('./index.js');
-
     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();
@@ -649,26 +640,100 @@ class Middleware {
           throw new Error('Middleware.syncWrapper 消息格式出错');
         }
 
-        data.waitFor = {
-          messageChain: () => {
-            var _data$bot, _data$bot$waiter;
+        const watiForMessageChain = async qq => {
+          var _qq, _data$sender17;
 
-            return (_data$bot = data.bot) === null || _data$bot === void 0 ? void 0 : (_data$bot$waiter = _data$bot.waiter) === null || _data$bot$waiter === void 0 ? void 0 : _data$bot$waiter.wait(data.type, ({
-              messageChain
-            }) => messageChain);
-          },
-          text: () => {
-            var _data$bot2, _data$bot2$waiter;
+          qq = (_qq = qq) !== null && _qq !== void 0 ? _qq : data === null || data === void 0 ? void 0 : (_data$sender17 = data.sender) === null || _data$sender17 === void 0 ? void 0 : _data$sender17.id;
 
-            return (_data$bot2 = data.bot) === null || _data$bot2 === void 0 ? void 0 : (_data$bot2$waiter = _data$bot2.waiter) === null || _data$bot2$waiter === void 0 ? void 0 : _data$bot2$waiter.wait(data.type, new Middleware().textProcessor().done(({
-              text
-            }) => text));
-          },
-          custom: processor => {
-            var _data$bot3, _data$bot3$waiter;
+          if (qq == undefined) {
+            throw new Error('Middleware.syncWrapper 消息格式出错');
+          }
+
+          do {
+            var _await$data$bot$waite, _data$bot, _data$bot$waiter;
+
+            var {
+              messageChain,
+              id
+            } = (_await$data$bot$waite = await ((_data$bot = data.bot) === null || _data$bot === void 0 ? void 0 : (_data$bot$waiter = _data$bot.waiter) === null || _data$bot$waiter === void 0 ? void 0 : _data$bot$waiter.wait(data.type, ({
+              messageChain,
+              sender: {
+                id
+              }
+            }) => ({
+              messageChain,
+              id
+            })))) !== null && _await$data$bot$waite !== void 0 ? _await$data$bot$waite : {};
+          } while (qq != id);
+
+          return messageChain;
+        };
+
+        const waitForText = async qq => {
+          var _qq2, _data$sender18;
+
+          qq = (_qq2 = qq) !== null && _qq2 !== void 0 ? _qq2 : data === null || data === void 0 ? void 0 : (_data$sender18 = data.sender) === null || _data$sender18 === void 0 ? void 0 : _data$sender18.id;
 
-            return (_data$bot3 = data.bot) === null || _data$bot3 === void 0 ? void 0 : (_data$bot3$waiter = _data$bot3.waiter) === null || _data$bot3$waiter === void 0 ? void 0 : _data$bot3$waiter.wait(data.type, processor);
+          if (qq == undefined) {
+            throw new Error('Middleware.syncWrapper 消息格式出错');
           }
+
+          do {
+            var _await$data$bot$waite2, _data$bot2, _data$bot2$waiter;
+
+            var {
+              text,
+              id
+            } = (_await$data$bot$waite2 = await ((_data$bot2 = data.bot) === null || _data$bot2 === void 0 ? void 0 : (_data$bot2$waiter = _data$bot2.waiter) === null || _data$bot2$waiter === void 0 ? void 0 : _data$bot2$waiter.wait(data.type, new Middleware().textProcessor().done(({
+              text,
+              sender: {
+                id
+              }
+            }) => ({
+              text,
+              id
+            }))))) !== null && _await$data$bot$waite2 !== void 0 ? _await$data$bot$waite2 : {};
+          } while (qq != id);
+
+          return text;
+        };
+
+        const waitForCustom = async (qq, processor) => {
+          var _qq3, _data$sender19;
+
+          qq = (_qq3 = qq) !== null && _qq3 !== void 0 ? _qq3 : data === null || data === void 0 ? void 0 : (_data$sender19 = data.sender) === null || _data$sender19 === void 0 ? void 0 : _data$sender19.id;
+
+          if (qq == undefined) {
+            throw new Error('Middleware.syncWrapper 消息格式出错');
+          }
+
+          do {
+            var _data$sender20, _data$bot3, _data$bot3$waiter;
+
+            var data = await ((_data$bot3 = data.bot) === null || _data$bot3 === void 0 ? void 0 : (_data$bot3$waiter = _data$bot3.waiter) === null || _data$bot3$waiter === void 0 ? void 0 : _data$bot3$waiter.wait(data.type, new Middleware().textProcessor().done(data => data)));
+          } while (qq != (data === null || data === void 0 ? void 0 : (_data$sender20 = data.sender) === null || _data$sender20 === void 0 ? void 0 : _data$sender20.id));
+
+          return await processor(data);
+        };
+
+        data.waitFor = {
+          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();
       } catch (error) {

package/dist/node/core/getFriendList.js

@@ -41,10 +41,10 @@ module.exports = async ({
 
     try {
       var {
-        data,
         data: {
           msg: message,
-          code
+          code,
+          data
         }
       } = responseData;
     } catch (error) {

package/dist/node/core/sendCommand.js

@@ -2,6 +2,10 @@
 
 const axios = require('axios').default;
 
+const {
+  errCodeMap
+} = require('../util/errCode');
+
 let URL;
 
 if (!process.browser) {
@@ -16,39 +20,46 @@ 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
+  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
+      sessionKey,
+      command
     });
 
     try {
       var {
-        data: message
+        data: {
+          msg: message,
+          code
+        }
       } = responseData;
     } catch (error) {
       throw new Error('core.sendCommand 请求返回格式出错，请检查 mirai-console');
+    } // 抛出 mirai 的异常，到 catch 中处理后再抛出
+
+
+    if (code in errCodeMap) {
+      throw new Error(message);
     }
 
     return {
-      message
+      message,
+      code
     };
   } catch (error) {
     errorHandler(error);

package/dist/node/core/sendTempMessage.js

@@ -39,28 +39,20 @@ module.exports = async ({
 }) => {
   try {
     // 拼接 url
-    const url = new URL('/sendTempMessage', baseUrl).toString(); // 请求
+    const url = new URL('/sendTempMessage', baseUrl).toString();
 
-    var responseData;
+    if (!qq || !group) {
+      throw new Error('sendTempMessage 缺少必要的 qq 和 group 参数');
+    } // 请求
 
-    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 参数');
-    }
+
+    const responseData = await axios.post(url, {
+      sessionKey,
+      qq,
+      group,
+      quote,
+      messageChain
+    });
 
     try {
       var {

package/dist/node/core/startListeningBrowser.js

@@ -49,7 +49,9 @@ module.exports = async ({
         data
       }) => {
         try {
-          message(JSON.parse(data));
+          var _JSON$parse;
+
+          message((_JSON$parse = JSON.parse(data)) === null || _JSON$parse === void 0 ? void 0 : _JSON$parse.data);
         } catch (error) {} // eslint-disable-line no-empty
 
       };

package/docs/checkDocShouldBuild.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+echo "🛑 - Build cancelled"
+exit 0;

package/package.json

@@ -1,52 +1,52 @@
-{
-    "name": "mirai-js",
-    "version": "2.0.1",
-    "description": "QQ robot development framework based on Mirai-api-http.",
-    "main": "dist/node/index.js",
-    "scripts": {
-        "lint": "eslint --fix .",
-        "build": "webpack &&　babel src --out-dir dist/node --copy-files",
-        "prepare": "husky install"
-    },
-    "lint-staged": {
-        "*.js": "eslint --fix",
-        "*.ts": "eslint --fix"
-    },
-    "keywords": [
-        "mirai",
-        "api",
-        "http",
-        "robot"
-    ],
-    "author": {
-        "email": "devgaolihai@foxmail.com",
-        "name": "gaolihai",
-        "url": "https://gaolihai.cool/note/"
-    },
-    "repository": {
-        "type": "git",
-        "url": "https://github.com/Drincann/Mirai-js"
-    },
-    "homepage": "https://drincann.github.io/Mirai-js/",
-    "license": "AGPL-3.0",
-    "dependencies": {
-        "axios": "^0.21.1",
-        "form-data": "^3.0.0",
-        "ws": "^7.4.2"
-    },
-    "devDependencies": {
-        "@babel/cli": "^7.13.14",
-        "@babel/core": "^7.13.14",
-        "@babel/preset-env": "^7.13.12",
-        "@typescript-eslint/eslint-plugin": "^4.15.2",
-        "@typescript-eslint/parser": "^4.15.2",
-        "eslint": "^7.19.0",
-        "husky": "^6.0.0",
-        "lint-staged": "^10.5.4",
-        "path-browserify": "^1.0.1",
-        "process": "^0.11.10",
-        "typescript": "^4.2.2",
-        "webpack": "^5.30.0",
-        "webpack-cli": "^4.6.0"
-    }
+{
+    "name": "mirai-js",
+    "version": "2.2.0",
+    "description": "QQ robot development framework based on Mirai-api-http.",
+    "main": "dist/node/index.js",
+    "scripts": {
+        "lint": "eslint --fix .",
+        "build": "webpack && babel src --out-dir dist/node --copy-files",
+        "prepare": "husky install"
+    },
+    "lint-staged": {
+        "*.js": "eslint --fix",
+        "*.ts": "eslint --fix"
+    },
+    "keywords": [
+        "mirai",
+        "api",
+        "http",
+        "robot"
+    ],
+    "author": {
+        "email": "devgaolihai@foxmail.com",
+        "name": "gaolihai",
+        "url": "https://gaolihai.cool/note/"
+    },
+    "repository": {
+        "type": "git",
+        "url": "https://github.com/Drincann/Mirai-js"
+    },
+    "homepage": "https://drincann.github.io/Mirai-js/",
+    "license": "AGPL-3.0",
+    "dependencies": {
+        "axios": "^0.24.0",
+        "form-data": "^3.0.0",
+        "ws": "^7.4.2"
+    },
+    "devDependencies": {
+        "@babel/cli": "^7.13.14",
+        "@babel/core": "^7.13.14",
+        "@babel/preset-env": "^7.13.12",
+        "@typescript-eslint/eslint-plugin": "^5.4.0",
+        "@typescript-eslint/parser": "^5.5.0",
+        "eslint": "^8.2.0",
+        "husky": "^6.0.0",
+        "lint-staged": "^12.0.2",
+        "path-browserify": "^1.0.1",
+        "process": "^0.11.10",
+        "typescript": "^4.2.2",
+        "webpack": "^5.30.0",
+        "webpack-cli": "^4.6.0"
+    }
 }

package/src/Bot.d.ts

@@ -253,6 +253,11 @@ export class Bot implements BotConfigGetable {
      */
     setEssence({ messageId }: Bot.SetEssenceOptions): Promise<void>;
 
+    /**
+     * @description 向 mirai-console 发送指令
+     * @param command 必选，指令名
+     */
+    sendCommand({ command }: Bot.SendCommandOptions): Promise<Bot.MiraiConsoleMessage>;
 
     // 类方法
     /**
@@ -263,17 +268,6 @@ export class Bot implements BotConfigGetable {
      */
     static isBotLoggedIn({ baseUrl, verifyKey, qq }: Bot.IsBotLoggedInOptions): Promise<boolean>;
 
-    /**
-     * @description 向 mirai-console 发送指令
-     * @param baseUrl 必选，mirai-api-http server 的地址
-     * @param verifyKey 必选，mirai-api-http server 设置的 verifyKey
-     * @param command 必选，指令名
-     * @param args    可选，指令的参数
-     */
-    static sendCommand({
-        baseUrl, verifyKey,
-        command, args,
-    }: Bot.SendCommandOptions): Promise<Bot.MiraiConsoleMessage>;
 }
 
 // 类型
@@ -442,10 +436,7 @@ declare namespace Bot {
     }
 
     interface SendCommandOptions {
-        baseUrl: string;
-        verifyKey: string;
-        command: string;
-        args: string[];
+        command: string[];
     }
 
     interface IsBotLoggedInOptions {

package/src/Bot.js

@@ -51,7 +51,6 @@ const { MessageChainGetable, BotConfigGetable } = require('./interface');
 class Bot extends BotConfigGetable {
     constructor() {
         super();
-        // 实例化一个内部类 Waiter
         this.waiter = new Waiter(this);
         this.config = undefined;
         this.eventProcessorMap = {};
@@ -966,6 +965,35 @@ class Bot extends BotConfigGetable {
         await _setEssence({ baseUrl, sessionKey, target: messageId });
     }
 
+    /**
+     * @description 向 mirai-console 发送指令
+     * @param {string[]}   command 必选，指令和参数
+     * @returns {Object} 结构 { message }，注意查看 message 的内容，已知的问题：
+     * 'Login failed: Mirai 无法完成滑块验证. 使用协议 ANDROID_PHONE 强制要求滑块验证, 
+     * 请更换协议后重试. 另请参阅: https://github.com/project-mirai/mirai-login-solver-selenium'
+     */
+    async sendCommand({ command }) {
+        // 检查对象状态
+        if (!this.config) {
+            throw new Error('setEssence 请先调用 open，建立一个会话');
+        }
+
+        // 检查参数
+        if (!command) {
+            throw new Error(`sendCommand 缺少必要的 ${getInvalidParamsString({ command })} 参数`);
+        }
+
+        const { Message } = require('./Message');
+        const { baseUrl, sessionKey } = this.config;
+        return await _sendCommand({
+            baseUrl, sessionKey,
+            command: command
+                .map((v) => v?.toString() ?? '')
+                .reduce((acc, cur) => acc.addText(cur), new Message)
+                .messageChain
+        });
+    }
+
     /**
      * @description 检测该账号是否已经在 mirai-console 登录
      * @param {string} baseUrl 必选，mirai-api-http server 的地址
@@ -990,24 +1018,6 @@ class Bot extends BotConfigGetable {
         }
     }
 
-    /**
-     * @description 向 mirai-console 发送指令
-     * @param {string}   baseUrl 必选，mirai-api-http server 的地址
-     * @param {string}   verifyKey 必选，mirai-api-http server 设置的 verifyKey
-     * @param {string}   command 必选，指令名
-     * @param {string[]} args    可选，指令的参数
-     * @returns {Object} 结构 { message }，注意查看 message 的内容，已知的问题：
-     * 'Login failed: Mirai 无法完成滑块验证. 使用协议 ANDROID_PHONE 强制要求滑块验证, 
-     * 请更换协议后重试. 另请参阅: https://github.com/project-mirai/mirai-login-solver-selenium'
-     */
-    static async sendCommand({ baseUrl, verifyKey, command, args }) {
-        // 检查参数
-        if (!baseUrl || !verifyKey || !command) {
-            throw new Error(`sendCommand 缺少必要的 ${getInvalidParamsString({ baseUrl, verifyKey, command })} 参数`);
-        }
-
-        return await _sendCommand({ baseUrl, verifyKey, command, args });
-    }
 }