mirai-js 2.6.1 → 2.7.0-beta.1.0.0

package/src/core/releaseSession.js

@@ -3,7 +3,7 @@ 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))}`;
+const locationStr = window === undefined ? `core.${path.basename(__filename, path.extname(__filename))}` : 'borwser';
 
 /**
  * @description 关闭一个会话

package/src/core/removeFriend.js

@@ -3,7 +3,7 @@ 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))}`;
+const locationStr = window === undefined ? `core.${path.basename(__filename, path.extname(__filename))}` : 'borwser';
 
 /**
  * @description 删除好友

package/src/core/removeMember.js

@@ -3,7 +3,7 @@ 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))}`;
+const locationStr = window === undefined ? `core.${path.basename(__filename, path.extname(__filename))}` : 'borwser';
 
 /**
  * @description 移除群成员

package/src/core/responseBotInvitedJoinGroupRequest.js

@@ -3,7 +3,7 @@ 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))}`;
+const locationStr = window === undefined ? `core.${path.basename(__filename, path.extname(__filename))}` : 'borwser';
 
 /**
  * ! 自动同意时，不会触发该事件

package/src/core/responseFirendRequest.js

@@ -3,7 +3,7 @@ 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))}`;
+const locationStr = window === undefined ? `core.${path.basename(__filename, path.extname(__filename))}` : 'borwser';
 
 /**
  * @description 响应好友请求

package/src/core/responseMemberJoinRequest.js

@@ -3,7 +3,7 @@ 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))}`;
+const locationStr = window === undefined ? `core.${path.basename(__filename, path.extname(__filename))}` : 'borwser';
 
 /**
  * FIXME: mirai-core 的问题，有时候收不到 MemberJoinRequestEvent 事件

package/src/core/sendCommand.js

@@ -3,7 +3,7 @@ const { errCodeMap } = require('../util/errCode');
 const { URL } = require('../polyfill/URL');
 const errorHandler = require('../util/errorHandler');
 const path = require('path');
-const locationStr = `core.${path.basename(__filename, path.extname(__filename))}`;
+const locationStr = window === undefined ? `core.${path.basename(__filename, path.extname(__filename))}` : 'borwser';
 
 /**
  * @description 向 mirai-console 发送指令

package/src/core/sendFriendMessage.js

@@ -3,7 +3,7 @@ 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))}`;
+const locationStr = window === undefined ? `core.${path.basename(__filename, path.extname(__filename))}` : 'borwser';
 
 /**
  * @description 向 qq 好友发送消息

package/src/core/sendGroupMessage.js

@@ -3,7 +3,7 @@ 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))}`;
+const locationStr = window === undefined ? `core.${path.basename(__filename, path.extname(__filename))}` : 'borwser';
 
 /**
  * @description 向 qq 群发送消息

package/src/core/sendNudge.js

@@ -3,7 +3,7 @@ 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))}`;
+const locationStr = window === undefined ? `core.${path.basename(__filename, path.extname(__filename))}` : 'borwser';
 
 /**
  * @description 发送戳一戳消息

package/src/core/sendTempMessage.js

@@ -3,7 +3,7 @@ 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))}`;
+const locationStr = window === undefined ? `core.${path.basename(__filename, path.extname(__filename))}` : 'borwser';
 
 /**
  * @description 向临时对象发送消息

package/src/core/setEssence.js

@@ -3,7 +3,7 @@ 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))}`;
+const locationStr = window === undefined ? `core.${path.basename(__filename, path.extname(__filename))}` : 'borwser';
 
 
 /**

package/src/core/setGroupConfig.js

@@ -3,7 +3,7 @@ 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))}`;
+const locationStr = window === undefined ? `core.${path.basename(__filename, path.extname(__filename))}` : 'borwser';
 
 
 /**

package/src/core/setMemberAdmin.js

@@ -3,7 +3,7 @@ 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))}`;
+const locationStr = window === undefined ? `core.${path.basename(__filename, path.extname(__filename))}` : 'borwser';
 
 /**
  * @description 设置群成员权限

package/src/core/setMemberInfo.js

@@ -3,7 +3,7 @@ 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))}`;
+const locationStr = window === undefined ? `core.${path.basename(__filename, path.extname(__filename))}` : 'borwser';
 
 /**
  * @description 设置群成员信息

package/src/core/setSessionConfig.js

@@ -3,7 +3,7 @@ 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))}`;
+const locationStr = window === undefined ? `core.${path.basename(__filename, path.extname(__filename))}` : 'borwser';
 
 
 /**

package/src/core/startListeningBrowser.js

@@ -2,7 +2,7 @@ const WebSocket = window.WebSocket;
 const { URL } = require('../polyfill/URL');
 const errorHandler = require('../util/errorHandler');
 const path = require('path');
-const locationStr = `core.${path.basename(__filename, path.extname(__filename))}`;
+const locationStr = window === undefined ? `core.${path.basename(__filename, path.extname(__filename))}` : 'borwser';
 
 /**
  * @description 开始侦听事件

package/src/core/startListeningNode.js

@@ -2,7 +2,7 @@ const WebSocket = require('ws');
 const { URL } = require('../polyfill/URL');
 const errorHandler = require('../util/errorHandler');
 const path = require('path');
-const locationStr = `core.${path.basename(__filename, path.extname(__filename))}`;
+const locationStr = window === undefined ? `core.${path.basename(__filename, path.extname(__filename))}` : 'borwser';
 
 /**
  * @description 开始侦听事件

package/src/core/stopListeningBrowser.js

@@ -1,6 +1,6 @@
 const errorHandler = require('../util/errorHandler');
 const path = require('path');
-const locationStr = `core.${path.basename(__filename, path.extname(__filename))}`;
+const locationStr = window === undefined ? `core.${path.basename(__filename, path.extname(__filename))}` : 'borwser';
 
 /**
  * @description 停止侦听事件

package/src/core/stopListeningNode.js

@@ -1,6 +1,6 @@
 const errorHandler = require('../util/errorHandler');
 const path = require('path');
-const locationStr = `core.${path.basename(__filename, path.extname(__filename))}`;
+const locationStr = window === undefined ? `core.${path.basename(__filename, path.extname(__filename))}` : 'borwser';
 
 /**
  * @description 停止侦听事件

package/src/core/unmute.js

@@ -3,7 +3,7 @@ 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))}`;
+const locationStr = window === undefined ? `core.${path.basename(__filename, path.extname(__filename))}` : 'borwser';
 
 /**
  * @description 解除禁言

package/src/core/unmuteAll.js

@@ -3,7 +3,7 @@ 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))}`;
+const locationStr = window === undefined ? `core.${path.basename(__filename, path.extname(__filename))}` : 'borwser';
 
 /**
  * @description 解除全员禁言

package/src/core/uploadImage.js

@@ -3,7 +3,7 @@ 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))}`;
+const locationStr = window === undefined ? `core.${path.basename(__filename, path.extname(__filename))}` : 'borwser';
 const FormData = require('form-data');
 
 

package/src/core/uploadVoice.js

@@ -3,7 +3,7 @@ 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))}`;
+const locationStr = window === undefined ? `core.${path.basename(__filename, path.extname(__filename))}` : 'borwser';
 const FormData = require('form-data');
 
 

package/src/core/verify.js

@@ -3,7 +3,7 @@ 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))}`;
+const locationStr = window === undefined ? `core.${path.basename(__filename, path.extname(__filename))}` : 'borwser';
 
 /**
  * @description 校验 sessionKey，将一个 session 绑定到指定的 qq 上

package/src/index.d.ts

@@ -1,3 +1,8 @@
-export { Bot } from './Bot';
-export { Message } from './Message';
-export { Middleware } from './Middleware';
+import { Bot as BotType } from './Bot';
+import { Message as MessageType } from './Message';
+import { Middleware as MiddlewareType } from './Middleware';
+declare module 'mirai-js' {
+    export const Bot: typeof BotType;
+    export const Message: typeof MessageType;
+    export const Middleware: typeof MiddlewareType;
+}

package/src/index.js

@@ -2,16 +2,20 @@ const { Bot } = require('./Bot');
 const { Message } = require('./Message');
 const { Middleware } = require('./Middleware');
 
-if (process.browser) {
-    window.miraiJs = {
+(function (window, factory) {
+    if (typeof exports === 'object') {
+        module.exports = factory();
+        // eslint-disable-next-line no-undef
+    } else if (typeof define === 'function' && define.amd) {
+        // eslint-disable-next-line no-undef
+        define(factory);
+    } else {
+        window.miraiJs = factory();
+    }
+})(this, function () {
+    return {
         Bot,
         Message,
         Middleware,
     };
-} else {
-    module.exports = {
-        Bot,
-        Message,
-        Middleware,
-    };
-}
+});

package/src/polyfill/URL.js

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

package/src/polyfill/wsListener.js

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