mirai-js 2.2.0 → 2.4.1

package/src/core/responseFirendRequest.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 响应好友请求
@@ -34,13 +31,14 @@ module.exports = async ({ baseUrl, sessionKey, eventId, fromId, groupId, operate
                 data: { code, msg: serverMessage }
             } = responseData;
         } catch (error) {
-            throw new Error('core.responseFirendRequest 请求返回格式出错，请检查 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);
     }
 };

package/src/core/responseMemberJoinRequest.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))}`;
 
 /**
  * FIXME: mirai-core 的问题，有时候收不到 MemberJoinRequestEvent 事件
@@ -36,13 +33,14 @@ module.exports = async ({ baseUrl, sessionKey, eventId, fromId, groupId, operate
                 data: { code, msg: serverMessage }
             } = responseData;
         } catch (error) {
-            throw new Error('core.responseMember 请求返回格式出错，请检查 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);
     }
 };

package/src/core/sendCommand.js

@@ -1,12 +1,9 @@
 const axios = require('axios').default;
 const { errCodeMap } = require('../util/errCode');
-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 向 mirai-console 发送指令
@@ -28,7 +25,7 @@ module.exports = async ({ baseUrl, sessionKey, command }) => {
                 data: { msg: message, code },
             } = responseData;
         } catch (error) {
-            throw new Error('core.sendCommand 请求返回格式出错，请检查 mirai-console');
+            throw new Error(('请求返回格式出错，请检查 mirai-console'));
         }
         // 抛出 mirai 的异常，到 catch 中处理后再抛出
         if (code in errCodeMap) {
@@ -36,6 +33,7 @@ module.exports = async ({ baseUrl, sessionKey, command }) => {
         }
         return { message, code };
     } catch (error) {
+        console.error(`mirai-js: error ${locationStr}`);
         errorHandler(error);
     }
 

package/src/core/sendFirendMessage.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 向 qq 好友发送消息
@@ -31,7 +28,7 @@ module.exports = async ({ baseUrl, sessionKey, target, quote, messageChain }) =>
                 data: { msg: message, code, messageId }
             } = responseData;
         } catch (error) {
-            throw new Error('core.sendFirendMessage 请求返回格式出错，请检查 mirai-console');
+            throw new Error(('请求返回格式出错，请检查 mirai-console'));
         }
         // 抛出 mirai 的异常，到 catch 中处理后再抛出
         if (code in errCodeMap) {
@@ -39,6 +36,7 @@ module.exports = async ({ baseUrl, sessionKey, target, quote, messageChain }) =>
         }
         return messageId;
     } catch (error) {
+        console.error(`mirai-js: error ${locationStr}`);
         errorHandler(error);
     }
 };

package/src/core/sendGroupMessage.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 向 qq 群发送消息
@@ -31,7 +28,7 @@ module.exports = async ({ baseUrl, sessionKey, target, quote, messageChain }) =>
                 data: { msg: message, code, messageId }
             } = responseData;
         } catch (error) {
-            throw new Error('core.sendGroupMessage 请求返回格式出错，请检查 mirai-console');
+            throw new Error(('请求返回格式出错，请检查 mirai-console'));
         }
         // 抛出 mirai 的异常，到 catch 中处理后再抛出
         if (code in errCodeMap) {
@@ -39,6 +36,7 @@ module.exports = async ({ baseUrl, sessionKey, target, quote, messageChain }) =>
         }
         return messageId;
     } catch (error) {
+        console.error(`mirai-js: error ${locationStr}`);
         errorHandler(error);
     }
 };

package/src/core/sendNudge.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, subject, kind }) => {
                 data: { msg: message, code }
             } = responseData;
         } catch (error) {
-            throw new Error('core.sendNudge 请求返回格式出错，请检查 mirai-console');
+            throw new Error(('请求返回格式出错，请检查 mirai-console'));
         }
         // 抛出 mirai 的异常，到 catch 中处理后再抛出
         if (code in errCodeMap) {
@@ -39,6 +36,7 @@ module.exports = async ({ baseUrl, sessionKey, target, subject, kind }) => {
         }
         return { message, code };
     } catch (error) {
+        console.error(`mirai-js: error ${locationStr}`);
         errorHandler(error);
     }
 };

package/src/core/sendTempMessage.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 向临时对象发送消息
@@ -41,7 +38,7 @@ module.exports = async ({ baseUrl, sessionKey, qq, group, quote, messageChain })
                 data: { msg: message, code, messageId }
             } = responseData;
         } catch (error) {
-            throw new Error('core.sendTempMessage 请求返回格式出错，请检查 mirai-console');
+            throw new Error(('请求返回格式出错，请检查 mirai-console'));
         }
 
         // 抛出 mirai 的异常，到 catch 中处理后再抛出
@@ -50,6 +47,7 @@ module.exports = async ({ baseUrl, sessionKey, qq, group, quote, messageChain })
         }
         return messageId;
     } catch (error) {
+        console.error(`mirai-js: error ${locationStr}`);
         errorHandler(error);
     }
 

package/src/core/setEssence.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))}`;
 
 
 /**
@@ -32,7 +29,7 @@ module.exports = async ({
                 data: { msg: message, code }
             } = responseData;
         } catch (error) {
-            throw new Error('core.setEssence 请求返回格式出错，请检查 mirai-console');
+            throw new Error(('请求返回格式出错，请检查 mirai-console'));
         }
         // 抛出 mirai 的异常，到 catch 中处理后再抛出
         if (code in errCodeMap) {
@@ -40,6 +37,7 @@ module.exports = async ({
         }
         return { message, code };
     } catch (error) {
+        console.error(`mirai-js: error ${locationStr}`);
         errorHandler(error);
     }
 };

package/src/core/setGroupConfig.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))}`;
 
 
 /**
@@ -46,7 +43,7 @@ module.exports = async ({
                 data: { msg: message, code }
             } = responseData;
         } catch (error) {
-            throw new Error('core.setGroupConfig 请求返回格式出错，请检查 mirai-console');
+            throw new Error(('请求返回格式出错，请检查 mirai-console'));
         }
         // 抛出 mirai 的异常，到 catch 中处理后再抛出
         if (code in errCodeMap) {
@@ -54,6 +51,7 @@ module.exports = async ({
         }
         return { message, code };
     } catch (error) {
+        console.error(`mirai-js: error ${locationStr}`);
         errorHandler(error);
     }
 };

package/src/core/setMemberAdmin.js

@@ -0,0 +1,43 @@
+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 {number} memberId     群成员的 qq 号
+ * @param {string} assign       是否设置为管理员
+ * @returns {Object} 结构 { message, code }
+ */
+module.exports = async ({ baseUrl, sessionKey, target, memberId, assign }) => {
+    try {
+        // 拼接 url
+        const url = new URL('/memberAdmin', baseUrl).toString();
+
+        // 请求
+        const responseData = await axios.post(url, {
+            sessionKey, target, memberId, assign
+        });
+        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/src/core/setMemberInfo.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 设置群成员信息
@@ -35,7 +32,7 @@ module.exports = async ({ baseUrl, sessionKey, target, memberId, name, specialTi
                 data: { msg: message, code }
             } = responseData;
         } catch (error) {
-            throw new Error('core.setMemberInfo 请求返回格式出错，请检查 mirai-console');
+            throw new Error(('请求返回格式出错，请检查 mirai-console'));
         }
         // 抛出 mirai 的异常，到 catch 中处理后再抛出
         if (code in errCodeMap) {
@@ -43,6 +40,7 @@ module.exports = async ({ baseUrl, sessionKey, target, memberId, name, specialTi
         }
         return { message, code };
     } catch (error) {
+        console.error(`mirai-js: error ${locationStr}`);
         errorHandler(error);
     }
 

package/src/core/setSessionConfig.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))}`;
 
 
 /**
@@ -29,7 +26,7 @@ module.exports = async ({ baseUrl, sessionKey, cacheSize, enableWebsocket }) =>
                 data: { msg: message, code }
             } = responseData;
         } catch (error) {
-            throw new Error('core.setSessionConfig 请求返回格式出错，请检查 mirai-console');
+            throw new Error(('请求返回格式出错，请检查 mirai-console'));
         }
         // 抛出 mirai 的异常，到 catch 中处理后再抛出
         if (code in errCodeMap) {
@@ -37,6 +34,7 @@ module.exports = async ({ baseUrl, sessionKey, cacheSize, enableWebsocket }) =>
         }
         return { message, code };
     } catch (error) {
+        console.error(`mirai-js: error ${locationStr}`);
         errorHandler(error);
     }
 };

package/src/core/startListeningBrowser.js

@@ -1,11 +1,8 @@
 const WebSocket = window.WebSocket;
-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 开始侦听事件
@@ -58,6 +55,7 @@ module.exports = async ({ baseUrl, sessionKey, verifyKey, message, error, close
         };
         return ws;
     } catch (error) {
+        console.error(`mirai-js: error ${locationStr}`);
         errorHandler(error);
     }
 };

package/src/core/startListeningNode.js

@@ -1,11 +1,8 @@
 const WebSocket = require('ws');
-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 开始侦听事件
@@ -70,6 +67,7 @@ module.exports = async ({ baseUrl, sessionKey, verifyKey, message, error, close,
         });
         return ws;
     } catch (error) {
+        console.error(`mirai-js: error ${locationStr}`);
         errorHandler(error);
     }
 };

package/src/core/stopListeningBrowser.js

@@ -1,4 +1,6 @@
 const errorHandler = require('../util/errorHandler');
+const path = require('path');
+const locationStr = `core.${path.basename(__filename, path.extname(__filename))}`;
 
 /**
  * @description 停止侦听事件
@@ -25,6 +27,7 @@ module.exports = async (wsConnection) => {
             // do nothing
         }
     } catch (error) {
+        console.error(`mirai-js: error ${locationStr}`);
         errorHandler(error);
     }
 };

package/src/core/stopListeningNode.js

@@ -1,4 +1,6 @@
 const errorHandler = require('../util/errorHandler');
+const path = require('path');
+const locationStr = `core.${path.basename(__filename, path.extname(__filename))}`;
 
 /**
  * @description 停止侦听事件
@@ -25,6 +27,7 @@ module.exports = async (wsConnection) => {
             // do nothing
         }
     } catch (error) {
+        console.error(`mirai-js: error ${locationStr}`);
         errorHandler(error);
     }
 };

package/src/core/unmute.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 解除禁言
@@ -28,7 +25,7 @@ module.exports = async ({ baseUrl, sessionKey, target, memberId }) => {
                 data: { code, msg: message }
             } = responseData;
         } catch (error) {
-            throw new Error('core.unmute 请求返回格式出错，请检查 mirai-console');
+            throw new Error(('请求返回格式出错，请检查 mirai-console'));
         }
         // 抛出 mirai 的异常，到 catch 中处理后再抛出
         if (code in errCodeMap) {
@@ -36,6 +33,7 @@ module.exports = async ({ baseUrl, sessionKey, target, memberId }) => {
         }
         return { message, code };
     } catch (error) {
+        console.error(`mirai-js: error ${locationStr}`);
         errorHandler(error);
     }
 };

package/src/core/unmuteAll.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.unmuteAll 请求返回格式出错，请检查 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/uploadImage.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))}`;
 const FormData = require('form-data');
 
 
@@ -42,7 +39,7 @@ module.exports = async ({ baseUrl, sessionKey, type, img }) => {
                 data: { msg: message, code, imageId, url, path }
             } = responseData;
         } catch (error) {
-            throw new Error('core.uploadImage 请求返回格式出错，请检查 mirai-console');
+            throw new Error(('请求返回格式出错，请检查 mirai-console'));
         }
 
         // 抛出 mirai 的异常，到 catch 中处理后再抛出
@@ -51,6 +48,7 @@ module.exports = async ({ baseUrl, sessionKey, type, img }) => {
         }
         return { imageId, url, path };
     } catch (error) {
+        console.error(`mirai-js: error ${locationStr}`);
         errorHandler(error);
     }
 };

package/src/core/uploadVoice.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))}`;
 const FormData = require('form-data');
 
 
@@ -42,7 +39,7 @@ module.exports = async ({ baseUrl, sessionKey, type, voice }) => {
                 data: { msg: message, code, voiceId, url, path }
             } = responseData;
         } catch (error) {
-            throw new Error('core.uploadVoice 请求返回格式出错，请检查 mirai-console');
+            throw new Error(('请求返回格式出错，请检查 mirai-console'));
         }
         // 抛出 mirai 的异常，到 catch 中处理后再抛出
         if (code in errCodeMap) {
@@ -50,6 +47,7 @@ module.exports = async ({ baseUrl, sessionKey, type, voice }) => {
         }
         return { voiceId, url, path };
     } catch (error) {
+        console.error(`mirai-js: error ${locationStr}`);
         errorHandler(error);
     }
 };

package/src/core/verify.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 校验 sessionKey，将一个 session 绑定到指定的 qq 上
@@ -28,7 +25,7 @@ module.exports = async ({ baseUrl, sessionKey, qq, throwable = true }) => {
                 data: { msg: message, code },
             } = responseData;
         } catch (error) {
-            throw new Error('core.verify 请求返回格式出错，请检查 mirai-console');
+            throw new Error(('请求返回格式出错，请检查 mirai-console'));
         }
         // 抛出 mirai 的异常，到 catch 中处理后再抛出
         if (code in errCodeMap) {
@@ -36,6 +33,7 @@ module.exports = async ({ baseUrl, sessionKey, qq, throwable = true }) => {
         }
         return { message, code };
     } catch (error) {
+        console.error(`mirai-js: error ${locationStr}`);
         errorHandler(error);
     }
 

package/src/polyfill/URL.js

@@ -0,0 +1,3 @@
+module.exports = {
+    URL: process.browser ? window.URL : require('url').URL
+};

package/src/polyfill/wsListener.js

@@ -0,0 +1,4 @@
+module.exports = {
+    wsStartListening: process.browser ? require('../core/startListeningBrowser') : require('../core/startListeningNode'),
+    wsStopListening: process.browser ? require('../core/stopListeningBrowser') : require('../core/stopListeningNode'),
+};

package/webpack.config.js

@@ -8,6 +8,10 @@ module.exports = {
         filename: 'mirai-js.js',
         clean: true
     },
+    externals: {
+        // ws v8+ 会需要配置更多 polyfill, 这里通过外部依赖直接忽略它
+        ws: 'ws'
+    },
     plugins: [
         new ProvidePlugin({
             process: 'process/browser',