mirai-js 2.0.2 → 2.3.0

package/src/core/sendCommand.js

@@ -1,4 +1,5 @@
 const axios = require('axios').default;
+const { errCodeMap } = require('../util/errCode');
 let URL;
 if (!process.browser) {
     ({ URL } = require('url'));
@@ -6,31 +7,38 @@ if (!process.browser) {
     URL = window.URL;
 }
 const errorHandler = require('../util/errorHandler');
+const path = require('path');
+const locationStr = `core.${path.basename(__filename, path.extname(__filename))}`;
 
 /**
  * @description 向 mirai-console 发送指令
  * @param {string} baseUrl mirai-api-http server 的地址
- * @param {string} verifyKey mirai-api-http server 设置的 verifyKey
+ * @param {string} sessionKey 会话标识
  * @param {string} command 指令名
- * @param {string[]} args  指令的参数
- * @returns {Object} 结构 { message }
+ * @param {MessageChain[]} args  指令的参数
+ * @returns {Object} 结构 { message, code }
  */
-module.exports = async ({ baseUrl, verifyKey, command: name, args }) => {
+module.exports = async ({ baseUrl, sessionKey, command }) => {
     try {
         // 拼接 url
-        const url = new URL('/command/send', baseUrl).toString();
+        const url = new URL('/cmd/execute', baseUrl).toString();
 
         // 请求
-        const responseData = await axios.post(url, { verifyKey, name, args, });
+        const responseData = await axios.post(url, { sessionKey, command, });
         try {
             var {
-                data: message
+                data: { msg: message, code },
             } = responseData;
         } catch (error) {
-            throw new Error('core.sendCommand 请求返回格式出错，请检查 mirai-console');
+            throw new Error(('请求返回格式出错，请检查 mirai-console'));
         }
-        return { message };
+        // 抛出 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/sendFirendMessage.js

@@ -7,6 +7,8 @@ if (!process.browser) {
     URL = window.URL;
 }
 const errorHandler = require('../util/errorHandler');
+const path = require('path');
+const locationStr = `core.${path.basename(__filename, path.extname(__filename))}`;
 
 /**
  * @description 向 qq 好友发送消息
@@ -31,7 +33,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 +41,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

@@ -7,6 +7,8 @@ if (!process.browser) {
     URL = window.URL;
 }
 const errorHandler = require('../util/errorHandler');
+const path = require('path');
+const locationStr = `core.${path.basename(__filename, path.extname(__filename))}`;
 
 /**
  * @description 向 qq 群发送消息
@@ -31,7 +33,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 +41,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

@@ -7,6 +7,8 @@ if (!process.browser) {
     URL = window.URL;
 }
 const errorHandler = require('../util/errorHandler');
+const path = require('path');
+const locationStr = `core.${path.basename(__filename, path.extname(__filename))}`;
 
 /**
  * @description 发送戳一戳消息
@@ -31,7 +33,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 +41,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

@@ -7,6 +7,8 @@ if (!process.browser) {
     URL = window.URL;
 }
 const errorHandler = require('../util/errorHandler');
+const path = require('path');
+const locationStr = `core.${path.basename(__filename, path.extname(__filename))}`;
 
 /**
  * @description 向临时对象发送消息
@@ -23,25 +25,25 @@ module.exports = async ({ baseUrl, sessionKey, qq, group, quote, messageChain })
         // 拼接 url
         const url = new URL('/sendTempMessage', baseUrl).toString();
 
-        // 请求
-        var responseData;
-        if (qq) {
-            responseData = await axios.post(url, {
-                sessionKey, qq, quote, messageChain
-            });
-        } else if (group) {
-            responseData = await axios.post(url, {
-                sessionKey, qq, quote, messageChain
-            });
-        } else {// 上层已经做了参数检查，这里有些多余
-            throw new Error('sendTempMessage 缺少必要的 qq 或 group 参数');
+        if (!qq || !group) {
+            throw new Error('sendTempMessage 缺少必要的 qq 和 group 参数');
         }
+
+        // 请求
+        const responseData = await axios.post(url, {
+            sessionKey,
+            qq,
+            group,
+            quote,
+            messageChain
+        });
+
         try {
             var {
                 data: { msg: message, code, messageId }
             } = responseData;
         } catch (error) {
-            throw new Error('core.sendTempMessage 请求返回格式出错，请检查 mirai-console');
+            throw new Error(('请求返回格式出错，请检查 mirai-console'));
         }
 
         // 抛出 mirai 的异常，到 catch 中处理后再抛出
@@ -50,6 +52,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

@@ -7,6 +7,8 @@ if (!process.browser) {
     URL = window.URL;
 }
 const errorHandler = require('../util/errorHandler');
+const path = require('path');
+const locationStr = `core.${path.basename(__filename, path.extname(__filename))}`;
 
 
 /**
@@ -32,7 +34,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 +42,7 @@ module.exports = async ({
         }
         return { message, code };
     } catch (error) {
+        console.error(`mirai-js: error ${locationStr}`);
         errorHandler(error);
     }
 };

package/src/core/setGroupConfig.js

@@ -7,6 +7,8 @@ if (!process.browser) {
     URL = window.URL;
 }
 const errorHandler = require('../util/errorHandler');
+const path = require('path');
+const locationStr = `core.${path.basename(__filename, path.extname(__filename))}`;
 
 
 /**
@@ -46,7 +48,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 +56,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,48 @@
+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} 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

@@ -7,6 +7,8 @@ if (!process.browser) {
     URL = window.URL;
 }
 const errorHandler = require('../util/errorHandler');
+const path = require('path');
+const locationStr = `core.${path.basename(__filename, path.extname(__filename))}`;
 
 /**
  * @description 设置群成员信息
@@ -35,7 +37,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 +45,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

@@ -7,6 +7,8 @@ if (!process.browser) {
     URL = window.URL;
 }
 const errorHandler = require('../util/errorHandler');
+const path = require('path');
+const locationStr = `core.${path.basename(__filename, path.extname(__filename))}`;
 
 
 /**
@@ -29,7 +31,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 +39,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

@@ -6,6 +6,8 @@ if (!process.browser) {
     URL = window.URL;
 }
 const errorHandler = require('../util/errorHandler');
+const path = require('path');
+const locationStr = `core.${path.basename(__filename, path.extname(__filename))}`;
 
 /**
  * @description 开始侦听事件
@@ -35,7 +37,7 @@ module.exports = async ({ baseUrl, sessionKey, verifyKey, message, error, close
 
             ws.onmessage = ({ data }) => {
                 try {
-                    message(JSON.parse(data));
+                    message(JSON.parse(data)?.data);
                 } catch (error) { }// eslint-disable-line no-empty
             };
 
@@ -58,6 +60,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

@@ -6,6 +6,8 @@ if (!process.browser) {
     URL = window.URL;
 }
 const errorHandler = require('../util/errorHandler');
+const path = require('path');
+const locationStr = `core.${path.basename(__filename, path.extname(__filename))}`;
 
 /**
  * @description 开始侦听事件
@@ -70,6 +72,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

@@ -7,6 +7,8 @@ if (!process.browser) {
     URL = window.URL;
 }
 const errorHandler = require('../util/errorHandler');
+const path = require('path');
+const locationStr = `core.${path.basename(__filename, path.extname(__filename))}`;
 
 /**
  * @description 解除禁言
@@ -28,7 +30,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 +38,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

@@ -7,6 +7,8 @@ if (!process.browser) {
     URL = window.URL;
 }
 const errorHandler = require('../util/errorHandler');
+const path = require('path');
+const locationStr = `core.${path.basename(__filename, path.extname(__filename))}`;
 
 /**
  * @description 解除全员禁言
@@ -27,7 +29,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 +37,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

@@ -7,6 +7,8 @@ if (!process.browser) {
     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');
 
 
@@ -42,7 +44,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 +53,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

@@ -7,6 +7,8 @@ if (!process.browser) {
     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');
 
 
@@ -42,7 +44,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 +52,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

@@ -7,6 +7,8 @@ if (!process.browser) {
     URL = window.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 +30,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 +38,7 @@ module.exports = async ({ baseUrl, sessionKey, qq, throwable = true }) => {
         }
         return { message, code };
     } catch (error) {
+        console.error(`mirai-js: error ${locationStr}`);
         errorHandler(error);
     }
 

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',

package/src/core/getGroupFileInfo.js

@@ -1,44 +0,0 @@
-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');
-
-/**
- * @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('core.getGroupFileInfo 请求返回格式出错，请检查 mirai-console');
-        }
-
-        // 抛出 mirai 的异常，到 catch 中处理后再抛出
-        if (code in errCodeMap) {
-            throw new Error(message);
-        }
-        return data;
-    } catch (error) {
-        errorHandler(error);
-    }
-};

package/src/core/getGroupFileList.js

@@ -1,40 +0,0 @@
-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');
-
-/**
- * @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('core.getGroupFileList 请求返回格式出错，请检查 mirai-console');
-        }
-
-        // 抛出 mirai 的异常，到 catch 中处理后再抛出
-        if (code in errCodeMap) {
-            throw new Error(message);
-        }
-        return data;
-    } catch (error) {
-        errorHandler(error);
-    }
-};