mirai-js 2.4.3 → 2.6.1

package/dist/node/BaseType.d.ts

@@ -40,6 +40,8 @@ interface MessageType {
     // App
     content?: string;
 
+    // Forward
+    nodeList?: ForwardNode[];
 }
 
 // 用于 Bot 获得消息链，Message 使用了该扩展
@@ -47,6 +49,17 @@ interface MessageChainGetable {
     getMessageChain(): MessageType[];
 }
 
+/**
+ * @description 合并转发类型Forward内消息节点的类型定义
+ */
+interface ForwardNode {
+    senderId?: number;
+    time?: number;
+    senderName?: string;
+    messageChain?: MessageType[] | MessageChainGetable;
+    messageId?: MessageId;
+}
+
 /**
  * @description Bot 实现的接口，其他类访问 bot.config
  * 的途径，避免其他类直接访问实现，用来解耦
@@ -104,6 +117,60 @@ type SEX = 'UNKNOWN' | 'MALE' | 'FEMALE'
 // 消息处理器
 type Processor = (data: any) => Promise<any> | any;
 
+// QQ 自带表情
+type FaceType =
+    | '惊讶' | '撇嘴' | '色' | '发呆' | '得意'
+    | '流泪' | '害羞' | '闭嘴' | '睡' | '大哭'
+    | '尴尬' | '发怒' | '调皮' | '呲牙' | '微笑'
+    | '难过' | '酷' | '抓狂' | '吐' | '偷笑'
+    | '可爱' | '白眼' | '傲慢' | '饥饿' | '困'
+    | '惊恐' | '流汗' | '憨笑' | '悠闲' | '奋斗'
+    | '咒骂' | '疑问' | '嘘' | '晕' | '折磨'
+    | '衰' | '骷髅' | '敲打' | '再见' | '发抖'
+    | '爱情' | '跳跳' | '猪头' | '拥抱' | '蛋糕'
+    | '闪电' | '炸弹' | '刀' | '足球' | '便便'
+    | '咖啡' | '饭' | '玫瑰' | '凋谢' | '爱心'
+    | '心碎' | '礼物' | '太阳' | '月亮' | '赞'
+    | '踩' | '握手' | '胜利' | '飞吻' | '怄火'
+    | '西瓜' | '冷汗' | '擦汗' | '抠鼻' | '鼓掌'
+    | '糗大了' | '坏笑' | '左哼哼' | '右哼哼' | '哈欠'
+    | '鄙视' | '委屈' | '快哭了' | '阴险' | '左亲亲'
+    | '吓' | '可怜' | '菜刀' | '啤酒' | '篮球'
+    | '乒乓' | '示爱' | '瓢虫' | '抱拳' | '勾引'
+    | '拳头' | '差劲' | '爱你' | '不' | '好'
+    | '转圈' | '磕头' | '回头' | '跳绳' | '挥手'
+    | '激动' | '街舞' | '献吻' | '左太极' | '右太极'
+    | '双喜' | '鞭炮' | '灯笼' | 'K歌' | '喝彩'
+    | '祈祷' | '爆筋' | '棒棒糖' | '喝奶' | '飞机'
+    | '钞票' | '药' | '手枪' | '茶' | '眨眼睛'
+    | '泪奔' | '无奈' | '卖萌' | '小纠结' | '喷血'
+    | '斜眼笑' | 'doge' | '惊喜' | '骚扰' | '笑哭'
+    | '我最美' | '河蟹' | '羊驼' | '幽灵' | '蛋'
+    | '菊花' | '红包' | '大笑' | '不开心' | '冷漠'
+    | '呃' | '好棒' | '拜托' | '点赞' | '无聊'
+    | '托脸' | '吃' | '送花' | '害怕' | '花痴'
+    | '小样儿' | '飙泪' | '我不看' | '托腮' | '啵啵'
+    | '糊脸' | '拍头' | '扯一扯' | '舔一舔' | '蹭一蹭'
+    | '拽炸天' | '顶呱呱' | '抱抱' | '暴击' | '开枪'
+    | '撩一撩' | '拍桌' | '拍手' | '恭喜' | '干杯'
+    | '嘲讽' | '哼' | '佛系' | '掐一掐' | '惊呆'
+    | '颤抖' | '啃头' | '偷看' | '扇脸' | '原谅'
+    | '喷脸' | '生日快乐' | '头撞击' | '甩头' | '扔狗'
+    | '加油必胜' | '加油抱抱' | '口罩护体' | '搬砖中' | '忙到飞起'
+    | '脑阔疼' | '沧桑' | '捂脸' | '辣眼睛' | '哦哟'
+    | '头秃' | '问号脸' | '暗中观察' | 'emm' | '吃瓜'
+    | '呵呵哒' | '我酸了' | '太南了' | '辣椒酱' | '汪汪'
+    | '汗' | '打脸' | '击掌' | '无眼笑' | '敬礼'
+    | '狂笑' | '面无表情' | '摸鱼' | '魔鬼笑' | '哦'
+    | '请' | '睁眼' | '敲开心' | '震惊' | '让我康康'
+    | '摸锦鲤' | '期待' | '拿到红包' | '真好' | '拜谢'
+    | '元宝' | '牛啊' | '胖三斤' | '好闪' | '左拜年'
+    | '右拜年' | '红包包' | '右亲亲' | '牛气冲天' | '喵喵'
+    | '求红包' | '谢红包' | '新年烟花' | '打call' | '变形'
+    | '嗑到了' | '仔细分析' | '加油' | '我没事' | '菜狗'
+    | '崇拜' | '比心' | '庆祝' | '老色痞' | '拒绝'
+    | '嫌弃' | '吃糖';
+
 // 消息处理器类型
 export {
     // 接口
@@ -112,6 +179,9 @@ export {
     // 消息类型
     MessageType,
 
+    // MessageType.nodeList 的元素类型
+    ForwardNode,
+
     // 图片 id  语音 id  消息 id
     ImageId, VoiceId, MessageId,
 
@@ -120,4 +190,7 @@ export {
 
     // 消息处理器
     Processor,
+
+    // QQ 自带表情
+    FaceType
 };

package/dist/node/Bot.d.ts

@@ -55,7 +55,7 @@ export class Bot implements BotConfigGetable {
      * @param keepProcessor 可选，是否保留事件处理器，默认值为 false，不保留
      * @param keepConfig    可选，是否保留 session baseUrl qq averifyKey，默认值为 false，不保留
      */
-    close({ keepProcessor, keepConfig }: Bot.CloseOptions): Promise<void>;
+    close({ keepProcessor, keepConfig }?: Bot.CloseOptions): Promise<void>;
 
     /**
      * ! messageChain 将在未来被移除
@@ -326,7 +326,7 @@ declare namespace Bot {
         baseUrl?: string;
         verifyKey?: string;
         qq?: number;
-        singleMode: boolean;
+        singleMode?: boolean;
     }
 
     interface CloseOptions {

package/dist/node/Bot.js

@@ -9,7 +9,7 @@ const _bind = require('./core/verify');
 
 const _sendCommand = require('./core/sendCommand');
 
-const _sendFriendMessage = require('./core/sendFirendMessage');
+const _sendFriendMessage = require('./core/sendFriendMessage');
 
 const _sendGroupMessage = require('./core/sendGroupMessage');
 

package/dist/node/ForwardNode.d.ts

@@ -0,0 +1,15 @@
+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

@@ -0,0 +1,70 @@
+"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/Message.d.ts

@@ -1,6 +1,6 @@
 // Message 通过实现 MessageChaingetable 与 Bot.sendMessage 通信
 // 消息链元素类型和图片 id 类型
-import { MessageChainGetable, MessageType, ImageId } from './BaseType';
+import { MessageChainGetable, MessageType, ImageId, FaceType, MessageId, ForwardNode, } from './BaseType';
 
 // Bot.sendMessage 的 message 参数是一个 Message 类型的实例
 // 方法内部通过 getMessageChainable 接口的 getMessageChain 方法拿到消息链
@@ -36,9 +36,31 @@ export class Message implements MessageChainGetable {
     // json
     addJson(json: string): Message;
 
-    // aoo
+    // app
     addApp(content: string): Message;
 
+    // face
+    addFace(name: FaceType): Message;
+
     // implements MessageChainGetable
     getMessageChain(): MessageType[];
+
+    // factory
+    static createForwardMessage(): ForwardMessage;
 }
+
+export class ForwardMessage implements MessageChainGetable {
+    constructor(nodeList: ForwardNode[]);
+    private messageChain: MessageType[];
+
+    addForwardNode({
+        senderId,
+        time,
+        senderName,
+        messageChain
+    }: ForwardNode): Message;
+    addForwardNode(messageId: MessageId): ForwardMessage;
+
+    // implements MessageChainGetable
+    getMessageChain(): MessageType[];
+}

package/dist/node/Message.js

@@ -154,9 +154,37 @@ class App extends MessageType {
     this.content = content;
   }
 
+}
+
+class ForwardNodeList extends MessageType {
+  constructor({
+    nodeList
+  }) {
+    super({
+      type: 'Forward'
+    });
+    this.nodeList = nodeList;
+  }
+
+}
+
+const faceMap = new Map([['惊讶', 0], ['撇嘴', 1], ['色', 2], ['发呆', 3], ['得意', 4], ['流泪', 5], ['害羞', 6], ['闭嘴', 7], ['睡', 8], ['大哭', 9], ['尴尬', 10], ['发怒', 11], ['调皮', 12], ['呲牙', 13], ['微笑', 14], ['难过', 15], ['酷', 16], ['抓狂', 18], ['吐', 19], ['偷笑', 20], ['可爱', 21], ['白眼', 22], ['傲慢', 23], ['饥饿', 24], ['困', 25], ['惊恐', 26], ['流汗', 27], ['憨笑', 28], ['悠闲', 29], ['奋斗', 30], ['咒骂', 31], ['疑问', 32], ['嘘', 33], ['晕', 34], ['折磨', 35], ['衰', 36], ['骷髅', 37], ['敲打', 38], ['再见', 39], ['发抖', 41], ['爱情', 42], ['跳跳', 43], ['猪头', 46], ['拥抱', 49], ['蛋糕', 53], ['闪电', 54], ['炸弹', 55], ['刀', 56], ['足球', 57], ['便便', 59], ['咖啡', 60], ['饭', 61], ['玫瑰', 63], ['凋谢', 64], ['爱心', 66], ['心碎', 67], ['礼物', 69], ['太阳', 74], ['月亮', 75], ['赞', 76], ['踩', 77], ['握手', 78], ['胜利', 79], ['飞吻', 85], ['怄火', 86], ['西瓜', 89], ['冷汗', 96], ['擦汗', 97], ['抠鼻', 98], ['鼓掌', 99], ['糗大了', 100], ['坏笑', 101], ['左哼哼', 102], ['右哼哼', 103], ['哈欠', 104], ['鄙视', 105], ['委屈', 106], ['快哭了', 107], ['阴险', 108], ['左亲亲', 109], ['吓', 110], ['可怜', 111], ['菜刀', 112], ['啤酒', 113], ['篮球', 114], ['乒乓', 115], ['示爱', 116], ['瓢虫', 117], ['抱拳', 118], ['勾引', 119], ['拳头', 120], ['差劲', 121], ['爱你', 122], ['不', 123], ['好', 124], ['转圈', 125], ['磕头', 126], ['回头', 127], ['跳绳', 128], ['挥手', 129], ['激动', 130], ['街舞', 131], ['献吻', 132], ['左太极', 133], ['右太极', 134], ['双喜', 136], ['鞭炮', 137], ['灯笼', 138], ['K歌', 140], ['喝彩', 144], ['祈祷', 145], ['爆筋', 146], ['棒棒糖', 147], ['喝奶', 148], ['飞机', 151], ['钞票', 158], ['药', 168], ['手枪', 169], ['茶', 171], ['眨眼睛', 172], ['泪奔', 173], ['无奈', 174], ['卖萌', 175], ['小纠结', 176], ['喷血', 177], ['斜眼笑', 178], ['doge', 179], ['惊喜', 180], ['骚扰', 181], ['笑哭', 182], ['我最美', 183], ['河蟹', 184], ['羊驼', 185], ['幽灵', 187], ['蛋', 188], ['菊花', 190], ['红包', 192], ['大笑', 193], ['不开心', 194], ['冷漠', 197], ['呃', 198], ['好棒', 199], ['拜托', 200], ['点赞', 201], ['无聊', 202], ['托脸', 203], ['吃', 204], ['送花', 205], ['害怕', 206], ['花痴', 207], ['小样儿', 208], ['飙泪', 210], ['我不看', 211], ['托腮', 212], ['啵啵', 214], ['糊脸', 215], ['拍头', 216], ['扯一扯', 217], ['舔一舔', 218], ['蹭一蹭', 219], ['拽炸天', 220], ['顶呱呱', 221], ['抱抱', 222], ['暴击', 223], ['开枪', 224], ['撩一撩', 225], ['拍桌', 226], ['拍手', 227], ['恭喜', 228], ['干杯', 229], ['嘲讽', 230], ['哼', 231], ['佛系', 232], ['掐一掐', 233], ['惊呆', 234], ['颤抖', 235], ['啃头', 236], ['偷看', 237], ['扇脸', 238], ['原谅', 239], ['喷脸', 240], ['生日快乐', 241], ['头撞击', 242], ['甩头', 243], ['扔狗', 244], ['加油必胜', 245], ['加油抱抱', 246], ['口罩护体', 247], ['搬砖中', 260], ['忙到飞起', 261], ['脑阔疼', 262], ['沧桑', 263], ['捂脸', 264], ['辣眼睛', 265], ['哦哟', 266], ['头秃', 267], ['问号脸', 268], ['暗中观察', 269], ['emm', 270], ['吃瓜', 271], ['呵呵哒', 272], ['我酸了', 273], ['太南了', 274], ['辣椒酱', 276], ['汪汪', 277], ['汗', 278], ['打脸', 279], ['击掌', 280], ['无眼笑', 281], ['敬礼', 282], ['狂笑', 283], ['面无表情', 284], ['摸鱼', 285], ['魔鬼笑', 286], ['哦', 287], ['请', 288], ['睁眼', 289], ['敲开心', 290], ['震惊', 291], ['让我康康', 292], ['摸锦鲤', 293], ['期待', 294], ['拿到红包', 295], ['真好', 296], ['拜谢', 297], ['元宝', 298], ['牛啊', 299], ['胖三斤', 300], ['好闪', 301], ['左拜年', 302], ['右拜年', 303], ['红包包', 304], ['右亲亲', 305], ['牛气冲天', 306], ['喵喵', 307], ['求红包', 308], ['谢红包', 309], ['新年烟花', 310], ['打call', 311], ['变形', 312], ['嗑到了', 313], ['仔细分析', 314], ['加油', 315], ['我没事', 316], ['菜狗', 317], ['崇拜', 318], ['比心', 319], ['庆祝', 320], ['老色痞', 321], ['拒绝', 322], ['嫌弃', 323], ['吃糖', 324]]);
+
+class Face extends MessageType {
+  constructor({
+    faceId,
+    name
+  }) {
+    super({
+      type: 'Face'
+    });
+    this.faceId = faceId;
+    this.name = name;
+  }
+
 }
 /**
- * @description 本框架抽象的消息类型，getMessageChainable
+ * @description 本框架抽象的消息类型
  */
 
 
@@ -281,6 +309,20 @@ class Message extends MessageChainGetable {
     this.messageChain.push(new App({
       content
     }));
+    return this;
+  } // face
+
+
+  addFace(name) {
+    const idx = faceMap.get(name);
+
+    if (idx) {
+      this.messageChain.push(new Face({
+        faceId: idx,
+        name
+      }));
+    }
+
     return this;
   } // get 原接口格式的信息链
 
@@ -289,6 +331,45 @@ class Message extends MessageChainGetable {
     return this.messageChain;
   }
 
+  static createForwardMessage() {
+    return new ForwardMessage();
+  }
+
+}
+
+class ForwardMessage extends MessageChainGetable {
+  constructor() {
+    super();
+    this.messageChain = [];
+    this.nodeList = [];
+  }
+
+  addForwardNode(nodeOrId) {
+    if (typeof nodeOrId === 'number') {
+      this.nodeList.push({
+        messageId: nodeOrId
+      });
+    } else if (typeof nodeOrId == 'object') {
+      if (nodeOrId.messageChain instanceof MessageChainGetable) {
+        nodeOrId.messageChain = nodeOrId.messageChain.getMessageChain();
+      }
+
+      this.nodeList.push(nodeOrId);
+    }
+    /* else ignore */
+
+
+    return this;
+  } // implements MessageChainGetable
+
+
+  getMessageChain() {
+    this.messageChain.push(new ForwardNodeList({
+      nodeList: this.nodeList
+    }));
+    return this.messageChain;
+  }
+
 }
 
 module.exports = {

package/dist/node/core/sendFriendMessage.js

@@ -0,0 +1,68 @@
+"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/package.json

@@ -1,6 +1,6 @@
 {
     "name": "mirai-js",
-    "version": "2.4.3",
+    "version": "2.6.1",
     "description": "QQ robot development framework based on Mirai-api-http.",
     "main": "dist/node/index.js",
     "scripts": {

package/src/BaseType.d.ts

@@ -40,6 +40,8 @@ interface MessageType {
     // App
     content?: string;
 
+    // Forward
+    nodeList?: ForwardNode[];
 }
 
 // 用于 Bot 获得消息链，Message 使用了该扩展
@@ -47,6 +49,17 @@ interface MessageChainGetable {
     getMessageChain(): MessageType[];
 }
 
+/**
+ * @description 合并转发类型Forward内消息节点的类型定义
+ */
+interface ForwardNode {
+    senderId?: number;
+    time?: number;
+    senderName?: string;
+    messageChain?: MessageType[] | MessageChainGetable;
+    messageId?: MessageId;
+}
+
 /**
  * @description Bot 实现的接口，其他类访问 bot.config
  * 的途径，避免其他类直接访问实现，用来解耦
@@ -104,6 +117,60 @@ type SEX = 'UNKNOWN' | 'MALE' | 'FEMALE'
 // 消息处理器
 type Processor = (data: any) => Promise<any> | any;
 
+// QQ 自带表情
+type FaceType =
+    | '惊讶' | '撇嘴' | '色' | '发呆' | '得意'
+    | '流泪' | '害羞' | '闭嘴' | '睡' | '大哭'
+    | '尴尬' | '发怒' | '调皮' | '呲牙' | '微笑'
+    | '难过' | '酷' | '抓狂' | '吐' | '偷笑'
+    | '可爱' | '白眼' | '傲慢' | '饥饿' | '困'
+    | '惊恐' | '流汗' | '憨笑' | '悠闲' | '奋斗'
+    | '咒骂' | '疑问' | '嘘' | '晕' | '折磨'
+    | '衰' | '骷髅' | '敲打' | '再见' | '发抖'
+    | '爱情' | '跳跳' | '猪头' | '拥抱' | '蛋糕'
+    | '闪电' | '炸弹' | '刀' | '足球' | '便便'
+    | '咖啡' | '饭' | '玫瑰' | '凋谢' | '爱心'
+    | '心碎' | '礼物' | '太阳' | '月亮' | '赞'
+    | '踩' | '握手' | '胜利' | '飞吻' | '怄火'
+    | '西瓜' | '冷汗' | '擦汗' | '抠鼻' | '鼓掌'
+    | '糗大了' | '坏笑' | '左哼哼' | '右哼哼' | '哈欠'
+    | '鄙视' | '委屈' | '快哭了' | '阴险' | '左亲亲'
+    | '吓' | '可怜' | '菜刀' | '啤酒' | '篮球'
+    | '乒乓' | '示爱' | '瓢虫' | '抱拳' | '勾引'
+    | '拳头' | '差劲' | '爱你' | '不' | '好'
+    | '转圈' | '磕头' | '回头' | '跳绳' | '挥手'
+    | '激动' | '街舞' | '献吻' | '左太极' | '右太极'
+    | '双喜' | '鞭炮' | '灯笼' | 'K歌' | '喝彩'
+    | '祈祷' | '爆筋' | '棒棒糖' | '喝奶' | '飞机'
+    | '钞票' | '药' | '手枪' | '茶' | '眨眼睛'
+    | '泪奔' | '无奈' | '卖萌' | '小纠结' | '喷血'
+    | '斜眼笑' | 'doge' | '惊喜' | '骚扰' | '笑哭'
+    | '我最美' | '河蟹' | '羊驼' | '幽灵' | '蛋'
+    | '菊花' | '红包' | '大笑' | '不开心' | '冷漠'
+    | '呃' | '好棒' | '拜托' | '点赞' | '无聊'
+    | '托脸' | '吃' | '送花' | '害怕' | '花痴'
+    | '小样儿' | '飙泪' | '我不看' | '托腮' | '啵啵'
+    | '糊脸' | '拍头' | '扯一扯' | '舔一舔' | '蹭一蹭'
+    | '拽炸天' | '顶呱呱' | '抱抱' | '暴击' | '开枪'
+    | '撩一撩' | '拍桌' | '拍手' | '恭喜' | '干杯'
+    | '嘲讽' | '哼' | '佛系' | '掐一掐' | '惊呆'
+    | '颤抖' | '啃头' | '偷看' | '扇脸' | '原谅'
+    | '喷脸' | '生日快乐' | '头撞击' | '甩头' | '扔狗'
+    | '加油必胜' | '加油抱抱' | '口罩护体' | '搬砖中' | '忙到飞起'
+    | '脑阔疼' | '沧桑' | '捂脸' | '辣眼睛' | '哦哟'
+    | '头秃' | '问号脸' | '暗中观察' | 'emm' | '吃瓜'
+    | '呵呵哒' | '我酸了' | '太南了' | '辣椒酱' | '汪汪'
+    | '汗' | '打脸' | '击掌' | '无眼笑' | '敬礼'
+    | '狂笑' | '面无表情' | '摸鱼' | '魔鬼笑' | '哦'
+    | '请' | '睁眼' | '敲开心' | '震惊' | '让我康康'
+    | '摸锦鲤' | '期待' | '拿到红包' | '真好' | '拜谢'
+    | '元宝' | '牛啊' | '胖三斤' | '好闪' | '左拜年'
+    | '右拜年' | '红包包' | '右亲亲' | '牛气冲天' | '喵喵'
+    | '求红包' | '谢红包' | '新年烟花' | '打call' | '变形'
+    | '嗑到了' | '仔细分析' | '加油' | '我没事' | '菜狗'
+    | '崇拜' | '比心' | '庆祝' | '老色痞' | '拒绝'
+    | '嫌弃' | '吃糖';
+
 // 消息处理器类型
 export {
     // 接口
@@ -112,6 +179,9 @@ export {
     // 消息类型
     MessageType,
 
+    // MessageType.nodeList 的元素类型
+    ForwardNode,
+
     // 图片 id  语音 id  消息 id
     ImageId, VoiceId, MessageId,
 
@@ -120,4 +190,7 @@ export {
 
     // 消息处理器
     Processor,
+
+    // QQ 自带表情
+    FaceType
 };

package/src/Bot.d.ts

@@ -55,7 +55,7 @@ export class Bot implements BotConfigGetable {
      * @param keepProcessor 可选，是否保留事件处理器，默认值为 false，不保留
      * @param keepConfig    可选，是否保留 session baseUrl qq averifyKey，默认值为 false，不保留
      */
-    close({ keepProcessor, keepConfig }: Bot.CloseOptions): Promise<void>;
+    close({ keepProcessor, keepConfig }?: Bot.CloseOptions): Promise<void>;
 
     /**
      * ! messageChain 将在未来被移除
@@ -326,7 +326,7 @@ declare namespace Bot {
         baseUrl?: string;
         verifyKey?: string;
         qq?: number;
-        singleMode: boolean;
+        singleMode?: boolean;
     }
 
     interface CloseOptions {

package/src/Bot.js

@@ -3,7 +3,7 @@ const _releaseSession = require('./core/releaseSession');
 const _verify = require('./core/auth');
 const _bind = require('./core/verify');
 const _sendCommand = require('./core/sendCommand');
-const _sendFriendMessage = require('./core/sendFirendMessage');
+const _sendFriendMessage = require('./core/sendFriendMessage');
 const _sendGroupMessage = require('./core/sendGroupMessage');
 const _sendTempMessage = require('./core/sendTempMessage');
 const _sendNudge = require('./core/sendNudge');

package/src/Message.d.ts

@@ -1,6 +1,6 @@
 // Message 通过实现 MessageChaingetable 与 Bot.sendMessage 通信
 // 消息链元素类型和图片 id 类型
-import { MessageChainGetable, MessageType, ImageId } from './BaseType';
+import { MessageChainGetable, MessageType, ImageId, FaceType, MessageId, ForwardNode, } from './BaseType';
 
 // Bot.sendMessage 的 message 参数是一个 Message 类型的实例
 // 方法内部通过 getMessageChainable 接口的 getMessageChain 方法拿到消息链
@@ -36,9 +36,31 @@ export class Message implements MessageChainGetable {
     // json
     addJson(json: string): Message;
 
-    // aoo
+    // app
     addApp(content: string): Message;
 
+    // face
+    addFace(name: FaceType): Message;
+
     // implements MessageChainGetable
     getMessageChain(): MessageType[];
+
+    // factory
+    static createForwardMessage(): ForwardMessage;
 }
+
+export class ForwardMessage implements MessageChainGetable {
+    constructor(nodeList: ForwardNode[]);
+    private messageChain: MessageType[];
+
+    addForwardNode({
+        senderId,
+        time,
+        senderName,
+        messageChain
+    }: ForwardNode): Message;
+    addForwardNode(messageId: MessageId): ForwardMessage;
+
+    // implements MessageChainGetable
+    getMessageChain(): MessageType[];
+}