woodenfish-bot 4.4.3 → 4.4.5

package/es/index.js

@@ -1,10 +1,10 @@
+import _asyncToGenerator from '@babel/runtime/helpers/asyncToGenerator';
 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 _asyncToGenerator from '@babel/runtime/helpers/asyncToGenerator';
 import _typeof from '@babel/runtime/helpers/typeof';
-import _regeneratorRuntime from '@babel/runtime/regenerator';
 import fs from 'fs';
 import https from 'https';
 import _possibleConstructorReturn from '@babel/runtime/helpers/possibleConstructorReturn';
@@ -297,7 +297,7 @@ var Guild = /*#__PURE__*/function () {
   }]);
 }();
 
-var version = "4.4.3";
+var version = "4.4.5";
 
 function getDefaultExportFromCjs (x) {
 	return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;
@@ -677,6 +677,9 @@ log.setLevel('info');
 log.setLevel('trace');
 var BotLogger = log;
 
+// 全局token刷新锁，避免并发刷新
+var tokenRefreshPromises = new Map();
+
 // 转为对象
 var toObject = function toObject(data) {
   if (Buffer.isBuffer(data)) return JSON.parse(data.toString());
@@ -755,73 +758,150 @@ function getAccessToken(access_token_file, url, data, appID) {
   });
 }
 
-// 添加 User-Agent
-var addAuthorization = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee(header, appID, token, clientSecret, apiVersion) {
-    var now_time, url, data, access_token_file, default_token_json, access_token, expires_in, access_token_json;
-    return _regeneratorRuntime.wrap(function (_context) {
-      while (1) switch (_context.prev = _context.next) {
+// 获取或刷新token（带并发控制）
+var getOrRefreshToken = /*#__PURE__*/function () {
+  var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee2(appID, clientSecret) {
+    var key, existingPromise, refreshPromise;
+    return _regeneratorRuntime.wrap(function (_context2) {
+      while (1) switch (_context2.prev = _context2.next) {
         case 0:
-          if (!(apiVersion == 'v2')) {
-            _context.next = 3;
+          key = "".concat(appID, ":").concat(clientSecret);
+          existingPromise = tokenRefreshPromises.get(key);
+          if (!existingPromise) {
+            _context2.next = 2;
             break;
           }
-          now_time = getTimeStampNumber();
-          url = 'https://bots.qq.com/app/getAppAccessToken';
-          data = {
-            appId: appID,
-            clientSecret: clientSecret
-          };
-          access_token_file = './access_token.json';
-          default_token_json = {
-            bot: _defineProperty({}, appID, {
-              access_token: "",
-              expires_in: ""
-            })
-          };
-          access_token = '';
-          expires_in = 0;
-          try {
-            // 判断文件是否存在
-            if (fs.existsSync(access_token_file)) {
-              // 执行文件存在时的处理逻辑
-              access_token_json = JSON.parse(fs.readFileSync(access_token_file).toString()); // 判断是否存在appID
-              if (access_token_json.hasOwnProperty('bot') && access_token_json['bot'].hasOwnProperty(appID)) {
-                access_token = access_token_json['bot'][appID]['access_token'];
-                expires_in = parseInt(access_token_json['bot'][appID]['expires_in']);
+          // 如果已经有刷新在进行，等待它完成
+          console.log("\u7B49\u5F85\u5DF2\u6709\u7684token\u5237\u65B0\u5B8C\u6210 (appID: ".concat(appID, ")"));
+          _context2.next = 1;
+          return existingPromise;
+        case 1:
+          return _context2.abrupt("return", _context2.sent);
+        case 2:
+          // 创建新的刷新Promise
+          refreshPromise = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+            var now_time, url, data, access_token_file, access_token, expires_in, needsRefresh, access_token_json, expiresStr, parsed, default_token_json;
+            return _regeneratorRuntime.wrap(function (_context) {
+              while (1) switch (_context.prev = _context.next) {
+                case 0:
+                  _context.prev = 0;
+                  now_time = getTimeStampNumber();
+                  url = 'https://bots.qq.com/app/getAppAccessToken';
+                  data = {
+                    appId: appID,
+                    clientSecret: clientSecret
+                  };
+                  access_token_file = './access_token.json';
+                  access_token = '';
+                  expires_in = 0;
+                  needsRefresh = false;
+                  try {
+                    // 判断文件是否存在
+                    if (fs.existsSync(access_token_file)) {
+                      // 执行文件存在时的处理逻辑
+                      access_token_json = JSON.parse(fs.readFileSync(access_token_file).toString()); // 判断是否存在appID
+                      if (access_token_json.hasOwnProperty('bot') && access_token_json['bot'].hasOwnProperty(appID)) {
+                        access_token = access_token_json['bot'][appID]['access_token'];
+                        expiresStr = access_token_json['bot'][appID]['expires_in']; // 改进expires_in解析，防止NaN
+                        if (expiresStr && typeof expiresStr === 'string') {
+                          parsed = parseInt(expiresStr);
+                          if (!isNaN(parsed) && parsed > 0) {
+                            expires_in = parsed;
+                          } else {
+                            console.log('expires_in解析失败，重置为0:', expiresStr);
+                            expires_in = 0;
+                          }
+                        } else {
+                          expires_in = 0;
+                        }
+                      }
+                    } else {
+                      // 执行文件不存在时的处理逻辑
+                      default_token_json = {
+                        bot: _defineProperty({}, appID, {
+                          access_token: "",
+                          expires_in: ""
+                        })
+                      };
+                      fs.writeFileSync(access_token_file, JSON.stringify(default_token_json, null, 2), 'utf-8');
+                      needsRefresh = true;
+                    }
+                  } catch (err) {
+                    console.error('读取文件时发生错误:', err);
+                    // 出错时重置expires_in为0，强制重新获取token
+                    expires_in = 0;
+                    needsRefresh = true;
+                  }
+
+                  // 判断是否需要刷新token
+                  if (!(access_token === '' || now_time > expires_in - 50 || needsRefresh)) {
+                    _context.next = 2;
+                    break;
+                  }
+                  console.log('检测到access_token需要刷新 - 当前token:', access_token, '过期时间:', expires_in, '当前时间:', now_time);
+                  _context.next = 1;
+                  return getAccessToken(access_token_file, url, data, appID);
+                case 1:
+                  access_token = _context.sent;
+                  console.log('access_token刷新成功，新token:', access_token);
+                case 2:
+                  return _context.abrupt("return", access_token);
+                case 3:
+                  _context.prev = 3;
+                  // 刷新完成后移除Promise
+                  tokenRefreshPromises["delete"](key);
+                  return _context.finish(3);
+                case 4:
+                case "end":
+                  return _context.stop();
               }
-            } else {
-              // 执行文件不存在时的处理逻辑
-              fs.writeFileSync(access_token_file, JSON.stringify(default_token_json, null, 2), 'utf-8');
-            }
-          } catch (err) {
-            console.error('读取文件时发生错误:', err);
-          }
-          // 判断access_token是否存在，不存在或者已经过期就重新获取
-          if (!(access_token === '' || now_time > expires_in - 50)) {
-            _context.next = 2;
+            }, _callee, null, [[0,, 3, 4]]);
+          }))(); // 存储Promise以便其他并发请求使用
+          tokenRefreshPromises.set(key, refreshPromise);
+          _context2.next = 3;
+          return refreshPromise;
+        case 3:
+          return _context2.abrupt("return", _context2.sent);
+        case 4:
+        case "end":
+          return _context2.stop();
+      }
+    }, _callee2);
+  }));
+  return function getOrRefreshToken(_x, _x2) {
+    return _ref.apply(this, arguments);
+  };
+}();
+
+// 添加 User-Agent
+var addAuthorization = /*#__PURE__*/function () {
+  var _ref3 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee3(header, appID, token, clientSecret, apiVersion) {
+    var access_token;
+    return _regeneratorRuntime.wrap(function (_context3) {
+      while (1) switch (_context3.prev = _context3.next) {
+        case 0:
+          if (!(apiVersion == 'v2')) {
+            _context3.next = 2;
             break;
           }
-          console.log('access_token', access_token, 'expire_time', expires_in);
-          _context.next = 1;
-          return getAccessToken(access_token_file, url, data, appID);
+          _context3.next = 1;
+          return getOrRefreshToken(appID, clientSecret);
         case 1:
-          access_token = _context.sent;
-        case 2:
+          access_token = _context3.sent;
           // 更新header['Authorization']
           header['Authorization'] = "QQBot ".concat(access_token);
-          _context.next = 4;
+          _context3.next = 3;
           break;
-        case 3:
+        case 2:
           header['Authorization'] = "Bot ".concat(appID, ".").concat(token);
-        case 4:
+        case 3:
         case "end":
-          return _context.stop();
+          return _context3.stop();
       }
-    }, _callee);
+    }, _callee3);
   }));
-  return function addAuthorization(_x, _x2, _x3, _x4, _x5) {
-    return _ref.apply(this, arguments);
+  return function addAuthorization(_x3, _x4, _x5, _x6, _x7) {
+    return _ref3.apply(this, arguments);
   };
 }();
 // 组装完整Url
@@ -1912,7 +1992,7 @@ var Interaction = /*#__PURE__*/function () {
 
 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 = 'v1';
+var apiVersion = 'v2';
 var OpenAPI = /*#__PURE__*/function () {
   function OpenAPI(config) {
     _classCallCheck(this, OpenAPI);
@@ -1966,41 +2046,78 @@ var OpenAPI = /*#__PURE__*/function () {
     // 基础rest请求
   }, {
     key: "request",
-    value: function request(options) {
-      var _this$config = this.config,
-        appID = _this$config.appID,
-        token = _this$config.token,
-        clientSecret = _this$config.clientSecret;
-      options.headers = _objectSpread({}, options.headers);
-      var apiVersion = options.apiVersion || '';
-      // 添加 UA
-      addUserAgent(options.headers, appID, apiVersion);
-      // 添加鉴权信息
-      addAuthorization(options.headers, appID, token, clientSecret, apiVersion);
-      // 组装完整Url
-      var 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(_objectSpread({}, error.response.data), {}, {
-            traceid: traceid
-          }));
-        }
-        if (error !== null && error !== void 0 && error.response) {
-          return Promise.reject(_objectSpread(_objectSpread({}, error.response), {}, {
-            traceid: traceid
-          }));
-        }
-        return Promise.reject(error);
-      });
-      var client = resty.create(options);
-      return client.request(botUrl, options);
-    }
+    value: function () {
+      var _request = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee(options) {
+        var _this$config, appID, token, clientSecret, apiVersion, botUrl, client, retryClient, _t, _t2;
+        return _regeneratorRuntime.wrap(function (_context) {
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              _this$config = this.config, appID = _this$config.appID, token = _this$config.token, clientSecret = _this$config.clientSecret;
+              options.headers = _objectSpread({}, options.headers);
+              apiVersion = options.apiVersion || 'v2'; // 添加 UA
+              addUserAgent(options.headers, appID, apiVersion);
+              // 添加鉴权信息
+              _context.next = 1;
+              return addAuthorization(options.headers, appID, token, clientSecret, apiVersion);
+            case 1:
+              // 组装完整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(_objectSpread({}, error.response.data), {}, {
+                    traceid: traceid
+                  }));
+                }
+                if (error !== null && error !== void 0 && error.response) {
+                  return Promise.reject(_objectSpread(_objectSpread({}, error.response), {}, {
+                    traceid: traceid
+                  }));
+                }
+                return Promise.reject(error);
+              });
+              client = resty.create(options);
+              _context.prev = 2;
+              _context.next = 3;
+              return client.request(botUrl, options);
+            case 3:
+              return _context.abrupt("return", _context.sent);
+            case 4:
+              _context.prev = 4;
+              _t = _context["catch"](2);
+              if (!((_t === null || _t === void 0 ? void 0 : _t.code) === 11201 || (_t === null || _t === void 0 ? void 0 : _t.err_code) === 40012001)) {
+                _context.next = 8;
+                break;
+              }
+              console.log('检测到认证失败，尝试重试请求...');
+              _context.prev = 5;
+              // 由于addAuthorization现在是并发安全的，重试时会自动获取最新token
+              retryClient = resty.create(options);
+              _context.next = 6;
+              return retryClient.request(botUrl, options);
+            case 6:
+              return _context.abrupt("return", _context.sent);
+            case 7:
+              _context.prev = 7;
+              _t2 = _context["catch"](5);
+              console.log('重试请求仍然失败:', _t2);
+              throw _t2;
+            case 8:
+              throw _t;
+            case 9:
+            case "end":
+              return _context.stop();
+          }
+        }, _callee, this, [[2, 4], [5, 7]]);
+      }));
+      function request(_x) {
+        return _request.apply(this, arguments);
+      }
+      return request;
+    }()
   }], [{
     key: "newClient",
     value: function newClient(config) {

package/lib/index.js

@@ -1,12 +1,12 @@
 'use strict';
 
+var _asyncToGenerator = require('@babel/runtime/helpers/asyncToGenerator');
 var _classCallCheck = require('@babel/runtime/helpers/classCallCheck');
 var _createClass = require('@babel/runtime/helpers/createClass');
 var _defineProperty = require('@babel/runtime/helpers/defineProperty');
+var _regeneratorRuntime = require('@babel/runtime/regenerator');
 var resty = require('resty-client');
-var _asyncToGenerator = require('@babel/runtime/helpers/asyncToGenerator');
 var _typeof = require('@babel/runtime/helpers/typeof');
-var _regeneratorRuntime = require('@babel/runtime/regenerator');
 var fs = require('fs');
 var https = require('https');
 var _possibleConstructorReturn = require('@babel/runtime/helpers/possibleConstructorReturn');
@@ -299,7 +299,7 @@ var Guild = /*#__PURE__*/function () {
   }]);
 }();
 
-var version = "4.4.3";
+var version = "4.4.5";
 
 function getDefaultExportFromCjs (x) {
 	return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;
@@ -679,6 +679,9 @@ log.setLevel('info');
 log.setLevel('trace');
 var BotLogger = log;
 
+// 全局token刷新锁，避免并发刷新
+var tokenRefreshPromises = new Map();
+
 // 转为对象
 var toObject = function toObject(data) {
   if (Buffer.isBuffer(data)) return JSON.parse(data.toString());
@@ -757,73 +760,150 @@ function getAccessToken(access_token_file, url, data, appID) {
   });
 }
 
-// 添加 User-Agent
-var addAuthorization = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee(header, appID, token, clientSecret, apiVersion) {
-    var now_time, url, data, access_token_file, default_token_json, access_token, expires_in, access_token_json;
-    return _regeneratorRuntime.wrap(function (_context) {
-      while (1) switch (_context.prev = _context.next) {
+// 获取或刷新token（带并发控制）
+var getOrRefreshToken = /*#__PURE__*/function () {
+  var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee2(appID, clientSecret) {
+    var key, existingPromise, refreshPromise;
+    return _regeneratorRuntime.wrap(function (_context2) {
+      while (1) switch (_context2.prev = _context2.next) {
         case 0:
-          if (!(apiVersion == 'v2')) {
-            _context.next = 3;
+          key = "".concat(appID, ":").concat(clientSecret);
+          existingPromise = tokenRefreshPromises.get(key);
+          if (!existingPromise) {
+            _context2.next = 2;
             break;
           }
-          now_time = getTimeStampNumber();
-          url = 'https://bots.qq.com/app/getAppAccessToken';
-          data = {
-            appId: appID,
-            clientSecret: clientSecret
-          };
-          access_token_file = './access_token.json';
-          default_token_json = {
-            bot: _defineProperty({}, appID, {
-              access_token: "",
-              expires_in: ""
-            })
-          };
-          access_token = '';
-          expires_in = 0;
-          try {
-            // 判断文件是否存在
-            if (fs.existsSync(access_token_file)) {
-              // 执行文件存在时的处理逻辑
-              access_token_json = JSON.parse(fs.readFileSync(access_token_file).toString()); // 判断是否存在appID
-              if (access_token_json.hasOwnProperty('bot') && access_token_json['bot'].hasOwnProperty(appID)) {
-                access_token = access_token_json['bot'][appID]['access_token'];
-                expires_in = parseInt(access_token_json['bot'][appID]['expires_in']);
+          // 如果已经有刷新在进行，等待它完成
+          console.log("\u7B49\u5F85\u5DF2\u6709\u7684token\u5237\u65B0\u5B8C\u6210 (appID: ".concat(appID, ")"));
+          _context2.next = 1;
+          return existingPromise;
+        case 1:
+          return _context2.abrupt("return", _context2.sent);
+        case 2:
+          // 创建新的刷新Promise
+          refreshPromise = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+            var now_time, url, data, access_token_file, access_token, expires_in, needsRefresh, access_token_json, expiresStr, parsed, default_token_json;
+            return _regeneratorRuntime.wrap(function (_context) {
+              while (1) switch (_context.prev = _context.next) {
+                case 0:
+                  _context.prev = 0;
+                  now_time = getTimeStampNumber();
+                  url = 'https://bots.qq.com/app/getAppAccessToken';
+                  data = {
+                    appId: appID,
+                    clientSecret: clientSecret
+                  };
+                  access_token_file = './access_token.json';
+                  access_token = '';
+                  expires_in = 0;
+                  needsRefresh = false;
+                  try {
+                    // 判断文件是否存在
+                    if (fs.existsSync(access_token_file)) {
+                      // 执行文件存在时的处理逻辑
+                      access_token_json = JSON.parse(fs.readFileSync(access_token_file).toString()); // 判断是否存在appID
+                      if (access_token_json.hasOwnProperty('bot') && access_token_json['bot'].hasOwnProperty(appID)) {
+                        access_token = access_token_json['bot'][appID]['access_token'];
+                        expiresStr = access_token_json['bot'][appID]['expires_in']; // 改进expires_in解析，防止NaN
+                        if (expiresStr && typeof expiresStr === 'string') {
+                          parsed = parseInt(expiresStr);
+                          if (!isNaN(parsed) && parsed > 0) {
+                            expires_in = parsed;
+                          } else {
+                            console.log('expires_in解析失败，重置为0:', expiresStr);
+                            expires_in = 0;
+                          }
+                        } else {
+                          expires_in = 0;
+                        }
+                      }
+                    } else {
+                      // 执行文件不存在时的处理逻辑
+                      default_token_json = {
+                        bot: _defineProperty({}, appID, {
+                          access_token: "",
+                          expires_in: ""
+                        })
+                      };
+                      fs.writeFileSync(access_token_file, JSON.stringify(default_token_json, null, 2), 'utf-8');
+                      needsRefresh = true;
+                    }
+                  } catch (err) {
+                    console.error('读取文件时发生错误:', err);
+                    // 出错时重置expires_in为0，强制重新获取token
+                    expires_in = 0;
+                    needsRefresh = true;
+                  }
+
+                  // 判断是否需要刷新token
+                  if (!(access_token === '' || now_time > expires_in - 50 || needsRefresh)) {
+                    _context.next = 2;
+                    break;
+                  }
+                  console.log('检测到access_token需要刷新 - 当前token:', access_token, '过期时间:', expires_in, '当前时间:', now_time);
+                  _context.next = 1;
+                  return getAccessToken(access_token_file, url, data, appID);
+                case 1:
+                  access_token = _context.sent;
+                  console.log('access_token刷新成功，新token:', access_token);
+                case 2:
+                  return _context.abrupt("return", access_token);
+                case 3:
+                  _context.prev = 3;
+                  // 刷新完成后移除Promise
+                  tokenRefreshPromises["delete"](key);
+                  return _context.finish(3);
+                case 4:
+                case "end":
+                  return _context.stop();
               }
-            } else {
-              // 执行文件不存在时的处理逻辑
-              fs.writeFileSync(access_token_file, JSON.stringify(default_token_json, null, 2), 'utf-8');
-            }
-          } catch (err) {
-            console.error('读取文件时发生错误:', err);
-          }
-          // 判断access_token是否存在，不存在或者已经过期就重新获取
-          if (!(access_token === '' || now_time > expires_in - 50)) {
-            _context.next = 2;
+            }, _callee, null, [[0,, 3, 4]]);
+          }))(); // 存储Promise以便其他并发请求使用
+          tokenRefreshPromises.set(key, refreshPromise);
+          _context2.next = 3;
+          return refreshPromise;
+        case 3:
+          return _context2.abrupt("return", _context2.sent);
+        case 4:
+        case "end":
+          return _context2.stop();
+      }
+    }, _callee2);
+  }));
+  return function getOrRefreshToken(_x, _x2) {
+    return _ref.apply(this, arguments);
+  };
+}();
+
+// 添加 User-Agent
+var addAuthorization = /*#__PURE__*/function () {
+  var _ref3 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee3(header, appID, token, clientSecret, apiVersion) {
+    var access_token;
+    return _regeneratorRuntime.wrap(function (_context3) {
+      while (1) switch (_context3.prev = _context3.next) {
+        case 0:
+          if (!(apiVersion == 'v2')) {
+            _context3.next = 2;
             break;
           }
-          console.log('access_token', access_token, 'expire_time', expires_in);
-          _context.next = 1;
-          return getAccessToken(access_token_file, url, data, appID);
+          _context3.next = 1;
+          return getOrRefreshToken(appID, clientSecret);
         case 1:
-          access_token = _context.sent;
-        case 2:
+          access_token = _context3.sent;
           // 更新header['Authorization']
           header['Authorization'] = "QQBot ".concat(access_token);
-          _context.next = 4;
+          _context3.next = 3;
           break;
-        case 3:
+        case 2:
           header['Authorization'] = "Bot ".concat(appID, ".").concat(token);
-        case 4:
+        case 3:
         case "end":
-          return _context.stop();
+          return _context3.stop();
       }
-    }, _callee);
+    }, _callee3);
   }));
-  return function addAuthorization(_x, _x2, _x3, _x4, _x5) {
-    return _ref.apply(this, arguments);
+  return function addAuthorization(_x3, _x4, _x5, _x6, _x7) {
+    return _ref3.apply(this, arguments);
   };
 }();
 // 组装完整Url
@@ -1914,7 +1994,7 @@ var Interaction = /*#__PURE__*/function () {
 
 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 = 'v1';
+var apiVersion = 'v2';
 var OpenAPI = /*#__PURE__*/function () {
   function OpenAPI(config) {
     _classCallCheck(this, OpenAPI);
@@ -1968,41 +2048,78 @@ var OpenAPI = /*#__PURE__*/function () {
     // 基础rest请求
   }, {
     key: "request",
-    value: function request(options) {
-      var _this$config = this.config,
-        appID = _this$config.appID,
-        token = _this$config.token,
-        clientSecret = _this$config.clientSecret;
-      options.headers = _objectSpread({}, options.headers);
-      var apiVersion = options.apiVersion || '';
-      // 添加 UA
-      addUserAgent(options.headers, appID, apiVersion);
-      // 添加鉴权信息
-      addAuthorization(options.headers, appID, token, clientSecret, apiVersion);
-      // 组装完整Url
-      var 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(_objectSpread({}, error.response.data), {}, {
-            traceid: traceid
-          }));
-        }
-        if (error !== null && error !== void 0 && error.response) {
-          return Promise.reject(_objectSpread(_objectSpread({}, error.response), {}, {
-            traceid: traceid
-          }));
-        }
-        return Promise.reject(error);
-      });
-      var client = resty.create(options);
-      return client.request(botUrl, options);
-    }
+    value: function () {
+      var _request = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee(options) {
+        var _this$config, appID, token, clientSecret, apiVersion, botUrl, client, retryClient, _t, _t2;
+        return _regeneratorRuntime.wrap(function (_context) {
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              _this$config = this.config, appID = _this$config.appID, token = _this$config.token, clientSecret = _this$config.clientSecret;
+              options.headers = _objectSpread({}, options.headers);
+              apiVersion = options.apiVersion || 'v2'; // 添加 UA
+              addUserAgent(options.headers, appID, apiVersion);
+              // 添加鉴权信息
+              _context.next = 1;
+              return addAuthorization(options.headers, appID, token, clientSecret, apiVersion);
+            case 1:
+              // 组装完整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(_objectSpread({}, error.response.data), {}, {
+                    traceid: traceid
+                  }));
+                }
+                if (error !== null && error !== void 0 && error.response) {
+                  return Promise.reject(_objectSpread(_objectSpread({}, error.response), {}, {
+                    traceid: traceid
+                  }));
+                }
+                return Promise.reject(error);
+              });
+              client = resty.create(options);
+              _context.prev = 2;
+              _context.next = 3;
+              return client.request(botUrl, options);
+            case 3:
+              return _context.abrupt("return", _context.sent);
+            case 4:
+              _context.prev = 4;
+              _t = _context["catch"](2);
+              if (!((_t === null || _t === void 0 ? void 0 : _t.code) === 11201 || (_t === null || _t === void 0 ? void 0 : _t.err_code) === 40012001)) {
+                _context.next = 8;
+                break;
+              }
+              console.log('检测到认证失败，尝试重试请求...');
+              _context.prev = 5;
+              // 由于addAuthorization现在是并发安全的，重试时会自动获取最新token
+              retryClient = resty.create(options);
+              _context.next = 6;
+              return retryClient.request(botUrl, options);
+            case 6:
+              return _context.abrupt("return", _context.sent);
+            case 7:
+              _context.prev = 7;
+              _t2 = _context["catch"](5);
+              console.log('重试请求仍然失败:', _t2);
+              throw _t2;
+            case 8:
+              throw _t;
+            case 9:
+            case "end":
+              return _context.stop();
+          }
+        }, _callee, this, [[2, 4], [5, 7]]);
+      }));
+      function request(_x) {
+        return _request.apply(this, arguments);
+      }
+      return request;
+    }()
   }], [{
     key: "newClient",
     value: function newClient(config) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "woodenfish-bot",
-    "version": "4.4.3",
+    "version": "4.4.5",
     "description": "woodenfish-bot",
     "publishConfig": {
         "registry": "https://registry.npmjs.org/"