@budibase/backend-core 2.6.19-alpha.31 → 2.6.19-alpha.35

package/dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "2.6.19-alpha.31",
+  "version": "2.6.19-alpha.35",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -22,7 +22,7 @@
   "dependencies": {
     "@budibase/nano": "10.1.2",
     "@budibase/pouchdb-replication-stream": "1.2.10",
-    "@budibase/types": "2.6.19-alpha.31",
+    "@budibase/types": "2.6.19-alpha.35",
     "@shopify/jest-koa-mocks": "5.0.1",
     "@techpass/passport-openidconnect": "0.3.2",
     "aws-cloudfront-sign": "2.2.0",
@@ -102,5 +102,5 @@
       }
     }
   },
-  "gitHead": "46abe5917ecc3ed921f10dfd9aff09f1970f80c3"
+  "gitHead": "2e6bc8435cb14649a8cc000a76d661fc121f21d1"
 }

package/dist/src/redis/redlockImpl.d.ts

@@ -1,4 +1,6 @@
+import Redlock from "redlock";
 import { LockOptions } from "@budibase/types";
+export declare function newRedlock(opts?: Redlock.Options): Promise<Redlock>;
 declare type SuccessfulRedlockExecution<T> = {
     executed: true;
     result: T;
@@ -7,5 +9,5 @@ declare type UnsuccessfulRedlockExecution = {
     executed: false;
 };
 declare type RedlockExecution<T> = SuccessfulRedlockExecution<T> | UnsuccessfulRedlockExecution;
-export declare const doWithLock: <T>(opts: LockOptions, task: () => Promise<T>) => Promise<RedlockExecution<T>>;
+export declare function doWithLock<T>(opts: LockOptions, task: () => Promise<T>): Promise<RedlockExecution<T>>;
 export {};

package/dist/src/redis/redlockImpl.js

@@ -35,39 +35,47 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.doWithLock = void 0;
+exports.doWithLock = exports.newRedlock = void 0;
 const redlock_1 = __importDefault(require("redlock"));
 const init_1 = require("./init");
 const types_1 = require("@budibase/types");
 const context = __importStar(require("../context"));
 const environment_1 = __importDefault(require("../environment"));
-const getClient = (type, opts) => __awaiter(void 0, void 0, void 0, function* () {
-    if (type === types_1.LockType.CUSTOM) {
-        return newRedlock(opts);
-    }
-    if (environment_1.default.isTest() && type !== types_1.LockType.TRY_ONCE) {
-        return newRedlock(OPTIONS.TEST);
-    }
-    switch (type) {
-        case types_1.LockType.TRY_ONCE: {
-            return newRedlock(OPTIONS.TRY_ONCE);
-        }
-        case types_1.LockType.DEFAULT: {
-            return newRedlock(OPTIONS.DEFAULT);
+function getClient(type, opts) {
+    return __awaiter(this, void 0, void 0, function* () {
+        if (type === types_1.LockType.CUSTOM) {
+            return newRedlock(opts);
         }
-        case types_1.LockType.DELAY_500: {
-            return newRedlock(OPTIONS.DELAY_500);
+        if (environment_1.default.isTest() && type !== types_1.LockType.TRY_ONCE) {
+            return newRedlock(OPTIONS.TEST);
         }
-        default: {
-            throw new Error(`Could not get redlock client: ${type}`);
+        switch (type) {
+            case types_1.LockType.TRY_ONCE: {
+                return newRedlock(OPTIONS.TRY_ONCE);
+            }
+            case types_1.LockType.TRY_TWICE: {
+                return newRedlock(OPTIONS.TRY_TWICE);
+            }
+            case types_1.LockType.DEFAULT: {
+                return newRedlock(OPTIONS.DEFAULT);
+            }
+            case types_1.LockType.DELAY_500: {
+                return newRedlock(OPTIONS.DELAY_500);
+            }
+            default: {
+                throw new Error(`Could not get redlock client: ${type}`);
+            }
         }
-    }
-});
+    });
+}
 const OPTIONS = {
     TRY_ONCE: {
         // immediately throws an error if the lock is already held
         retryCount: 0,
     },
+    TRY_TWICE: {
+        retryCount: 1,
+    },
     TEST: {
         // higher retry count in unit tests
         // due to high contention.
@@ -91,56 +99,64 @@ const OPTIONS = {
         retryDelay: 500,
     },
 };
-const newRedlock = (opts = {}) => __awaiter(void 0, void 0, void 0, function* () {
-    let options = Object.assign(Object.assign({}, OPTIONS.DEFAULT), opts);
-    const redisWrapper = yield (0, init_1.getLockClient)();
-    const client = redisWrapper.getClient();
-    return new redlock_1.default([client], options);
-});
-const doWithLock = (opts, task) => __awaiter(void 0, void 0, void 0, function* () {
-    const redlock = yield getClient(opts.type, opts.customOptions);
-    let lock;
-    try {
-        // determine lock name
-        // by default use the tenantId for uniqueness, unless using a system lock
-        const prefix = opts.systemLock ? "system" : context.getTenantId();
-        let name = `lock:${prefix}_${opts.name}`;
-        // add additional unique name if required
-        if (opts.resource) {
-            name = name + `_${opts.resource}`;
-        }
-        // create the lock
-        lock = yield redlock.lock(name, opts.ttl);
-        // perform locked task
-        // need to await to ensure completion before unlocking
-        const result = yield task();
-        return { executed: true, result };
+function newRedlock(opts = {}) {
+    return __awaiter(this, void 0, void 0, function* () {
+        let options = Object.assign(Object.assign({}, OPTIONS.DEFAULT), opts);
+        const redisWrapper = yield (0, init_1.getLockClient)();
+        const client = redisWrapper.getClient();
+        return new redlock_1.default([client], options);
+    });
+}
+exports.newRedlock = newRedlock;
+function getLockName(opts) {
+    // determine lock name
+    // by default use the tenantId for uniqueness, unless using a system lock
+    const prefix = opts.systemLock ? "system" : context.getTenantId();
+    let name = `lock:${prefix}_${opts.name}`;
+    // add additional unique name if required
+    if (opts.resource) {
+        name = name + `_${opts.resource}`;
     }
-    catch (e) {
-        console.warn("lock error");
-        // lock limit exceeded
-        if (e.name === "LockError") {
-            if (opts.type === types_1.LockType.TRY_ONCE) {
-                // don't throw for try-once locks, they will always error
-                // due to retry count (0) exceeded
-                console.warn(e);
-                return { executed: false };
+    return name;
+}
+function doWithLock(opts, task) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const redlock = yield getClient(opts.type, opts.customOptions);
+        let lock;
+        try {
+            const name = getLockName(opts);
+            // create the lock
+            lock = yield redlock.lock(name, opts.ttl);
+            // perform locked task
+            // need to await to ensure completion before unlocking
+            const result = yield task();
+            return { executed: true, result };
+        }
+        catch (e) {
+            console.warn("lock error");
+            // lock limit exceeded
+            if (e.name === "LockError") {
+                if (opts.type === types_1.LockType.TRY_ONCE) {
+                    // don't throw for try-once locks, they will always error
+                    // due to retry count (0) exceeded
+                    return { executed: false };
+                }
+                else {
+                    console.error(e);
+                    throw e;
+                }
             }
             else {
                 console.error(e);
                 throw e;
             }
         }
-        else {
-            console.error(e);
-            throw e;
-        }
-    }
-    finally {
-        if (lock) {
-            yield lock.unlock();
+        finally {
+            if (lock) {
+                yield lock.unlock();
+            }
         }
-    }
-});
+    });
+}
 exports.doWithLock = doWithLock;
 //# sourceMappingURL=redlockImpl.js.map

package/dist/src/redis/redlockImpl.js.map

@@ -1 +1 @@
-{"version":3,"file":"redlockImpl.js","sourceRoot":"","sources":["../../../src/redis/redlockImpl.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"redlockImpl.js","sourceRoot":"","sources":["../../../src/redis/redlockImpl.ts"],"names":[],"mappings":"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"}