axios-annotations 2.1.1 → 2.3.0

package/lib/decorator/delete-mapping.d.ts

@@ -1 +1 @@
-export default function DeleteMapping(path?: string): MethodDecorator;
+export default function DeleteMapping<M = undefined>(path?: string): MethodDecorator;

package/lib/decorator/get-mapping.d.ts

@@ -1 +1 @@
-export default function GetMapping(path?: string): MethodDecorator;
+export default function GetMapping<M = undefined>(path?: string): MethodDecorator;

package/lib/decorator/patch-mapping.d.ts

@@ -1 +1 @@
-export default function PatchMapping(path?: string): MethodDecorator;
+export default function PatchMapping<M = undefined>(path?: string): MethodDecorator;

package/lib/decorator/post-mapping.d.ts

@@ -1 +1 @@
-export default function PostMapping(path?: string): MethodDecorator;
+export default function PostMapping<M = undefined>(path?: string): MethodDecorator;

package/lib/decorator/put-mapping.d.ts

@@ -1 +1 @@
-export default function PutMapping(path?: string): MethodDecorator;
+export default function PutMapping<M = undefined>(path?: string): MethodDecorator;

package/lib/decorator/request-mapping.d.ts

@@ -1,3 +1,3 @@
 type DecoratorTargetType<M> = M extends string ? MethodDecorator : ClassDecorator;
-export default function RequestMapping<M = undefined>(path: string, method?: M): DecoratorTargetType<M>;
+export default function RequestMapping<M = undefined>(path: string, method?: M | string): DecoratorTargetType<M>;
 export {};

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,6 +1,6 @@
 {
   "name": "axios-annotations",
-  "version": "2.1.1",
+  "version": "2.3.0",
   "description": "HTTP client library uses Axios without Typescript.",
   "main": "index.js",
   "miniprogram": "lib",