npm - @budibase/server - Versions diffs - 2.6.19-alpha.31 → 2.6.19-alpha.35 - Mend

@budibase/server 2.6.19-alpha.31 → 2.6.19-alpha.35

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (13) hide show

package/builder/assets/{index.8469b14c.css → index.a96c516c.css} +1 -1
package/builder/assets/{index.3dd3d237.js → index.b6e30d5b.js} +3 -3
package/builder/index.html +2 -2
package/dist/automation.js +79 -65
package/dist/automation.js.map +3 -3
package/dist/index.js +183 -150
package/dist/index.js.map +3 -3
package/dist/query.js +23 -13
package/dist/query.js.map +2 -2
package/package.json +8 -8
package/src/middleware/builder.ts +22 -13
package/src/threads/automation.ts +5 -1
package/src/utilities/fileSystem/app.ts +14 -4

package/builder/index.html CHANGED Viewed

@@ -8,8 +8,8 @@
 	<link rel="preconnect" href="https://fonts.gstatic.com" />
 	<link href="https://fonts.googleapis.com/css2?family=Source+Sans+Pro:wght@400;600;700&display=swap"
 		rel="stylesheet" />
-  <script type="module" crossorigin src="/builder/assets/index.3dd3d237.js"></script>
-  <link rel="stylesheet" href="/builder/assets/index.8469b14c.css">
+  <script type="module" crossorigin src="/builder/assets/index.b6e30d5b.js"></script>
+  <link rel="stylesheet" href="/builder/assets/index.a96c516c.css">
 </head>
 <body id="app">

package/dist/automation.js CHANGED Viewed

@@ -3441,9 +3441,76 @@ var init_users3 = __esm({
 // ../backend-core/src/redis/redlockImpl.ts
 var redlockImpl_exports = {};
 __export(redlockImpl_exports, {
-  doWithLock: () => doWithLock
+  doWithLock: () => doWithLock,
+  newRedlock: () => newRedlock
 });
-var import_redlock, getClient, OPTIONS, newRedlock, doWithLock;
+async function getClient(type, opts) {
+  if (type === "custom" /* CUSTOM */) {
+    return newRedlock(opts);
+  }
+  if (environment_default2.isTest() && type !== "try_once" /* TRY_ONCE */) {
+    return newRedlock(OPTIONS.TEST);
+  }
+  switch (type) {
+    case "try_once" /* TRY_ONCE */: {
+      return newRedlock(OPTIONS.TRY_ONCE);
+    }
+    case "try_twice" /* TRY_TWICE */: {
+      return newRedlock(OPTIONS.TRY_TWICE);
+    }
+    case "default" /* DEFAULT */: {
+      return newRedlock(OPTIONS.DEFAULT);
+    }
+    case "delay_500" /* DELAY_500 */: {
+      return newRedlock(OPTIONS.DELAY_500);
+    }
+    default: {
+      throw new Error(`Could not get redlock client: ${type}`);
+    }
+  }
+}
+async function newRedlock(opts = {}) {
+  let options2 = { ...OPTIONS.DEFAULT, ...opts };
+  const redisWrapper = await getLockClient();
+  const client3 = redisWrapper.getClient();
+  return new import_redlock.default([client3], options2);
+}
+function getLockName(opts) {
+  const prefix = opts.systemLock ? "system" : getTenantId();
+  let name = `lock:${prefix}_${opts.name}`;
+  if (opts.resource) {
+    name = name + `_${opts.resource}`;
+  }
+  return name;
+}
+async function doWithLock(opts, task) {
+  const redlock = await getClient(opts.type, opts.customOptions);
+  let lock;
+  try {
+    const name = getLockName(opts);
+    lock = await redlock.lock(name, opts.ttl);
+    const result = await task();
+    return { executed: true, result };
+  } catch (e) {
+    console.warn("lock error");
+    if (e.name === "LockError") {
+      if (opts.type === "try_once" /* TRY_ONCE */) {
+        return { executed: false };
+      } else {
+        console.error(e);
+        throw e;
+      }
+    } else {
+      console.error(e);
+      throw e;
+    }
+  } finally {
+    if (lock) {
+      await lock.unlock();
+    }
+  }
+}
+var import_redlock, OPTIONS;
 var init_redlockImpl = __esm({
   "../backend-core/src/redis/redlockImpl.ts"() {
     import_redlock = __toESM(require("redlock"));
@@ -3451,33 +3518,14 @@ var init_redlockImpl = __esm({
     init_src();
     init_context2();
     init_environment3();
-    getClient = async (type, opts) => {
-      if (type === "custom" /* CUSTOM */) {
-        return newRedlock(opts);
-      }
-      if (environment_default2.isTest() && type !== "try_once" /* TRY_ONCE */) {
-        return newRedlock(OPTIONS.TEST);
-      }
-      switch (type) {
-        case "try_once" /* TRY_ONCE */: {
-          return newRedlock(OPTIONS.TRY_ONCE);
-        }
-        case "default" /* DEFAULT */: {
-          return newRedlock(OPTIONS.DEFAULT);
-        }
-        case "delay_500" /* DELAY_500 */: {
-          return newRedlock(OPTIONS.DELAY_500);
-        }
-        default: {
-          throw new Error(`Could not get redlock client: ${type}`);
-        }
-      }
-    };
     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.
@@ -3504,44 +3552,6 @@ var init_redlockImpl = __esm({
         retryDelay: 500
       }
     };
-    newRedlock = async (opts = {}) => {
-      let options2 = { ...OPTIONS.DEFAULT, ...opts };
-      const redisWrapper = await getLockClient();
-      const client3 = redisWrapper.getClient();
-      return new import_redlock.default([client3], options2);
-    };
-    doWithLock = async (opts, task) => {
-      const redlock = await getClient(opts.type, opts.customOptions);
-      let lock;
-      try {
-        const prefix = opts.systemLock ? "system" : getTenantId();
-        let name = `lock:${prefix}_${opts.name}`;
-        if (opts.resource) {
-          name = name + `_${opts.resource}`;
-        }
-        lock = await redlock.lock(name, opts.ttl);
-        const result = await task();
-        return { executed: true, result };
-      } catch (e) {
-        console.warn("lock error");
-        if (e.name === "LockError") {
-          if (opts.type === "try_once" /* TRY_ONCE */) {
-            console.warn(e);
-            return { executed: false };
-          } else {
-            console.error(e);
-            throw e;
-          }
-        } else {
-          console.error(e);
-          throw e;
-        }
-      } finally {
-        if (lock) {
-          await lock.unlock();
-        }
-      }
-    };
   }
 });
@@ -31991,6 +32001,7 @@ init_src();
 init_src2();
 var import_string_templates8 = __toESM(require_src2());
 var import_fp8 = require("lodash/fp");
+var import_perf_hooks2 = require("perf_hooks");
 init_utils15();
 init_environment();
 utils_default.threadSetup();
@@ -32167,7 +32178,7 @@ var Orchestrator = class {
         return;
       }
     }
-    const start2 = performance.now();
+    const start2 = import_perf_hooks2.performance.now();
     for (let step of automation.definition.steps) {
       if (timeoutFlag) {
         break;
@@ -32351,9 +32362,12 @@ var Orchestrator = class {
         loopSteps = [];
       }
     }
-    const end2 = performance.now();
+    const end2 = import_perf_hooks2.performance.now();
     const executionTime = end2 - start2;
-    console.log(`Execution time: ${executionTime} milliseconds`);
+    console.info(`Execution time: ${executionTime} milliseconds`, {
+      _logKey: "automation",
+      executionTime
+    });
     try {
       await storeLog2(this._automation, this.executionOutput);
     } catch (e) {