mirai-js 2.2.0 → 2.4.1

package/src/core/{groupFileRename.js → fs/renameGroupFile.js}

@@ -1,30 +1,27 @@
-const { errCodeMap } = require('../util/errCode');
+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 { 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 {number} id         文件 id
+ * @param {number} group      群号
  * @param {string} rename     重命名
  * @returns {Object} 结构 { message, code }
  */
-module.exports = async ({ baseUrl, sessionKey, target, id, rename }) => {
+module.exports = async ({ baseUrl, sessionKey, id, path, group, renameTo }) => {
     try {
         // 拼接 url
-        const url = new URL('/groupFileRename', baseUrl).toString();
+        const url = new URL('/file/rename', baseUrl).toString();
 
         // 请求
         const responseData = await axios.post(url, {
-            sessionKey, target, id, rename
+            sessionKey, id, path, target: group, group, renameTo
         });
 
         try {
@@ -32,7 +29,7 @@ module.exports = async ({ baseUrl, sessionKey, target, id, rename }) => {
                 data: { msg: message, code }
             } = responseData;
         } catch (error) {
-            throw new Error('core.groupFileRename 请求返回格式出错，请检查 mirai-console');
+            throw new Error(('请求返回格式出错，请检查 mirai-console'));
         }
         // 抛出 mirai 的异常，到 catch 中处理后再抛出
         if (code in errCodeMap) {
@@ -40,6 +37,7 @@ module.exports = async ({ baseUrl, sessionKey, target, id, rename }) => {
         }
         return { message, code };
     } catch (error) {
+        console.error(`mirai-js: error ${locationStr}`);
         errorHandler(error);
     }
 };

package/src/core/{uploadFileAndSend.js → fs/uploadGroupFIle.js}

@@ -1,12 +1,9 @@
-const { errCodeMap } = require('../util/errCode');
+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 { URL } = require('../../polyfill/URL');
+const errorHandler = require('../../util/errorHandler');
+const path = require('path');
+const locationStr = `core.${path.basename(__filename, path.extname(__filename))}`;
 const FormData = require('form-data');
 
 
@@ -16,14 +13,14 @@ const FormData = require('form-data');
  * @param {string}  sessionKey 会话标识
  * @param {string}  type       "friend" 或 "group"，目前仅支持 group
  * @param {string}  target     群/好友号
- * @param {string}  path       上传目录
+ * @param {string}  path       上传目录id
  * @param {Buffer}  file       文件二进制数据
  * @returns {string} 文件 id
  */
 module.exports = async ({ baseUrl, sessionKey, type, target, path, file }) => {
     try {
         // 拼接 url
-        const targetUrl = new URL('/uploadFileAndSend', baseUrl).toString();
+        const targetUrl = new URL('/file/upload', baseUrl).toString();
 
         // 构造 fromdata
         const form = new FormData();
@@ -45,7 +42,7 @@ module.exports = async ({ baseUrl, sessionKey, type, target, path, file }) => {
                 data: { msg: message, code, id }
             } = responseData;
         } catch (error) {
-            throw new Error('core.uploadFileAndSend 请求返回格式出错，请检查 mirai-console');
+            throw new Error(('请求返回格式出错，请检查 mirai-console'));
         }
 
         // 抛出 mirai 的异常，到 catch 中处理后再抛出
@@ -54,6 +51,7 @@ module.exports = async ({ baseUrl, sessionKey, type, target, path, file }) => {
         }
         return id;
     } catch (error) {
+        console.error(`mirai-js: error ${locationStr}`);
         errorHandler(error);
     }
 };

package/src/core/getFriendList.js

@@ -1,12 +1,9 @@
 const { errCodeMap } = require('../util/errCode');
 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');
+const path = require('path');
+const locationStr = `core.${path.basename(__filename, path.extname(__filename))}`;
 
 /**
  * @description 获取好友列表
@@ -24,7 +21,7 @@ module.exports = async ({ baseUrl, sessionKey }) => {
         try {
             var { data: { msg: message, code, data } } = responseData;
         } catch (error) {
-            throw new Error('core.getFriendList 请求返回格式出错，请检查 mirai-console');
+            throw new Error(('请求返回格式出错，请检查 mirai-console'));
         }
 
         // 抛出 mirai 的异常，到 catch 中处理后再抛出
@@ -33,6 +30,7 @@ module.exports = async ({ baseUrl, sessionKey }) => {
         }
         return data;
     } catch (error) {
+        console.error(`mirai-js: error ${locationStr}`);
         errorHandler(error);
     }
 };

package/src/core/getGroupConfig.js

@@ -1,12 +1,9 @@
 const { errCodeMap } = require('../util/errCode');
 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');
+const path = require('path');
+const locationStr = `core.${path.basename(__filename, path.extname(__filename))}`;
 
 /**
  * @description 获取群配置
@@ -25,7 +22,7 @@ module.exports = async ({ baseUrl, sessionKey, target }) => {
         try {
             var { data, data: { msg: message, code } } = responseData;
         } catch (error) {
-            throw new Error('core.getGroupConfig 请求返回格式出错，请检查 mirai-console');
+            throw new Error(('请求返回格式出错，请检查 mirai-console'));
         }
         // 抛出 mirai 的异常，到 catch 中处理后再抛出
         if (code in errCodeMap) {
@@ -33,6 +30,7 @@ module.exports = async ({ baseUrl, sessionKey, target }) => {
         }
         return data;
     } catch (error) {
+        console.error(`mirai-js: error ${locationStr}`);
         errorHandler(error);
     }
 };

package/src/core/getGroupList.js

@@ -1,12 +1,9 @@
 const { errCodeMap } = require('../util/errCode');
 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');
+const path = require('path');
+const locationStr = `core.${path.basename(__filename, path.extname(__filename))}`;
 
 /**
  * @description 获取群列表
@@ -24,7 +21,7 @@ module.exports = async ({ baseUrl, sessionKey }) => {
         try {
             var { data, data: { msg: message, code } } = responseData;
         } catch (error) {
-            throw new Error('core.getGroupList 请求返回格式出错，请检查 mirai-console');
+            throw new Error(('请求返回格式出错，请检查 mirai-console'));
         }
 
         // 抛出 mirai 的异常，到 catch 中处理后再抛出
@@ -33,6 +30,7 @@ module.exports = async ({ baseUrl, sessionKey }) => {
         }
         return data;
     } catch (error) {
+        console.error(`mirai-js: error ${locationStr}`);
         errorHandler(error);
     }
 };

package/src/core/getMemberInfo.js

@@ -1,12 +1,9 @@
 const { errCodeMap } = require('../util/errCode');
 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');
+const path = require('path');
+const locationStr = `core.${path.basename(__filename, path.extname(__filename))}`;
 
 /**
  * @description 获取群成员信息
@@ -14,7 +11,7 @@ const errorHandler = require('../util/errorHandler');
  * @param {string} sessionKey 会话标识
  * @param {number} target     群成员所在群号
  * @param {number} memberId   群成员的 qq 号
- * @returns {Object} 结构 { name, specialTitle } 群名片和群头衔
+ * @returns {Object}
  */
 module.exports = async ({ baseUrl, sessionKey, target, memberId }) => {
     try {
@@ -25,17 +22,18 @@ module.exports = async ({ baseUrl, sessionKey, target, memberId }) => {
         const responseData = await axios.get(url, { params: { sessionKey, target, memberId } });
         try {
             var {
-                data: { msg: message, code, name, specialTitle }
+                data, data: { msg: message, code }
             } = responseData;
         } catch (error) {
-            throw new Error('core.getMemberInfo 请求返回格式出错，请检查 mirai-console');
+            throw new Error(('请求返回格式出错，请检查 mirai-console'));
         }
         // 抛出 mirai 的异常，到 catch 中处理后再抛出
         if (code in errCodeMap) {
             throw new Error(message);
         }
-        return { name, specialTitle };
+        return data;
     } catch (error) {
+        console.error(`mirai-js: error ${locationStr}`);
         errorHandler(error);
     }
 

package/src/core/getMemberList.js

@@ -1,12 +1,9 @@
 const { errCodeMap } = require('../util/errCode');
 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');
+const path = require('path');
+const locationStr = `core.${path.basename(__filename, path.extname(__filename))}`;
 
 /**
  * @description 获取指定群的成员列表
@@ -31,7 +28,7 @@ module.exports = async ({ baseUrl, sessionKey, target }) => {
         try {
             var { data, data: { msg: message, code } } = responseData;
         } catch (error) {
-            throw new Error('core.getMemberList 请求返回格式出错，请检查 mirai-console');
+            throw new Error(('请求返回格式出错，请检查 mirai-console'));
         }
 
         // 抛出 mirai 的异常，到 catch 中处理后再抛出
@@ -40,6 +37,7 @@ module.exports = async ({ baseUrl, sessionKey, target }) => {
         }
         return data;
     } catch (error) {
+        console.error(`mirai-js: error ${locationStr}`);
         errorHandler(error);
     }
 };

package/src/core/getSessionConfig.js

@@ -1,12 +1,9 @@
 const { errCodeMap } = require('../util/errCode');
 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');
+const path = require('path');
+const locationStr = `core.${path.basename(__filename, path.extname(__filename))}`;
 
 /**
  * @description 获取指定 session 的 config
@@ -26,7 +23,7 @@ module.exports = async ({ baseUrl, sessionKey }) => {
                 data: { data: { msg: message, code, cacheSize, enableWebsocket } },
             } = responseData;
         } catch (error) {
-            throw new Error('core.getSessionConfig 请求返回格式出错，请检查 mirai-console');
+            throw new Error(('请求返回格式出错，请检查 mirai-console'));
         }
         // 抛出 mirai 的异常，到 catch 中处理后再抛出
         if (code in errCodeMap) {
@@ -34,6 +31,7 @@ module.exports = async ({ baseUrl, sessionKey }) => {
         }
         return { cacheSize, enableWebsocket };
     } catch (error) {
+        console.error(`mirai-js: error ${locationStr}`);
         errorHandler(error);
     }
 

package/src/core/getUserProfile.js

@@ -0,0 +1,39 @@
+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     qq 号
+ * @returns {Object} 结构 { nickname, email, age, level, sign, sex }
+ */
+module.exports = async ({ baseUrl, sessionKey, target, memberId }) => {
+    try {
+        // 拼接 url
+        const url = new URL('/userProfile', baseUrl).toString();
+
+        // 请求
+        const responseData = await axios.get(url, { params: { sessionKey, target, memberId } });
+        try {
+            var {
+                data: { msg: message, code, nickname, email, age, level, sign, sex }
+            } = responseData;
+        } catch (error) {
+            throw new Error('请求返回格式出错，请检查 mirai-console');
+        }
+        // 抛出 mirai 的异常，到 catch 中处理后再抛出
+        if (code in errCodeMap) {
+            throw new Error(message);
+        }
+        return { nickname, email, age, level, sign, sex };
+    } catch (error) {
+        console.error(`mirai-js: error ${locationStr}`);
+        errorHandler(error);
+    }
+
+};

package/src/core/mute.js

@@ -1,12 +1,9 @@
 const { errCodeMap } = require('../util/errCode');
 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');
+const path = require('path');
+const locationStr = `core.${path.basename(__filename, path.extname(__filename))}`;
 
 /**
  * @description 禁言群成员
@@ -29,7 +26,7 @@ module.exports = async ({ baseUrl, sessionKey, target, memberId, time }) => {
                 data: { code, msg: message }
             } = responseData;
         } catch (error) {
-            throw new Error('core.mute 请求返回格式出错，请检查 mirai-console');
+            throw new Error(('请求返回格式出错，请检查 mirai-console'));
         }
         // 抛出 mirai 的异常，到 catch 中处理后再抛出
         if (code in errCodeMap) {
@@ -37,6 +34,7 @@ module.exports = async ({ baseUrl, sessionKey, target, memberId, time }) => {
         }
         return { message, code };
     } catch (error) {
+        console.error(`mirai-js: error ${locationStr}`);
         errorHandler(error);
     }
 };

package/src/core/muteAll.js

@@ -1,12 +1,9 @@
 const { errCodeMap } = require('../util/errCode');
 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');
+const path = require('path');
+const locationStr = `core.${path.basename(__filename, path.extname(__filename))}`;
 
 /**
  * @description 全员禁言
@@ -27,7 +24,7 @@ module.exports = async ({ baseUrl, sessionKey, target }) => {
                 data: { code, msg: message }
             } = responseData;
         } catch (error) {
-            throw new Error('core.muteAll 请求返回格式出错，请检查 mirai-console');
+            throw new Error(('请求返回格式出错，请检查 mirai-console'));
         }
         // 抛出 mirai 的异常，到 catch 中处理后再抛出
         if (code in errCodeMap) {
@@ -35,6 +32,7 @@ module.exports = async ({ baseUrl, sessionKey, target }) => {
         }
         return { message, code };
     } catch (error) {
+        console.error(`mirai-js: error ${locationStr}`);
         errorHandler(error);
     }
 };

package/src/core/quitGroup.js

@@ -1,12 +1,9 @@
 const { errCodeMap } = require('../util/errCode');
 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');
+const path = require('path');
+const locationStr = `core.${path.basename(__filename, path.extname(__filename))}`;
 
 /**
  * @description 退出群聊
@@ -27,7 +24,7 @@ module.exports = async ({ baseUrl, sessionKey, target }) => {
                 data: { msg: message, code }
             } = responseData;
         } catch (error) {
-            throw new Error('core.quitGroup 请求返回格式出错，请检查 mirai-console');
+            throw new Error(('请求返回格式出错，请检查 mirai-console'));
         }
         // 抛出 mirai 的异常，到 catch 中处理后再抛出
         if (code in errCodeMap) {
@@ -35,6 +32,7 @@ module.exports = async ({ baseUrl, sessionKey, target }) => {
         }
         return { message, code };
     } catch (error) {
+        console.error(`mirai-js: error ${locationStr}`);
         errorHandler(error);
     }
 

package/src/core/recall.js

@@ -1,12 +1,9 @@
 const { errCodeMap } = require('../util/errCode');
 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');
+const path = require('path');
+const locationStr = `core.${path.basename(__filename, path.extname(__filename))}`;
 
 /**
  * @description 撤回由 messageId 确定的消息
@@ -27,7 +24,7 @@ module.exports = async ({ baseUrl, sessionKey, target }) => {
                 data: { code, msg: message }
             } = responseData;
         } catch (error) {
-            throw new Error('core.recall 请求返回格式出错，请检查 mirai-console');
+            throw new Error(('请求返回格式出错，请检查 mirai-console'));
         }
         // 抛出 mirai 的异常，到 catch 中处理后再抛出
         if (code in errCodeMap) {
@@ -35,6 +32,7 @@ module.exports = async ({ baseUrl, sessionKey, target }) => {
         }
         return { message, code };
     } catch (error) {
+        console.error(`mirai-js: error ${locationStr}`);
         errorHandler(error);
     }
 };

package/src/core/releaseSession.js

@@ -1,12 +1,9 @@
 const { errCodeMap } = require('../util/errCode');
 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');
+const path = require('path');
+const locationStr = `core.${path.basename(__filename, path.extname(__filename))}`;
 
 /**
  * @description 关闭一个会话
@@ -27,7 +24,7 @@ module.exports = async ({ baseUrl, sessionKey, qq }) => {
                 data: { msg: message, code }
             } = responseData;
         } catch (error) {
-            throw new Error('core.releaseSession 请求返回格式出错，请检查 mirai-console');
+            throw new Error(('请求返回格式出错，请检查 mirai-console'));
         }
         // 抛出 mirai 的异常，到 catch 中处理后再抛出
         if (code in errCodeMap) {
@@ -35,6 +32,8 @@ module.exports = async ({ baseUrl, sessionKey, qq }) => {
         }
         return { message, code };
     } catch (error) {
+        console.error(`mirai-js: error ${locationStr}`);
+        console.error(`mirai-js: error ${locationStr}`);
         errorHandler(error);
     }
 

package/src/core/{groupFileDelete.js → removeFriend.js}

@@ -1,37 +1,30 @@
 const { errCodeMap } = require('../util/errCode');
-const axios = require('axios');
-let URL;
-if (!process.browser) {
-    ({ URL } = require('url'));
-} else {
-    URL = window.URL;
-}
+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 删除群文件
+ * @description 删除好友
  * @param {string} baseUrl    mirai-api-http server 的地址
  * @param {string} sessionKey 会话标识
- * @param {number} target     群号
- * @param {number} id         文件 id
+ * @param {number} target   欲删除好友的 qq 号
  * @returns {Object} 结构 { message, code }
  */
-module.exports = async ({ baseUrl, sessionKey, target, id }) => {
+module.exports = async ({ baseUrl, sessionKey, target }) => {
     try {
         // 拼接 url
-        const url = new URL('/groupFileDelete', baseUrl).toString();
+        const url = new URL('/deleteFriend', baseUrl).toString();
 
         // 请求
-        const responseData = await axios.post(url, {
-            sessionKey, target, id
-        });
-
+        const responseData = await axios.post(url, { sessionKey, target });
         try {
             var {
                 data: { msg: message, code }
             } = responseData;
         } catch (error) {
-            throw new Error('core.groupFileDelete 请求返回格式出错，请检查 mirai-console');
+            throw new Error(('请求返回格式出错，请检查 mirai-console'));
         }
         // 抛出 mirai 的异常，到 catch 中处理后再抛出
         if (code in errCodeMap) {
@@ -39,6 +32,7 @@ module.exports = async ({ baseUrl, sessionKey, target, id }) => {
         }
         return { message, code };
     } catch (error) {
+        console.error(`mirai-js: error ${locationStr}`);
         errorHandler(error);
     }
 

package/src/core/removeMember.js

@@ -1,12 +1,9 @@
 const { errCodeMap } = require('../util/errCode');
 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');
+const path = require('path');
+const locationStr = `core.${path.basename(__filename, path.extname(__filename))}`;
 
 /**
  * @description 移除群成员
@@ -29,7 +26,7 @@ module.exports = async ({ baseUrl, sessionKey, target, memberId, msg }) => {
                 data: { msg: message, code }
             } = responseData;
         } catch (error) {
-            throw new Error('core.removeMember 请求返回格式出错，请检查 mirai-console');
+            throw new Error(('请求返回格式出错，请检查 mirai-console'));
         }
         // 抛出 mirai 的异常，到 catch 中处理后再抛出
         if (code in errCodeMap) {
@@ -37,6 +34,7 @@ module.exports = async ({ baseUrl, sessionKey, target, memberId, msg }) => {
         }
         return { message, code };
     } catch (error) {
+        console.error(`mirai-js: error ${locationStr}`);
         errorHandler(error);
     }
 

package/src/core/responseBotInvitedJoinGroupRequest.js

@@ -1,12 +1,9 @@
 const { errCodeMap } = require('../util/errCode');
 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');
+const path = require('path');
+const locationStr = `core.${path.basename(__filename, path.extname(__filename))}`;
 
 /**
  * ! 自动同意时，不会触发该事件
@@ -35,13 +32,14 @@ module.exports = async ({ baseUrl, sessionKey, eventId, fromId, groupId, operate
                 data: { code, msg: serverMessage }
             } = responseData;
         } catch (error) {
-            throw new Error('core.responseBotlnviedJoinGroupRequest 请求返回格式出错，请检查 mirai-console');
+            throw new Error(('请求返回格式出错，请检查 mirai-console'));
         }
         // 抛出 mirai 的异常，到 catch 中处理后再抛出
         if (code in errCodeMap) {
             throw new Error(serverMessage);
         }
     } catch (error) {
+        console.error(`mirai-js: error ${locationStr}`);
         errorHandler(error);
     }
 };