feat: adds ability to customize retry strategy

kontent-ai-bot · Sep 14, 2022 · 4c3a2a8 · 4c3a2a8
1 parent b60e29e
commit 4c3a2a8
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 12 deletions.
diff --git a/lib/clean/clean.models.ts b/lib/clean/clean.models.ts
@@ -1,10 +1,12 @@
 import { IProcessedItem } from '../core';
+import { IRetryStrategyOptions } from '@kontent-ai/core-sdk';
 
 export interface ICleanConfig {
     projectId: string;
     apiKey: string;
     baseUrl?: string;
     onDelete?: (item: IProcessedItem) => void;
+    retryStrategy?: IRetryStrategyOptions;
 }
 
 export interface ICleanResult {

diff --git a/lib/clean/clean.service.ts b/lib/clean/clean.service.ts
@@ -1,7 +1,7 @@
 import { AssetFolderModels, ManagementClient } from '@kontent-ai/management-sdk';
 import { HttpService } from '@kontent-ai/core-sdk';
 
-import { defaultWorkflowCodename, handleError, ItemType } from '../core';
+import { defaultRetryStrategy, defaultWorkflowCodename, handleError, ItemType } from '../core';
 import { ICleanConfig, ICleanResult } from './clean.models';
 
 export class CleanService {
@@ -14,7 +14,8 @@ export class CleanService {
             baseUrl: config.baseUrl,
             httpService: new HttpService({
                 logErrorsToConsole: false
-            })
+            }),
+            retryStrategy: config.retryStrategy ?? defaultRetryStrategy
         });
     }
 

diff --git a/lib/core/global-helper.ts b/lib/core/global-helper.ts
@@ -1,4 +1,12 @@
 import { SharedModels } from '@kontent-ai/management-sdk';
+import { IRetryStrategyOptions } from '@kontent-ai/core-sdk';
+
+export const defaultRetryStrategy: IRetryStrategyOptions = {
+    addJitter: true,
+    canRetryError: (err) => true, // so that timeout errors are retried
+    maxAttempts: 3,
+    deltaBackoffMs: 1000
+};
 
 export function getFilenameWithoutExtension(filename: string): string {
     if (!filename) {

diff --git a/lib/export/export.models.ts b/lib/export/export.models.ts
@@ -10,8 +10,9 @@ import {
     ProjectContracts,
     WorkflowContracts,
     WebhookContracts,
-    CollectionContracts,
+    CollectionContracts
 } from '@kontent-ai/management-sdk';
+import { IRetryStrategyOptions } from '@kontent-ai/core-sdk';
 
 import { IProcessedItem, IPackageMetadata, ItemType } from '../core';
 
@@ -22,6 +23,7 @@ export interface IExportConfig {
     onExport?: (item: IProcessedItem) => void;
     exportFilter?: ItemType[];
     skipValidation: boolean;
+    retryStrategy?: IRetryStrategyOptions;
 }
 
 export interface IExportData {

diff --git a/lib/export/export.service.ts b/lib/export/export.service.ts
@@ -16,7 +16,7 @@ import {
 import {HttpService } from '@kontent-ai/core-sdk';
 
 import { IExportAllResult, IExportConfig, IExportData } from './export.models';
-import { ItemType } from '../core';
+import { defaultRetryStrategy, ItemType } from '../core';
 import { version } from '../../package.json';
 
 export class ExportService {
@@ -30,6 +30,7 @@ export class ExportService {
             httpService: new HttpService({
                 logErrorsToConsole: false
             }),
+            retryStrategy: config.retryStrategy ?? defaultRetryStrategy
         });
     }
 

diff --git a/lib/import/import.models.ts b/lib/import/import.models.ts
@@ -8,12 +8,14 @@ import {
     LanguageVariantContracts,
     TaxonomyContracts,
     ProjectContracts,
-    WorkflowContracts,
+    WorkflowContracts
 } from '@kontent-ai/management-sdk';
+import { IRetryStrategyOptions } from '@kontent-ai/core-sdk';
 
 import { IProcessedItem, ItemType, IPackageMetadata } from '../core';
 
 export interface IImportConfig {
+    retryStrategy?: IRetryStrategyOptions;
     workflowIdForImportedItems?: string;
     baseUrl?: string;
     projectId: string;

diff --git a/lib/import/import.service.ts b/lib/import/import.service.ts
@@ -30,7 +30,8 @@ import {
     ValidImportModel,
     handleError,
     defaultWorkflowCodename,
-    defaultObjectId
+    defaultObjectId,
+    defaultRetryStrategy
 } from '../core';
 import { IBinaryFile, IImportConfig, IImportSource } from './import.models';
 import { HttpService } from '@kontent-ai/core-sdk';
@@ -53,12 +54,7 @@ export class ImportService {
             httpService: new HttpService({
                 logErrorsToConsole: false
             }),
-            retryStrategy: {
-                addJitter: true,
-                canRetryError: (err) => true, // so that timeout errors are retried
-                maxAttempts: 3,
-                deltaBackoffMs: 1000
-            }
+            retryStrategy: config.retryStrategy ?? defaultRetryStrategy
         });
     }