axios-annotations 2.2.0 → 2.3.0

package/lib/core/expect.d.ts

@@ -1,4 +1,4 @@
-import type {AxiosPromise} from "axios";
-
-export default function Expect<T, D = AxiosPromise<T>>(params: any): D;
-export {};
+import type {AxiosPromise} from "axios";
+
+export default function Expect<T, D = AxiosPromise<T>>(params: any): D;
+export {};

package/lib/core/expect.js

@@ -1,15 +1,15 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", {
-    value: true
-});
-exports["default"] = Expect;
-/**
- * 警告 Warning: <br/>
- * 仅用于仿冒使用装饰器的方法返回值，绕过IDE/Typescript的类型检查，获得代码提示功能。<br/>
- *
- * Only used to ensure the return value of a method that uses decorators,
- * bypassing IDE/Typescript type checking and obtaining code intelligence.
- */
-function Expect(params) {
-    return params;
-}
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+exports["default"] = Expect;
+/**
+ * 警告 Warning: <br/>
+ * 仅用于仿冒使用装饰器的方法返回值，绕过IDE/Typescript的类型检查，获得代码提示功能。<br/>
+ *
+ * Only used to ensure the return value of a method that uses decorators,
+ * bypassing IDE/Typescript type checking and obtaining code intelligence.
+ */
+function Expect(params) {
+    return params;
+}

package/lib/core/service.d.ts

@@ -35,8 +35,8 @@ export default class Service {
     _for: Record<string, string>;
     _features: Record<string, QueryStringEncodeFeatures>;
     constructor(path?: any);
-    get config(): Config<import("axios").AxiosStatic, import("axios").AxiosInstance>;
-    set config(value: Config<import("axios").AxiosStatic, import("axios").AxiosInstance>);
+    get config(): Config;
+    set config(value: Config);
     get path(): string;
     set path(value: string);
     params(id: string, name: string, config?: RequestParamEncodeRule): void;

package/lib/plugins/auth/queue.js

@@ -158,19 +158,21 @@ var PendingQueue = /** @class */ function() {
     }
     PendingQueue.prototype.resend = function(error_1) {
         return __awaiter(this, arguments, void 0, function(error, retries) {
-            var i, session, axios, e_1;
+            var maxTimes, i, session, axios, e_1;
             if (retries === void 0) {
                 retries = 3;
             }
             return __generator(this, function(_a) {
                 switch(_a.label){
                     case 0:
+                        maxTimes = Math.max(this._retryTimes, retries, 1);
+                        console.log(maxTimes);
                         i = 0;
                         _a.label = 1;
                     case 1:
-                        if (!(i < this._retryTimes)) return [
+                        if (!(i < maxTimes)) return [
                             3 /*break*/ ,
-                            9
+                            10
                         ];
                         if (!(i > 0)) return [
                             3 /*break*/ ,
@@ -198,37 +200,43 @@ var PendingQueue = /** @class */ function() {
                     case 5:
                         _a.trys.push([
                             5,
-                            7,
+                            8,
                             ,
-                            8
+                            9
                         ]);
                         return [
                             4 /*yield*/ ,
-                            this._config.requestAxiosInstance()
+                            this._config.axiosProvider.get()
                         ];
                     case 6:
-                        axios = _a.sent();
+                        axios = _a.sent().create();
                         this._authorizer.withAuthentication(error.config, session);
                         return [
-                            2 /*return*/ ,
+                            4 /*yield*/ ,
                             axios.request(error.config)
                         ];
                     case 7:
+                        // fix: 401 循环 忘了加 await
+                        return [
+                            2 /*return*/ ,
+                            _a.sent()
+                        ];
+                    case 8:
                         e_1 = _a.sent();
-                        if (i >= retries - 1) {
+                        if (i >= maxTimes) {
                             throw e_1;
                         }
                         return [
                             3 /*break*/ ,
-                            8
+                            9
                         ];
-                    case 8:
-                        ++i;
+                    case 9:
+                        i++;
                         return [
                             3 /*break*/ ,
                             1
                         ];
-                    case 9:
+                    case 10:
                         throw error;
                 }
             });

package/package.json

@@ -1,16 +1,16 @@
-{
-  "name": "axios-annotations",
-  "version": "2.2.0",
-  "description": "HTTP client library uses Axios without Typescript.",
-  "main": "index.js",
-  "miniprogram": "lib",
-  "miniprogramRoot": "lib",
-  "keywords": [
-    "axios",
-    "axios-annotations",
-    "axios-decorators"
-  ],
-  "author": "sitorhy",
-  "license": "MIT",
-  "homepage": "https://github.com/sitorhy/axios-annotations#readme"
-}
+{
+  "name": "axios-annotations",
+  "version": "2.3.0",
+  "description": "HTTP client library uses Axios without Typescript.",
+  "main": "index.js",
+  "miniprogram": "lib",
+  "miniprogramRoot": "lib",
+  "keywords": [
+    "axios",
+    "axios-annotations",
+    "axios-decorators"
+  ],
+  "author": "sitorhy",
+  "license": "MIT",
+  "homepage": "https://github.com/sitorhy/axios-annotations#readme"
+}