fix for openapi

aliyun · Oct 29, 2024 · bbc7b3b · bbc7b3b
1 parent 49b58a0
commit bbc7b3b
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 8 deletions.
diff --git a/src/error.ts b/src/error.ts
@@ -1,6 +1,7 @@
 
 
 import { Request, Response } from './core';
+import { RetryPolicyContext } from './retry';
 
 export class BaseError extends Error {
   name: string;
@@ -70,10 +71,19 @@ export function newError(data: any): ResponseError {
   return new ResponseError(data);
 }
 
-export function newUnretryableError(request: Request): Error {
-  const e = new UnretryableError('');
-  e.data = {
-    lastRequest: request
-  };
-  return e;
+export function newUnretryableError(ctx: RetryPolicyContext | Request): Error {
+  if(ctx instanceof RetryPolicyContext) {
+    const message = ctx.exception ? ctx.exception.message : '';
+    const e = new UnretryableError(message);
+    e.data = {
+      lastRequest: ctx.httpRequest
+    };
+    return e;
+  } else {
+    const e = new UnretryableError('');
+    e.data = {
+      lastRequest: ctx
+    };
+    return e;
+  }
 }
diff --git a/src/retry.ts b/src/retry.ts
@@ -161,6 +161,9 @@ export class RetryPolicyContext {
 }
 
 export function shouldRetry(options: RetryOptions, ctx: RetryPolicyContext): boolean {
+  if(ctx.retriesAttempted === 0) {
+    return true;
+  }
   if(!options || !options.retryable) {
     return false;
   }

diff --git a/test/error.spec.ts b/test/error.spec.ts
@@ -19,7 +19,7 @@ describe('$dara error', function () {
   });
 
   it('newUnretryableError should ok', function () {
-    const err = $dara.newUnretryableError(new $dara.Request());
+    const err = $dara.newUnretryableError(new $dara.RetryPolicyContext({}));
     assert.strictEqual(err.name, 'UnretryableError');
   });
 

diff --git a/test/fixtures/test.txt b/test/fixtures/test.txt
@@ -1 +0,0 @@
-Test For File

diff --git a/test/retry.spec.ts b/test/retry.spec.ts
@@ -51,6 +51,11 @@ describe('$dara retry', function () {
     assert.deepStrictEqual($dara.shouldRetry(undefined, context), false);
     assert.deepStrictEqual($dara.shouldRetry(null, context), false);
 
+    context = new $dara.RetryPolicyContext({
+      retriesAttempted: 0,
+    });
+    assert.deepStrictEqual($dara.shouldRetry(undefined, context), true);
+
     const condition1 = new $dara.RetryCondition({
       maxAttempts: 3,
       exception: ['AErr'],
@@ -139,6 +144,7 @@ describe('$dara retry', function () {
     });
     assert.deepStrictEqual($dara.shouldRetry(option, context), false);
     context = new $dara.RetryPolicyContext({
+      retriesAttempted: 1,
       exception: new BErr({
         code: 'A1Err',
         message: 'b1 error',