woodenfish-bot 5.0.1 → 5.0.3

package/es/index.js

@@ -1,8 +1,8 @@
 import _asyncToGenerator from '@babel/runtime/helpers/asyncToGenerator';
+import _regeneratorRuntime from '@babel/runtime/regenerator';
 import _classCallCheck from '@babel/runtime/helpers/classCallCheck';
 import _createClass from '@babel/runtime/helpers/createClass';
 import _defineProperty from '@babel/runtime/helpers/defineProperty';
-import _regeneratorRuntime from '@babel/runtime/regenerator';
 import resty from 'resty-client';
 import _typeof from '@babel/runtime/helpers/typeof';
 import https from 'node:https';
@@ -282,7 +282,7 @@ var Guild = /*#__PURE__*/function () {
   }]);
 }();
 
-var version = "5.0.1";
+var version = "5.0.3";
 
 function getDefaultExportFromCjs (x) {
 	return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;
@@ -681,10 +681,13 @@ var addUserAgent = function addUserAgent(header) {
   header['User-Agent'] = "BotNodeSDK/v".concat(version);
 };
 var addV1Authorization = function addV1Authorization(header, appID, token) {
+  header['Authorization'] = getV1Authorization(appID, token);
+};
+var getV1Authorization = function getV1Authorization(appID, token) {
   if (!token) {
     throw new Error('QQ OpenAPI v1 需要配置 token');
   }
-  header['Authorization'] = "Bot ".concat(appID, ".").concat(token);
+  return "Bot ".concat(appID, ".").concat(token);
 };
 // 组装完整Url
 var buildUrl = function buildUrl() {
@@ -1306,8 +1309,8 @@ var Audio = /*#__PURE__*/function () {
   }]);
 }();
 
-function ownKeys$4(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$4(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$4(Object(t), true).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$4(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function ownKeys$5(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$5(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$5(Object(t), true).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$5(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var Mute = /*#__PURE__*/function () {
   function Mute(request, config) {
     _classCallCheck(this, Mute);
@@ -1368,7 +1371,7 @@ var Mute = /*#__PURE__*/function () {
           guildID: guildID
         },
         // 将options和userIDList合并到一起
-        data: _objectSpread$4(_objectSpread$4({}, options), {}, {
+        data: _objectSpread$5(_objectSpread$5({}, options), {}, {
           user_ids: userIDList
         })
       };
@@ -1564,8 +1567,8 @@ var Schedule = /*#__PURE__*/function () {
   }]);
 }();
 
-function ownKeys$3(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$3(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$3(Object(t), true).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$3(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function ownKeys$4(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$4(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$4(Object(t), true).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$4(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var Threads = /*#__PURE__*/function () {
   function Threads(request, config) {
     _classCallCheck(this, Threads);
@@ -1579,7 +1582,7 @@ var Threads = /*#__PURE__*/function () {
   return _createClass(Threads, [{
     key: "threads",
     value: function threads(channelID, requestOptions) {
-      var options = _objectSpread$3({
+      var options = _objectSpread$4({
         method: 'GET',
         url: getURL$1('threadsURI'),
         rest: {
@@ -1593,7 +1596,7 @@ var Threads = /*#__PURE__*/function () {
   }, {
     key: "thread",
     value: function thread(channelID, threadID, requestOptions) {
-      var options = _objectSpread$3({
+      var options = _objectSpread$4({
         method: 'GET',
         url: getURL$1('threadURI'),
         rest: {
@@ -1608,7 +1611,7 @@ var Threads = /*#__PURE__*/function () {
   }, {
     key: "putThreads",
     value: function putThreads(channelID, _Threads2, requestOptions) {
-      var options = _objectSpread$3({
+      var options = _objectSpread$4({
         method: 'PUT',
         url: getURL$1('threadsURI'),
         rest: {
@@ -1625,7 +1628,7 @@ var Threads = /*#__PURE__*/function () {
   }, {
     key: "putPostReply",
     value: function putPostReply(channelID, threadID, postID, reply, requestOptions) {
-      var options = _objectSpread$3({
+      var options = _objectSpread$4({
         method: 'PUT',
         url: getURL$1('threadPostRepliesURI'),
         rest: {
@@ -1642,7 +1645,7 @@ var Threads = /*#__PURE__*/function () {
   }, {
     key: "deleteThreads",
     value: function deleteThreads(channelID, threadID, requestOptions) {
-      var options = _objectSpread$3({
+      var options = _objectSpread$4({
         method: 'DELETE',
         url: getURL$1('threadURI'),
         rest: {
@@ -1724,6 +1727,43 @@ var Interaction = /*#__PURE__*/function () {
   }]);
 }();
 
+function ownKeys$3(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$3(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$3(Object(t), true).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$3(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+var getTraceID = function getTraceID(error) {
+  var _error$response;
+  return error === null || error === void 0 || (_error$response = error.response) === null || _error$response === void 0 || (_error$response = _error$response.headers) === null || _error$response === void 0 ? void 0 : _error$response['x-tps-trace-id'];
+};
+var normalizeV1OpenAPIError = function normalizeV1OpenAPIError(error) {
+  var _error$response2;
+  var traceid = getTraceID(error);
+  if (error !== null && error !== void 0 && (_error$response2 = error.response) !== null && _error$response2 !== void 0 && _error$response2.data) {
+    return _objectSpread$3(_objectSpread$3({}, error.response.data), {}, {
+      traceid: traceid
+    });
+  }
+  if (error !== null && error !== void 0 && error.response) {
+    return _objectSpread$3(_objectSpread$3({}, error.response), {}, {
+      traceid: traceid
+    });
+  }
+  return error;
+};
+var normalizeV2OpenAPIError = function normalizeV2OpenAPIError(error) {
+  var _error$response3;
+  var traceID = getTraceID(error);
+  if (error !== null && error !== void 0 && (_error$response3 = error.response) !== null && _error$response3 !== void 0 && _error$response3.data) {
+    return _objectSpread$3(_objectSpread$3({}, error.response.data), {}, {
+      trace_id: error.response.data.trace_id || traceID
+    });
+  }
+  if (error !== null && error !== void 0 && error.response) {
+    return _objectSpread$3(_objectSpread$3({}, error.response), {}, {
+      trace_id: traceID
+    });
+  }
+  return error;
+};
+
 function ownKeys$2(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread$2(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$2(Object(t), true).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$2(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var OpenAPI$1 = /*#__PURE__*/function () {
@@ -1754,7 +1794,7 @@ var OpenAPI$1 = /*#__PURE__*/function () {
     // 基础rest请求
     _defineProperty(this, "request", /*#__PURE__*/function () {
       var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee(options) {
-        var _this$config, appID, token, botUrl, client;
+        var _this$config, appID, token, botUrl, client, _t;
         return _regeneratorRuntime.wrap(function (_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
@@ -1766,31 +1806,22 @@ var OpenAPI$1 = /*#__PURE__*/function () {
               // 添加鉴权信息
               addV1Authorization(options.headers, appID, token);
               // 组装完整Url
-              botUrl = buildUrl(options.url, _this.config.sandbox); // 简化错误信息，后续可考虑通过中间件形式暴露给用户自行处理
-              resty.useRes(function (result) {
-                return result;
-              }, function (error) {
-                var _error$response, _error$response2;
-                var traceid = error === null || error === void 0 || (_error$response = error.response) === null || _error$response === void 0 || (_error$response = _error$response.headers) === null || _error$response === void 0 ? void 0 : _error$response['x-tps-trace-id'];
-                if (error !== null && error !== void 0 && (_error$response2 = error.response) !== null && _error$response2 !== void 0 && _error$response2.data) {
-                  return Promise.reject(_objectSpread$2(_objectSpread$2({}, error.response.data), {}, {
-                    traceid: traceid
-                  }));
-                }
-                if (error !== null && error !== void 0 && error.response) {
-                  return Promise.reject(_objectSpread$2(_objectSpread$2({}, error.response), {}, {
-                    traceid: traceid
-                  }));
-                }
-                return Promise.reject(error);
-              });
+              botUrl = buildUrl(options.url, _this.config.sandbox);
               client = resty.create(options);
-              return _context.abrupt("return", client.request(botUrl, options));
-            case 1:
+              _context.prev = 1;
+              _context.next = 2;
+              return client.request(botUrl, options);
+            case 2:
+              return _context.abrupt("return", _context.sent);
+            case 3:
+              _context.prev = 3;
+              _t = _context["catch"](1);
+              throw normalizeV1OpenAPIError(_t);
+            case 4:
             case "end":
               return _context.stop();
           }
-        }, _callee);
+        }, _callee, null, [[1, 3]]);
       }));
       return function (_x) {
         return _ref.apply(this, arguments);
@@ -1960,30 +1991,52 @@ var getV2AccessToken = /*#__PURE__*/function () {
     return _ref.apply(this, arguments);
   };
 }();
-var addV2Authorization = /*#__PURE__*/function () {
-  var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee2(headers, config) {
+var getV2Authorization = /*#__PURE__*/function () {
+  var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee2(config) {
     var forceRefresh,
       _args2 = arguments,
       _t;
     return _regeneratorRuntime.wrap(function (_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
-          forceRefresh = _args2.length > 2 && _args2[2] !== undefined ? _args2[2] : false;
+          forceRefresh = _args2.length > 1 && _args2[1] !== undefined ? _args2[1] : false;
           _t = "QQBot ";
           _context2.next = 1;
           return getV2AccessToken(config, forceRefresh);
         case 1:
-          headers.Authorization = _t.concat.call(_t, _context2.sent);
+          return _context2.abrupt("return", _t.concat.call(_t, _context2.sent));
         case 2:
         case "end":
           return _context2.stop();
       }
     }, _callee2);
   }));
-  return function addV2Authorization(_x2, _x3) {
+  return function getV2Authorization(_x2) {
     return _ref2.apply(this, arguments);
   };
 }();
+var addV2Authorization = /*#__PURE__*/function () {
+  var _ref3 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee3(headers, config) {
+    var forceRefresh,
+      _args3 = arguments;
+    return _regeneratorRuntime.wrap(function (_context3) {
+      while (1) switch (_context3.prev = _context3.next) {
+        case 0:
+          forceRefresh = _args3.length > 2 && _args3[2] !== undefined ? _args3[2] : false;
+          _context3.next = 1;
+          return getV2Authorization(config, forceRefresh);
+        case 1:
+          headers.Authorization = _context3.sent;
+        case 2:
+        case "end":
+          return _context3.stop();
+      }
+    }, _callee3);
+  }));
+  return function addV2Authorization(_x3, _x4) {
+    return _ref3.apply(this, arguments);
+  };
+}();
 
 var apiMap = {
   groupMessagesURI: '/v2/groups/:groupOpenid/messages',
@@ -2252,9 +2305,10 @@ var Message = /*#__PURE__*/function (_CommonMessage) {
 
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), true).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-var apiVersion = 'v2';
 var isAuthenticationError = function isAuthenticationError(error) {
-  return (error === null || error === void 0 ? void 0 : error.status) === 401 || (error === null || error === void 0 ? void 0 : error.statusCode) === 401 || (error === null || error === void 0 ? void 0 : error.code) === 11201 || (error === null || error === void 0 ? void 0 : error.err_code) === 40012001;
+  var _error$response, _error$response2;
+  var responseData = error === null || error === void 0 || (_error$response = error.response) === null || _error$response === void 0 ? void 0 : _error$response.data;
+  return (error === null || error === void 0 ? void 0 : error.status) === 401 || (error === null || error === void 0 ? void 0 : error.statusCode) === 401 || (error === null || error === void 0 || (_error$response2 = error.response) === null || _error$response2 === void 0 ? void 0 : _error$response2.status) === 401 || (error === null || error === void 0 ? void 0 : error.code) === 11201 || (error === null || error === void 0 ? void 0 : error.err_code) === 40012001 || (responseData === null || responseData === void 0 ? void 0 : responseData.code) === 11201 || (responseData === null || responseData === void 0 ? void 0 : responseData.err_code) === 40012001;
 };
 var OpenAPI = /*#__PURE__*/function () {
   function OpenAPI(config) {
@@ -2308,27 +2362,10 @@ var OpenAPI = /*#__PURE__*/function () {
     }());
     _defineProperty(this, "request", /*#__PURE__*/function () {
       var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee2(options) {
-        var botUrl, preparedOptions, _t;
+        var botUrl, preparedOptions, _t, _t2;
         return _regeneratorRuntime.wrap(function (_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
-              resty.useRes(function (result) {
-                return result;
-              }, function (error) {
-                var _error$response, _error$response2;
-                var traceID = error === null || error === void 0 || (_error$response = error.response) === null || _error$response === void 0 || (_error$response = _error$response.headers) === null || _error$response === void 0 ? void 0 : _error$response['x-tps-trace-id'];
-                if (error !== null && error !== void 0 && (_error$response2 = error.response) !== null && _error$response2 !== void 0 && _error$response2.data) {
-                  return Promise.reject(_objectSpread(_objectSpread({}, error.response.data), {}, {
-                    trace_id: error.response.data.trace_id || traceID
-                  }));
-                }
-                if (error !== null && error !== void 0 && error.response) {
-                  return Promise.reject(_objectSpread(_objectSpread({}, error.response), {}, {
-                    trace_id: traceID
-                  }));
-                }
-                return Promise.reject(error);
-              });
               botUrl = buildUrl(options.url, _this.config.sandbox);
               _context2.next = 1;
               return _this.prepareOptions(options);
@@ -2346,19 +2383,27 @@ var OpenAPI = /*#__PURE__*/function () {
                 _context2.next = 5;
                 break;
               }
-              throw _t;
+              throw normalizeV2OpenAPIError(_t);
             case 5:
               invalidateV2AccessToken(_this.config.appID);
               _context2.next = 6;
               return _this.prepareOptions(options, true);
             case 6:
               preparedOptions = _context2.sent;
-              return _context2.abrupt("return", resty.create(preparedOptions).request(botUrl, preparedOptions));
-            case 7:
+              _context2.prev = 7;
+              _context2.next = 8;
+              return resty.create(preparedOptions).request(botUrl, preparedOptions);
+            case 8:
+              return _context2.abrupt("return", _context2.sent);
+            case 9:
+              _context2.prev = 9;
+              _t2 = _context2["catch"](7);
+              throw normalizeV2OpenAPIError(_t2);
+            case 10:
             case "end":
               return _context2.stop();
           }
-        }, _callee2, null, [[2, 4]]);
+        }, _callee2, null, [[2, 4], [7, 9]]);
       }));
       return function (_x2) {
         return _ref2.apply(this, arguments);
@@ -2398,8 +2443,6 @@ var OpenAPI = /*#__PURE__*/function () {
 
 // 事件分发类型
 
-// 请求得到ws地址的参数
-
 // 请求ws地址回包对象
 
 // ws信息
@@ -2728,7 +2771,7 @@ var SessionEvents = {
 };
 
 // ws地址配置
-var WsObjRequestOptions = function WsObjRequestOptions(sandbox) {
+var WsObjRequestOptions = function WsObjRequestOptions(sandbox, apiVersion) {
   return {
     method: 'GET',
     url: buildUrl(getURL$1('gatewayBotURI'), sandbox),
@@ -2753,11 +2796,12 @@ var Properties = {
 
 // websocket连接
 var Ws = /*#__PURE__*/function () {
-  function Ws(config, event, sessionRecord) {
+  function Ws(config, authorization, event, sessionRecord) {
     _classCallCheck(this, Ws);
     _defineProperty(this, "ws", void 0);
     _defineProperty(this, "event", void 0);
     _defineProperty(this, "config", void 0);
+    _defineProperty(this, "authorization", void 0);
     _defineProperty(this, "heartbeatInterval", void 0);
     // 心跳参数，默认为心跳测试
     _defineProperty(this, "heartbeatParam", {
@@ -2773,6 +2817,7 @@ var Ws = /*#__PURE__*/function () {
     });
     _defineProperty(this, "alive", false);
     this.config = config;
+    this.authorization = authorization;
     this.isReconnect = false;
     this.event = event;
     // 如果是重连，则拿到重新的会话记录，然后进入重连步骤
@@ -2816,7 +2861,15 @@ var Ws = /*#__PURE__*/function () {
           // websocket连接成功，拿到心跳周期
           _this.heartbeatInterval = wsRes === null || wsRes === void 0 || (_wsRes$d2 = wsRes.d) === null || _wsRes$d2 === void 0 ? void 0 : _wsRes$d2.heartbeat_interval;
           // 非断线重连时，需要鉴权
-          _this.isReconnect ? _this.reconnectWs() : _this.authWs();
+          void (_this.isReconnect ? _this.reconnectWs() : _this.authWs())["catch"](function (error) {
+            var message = error instanceof Error ? error.message : String(error);
+            BotLogger.info('[CLIENT] WebSocket鉴权失败', message);
+            _this.event.emit(SessionEvents.ERROR, {
+              eventType: SessionEvents.ERROR,
+              msg: message
+            });
+            _this.ws.close();
+          });
           return;
         }
 
@@ -2913,30 +2966,47 @@ var Ws = /*#__PURE__*/function () {
     // 鉴权
   }, {
     key: "authWs",
-    value: function authWs() {
-      // 鉴权参数
-      var authOp = {
-        op: OpCode.IDENTIFY,
-        // 鉴权参数
-        d: {
-          token: "Bot ".concat(this.config.appID, ".").concat(this.config.token),
-          // 根据配置转换token
-          intents: this.getValidIntents(),
-          // todo 接受的类型
-          shard: this.checkShards(this.config.shards) || [0, 1],
-          // 分片信息,给一个默认值
-          properties: {
-            $os: Properties.os,
-            $browser: Properties.browser,
-            $device: Properties.device
+    value: function () {
+      var _authWs = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+        var authOp, _t, _t2, _t3, _t4, _t5, _t6;
+        return _regeneratorRuntime.wrap(function (_context) {
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              _t = OpCode.IDENTIFY;
+              _context.next = 1;
+              return this.authorization.getAuthorization();
+            case 1:
+              _t2 = _context.sent;
+              _t3 = this.getValidIntents();
+              _t4 = this.checkShards(this.config.shards) || [0, 1];
+              _t5 = {
+                $os: Properties.os,
+                $browser: Properties.browser,
+                $device: Properties.device
+              };
+              _t6 = {
+                token: _t2,
+                intents: _t3,
+                shard: _t4,
+                properties: _t5
+              };
+              authOp = {
+                op: _t,
+                d: _t6
+              };
+              // 发送鉴权请求
+              this.sendWs(authOp);
+            case 2:
+            case "end":
+              return _context.stop();
           }
-        }
-      };
-      // 发送鉴权请求
-      this.sendWs(authOp);
-    }
-
-    // 校验intents类型
+        }, _callee, this);
+      }));
+      function authWs() {
+        return _authWs.apply(this, arguments);
+      }
+      return authWs;
+    }() // 校验intents类型
   }, {
     key: "getValidIntents",
     value: function getValidIntents() {
@@ -3028,19 +3098,40 @@ var Ws = /*#__PURE__*/function () {
     // 重新重连Ws
   }, {
     key: "reconnectWs",
-    value: function reconnectWs() {
-      var reconnectParam = {
-        op: OpCode.RESUME,
-        d: {
-          token: "Bot ".concat(this.config.appID, ".").concat(this.config.token),
-          session_id: this.sessionRecord.sessionID,
-          seq: this.sessionRecord.seq
-        }
-      };
-      this.sendWs(reconnectParam);
-    }
-
-    // OpenAPI事件分发
+    value: function () {
+      var _reconnectWs = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
+        var reconnectParam, _t7, _t8, _t9, _t0, _t1;
+        return _regeneratorRuntime.wrap(function (_context2) {
+          while (1) switch (_context2.prev = _context2.next) {
+            case 0:
+              _t7 = OpCode.RESUME;
+              _context2.next = 1;
+              return this.authorization.getAuthorization();
+            case 1:
+              _t8 = _context2.sent;
+              _t9 = this.sessionRecord.sessionID;
+              _t0 = this.sessionRecord.seq;
+              _t1 = {
+                token: _t8,
+                session_id: _t9,
+                seq: _t0
+              };
+              reconnectParam = {
+                op: _t7,
+                d: _t1
+              };
+              this.sendWs(reconnectParam);
+            case 2:
+            case "end":
+              return _context2.stop();
+          }
+        }, _callee2, this);
+      }));
+      function reconnectWs() {
+        return _reconnectWs.apply(this, arguments);
+      }
+      return reconnectWs;
+    }() // OpenAPI事件分发
   }, {
     key: "dispatchEvent",
     value: function dispatchEvent(eventType, wsRes) {
@@ -3071,7 +3162,10 @@ var Ws = /*#__PURE__*/function () {
   }, {
     key: "handleWsCloseEvent",
     value: function handleWsCloseEvent(code) {
-      var _this2 = this;
+      var _this$authorization$i,
+        _this$authorization,
+        _this2 = this;
+      if (code === 4004) (_this$authorization$i = (_this$authorization = this.authorization).invalidate) === null || _this$authorization$i === void 0 || _this$authorization$i.call(_this$authorization);
       WebsocketCloseReason.forEach(function (e) {
         if (e.code === code) {
           _this2.event.emit(SessionEvents.ERROR, {
@@ -3085,14 +3179,16 @@ var Ws = /*#__PURE__*/function () {
 }();
 
 var Session = /*#__PURE__*/function () {
-  function Session(config, event, sessionRecord) {
+  function Session(config, authorization, event, sessionRecord) {
     _classCallCheck(this, Session);
     _defineProperty(this, "config", void 0);
+    _defineProperty(this, "authorization", void 0);
     _defineProperty(this, "heartbeatInterval", void 0);
     _defineProperty(this, "ws", void 0);
     _defineProperty(this, "event", void 0);
     _defineProperty(this, "sessionRecord", void 0);
     this.config = config;
+    this.authorization = authorization;
     this.event = event;
     // 如果会话记录存在的话，继续透传
     if (sessionRecord) {
@@ -3106,16 +3202,17 @@ var Session = /*#__PURE__*/function () {
     key: "createSession",
     value: function () {
       var _createSession = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-        var reqOptions, response, wsData, _t;
+        var reqOptions, response, wsData, _response, _t;
         return _regeneratorRuntime.wrap(function (_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
               _context.prev = 0;
-              this.ws = new Ws(this.config, this.event, this.sessionRecord || undefined);
-              reqOptions = WsObjRequestOptions(this.config.sandbox);
+              this.ws = new Ws(this.config, this.authorization, this.event, this.sessionRecord || undefined);
+              reqOptions = WsObjRequestOptions(this.config.sandbox, this.authorization.apiVersion);
               _context.next = 1;
-              return addV2Authorization(reqOptions.headers, this.config);
+              return this.authorization.getAuthorization();
             case 1:
+              reqOptions.headers.Authorization = _context.sent;
               _context.next = 2;
               return resty.create(reqOptions).get(reqOptions.url, {});
             case 2:
@@ -3133,7 +3230,12 @@ var Session = /*#__PURE__*/function () {
             case 4:
               _context.prev = 4;
               _t = _context["catch"](0);
-              BotLogger.info('[ERROR] createSession: ', _t);
+              _response = _t === null || _t === void 0 ? void 0 : _t.response;
+              BotLogger.info('[ERROR] createSession: ', {
+                message: _t instanceof Error ? _t.message : String(_t),
+                status: _response === null || _response === void 0 ? void 0 : _response.status,
+                data: _response === null || _response === void 0 ? void 0 : _response.data
+              });
               this.event.emit(SessionEvents.EVENT_WS, {
                 eventType: SessionEvents.DISCONNECT,
                 eventMsg: this.sessionRecord
@@ -3161,13 +3263,13 @@ function _callSuper(t, o, e) { return o = _getPrototypeOf(o), _possibleConstruct
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
 var MAX_RETRY = 2;
 var WebsocketClient = /*#__PURE__*/function (_EventEmitter) {
-  function WebsocketClient(config) {
+  function WebsocketClient(config, authorization) {
     var _this;
     _classCallCheck(this, WebsocketClient);
     _this = _callSuper(this, WebsocketClient);
     _defineProperty(_this, "session", void 0);
     _defineProperty(_this, "retry", 0);
-    _this.connect(config);
+    _this.connect(config, authorization);
     _this.on(SessionEvents.EVENT_WS, function (data) {
       switch (data.eventType) {
         case SessionEvents.RECONNECT:
@@ -3177,9 +3279,9 @@ var WebsocketClient = /*#__PURE__*/function (_EventEmitter) {
           if (_this.retry < (config.maxRetry || MAX_RETRY)) {
             var _WebsocketCloseReason;
             BotLogger.info('[CLIENT] 重新连接中，尝试次数：', _this.retry + 1);
-            _this.connect(config, (_WebsocketCloseReason = WebsocketCloseReason.find(function (v) {
+            _this.connect(config, authorization, (_WebsocketCloseReason = WebsocketCloseReason.find(function (v) {
               return v.code === data.code;
-            })) !== null && _WebsocketCloseReason !== void 0 && _WebsocketCloseReason.resume ? data.eventMsg : null);
+            })) !== null && _WebsocketCloseReason !== void 0 && _WebsocketCloseReason.resume ? data.eventMsg : undefined);
             _this.retry += 1;
           } else {
             BotLogger.info('[CLIENT] 超过重试次数，连接终止');
@@ -3202,10 +3304,10 @@ var WebsocketClient = /*#__PURE__*/function (_EventEmitter) {
   _inherits(WebsocketClient, _EventEmitter);
   return _createClass(WebsocketClient, [{
     key: "connect",
-    value: function connect(config, sessionRecord) {
+    value: function connect(config, authorization, sessionRecord) {
       var event = this;
       // 新建一个会话
-      this.session = new Session(config, event, sessionRecord);
+      this.session = new Session(config, authorization, event, sessionRecord);
       return this.session;
     }
 
@@ -3225,10 +3327,38 @@ function createOpenAPIV1(config) {
 function createOpenAPIV2(config) {
   return OpenAPI.newClient(config);
 }
-
-// ws连接新建
-function createWebsocket(config) {
-  return new WebsocketClient(config);
+function createWebsocketV1(config) {
+  return new WebsocketClient(config, {
+    apiVersion: 'v1',
+    getAuthorization: function () {
+      var _getAuthorization = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+        return _regeneratorRuntime.wrap(function (_context) {
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              return _context.abrupt("return", getV1Authorization(config.appID, config.token));
+            case 1:
+            case "end":
+              return _context.stop();
+          }
+        }, _callee);
+      }));
+      function getAuthorization() {
+        return _getAuthorization.apply(this, arguments);
+      }
+      return getAuthorization;
+    }()
+  });
+}
+function createWebsocketV2(config) {
+  return new WebsocketClient(config, {
+    apiVersion: 'v2',
+    getAuthorization: function getAuthorization() {
+      return getV2Authorization(config);
+    },
+    invalidate: config.clientSecret && !config.accessToken && !config.access_token ? function () {
+      return invalidateV2AccessToken(config.appID);
+    } : undefined
+  });
 }
 
-export { AvailableIntentsEventsEnum, IntentEvents, Intents, OpCode, SessionEvents, WSCodes, WebsocketCloseReason, WebsocketCode, WsEventType, WsObjRequestOptions, createOpenAPIV1, createOpenAPIV2, createWebsocket };
+export { AvailableIntentsEventsEnum, IntentEvents, Intents, OpCode, SessionEvents, WSCodes, WebsocketCloseReason, WebsocketCode, WsEventType, WsObjRequestOptions, createOpenAPIV1, createOpenAPIV2, createWebsocketV1, createWebsocketV2 };