gcf-common-lib 0.23.13 → 0.23.15

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "gcf-common-lib",
   "description": "",
-  "version": "0.23.13",
+  "version": "0.23.15",
   "publishConfig": {
     "access": "public",
     "branches": [

package/src/mongo-lock.js

@@ -73,8 +73,8 @@ class MongoLock {
             return (0, rxjs_1.lastValueFrom)((0, rxjs_1.defer)(() => (0, rxjs_1.from)(this.acquireLock(name, ttlSeconds))).pipe((0, rxjs_1.map)(locked => {
                 // console.log(locked);
                 if (!locked)
-                    throw locked;
-            }), wait ? (0, rxjs_1.retry)({ count, delay }) : rxjs_1.identity, (0, rxjs_1.switchMap)(() => __awaiter(this, void 0, void 0, function* () { return fn().finally(() => this.releaseLock(name).catch(noop_1.default)); }))));
+                    throw new Error('Could not acquire lock');
+            }), wait ? (0, rxjs_1.retry)({ count, delay }) : (0, rxjs_1.tap)(rxjs_1.identity), (0, rxjs_1.switchMap)(() => __awaiter(this, void 0, void 0, function* () { return fn().finally(() => this.releaseLock(name).catch(noop_1.default)); }))));
         });
     }
     checkLock(name, waitSeconds = 0) {
@@ -86,7 +86,7 @@ class MongoLock {
                 // console.log(lock);
                 if (lock)
                     throw lock;
-            }), waitSeconds > 0 ? (0, rxjs_1.retry)({ count, delay }) : rxjs_1.identity));
+            }), waitSeconds > 0 ? (0, rxjs_1.retry)({ count, delay }) : (0, rxjs_1.tap)(rxjs_1.identity)));
         });
     }
 }

package/src/mongo-lock.ts

@@ -1,7 +1,7 @@
 import { MongoClient, MongoError } from 'mongodb';
 import moment from 'moment';
 import noop from 'lodash/noop';
-import { defer, from, identity, lastValueFrom, map, retry, switchMap } from 'rxjs';
+import { defer, from, identity, lastValueFrom, map, of, retry, switchMap, tap } from 'rxjs';
 import { MongoHelper } from './mongo-helper';
 
 export class MongoLock {
@@ -59,9 +59,9 @@ export class MongoLock {
       defer(() => from(this.acquireLock(name, ttlSeconds))).pipe(
         map(locked => {
           // console.log(locked);
-          if (!locked) throw locked;
+          if (!locked) throw new Error('Could not acquire lock');
         }),
-        wait ? retry({ count, delay }) : identity,
+        wait ? retry({ count, delay }) : tap(identity),
         switchMap(async () => fn().finally(() => this.releaseLock(name).catch(noop))),
       ),
     );
@@ -78,7 +78,7 @@ export class MongoLock {
           // console.log(lock);
           if (lock) throw lock;
         }),
-        waitSeconds > 0 ? retry({ count, delay }) : identity,
+        waitSeconds > 0 ? retry({ count, delay }) : tap(identity),
       ),
     );
   }