fix: correctly test error is retriable

meshcloud · Feb 9, 2022 · 28677fc · 28677fc
1 parent 9b5f03b
commit 28677fc
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/package.json b/package.json
@@ -1,5 +1,5 @@
 {
-  "version": "0.7.0",
+  "version": "0.8.0",
   "name": "@meshcloud/notion-markdown-cms",
   "engines": {
     "node": ">=14"

diff --git a/src/NotionApiFacade.ts b/src/NotionApiFacade.ts
@@ -26,11 +26,11 @@ export class NotionApiFacade {
   }
 
   async retrieveDatabase(databaseId: string) {
-    return await this.withRetry(async () =>
-      this.client.databases.retrieve({
+    return await this.withRetry(async () => {
+      return this.client.databases.retrieve({
         database_id: databaseId,
-      })
-    );
+      });
+    });
   }
 
   async queryDatabase(query: DatabasesQueryParameters) {
@@ -82,7 +82,7 @@ export class NotionApiFacade {
       APIErrorCode.RateLimited,
     ],
     retriableUnknownHTTPStatusCodes: number[] = [502]
-  ) {
+  ): Promise<T> {
     let lastError: any;
 
     for (let i = 1; i <= maxRetries; i++) {
@@ -99,8 +99,9 @@ export class NotionApiFacade {
           RequestTimeoutError.isRequestTimeoutError(error) && error;
 
         const isRetriable =
-          (apiError && error.code in retriableApiErrorCodes) ||
-          (unknownError && error.status in retriableUnknownHTTPStatusCodes) ||
+          (apiError && retriableApiErrorCodes.includes(error.code)) ||
+          (unknownError &&
+            retriableUnknownHTTPStatusCodes.includes(error.status)) ||
           timeoutError;
 
         if (!isRetriable) {