mirai-js 2.3.0 → 2.4.0

package/dist/node/Bot.js

@@ -33,10 +33,18 @@ const _getMemberList = require('./core/getMemberList');
 
 const _getMemberInfo = require('./core/getMemberInfo');
 
+const _getUserProfile = require('./core/getUserProfile');
+
 const _setMemberInfo = require('./core/setMemberInfo');
 
 const _setMemberAdmin = require('./core/setMemberAdmin');
 
+const _getAnnoList = require('./core/anno/getAnno');
+
+const _publishAnno = require('./core/anno/publishAnno');
+
+const _deleteAnno = require('./core/anno/deleteAnno');
+
 const _recall = require('./core/recall');
 
 const _mute = require('./core/mute');
@@ -59,9 +67,10 @@ const _setGroupConfig = require('./core/setGroupConfig');
 
 const _setEssence = require('./core/setEssence');
 
-const _startListening = process.browser ? require('./core/startListeningBrowser') : require('./core/startListeningNode');
-
-const _stopListening = process.browser ? require('./core/stopListeningBrowser') : require('./core/stopListeningNode'); // 其他
+const {
+  wsStartListening: _startListening,
+  wsStopListening: _stopListening
+} = require('./polyfill/wsListener'); // 其他
 
 
 const random = require('./util/random')(0, 2E16);
@@ -914,7 +923,7 @@ class Bot extends BotConfigGetable {
    * @description 获取群成员信息
    * @param {number} group 必选，群成员所在群号
    * @param {number} qq    必选，群成员的 qq 号
-   * @returns {Object[]} 结构 { name, title } 群名片和群头衔
+   * @returns {Object}
    */
 
 
@@ -951,6 +960,36 @@ class Bot extends BotConfigGetable {
     delete memberInfo.specialTitle;
     return memberInfo;
   }
+  /**
+   * @description 获取群成员信息
+   * @param {number} qq    必选，用户的 qq 号
+   * @returns {Object} 结构 { nickname, email, age, level, sign, sex }
+   */
+
+
+  async getUserProfile({
+    qq
+  }) {
+    // 检查对象状态
+    if (!this.config) {
+      throw new Error('getUserProfile 请先调用 open，建立一个会话');
+    } // 检查参数
+
+
+    if (!qq) {
+      throw new Error('getUserProfile 缺少必要的 qq 参数');
+    }
+
+    const {
+      baseUrl,
+      sessionKey
+    } = this.config;
+    return await _getUserProfile({
+      baseUrl,
+      sessionKey,
+      target: qq
+    });
+  }
   /**
    * @description 设置群成员信息
    * @param {number} group 必选，群成员所在群号
@@ -1015,6 +1054,134 @@ class Bot extends BotConfigGetable {
       });
     }
   }
+  /**
+   * @description 获取群公告列表迭代器
+   * @param {number} group 必选，群号
+   * @returns 迭代器
+   */
+
+
+  async *getAnnoIter({
+    group
+  }) {
+    // 检查对象状态
+    if (!this.config) {
+      throw new Error('getAnno 请先调用 open，建立一个会话');
+    } // 检查参数
+
+
+    if (!group) {
+      throw new Error('getAnno 缺少必要的 group 参数');
+    } // 获取列表
+
+
+    const {
+      baseUrl,
+      sessionKey
+    } = this.config;
+    let offset = 0;
+    let annoList = await _getAnnoList({
+      baseUrl,
+      sessionKey,
+      id: group,
+      offset,
+      size: 10
+    });
+
+    while (annoList.length > 0) {
+      for (const anno of annoList) {
+        yield anno;
+      } // 获取下一页
+
+
+      offset += 10;
+      annoList = await _getAnnoList({
+        baseUrl,
+        sessionKey,
+        id: group,
+        offset,
+        size: 10
+      });
+    }
+
+    return;
+  }
+  /**
+   * @description 发布群公告
+   * @param {number} group 必选，群号
+   * @param {string} content 必选，公告内容
+   * @returns {void}
+   */
+
+
+  async publishAnno({
+    group,
+    content,
+    pinned
+  }) {
+    // 检查对象状态
+    if (!this.config) {
+      throw new Error('publishAllo 请先调用 open，建立一个会话');
+    } // 检查参数
+
+
+    if (!group || !content) {
+      throw new Error(`publishAllo 缺少必要的 ${getInvalidParamsString({
+        group,
+        content
+      })} 参数`);
+    } // 发布公告
+
+
+    const {
+      baseUrl,
+      sessionKey
+    } = this.config;
+    await _publishAnno({
+      baseUrl,
+      sessionKey,
+      target: group,
+      content,
+      pinned
+    });
+  }
+  /**
+   * @description 删除群公告
+   * @param {number} group 必选，群号
+   * @param {string} fid 必选，公告 id
+   * @reaturns {void}
+   */
+
+
+  async deleteAnno({
+    group,
+    fid
+  }) {
+    // 检查对象状态
+    if (!this.config) {
+      throw new Error('deleteAnno 请先调用 open，建立一个会话');
+    } // 检查参数
+
+
+    if (!group || !fid) {
+      throw new Error(`deleteAnno 缺少必要的 ${getInvalidParamsString({
+        group,
+        fid
+      })} 参数`);
+    } // 发布公告
+
+
+    const {
+      baseUrl,
+      sessionKey
+    } = this.config;
+    await _deleteAnno({
+      baseUrl,
+      sessionKey,
+      id: group,
+      fid
+    });
+  }
   /**
    * @description 禁言群成员
    * @param {number} group 必选，欲禁言成员所在群号

package/dist/node/core/anno/deleteAnno.js

@@ -0,0 +1,67 @@
+"use strict";
+
+const {
+  errCodeMap
+} = require('../../util/errCode');
+
+const axios = require('axios');
+
+const {
+  URL
+} = require('../../polyfill/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}  id     群号
+ * @param {string}  fid    公告 id
+ * @returns {Object} { code, msg }
+ */
+
+module.exports = async ({
+  baseUrl,
+  sessionKey,
+  id,
+  fid
+}) => {
+  try {
+    // 拼接 url
+    const url = new URL('/anno/delete', baseUrl).toString(); // 请求
+
+    const responseData = await axios.post(url, {
+      sessionKey,
+      id,
+      fid
+    });
+
+    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/anno/getAnno.js

@@ -0,0 +1,70 @@
+"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 获取群公告 
+ * @param {string}  baseUrl    mirai-api-http server 的地址
+ * @param {string}  sessionKey 会话标识
+ * @param {number}  id         群号
+ * @param {number}  offset     分页
+ * @param {number}  size       分页, 默认 10
+ * @returns {Object[]}
+ */
+
+module.exports = async ({
+  baseUrl,
+  sessionKey,
+  id,
+  offset,
+  size = 10
+}) => {
+  try {
+    // 拼接 url
+    const url = new URL('/anno/list', baseUrl).toString(); // 请求
+
+    const responseData = await axios.get(url, {
+      params: {
+        sessionKey,
+        id,
+        offset,
+        size
+      }
+    });
+
+    try {
+      var {
+        data: {
+          msg: message,
+          code,
+          data
+        }
+      } = 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/anno/publishAnno.js

@@ -0,0 +1,70 @@
+"use strict";
+
+const {
+  errCodeMap
+} = require('../../util/errCode');
+
+const axios = require('axios');
+
+const {
+  URL
+} = require('../../polyfill/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}  content    公告内容
+ * @param {boolean} pinned     是否置顶
+ * @returns {Object} { code, msg }
+ */
+
+module.exports = async ({
+  baseUrl,
+  sessionKey,
+  target,
+  content,
+  pinned
+}) => {
+  try {
+    // 拼接 url
+    const url = new URL('/anno/publish', baseUrl).toString(); // 请求
+
+    const responseData = await axios.post(url, {
+      sessionKey,
+      target,
+      content,
+      pinned
+    });
+
+    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/auth.js

@@ -6,15 +6,9 @@ const {
 
 const axios = require('axios');
 
-let URL;
-
-if (!process.browser) {
-  ({
-    URL
-  } = require('url'));
-} else {
-  URL = window.URL;
-}
+const {
+  URL
+} = require('../polyfill/URL');
 
 const errorHandler = require('../util/errorHandler');
 

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

@@ -6,15 +6,9 @@ const {
 
 const axios = require('axios');
 
-let URL;
-
-if (!process.browser) {
-  ({
-    URL
-  } = require('url'));
-} else {
-  URL = window.URL;
-}
+const {
+  URL
+} = require('../../polyfill/URL');
 
 const errorHandler = require('../../util/errorHandler');
 

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

@@ -6,15 +6,9 @@ const {
 
 const axios = require('axios').default;
 
-let URL;
-
-if (!process.browser) {
-  ({
-    URL
-  } = require('url'));
-} else {
-  URL = window.URL;
-}
+const {
+  URL
+} = require('../../polyfill/URL');
 
 const errorHandler = require('../../util/errorHandler');
 

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

@@ -6,15 +6,9 @@ const {
 
 const axios = require('axios').default;
 
-let URL;
-
-if (!process.browser) {
-  ({
-    URL
-  } = require('url'));
-} else {
-  URL = window.URL;
-}
+const {
+  URL
+} = require('../../polyfill/URL');
 
 const errorHandler = require('../../util/errorHandler');
 

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

@@ -6,15 +6,9 @@ const {
 
 const axios = require('axios');
 
-let URL;
-
-if (!process.browser) {
-  ({
-    URL
-  } = require('url'));
-} else {
-  URL = window.URL;
-}
+const {
+  URL
+} = require('../../polyfill/URL');
 
 const errorHandler = require('../../util/errorHandler');
 

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

@@ -6,15 +6,9 @@ const {
 
 const axios = require('axios');
 
-let URL;
-
-if (!process.browser) {
-  ({
-    URL
-  } = require('url'));
-} else {
-  URL = window.URL;
-}
+const {
+  URL
+} = require('../../polyfill/URL');
 
 const errorHandler = require('../../util/errorHandler');
 

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

@@ -6,15 +6,9 @@ const {
 
 const axios = require('axios');
 
-let URL;
-
-if (!process.browser) {
-  ({
-    URL
-  } = require('url'));
-} else {
-  URL = window.URL;
-}
+const {
+  URL
+} = require('../../polyfill/URL');
 
 const errorHandler = require('../../util/errorHandler');
 

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

@@ -6,15 +6,9 @@ const {
 
 const axios = require('axios').default;
 
-let URL;
-
-if (!process.browser) {
-  ({
-    URL
-  } = require('url'));
-} else {
-  URL = window.URL;
-}
+const {
+  URL
+} = require('../../polyfill/URL');
 
 const errorHandler = require('../../util/errorHandler');
 

package/dist/node/core/getFriendList.js

@@ -6,15 +6,9 @@ const {
 
 const axios = require('axios').default;
 
-let URL;
-
-if (!process.browser) {
-  ({
-    URL
-  } = require('url'));
-} else {
-  URL = window.URL;
-}
+const {
+  URL
+} = require('../polyfill/URL');
 
 const errorHandler = require('../util/errorHandler');
 

package/dist/node/core/getGroupConfig.js

@@ -6,15 +6,9 @@ const {
 
 const axios = require('axios').default;
 
-let URL;
-
-if (!process.browser) {
-  ({
-    URL
-  } = require('url'));
-} else {
-  URL = window.URL;
-}
+const {
+  URL
+} = require('../polyfill/URL');
 
 const errorHandler = require('../util/errorHandler');
 

package/dist/node/core/getGroupList.js

@@ -6,15 +6,9 @@ const {
 
 const axios = require('axios').default;
 
-let URL;
-
-if (!process.browser) {
-  ({
-    URL
-  } = require('url'));
-} else {
-  URL = window.URL;
-}
+const {
+  URL
+} = require('../polyfill/URL');
 
 const errorHandler = require('../util/errorHandler');
 

package/dist/node/core/getMemberInfo.js

@@ -6,15 +6,9 @@ const {
 
 const axios = require('axios');
 
-let URL;
-
-if (!process.browser) {
-  ({
-    URL
-  } = require('url'));
-} else {
-  URL = window.URL;
-}
+const {
+  URL
+} = require('../polyfill/URL');
 
 const errorHandler = require('../util/errorHandler');
 
@@ -27,7 +21,7 @@ const locationStr = `core.${path.basename(__filename, path.extname(__filename))}
  * @param {string} sessionKey 会话标识
  * @param {number} target     群成员所在群号
  * @param {number} memberId   群成员的 qq 号
- * @returns {Object} 结构 { name, specialTitle } 群名片和群头衔
+ * @returns {Object}
  */
 
 module.exports = async ({
@@ -50,11 +44,10 @@ module.exports = async ({
 
     try {
       var {
+        data,
         data: {
           msg: message,
-          code,
-          name,
-          specialTitle
+          code
         }
       } = responseData;
     } catch (error) {
@@ -66,10 +59,7 @@ module.exports = async ({
       throw new Error(message);
     }
 
-    return {
-      name,
-      specialTitle
-    };
+    return data;
   } catch (error) {
     console.error(`mirai-js: error ${locationStr}`);
     errorHandler(error);