mirai-js 2.0.2 → 2.3.0

package/dist/node/Bot.d.ts

@@ -146,9 +146,9 @@ export class Bot implements BotConfigGetable {
 
     /**
      * @description 上传语音至服务器，返回 voiceId, url 及 path
-     * @param {string} type     目前仅支持 "group"，请忽略该参数
-     * @param {Buffer} voice    二选一，语音二进制数据
-     * @param {string} filename 二选一，语音文件路径
+     * @param type     目前仅支持 "group"，请忽略该参数
+     * @param voice    二选一，语音二进制数据
+     * @param filename 二选一，语音文件路径
      */
     uploadVoice({ type, voice, filename }: Bot.UploadVoiceOptions): Promise<Bot.VoiceInfo>;
 
@@ -181,8 +181,9 @@ export class Bot implements BotConfigGetable {
      * @param qq    必选，群成员的 qq 号
      * @param name  可选，要设置的群名片
      * @param title 可选，要设置的群头衔
+     * @param permission 可选，要设置的群头衔
      */
-    setMemberInfo({ group, qq, name, title }: Bot.SetMemberInfoOptions): Promise<void>;
+    setMemberInfo({ group, qq, name, title, permission }: Bot.SetMemberInfoOptions): Promise<void>;
 
     /**
      * @description 禁言群成员
@@ -219,6 +220,12 @@ export class Bot implements BotConfigGetable {
      */
     removeMember({ group, qq, message }: Bot.RemoveMemberOptions): Promise<void>;
 
+    /**
+     * @description 删除好友
+     * @param qq 欲删除的好友 qq 号
+     */
+    removeFriend({ qq }: Bot.RemoveFriendOptions): Promise<void>;
+
     /**
      * @description 移除群成员
      * @param group   必选，欲移除的成员所在群号
@@ -253,6 +260,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 +275,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>;
 }
 
 // 类型
@@ -383,6 +384,7 @@ declare namespace Bot {
         qq: number;
         name?: string;
         title?: string;
+        permission?: GroupPermission
     }
 
     interface MuteOptions {
@@ -410,6 +412,10 @@ declare namespace Bot {
         message?: string;
     }
 
+    interface RemoveFriendOptions {
+        qq: number;
+    }
+
     interface QuitGroupOptions {
         group: number;
     }
@@ -442,10 +448,7 @@ declare namespace Bot {
     }
 
     interface SendCommandOptions {
-        baseUrl: string;
-        verifyKey: string;
-        command: string;
-        args: string[];
+        command: string[];
     }
 
     interface IsBotLoggedInOptions {

package/dist/node/Bot.js

@@ -35,6 +35,8 @@ const _getMemberInfo = require('./core/getMemberInfo');
 
 const _setMemberInfo = require('./core/setMemberInfo');
 
+const _setMemberAdmin = require('./core/setMemberAdmin');
+
 const _recall = require('./core/recall');
 
 const _mute = require('./core/mute');
@@ -47,6 +49,8 @@ const _unmuteAll = require('./core/unmuteAll');
 
 const _removeMember = require('./core/removeMember');
 
+const _removeFriend = require('./core/removeFriend');
+
 const _quitGroup = require('./core/quitGroup');
 
 const _getGroupConfig = require('./core/getGroupConfig');
@@ -97,8 +101,7 @@ const {
 
 class Bot extends BotConfigGetable {
   constructor() {
-    super(); // 实例化一个内部类 Waiter
-
+    super();
     this.waiter = new Waiter(this);
     this.config = undefined;
     this.eventProcessorMap = {};
@@ -954,6 +957,8 @@ class Bot extends BotConfigGetable {
    * @param {number} qq    必选，群成员的 qq 号
    * @param {string} name  可选，要设置的群名片
    * @param {string} title 可选，要设置的群头衔
+   * @param {boolean} permission 可选，要设置的权限，
+   * 使用枚举值：Bot.Permission.Admin, Bot.Permission.Member
    * @returns {void}
    */
 
@@ -962,7 +967,8 @@ class Bot extends BotConfigGetable {
     group,
     qq,
     name,
-    title
+    title,
+    permission
   }) {
     // 检查对象状态
     if (!this.config) {
@@ -975,21 +981,39 @@ class Bot extends BotConfigGetable {
         group,
         qq
       })} 参数`);
-    } // 获取列表
+    }
+
+    if (permission != undefined && permission != Bot.groupPermission.ADMINISTRATOR && permission != Bot.groupPermission.MEMBER) {
+      throw new Error('setMemberInfo admin 参数只能是 Bot.groupPermission.ADMINISTRATOR 或 Bot.groupPermission.Member');
+    } // setMemberInfo
 
 
     const {
       baseUrl,
       sessionKey
     } = this.config;
-    await _setMemberInfo({
-      baseUrl,
-      sessionKey,
-      target: group,
-      memberId: qq,
-      name,
-      specialTitle: title
-    });
+
+    if (name != undefined || title != undefined) {
+      await _setMemberInfo({
+        baseUrl,
+        sessionKey,
+        target: group,
+        memberId: qq,
+        name,
+        specialTitle: title
+      });
+    } // setPermission
+
+
+    if (permission != undefined) {
+      await _setMemberAdmin({
+        baseUrl,
+        sessionKey,
+        target: group,
+        memberId: qq,
+        assign: permission == Bot.groupPermission.ADMINISTRATOR ? true : false
+      });
+    }
   }
   /**
    * @description 禁言群成员
@@ -1171,6 +1195,37 @@ class Bot extends BotConfigGetable {
       msg: message
     });
   }
+  /**
+   * @description 删除好友
+   * @param {*} qq 欲删除的好友 qq 号
+   * @returns {void}
+   */
+
+
+  async removeFriend({
+    qq
+  }) {
+    // 检查对象状态
+    if (!this.config) {
+      throw new Error('removeFriend 请先调用 open，建立一个会话');
+    } // 检查参数
+
+
+    if (!qq) {
+      throw new Error('removeFriend 缺少必要的 qq 参数');
+    }
+
+    const {
+      baseUrl,
+      sessionKey
+    } = this.config; // 删除好友
+
+    await _removeFriend({
+      baseUrl,
+      sessionKey,
+      target: qq
+    });
+  }
   /**
    * @description 移除群成员
    * @param {number} group   必选，欲移除的成员所在群号
@@ -1181,7 +1236,7 @@ class Bot extends BotConfigGetable {
   async quitGroup({
     group
   }) {
-    // 检查对象状态
+    // 检查对象状态 
     if (!this.config) {
       throw new Error('quitGroup 请先调用 open，建立一个会话');
     } // 检查参数
@@ -1325,6 +1380,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 +1470,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/FileManager.js

@@ -18,7 +18,7 @@ class FileManager {
 
     this._getGroupFileList = ({
       dir
-    }) => require('./core/getGroupFileList')({
+    }) => require('./core/fs/getGroupFileList')({
       baseUrl,
       sessionKey,
       target: group,
@@ -27,7 +27,7 @@ class FileManager {
 
     this._getGroupFileInfo = ({
       id
-    }) => require('./core/getGroupFileInfo')({
+    }) => require('./core/fs/getGroupFileInfo')({
       baseUrl,
       sessionKey,
       target: group,
@@ -38,7 +38,7 @@ class FileManager {
       type,
       path,
       file
-    }) => require('./core/uploadFileAndSend')({
+    }) => require('./core/fs/uploadGroupFIle')({
       baseUrl,
       sessionKey,
       type,
@@ -49,17 +49,26 @@ class FileManager {
 
     this._groupFileDelete = ({
       id
-    }) => require('./core/groupFileDelete')({
+    }) => require('./core/fs/deleteGroupFile')({
       baseUrl,
       sessionKey,
       target: group,
       id
     });
 
+    this._makeGroupDir = ({
+      dir
+    }) => require('./core/fs/makeGroupDir')({
+      baseUrl,
+      sessionKey,
+      target: group,
+      dir
+    });
+
     this._groupFileRename = ({
       id,
       rename
-    }) => require('./core/groupFileRename')({
+    }) => require('./core/fs/renameGroupFile')({
       baseUrl,
       sessionKey,
       target: group,
@@ -70,7 +79,7 @@ class FileManager {
     this._groupFileMove = ({
       id,
       movePath
-    }) => require('./core/groupFileMove')({
+    }) => require('./core/fs/moveGroupFile')({
       baseUrl,
       sessionKey,
       target: group,

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/auth.js

@@ -17,6 +17,10 @@ if (!process.browser) {
 }
 
 const errorHandler = require('../util/errorHandler');
+
+const path = require('path');
+
+const locationStr = `core.${path.basename(__filename, path.extname(__filename))}`;
 /**
  *
  * @description 认证 verifyKey，创建回话，返回一个 sessionKey
@@ -25,7 +29,6 @@ const errorHandler = require('../util/errorHandler');
  * @returns {string} 会话标识 sessionKey
  */
 
-
 module.exports = async ({
   baseUrl,
   verifyKey
@@ -47,7 +50,7 @@ module.exports = async ({
         }
       } = responseData;
     } catch (error) {
-      throw new Error('core.auth 请求返回格式出错，请检查 mirai-console');
+      throw new Error('请求返回格式出错，请检查 mirai-console');
     } // 抛出 mirai 的异常，到 catch 中处理后再抛出
 
 
@@ -57,6 +60,7 @@ module.exports = async ({
 
     return sessionKey;
   } catch (error) {
+    console.error(`mirai-js: error ${locationStr}`);
     errorHandler(error);
   }
 };

package/dist/node/core/fs/deleteGroupFile.js

@@ -0,0 +1,77 @@
+"use strict";
+
+const {
+  errCodeMap
+} = require('../../util/errCode');
+
+const axios = require('axios');
+
+let URL;
+
+if (!process.browser) {
+  ({
+    URL
+  } = require('url'));
+} else {
+  URL = window.URL;
+}
+
+const errorHandler = require('../../util/errorHandler');
+
+const path = require('path');
+
+const locationStr = `core.${path.basename(__filename, path.extname(__filename))}`;
+/**
+ * @description 删除群文件
+ * @param {string}  baseUrl          mirai-api-http server 的地址
+ * @param {string}  sessionKey       会话标识
+ * @param {string}  id               文件夹id, 空串为根目录
+ * @param {string}  path             文件夹路径, 文件夹允许重名, 不保证准确, 准确定位使用 id
+ * @param {number}  group            群号
+ * @returns {Object} 结构 { message, code }
+ */
+
+module.exports = async ({
+  baseUrl,
+  sessionKey,
+  id,
+  path,
+  group
+}) => {
+  try {
+    // 拼接 url
+    const url = new URL('/file/delete', baseUrl).toString(); // 请求
+
+    const responseData = await axios.post(url, {
+      sessionKey,
+      id,
+      path,
+      target: group,
+      group
+    });
+
+    try {
+      var {
+        data: {
+          msg: message,
+          code
+        }
+      } = responseData;
+    } catch (error) {
+      throw new Error('请求返回格式出错，请检查 mirai-console');
+    } // 抛出 mirai 的异常，到 catch 中处理后再抛出
+
+
+    if (code in errCodeMap) {
+      throw new Error(message);
+    }
+
+    return {
+      message,
+      code
+    };
+  } catch (error) {
+    console.error(`mirai-js: error ${locationStr}`);
+    errorHandler(error);
+  }
+};