mirai-js 2.8.0-0 → 2.8.0-1

package/dist/node/BaseType.d.ts

@@ -1,4 +1,5 @@
 import { Bot } from './Bot';
+import { ArrayToValuesUnion } from './typeHelpers';
 
 /**
  * 消息链的元素，是 mirai-api-http 接口需要的原始类型
@@ -154,7 +155,7 @@ interface Friend {
     remark: string;
 }
 
-interface EventTypes {
+interface EventEntityMap {
     error: {
         code: number;
     } & EventBaseType,
@@ -352,10 +353,9 @@ interface EventTypes {
         nick: string,
         message: string
     } & RequestEventExtendType & EventBaseType;
-    AnyEvent: EventBaseType;
 }
 
-type EventType = keyof EventTypes;
+type EventType = keyof EventEntityMap;
 
 type Awaitable<T> = T | PromiseLike<T>;
 
@@ -366,7 +366,8 @@ type GroupPermission = 'OWNER' | 'ADMINISTRATOR' | 'MEMBER';
 type SEX = 'UNKNOWN' | 'MALE' | 'FEMALE';
 
 // 消息处理器
-type Processor<U extends keyof EventTypes> = (data: EventTypes[U]) => Awaitable<void | any>
+type Processor<U extends EventType[] | 'UnknownEventType' = 'UnknownEventType'> =
+    (data: U extends 'UnknownEventType' ? EventBaseType : EventEntityMap[ArrayToValuesUnion<U extends 'UnknownEventType' ? never : U>]) => Awaitable<void | any>;
 
 // QQ 自带表情
 type FaceType =
@@ -433,7 +434,7 @@ export {
     // 图片 id  语音 id  消息 id
     ImageId, VoiceId, MessageId,
     // 事件类型            群成员权限        性别
-    EventType, EventTypes, GroupPermission, SEX,
+    EventType, EventEntityMap, GroupPermission, SEX,
     // QQ 自带表情
     FaceType,
     Processor,

package/dist/node/Bot.d.ts

@@ -3,7 +3,7 @@ import {
     ImageId, VoiceId, MessageId,
 
     // 事件类型    群成员权限      性别
-    EventType, EventTypes, GroupPermission, SEX,
+    EventType, EventEntityMap, GroupPermission, SEX,
 
     // 接口               原始消息类型  事件处理器类型
     MessageChainGetable, BotConfigGetable, MessageType,
@@ -93,8 +93,8 @@ export class Bot implements BotConfigGetable {
      * @param callback  必选，回调函数
      * @returns handle 事件处理器的标识，用于移除该处理器
      */
-    on<U extends keyof EventTypes>(eventType: U, callback: Processor<U>): number;
-    on<U extends (keyof EventTypes)[]>(eventType: U, callback: Processor<U[number]>): number[];
+    on<U extends EventType>(eventType: U, callback: Processor<[U]>): number;
+    on<U extends EventType[]>(eventType: U, callback: Processor<U>): number[];
 
     /**
      * @description 添加一个一次性事件处理器，回调一次后自动移除
@@ -104,8 +104,8 @@ export class Bot implements BotConfigGetable {
      *                  当为 true 时，只有开发者的处理器结束后才会移除该处理器
      *                  当为 false 时，即使消息被拦截，也会移除该处理器
      */
-    one<U extends keyof EventTypes>(eventType: U, callback: Processor<U>, strict: boolean): void;
-    one<U extends (keyof EventTypes)[]>(eventType: U, callback: Processor<U[number]>, strict: boolean): void;
+    one<U extends EventType>(eventType: U, callback: Processor<[U]>, strict: boolean): void;
+    one<U extends EventType[]>(eventType: U, callback: Processor<U>, strict: boolean): void;
 
     /**
      * @description 移除一个事件处理器
@@ -323,7 +323,7 @@ declare namespace Bot {
     type EventProcessorMap = {
         // 索引不能使用联合类型
         [eventType in EventType]: {
-            [handler: number]: (data: EventTypes[eventType]) => Awaitable<void | any>;
+            [handler: number]: (data: EventEntityMap[eventType]) => Awaitable<void | any>;
         };
     }
 

package/dist/node/Middleware.d.ts

@@ -128,12 +128,12 @@ export class Middleware {
      * @description 生成一个带有中间件的事件处理器
      * @param callback 事件处理器
      */
-    done(callback: Processor<'AnyEvent'>): Processor<'AnyEvent'>;
+    done(callback: Processor): Processor;
 
 }
 
 declare namespace Middleware {
-    type NextMiddlewareCaller = () => NextMiddlewareCaller | Processor<'AnyEvent'>;
+    type NextMiddlewareCaller = () => NextMiddlewareCaller | Processor;
 
     interface GroupMemberMap {
         [group: number]: number[];

package/dist/node/Waiter.d.ts

@@ -9,5 +9,5 @@ export class Waiter {
      * @param eventType 事件类型
      * @param callback  处理器，其返回值将被 resolve，传递到外部
      */
-    wait(eventType: EventType, callback: Processor<'AnyEvent'>): Promise<any>;
+    wait(eventType: EventType, callback: Processor): Promise<any>;
 }

package/dist/node/index.d.ts

@@ -1,6 +1,8 @@
-import { Bot as BotType } from './Bot';
-import { Message as MessageType } from './Message';
-import { Middleware as MiddlewareType } from './Middleware';
+import { Bot, Bot as BotType } from './Bot';
+import { Message, Message as MessageType } from './Message';
+import { Middleware, Middleware as MiddlewareType } from './Middleware';
+
+export { Bot, Message, Middleware };
 declare module 'mirai-js' {
     export const Bot: typeof BotType;
     export const Message: typeof MessageType;

package/dist/node/typeHelpers.d.ts

@@ -0,0 +1,2 @@
+// 将数组转换为
+export type ArrayToValuesUnion<T extends string[]> = T extends (infer E)[] ? E : never;

package/index.ts

@@ -0,0 +1,7 @@
+import { Bot } from './src';
+const bot = new Bot();
+bot.on(['FriendMessage', 'NewFriendRequestEvent'], e => {
+
+
+
+})

package/package.json

@@ -1,11 +1,11 @@
 {
     "name": "mirai-js",
-    "version": "2.8.0-0",
+    "version": "2.8.0-1",
     "description": "QQ robot development framework based on Mirai-api-http.",
     "main": "dist/node/index.js",
     "scripts": {
         "lint": "eslint --fix .",
-        "build": "tsc --noEmit src/*.d.ts && webpack && babel src --out-dir dist/node --copy-files",
+        "build": "rm -rf dist && tsc --noEmit src/*.d.ts && webpack && babel src --out-dir dist/node --copy-files",
         "prepare": "husky install"
     },
     "lint-staged": {

package/src/BaseType.d.ts

@@ -1,4 +1,5 @@
 import { Bot } from './Bot';
+import { ArrayToValuesUnion } from './typeHelpers';
 
 /**
  * 消息链的元素，是 mirai-api-http 接口需要的原始类型
@@ -154,7 +155,7 @@ interface Friend {
     remark: string;
 }
 
-interface EventTypes {
+interface EventEntityMap {
     error: {
         code: number;
     } & EventBaseType,
@@ -352,10 +353,9 @@ interface EventTypes {
         nick: string,
         message: string
     } & RequestEventExtendType & EventBaseType;
-    AnyEvent: EventBaseType;
 }
 
-type EventType = keyof EventTypes;
+type EventType = keyof EventEntityMap;
 
 type Awaitable<T> = T | PromiseLike<T>;
 
@@ -366,7 +366,8 @@ type GroupPermission = 'OWNER' | 'ADMINISTRATOR' | 'MEMBER';
 type SEX = 'UNKNOWN' | 'MALE' | 'FEMALE';
 
 // 消息处理器
-type Processor<U extends keyof EventTypes> = (data: EventTypes[U]) => Awaitable<void | any>
+type Processor<U extends EventType[] | 'UnknownEventType' = 'UnknownEventType'> =
+    (data: U extends 'UnknownEventType' ? EventBaseType : EventEntityMap[ArrayToValuesUnion<U extends 'UnknownEventType' ? never : U>]) => Awaitable<void | any>;
 
 // QQ 自带表情
 type FaceType =
@@ -433,7 +434,7 @@ export {
     // 图片 id  语音 id  消息 id
     ImageId, VoiceId, MessageId,
     // 事件类型            群成员权限        性别
-    EventType, EventTypes, GroupPermission, SEX,
+    EventType, EventEntityMap, GroupPermission, SEX,
     // QQ 自带表情
     FaceType,
     Processor,

package/src/Bot.d.ts

@@ -3,7 +3,7 @@ import {
     ImageId, VoiceId, MessageId,
 
     // 事件类型    群成员权限      性别
-    EventType, EventTypes, GroupPermission, SEX,
+    EventType, EventEntityMap, GroupPermission, SEX,
 
     // 接口               原始消息类型  事件处理器类型
     MessageChainGetable, BotConfigGetable, MessageType,
@@ -93,8 +93,8 @@ export class Bot implements BotConfigGetable {
      * @param callback  必选，回调函数
      * @returns handle 事件处理器的标识，用于移除该处理器
      */
-    on<U extends keyof EventTypes>(eventType: U, callback: Processor<U>): number;
-    on<U extends (keyof EventTypes)[]>(eventType: U, callback: Processor<U[number]>): number[];
+    on<U extends EventType>(eventType: U, callback: Processor<[U]>): number;
+    on<U extends EventType[]>(eventType: U, callback: Processor<U>): number[];
 
     /**
      * @description 添加一个一次性事件处理器，回调一次后自动移除
@@ -104,8 +104,8 @@ export class Bot implements BotConfigGetable {
      *                  当为 true 时，只有开发者的处理器结束后才会移除该处理器
      *                  当为 false 时，即使消息被拦截，也会移除该处理器
      */
-    one<U extends keyof EventTypes>(eventType: U, callback: Processor<U>, strict: boolean): void;
-    one<U extends (keyof EventTypes)[]>(eventType: U, callback: Processor<U[number]>, strict: boolean): void;
+    one<U extends EventType>(eventType: U, callback: Processor<[U]>, strict: boolean): void;
+    one<U extends EventType[]>(eventType: U, callback: Processor<U>, strict: boolean): void;
 
     /**
      * @description 移除一个事件处理器
@@ -323,7 +323,7 @@ declare namespace Bot {
     type EventProcessorMap = {
         // 索引不能使用联合类型
         [eventType in EventType]: {
-            [handler: number]: (data: EventTypes[eventType]) => Awaitable<void | any>;
+            [handler: number]: (data: EventEntityMap[eventType]) => Awaitable<void | any>;
         };
     }
 

package/src/Middleware.d.ts

@@ -128,12 +128,12 @@ export class Middleware {
      * @description 生成一个带有中间件的事件处理器
      * @param callback 事件处理器
      */
-    done(callback: Processor<'AnyEvent'>): Processor<'AnyEvent'>;
+    done(callback: Processor): Processor;
 
 }
 
 declare namespace Middleware {
-    type NextMiddlewareCaller = () => NextMiddlewareCaller | Processor<'AnyEvent'>;
+    type NextMiddlewareCaller = () => NextMiddlewareCaller | Processor;
 
     interface GroupMemberMap {
         [group: number]: number[];

package/src/Waiter.d.ts

@@ -9,5 +9,5 @@ export class Waiter {
      * @param eventType 事件类型
      * @param callback  处理器，其返回值将被 resolve，传递到外部
      */
-    wait(eventType: EventType, callback: Processor<'AnyEvent'>): Promise<any>;
+    wait(eventType: EventType, callback: Processor): Promise<any>;
 }

package/src/index.d.ts

@@ -1,6 +1,8 @@
-import { Bot as BotType } from './Bot';
-import { Message as MessageType } from './Message';
-import { Middleware as MiddlewareType } from './Middleware';
+import { Bot, Bot as BotType } from './Bot';
+import { Message, Message as MessageType } from './Message';
+import { Middleware, Middleware as MiddlewareType } from './Middleware';
+
+export { Bot, Message, Middleware };
 declare module 'mirai-js' {
     export const Bot: typeof BotType;
     export const Message: typeof MessageType;

package/src/typeHelpers.d.ts

@@ -0,0 +1,2 @@
+// 将数组转换为
+export type ArrayToValuesUnion<T extends string[]> = T extends (infer E)[] ? E : never;

package/dist/node/ForwardNode.d.ts

@@ -1,15 +0,0 @@
-import { ForwardNodeGetable, ForwardNodeType, MessageId } from './BaseType';
-
-// Bot.sendForward 的 nodeList 参数是一个 ForwardNode 类型的实例
-// 方法内部通过 ForwardNodeType 接口的 getForwardNode 方法拿到消息链
-export class ForwardNode implements ForwardNodeGetable {
-    private nodeList: ForwardNodeType[];
-
-    // 自行添加一个消息节点
-    addForwardNode(nodeList: ForwardNodeType): ForwardNode;
-    // 使用 MessageId 添加一个消息节点
-    addForwardNodeById(ID: MessageId): ForwardNode;
-
-    // implements ForwardNodeGetable
-    getForwardNode(): ForwardNodeType[];
-}

package/dist/node/ForwardNode.js

@@ -1,70 +0,0 @@
-"use strict";
-
-// 用于与 Bot.sendForward 耦合的接口
-const {
-  ForwardNodeGetable,
-  MessageChainGetable
-} = require('./interface');
-
-class ForwardNode_Data {
-  constructor({
-    senderId,
-    time,
-    senderName,
-    messageChain
-  }) {
-    this.senderId = senderId;
-    this.time = time;
-    this.senderName = senderName;
-    this.messageChain = messageChain;
-  }
-
-}
-
-class ForwardNode_Id {
-  constructor({
-    messageId
-  }) {
-    this.messageId = messageId;
-  }
-
-}
-/**
- * @description 本框架抽象的消息节点
- */
-
-
-class ForwardNode extends ForwardNodeGetable {
-  constructor() {
-    super();
-    this.nodeList = [];
-  } // 手动添加节点
-
-
-  addForwardNode(nodeList) {
-    if (nodeList.messageChain instanceof MessageChainGetable) {
-      nodeList.messageChain = nodeList.messageChain.getMessageChain();
-    }
-
-    this.nodeList.push(new ForwardNode_Data(nodeList));
-    return this;
-  } // 使用 messageId 添加节点
-
-
-  addForwardNodeById(messageId) {
-    this.nodeList.push(new ForwardNode_Id({
-      messageId
-    }));
-    return this;
-  } // get 原接口格式的信息链
-
-
-  getForwardNode() {
-    return this.nodeList;
-  }
-
-}
-
-module.exports = {
-  ForwardNode
-};

package/dist/node/core/getGroupFileInfo.js

@@ -1,77 +0,0 @@
-"use strict";
-
-const {
-  errCodeMap
-} = require('../util/errCode');
-
-const axios = require('axios').default;
-
-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 {number} target     群号
- * @param {string} id         文件 id
- * @returns {Object}   
- * 结构 { 
- *     id, name, path, length, downloadTimes, uploaderId, 
- *     uploadTime, lastModifyTime, downloadUrl, sha1, md5
- * }
- */
-
-module.exports = async ({
-  baseUrl,
-  sessionKey,
-  target,
-  id
-}) => {
-  try {
-    // 拼接 url
-    const url = new URL('/groupFileInfo', baseUrl).toString(); // 请求
-
-    const responseData = await axios.get(url, {
-      params: {
-        sessionKey,
-        target,
-        id
-      }
-    });
-
-    try {
-      var {
-        data,
-        data: {
-          msg: message,
-          code
-        }
-      } = responseData;
-    } catch (error) {
-      throw new Error('请求返回格式出错，请检查 mirai-console');
-    } // 抛出 mirai 的异常，到 catch 中处理后再抛出
-
-
-    if (code in errCodeMap) {
-      throw new Error(message);
-    }
-
-    return data;
-  } catch (error) {
-    console.error(`mirai-js: error ${locationStr}`);
-    errorHandler(error);
-  }
-};

package/dist/node/core/getGroupFileList.js

@@ -1,73 +0,0 @@
-"use strict";
-
-const {
-  errCodeMap
-} = require('../util/errCode');
-
-const axios = require('axios').default;
-
-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 {number} target     群号
- * @param {string} dir        可选，查询目录，默认为根目录
- * @returns {Object[]}   结构 array[...{ id, name, path, isFile }]
- */
-
-module.exports = async ({
-  baseUrl,
-  sessionKey,
-  target,
-  dir
-}) => {
-  try {
-    // 拼接 url
-    const url = new URL('/groupFileList', baseUrl).toString(); // 请求
-
-    const responseData = await axios.get(url, {
-      params: {
-        sessionKey,
-        target,
-        dir
-      }
-    });
-
-    try {
-      var {
-        data,
-        data: {
-          msg: message,
-          code
-        }
-      } = responseData;
-    } catch (error) {
-      throw new Error('请求返回格式出错，请检查 mirai-console');
-    } // 抛出 mirai 的异常，到 catch 中处理后再抛出
-
-
-    if (code in errCodeMap) {
-      throw new Error(message);
-    }
-
-    return data;
-  } catch (error) {
-    console.error(`mirai-js: error ${locationStr}`);
-    errorHandler(error);
-  }
-};

package/dist/node/core/groupFileDelete.js

@@ -1,73 +0,0 @@
-"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 {number} target     群号
- * @param {number} id         文件 id
- * @returns {Object} 结构 { message, code }
- */
-
-module.exports = async ({
-  baseUrl,
-  sessionKey,
-  target,
-  id
-}) => {
-  try {
-    // 拼接 url
-    const url = new URL('/groupFileDelete', baseUrl).toString(); // 请求
-
-    const responseData = await axios.post(url, {
-      sessionKey,
-      target,
-      id
-    });
-
-    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);
-  }
-};

package/dist/node/core/groupFileMove.js

@@ -1,76 +0,0 @@
-"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 {number} target     群号
- * @param {number} id         文件 id
- * @param {string} movePath   目标 path
- * @returns {Object} 结构 { message, code }
- */
-
-module.exports = async ({
-  baseUrl,
-  sessionKey,
-  target,
-  id,
-  movePath
-}) => {
-  try {
-    // 拼接 url
-    const url = new URL('/groupFileMove', baseUrl).toString(); // 请求
-
-    const responseData = await axios.post(url, {
-      sessionKey,
-      target,
-      id,
-      movePath
-    });
-
-    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);
-  }
-};

package/dist/node/core/groupFileRename.js

@@ -1,76 +0,0 @@
-"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 {number} target     群号
- * @param {number} id         文件 id
- * @param {string} rename     重命名
- * @returns {Object} 结构 { message, code }
- */
-
-module.exports = async ({
-  baseUrl,
-  sessionKey,
-  target,
-  id,
-  rename
-}) => {
-  try {
-    // 拼接 url
-    const url = new URL('/groupFileRename', baseUrl).toString(); // 请求
-
-    const responseData = await axios.post(url, {
-      sessionKey,
-      target,
-      id,
-      rename
-    });
-
-    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);
-  }
-};

package/dist/node/core/sendFirendMessage.js

@@ -1,68 +0,0 @@
-"use strict";
-
-const {
-  errCodeMap
-} = require('../util/errCode');
-
-const axios = require('axios').default;
-
-const {
-  URL
-} = require('../polyfill/URL');
-
-const errorHandler = require('../util/errorHandler');
-
-const path = require('path');
-
-const locationStr = `core.${path.basename(__filename, path.extname(__filename))}`;
-/**
- * @description 向 qq 好友发送消息
- * @param {string}             baseUrl      mirai-api-http server 的地址
- * @param {string}             sessionKey   会话标识
- * @param {number}             target       目标好友 qq 号
- * @param {number}             quote        消息引用，使用发送时返回的 messageId
- * @param {MessageType[]} messageChain 消息链，MessageType 数组
- * @returns {Object} 结构 { message, code, messageId }
- */
-
-module.exports = async ({
-  baseUrl,
-  sessionKey,
-  target,
-  quote,
-  messageChain
-}) => {
-  try {
-    // 拼接 url
-    const url = new URL('/sendFriendMessage', baseUrl).toString(); // 请求
-
-    const responseData = await axios.post(url, {
-      sessionKey,
-      target,
-      quote,
-      messageChain
-    });
-
-    try {
-      var {
-        data: {
-          msg: message,
-          code,
-          messageId
-        }
-      } = responseData;
-    } catch (error) {
-      throw new Error('请求返回格式出错，请检查 mirai-console');
-    } // 抛出 mirai 的异常，到 catch 中处理后再抛出
-
-
-    if (code in errCodeMap) {
-      throw new Error(message);
-    }
-
-    return messageId;
-  } catch (error) {
-    console.error(`mirai-js: error ${locationStr}`);
-    errorHandler(error);
-  }
-};

package/dist/node/core/uploadFileAndSend.js

@@ -1,87 +0,0 @@
-"use strict";
-
-const {
-  errCodeMap
-} = require('../util/errCode');
-
-const axios = require('axios').default;
-
-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))}`;
-
-const FormData = require('form-data');
-/**
- * @description 上传文件至服务器并发送，返回文件 id
- * @param {string}  baseUrl    mirai-api-http server 的地址
- * @param {string}  sessionKey 会话标识
- * @param {string}  type       "friend" 或 "group"，目前仅支持 group
- * @param {string}  target     群/好友号
- * @param {string}  path       上传目录
- * @param {Buffer}  file       文件二进制数据
- * @returns {string} 文件 id
- */
-
-
-module.exports = async ({
-  baseUrl,
-  sessionKey,
-  type,
-  target,
-  path,
-  file
-}) => {
-  try {
-    // 拼接 url
-    const targetUrl = new URL('/uploadFileAndSend', baseUrl).toString(); // 构造 fromdata
-
-    const form = new FormData();
-    form.append('sessionKey', sessionKey);
-    form.append('type', type);
-    form.append('target', target);
-    form.append('path', path);
-    form.append('file', file, {
-      filename: 'payload'
-    }); // 请求
-
-    const responseData = await axios.post(targetUrl, form, {
-      // formdata.getHeaders 将会指定 content-type，同时给定随
-      // 机生成的 boundary，即分隔符，用以分隔多个表单项而不会造成混乱
-      headers: form.getHeaders()
-    });
-
-    try {
-      var {
-        data: {
-          msg: message,
-          code,
-          id
-        }
-      } = responseData;
-    } catch (error) {
-      throw new Error('请求返回格式出错，请检查 mirai-console');
-    } // 抛出 mirai 的异常，到 catch 中处理后再抛出
-
-
-    if (code in errCodeMap) {
-      throw new Error(message);
-    }
-
-    return id;
-  } catch (error) {
-    console.error(`mirai-js: error ${locationStr}`);
-    errorHandler(error);
-  }
-};