@wavezync/nestjs-pgboss 3.0.0 → 3.0.1

package/dist/utils/handleRetry.js

@@ -3,13 +3,22 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.handleRetry = handleRetry;
 const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
+const consts_1 = require("./consts");
+const common_1 = require("@nestjs/common");
 function handleRetry(retryAttempts = 9, retryDelay = 3000, verbose = false, toRetry = (_err) => true) {
-    return (source) => source.pipe((0, operators_1.retryWhen)((attempts) => attempts.pipe((0, operators_1.take)(retryAttempts), (0, operators_1.mergeMap)((error, index) => {
+    const logger = new common_1.Logger(consts_1.LOGGER);
+    return (source) => source.pipe((0, operators_1.retryWhen)((attempts) => attempts.pipe((0, operators_1.mergeMap)((error, index) => {
         const includeError = toRetry(error);
-        if (verbose && includeError) {
-            console.warn(`Attempt ${index + 1}: Retrying in ${retryDelay / 1000} seconds...`);
+        if (includeError) {
+            if (verbose) {
+                logger.warn(`Attempt ${index + 1}: Retrying in ${retryDelay / 1000} seconds...`);
+            }
+            if (index + 1 >= retryAttempts) {
+                return (0, rxjs_1.throwError)(() => new Error(error.message));
+            }
+            return (0, rxjs_1.of)(error).pipe((0, operators_1.delay)(retryDelay));
         }
-        return includeError ? (0, rxjs_1.of)(error) : (0, rxjs_1.throwError)(error);
-    }), (0, operators_1.delay)(retryDelay))));
+        return (0, rxjs_1.throwError)(() => error);
+    }))));
 }
 //# sourceMappingURL=handleRetry.js.map

package/dist/utils/handleRetry.js.map

@@ -1 +1 @@
-{"version":3,"file":"handleRetry.js","sourceRoot":"","sources":["../../lib/utils/handleRetry.ts"],"names":[],"mappings":";;AAGA,kCA0BC;AA7BD,+BAAsC;AACtC,8CAAkE;AAElE,SAAgB,WAAW,CACzB,aAAa,GAAG,CAAC,EACjB,UAAU,GAAG,IAAI,EACjB,OAAO,GAAG,KAAK,EACf,UAAiC,CAAC,IAAS,EAAE,EAAE,CAAC,IAAI;IAEpD,OAAO,CAAI,MAAoC,EAAE,EAAE,CACjD,MAAM,CAAC,IAAI,CACT,IAAA,qBAAS,EAAC,CAAC,QAAQ,EAAE,EAAE,CACrB,QAAQ,CAAC,IAAI,CACX,IAAA,gBAAI,EAAC,aAAa,CAAC,EACnB,IAAA,oBAAQ,EAAC,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE;QACxB,MAAM,YAAY,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC;QACpC,IAAI,OAAO,IAAI,YAAY,EAAE,CAAC;YAC5B,OAAO,CAAC,IAAI,CACV,WAAW,KAAK,GAAG,CAAC,iBAClB,UAAU,GAAG,IACf,aAAa,CACd,CAAC;QACJ,CAAC;QACD,OAAO,YAAY,CAAC,CAAC,CAAC,IAAA,SAAE,EAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAA,iBAAU,EAAC,KAAK,CAAC,CAAC;IACtD,CAAC,CAAC,EACF,IAAA,iBAAK,EAAC,UAAU,CAAC,CAClB,CACF,CACF,CAAC;AACN,CAAC"}
+{"version":3,"file":"handleRetry.js","sourceRoot":"","sources":["../../lib/utils/handleRetry.ts"],"names":[],"mappings":";;AAKA,kCAoCC;AAzCD,+BAAsC;AACtC,8CAA4D;AAC5D,qCAAkC;AAClC,2CAAwC;AAExC,SAAgB,WAAW,CACzB,aAAa,GAAG,CAAC,EACjB,UAAU,GAAG,IAAI,EACjB,OAAO,GAAG,KAAK,EACf,UAAiC,CAAC,IAAS,EAAE,EAAE,CAAC,IAAI;IAEpD,MAAM,MAAM,GAAG,IAAI,eAAM,CAAC,eAAM,CAAC,CAAC;IAElC,OAAO,CAAI,MAAoC,EAAE,EAAE,CACjD,MAAM,CAAC,IAAI,CACT,IAAA,qBAAS,EAAC,CAAC,QAAQ,EAAE,EAAE,CACrB,QAAQ,CAAC,IAAI,CACX,IAAA,oBAAQ,EAAC,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE;QACxB,MAAM,YAAY,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC;QAEpC,IAAI,YAAY,EAAE,CAAC;YACjB,IAAI,OAAO,EAAE,CAAC;gBACZ,MAAM,CAAC,IAAI,CACT,WAAW,KAAK,GAAG,CAAC,iBAClB,UAAU,GAAG,IACf,aAAa,CACd,CAAC;YACJ,CAAC;YAED,IAAI,KAAK,GAAG,CAAC,IAAI,aAAa,EAAE,CAAC;gBAC/B,OAAO,IAAA,iBAAU,EAAC,GAAG,EAAE,CAAC,IAAI,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;YACpD,CAAC;YAED,OAAO,IAAA,SAAE,EAAC,KAAK,CAAC,CAAC,IAAI,CAAC,IAAA,iBAAK,EAAC,UAAU,CAAC,CAAC,CAAC;QAC3C,CAAC;QAED,OAAO,IAAA,iBAAU,EAAC,GAAG,EAAE,CAAC,KAAK,CAAC,CAAC;IACjC,CAAC,CAAC,CACH,CACF,CACF,CAAC;AACN,CAAC"}

package/lib/utils/handleRetry.ts

@@ -1,5 +1,7 @@
 import { of, throwError } from "rxjs";
-import { mergeMap, retryWhen, take, delay } from "rxjs/operators";
+import { mergeMap, retryWhen, delay } from "rxjs/operators";
+import { LOGGER } from "./consts";
+import { Logger } from "@nestjs/common";
 
 export function handleRetry(
   retryAttempts = 9,
@@ -7,23 +9,33 @@ export function handleRetry(
   verbose = false,
   toRetry: (err: any) => boolean = (_err: any) => true,
 ) {
+  const logger = new Logger(LOGGER);
+
   return <T>(source: import("rxjs").Observable<T>) =>
     source.pipe(
       retryWhen((attempts) =>
         attempts.pipe(
-          take(retryAttempts),
           mergeMap((error, index) => {
             const includeError = toRetry(error);
-            if (verbose && includeError) {
-              console.warn(
-                `Attempt ${index + 1}: Retrying in ${
-                  retryDelay / 1000
-                } seconds...`,
-              );
+
+            if (includeError) {
+              if (verbose) {
+                logger.warn(
+                  `Attempt ${index + 1}: Retrying in ${
+                    retryDelay / 1000
+                  } seconds...`,
+                );
+              }
+
+              if (index + 1 >= retryAttempts) {
+                return throwError(() => new Error(error.message));
+              }
+
+              return of(error).pipe(delay(retryDelay));
             }
-            return includeError ? of(error) : throwError(error);
+
+            return throwError(() => error);
           }),
-          delay(retryDelay),
         ),
       ),
     );

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wavezync/nestjs-pgboss",
-  "version": "3.0.0",
+  "version": "3.0.1",
   "description": "A NestJS module that integrates pg-boss for job scheduling and handling.",
   "license": "MIT",
   "author": "samaratungajs@wavezync.com",