@budibase/server 2.6.19-alpha.30 → 2.6.19-alpha.34

package/dist/index.js

@@ -3368,9 +3368,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_default.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"));
@@ -3378,33 +3445,14 @@ var init_redlockImpl = __esm({
     init_src();
     init_context2();
     init_environment2();
-    getClient = async (type, opts) => {
-      if (type === "custom" /* CUSTOM */) {
-        return newRedlock(opts);
-      }
-      if (environment_default.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.
@@ -3431,44 +3479,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();
-        }
-      }
-    };
   }
 });
 
@@ -3648,6 +3658,7 @@ var init_logger = __esm({
         }
         const mergingObject = {
           err: error2,
+          pid: process.pid,
           ...contextObject
         };
         if (objects.length) {
@@ -9078,10 +9089,10 @@ function doesHaveBasePermission(permType, permLevel, rolesHierarchy) {
     ...new Set(rolesHierarchy.map((role) => role.permissionId))
   ];
   const builtins = Object.values(BUILTIN_PERMISSIONS);
-  let permissions2 = flatten(
+  let permissions = flatten(
     builtins.filter((builtin) => basePermissions.indexOf(builtin._id) !== -1).map((builtin) => builtin.permissions)
   );
-  for (let permission of permissions2) {
+  for (let permission of permissions) {
     if (permission.type === permType && getAllowedLevels(permission.level).indexOf(permLevel) !== -1) {
       return true;
     }
@@ -12063,6 +12074,7 @@ var init_environment3 = __esm({
       ENABLE_ANALYTICS: process.env.ENABLE_ANALYTICS,
       SELF_HOSTED: process.env.SELF_HOSTED,
       HTTP_MB_LIMIT: process.env.HTTP_MB_LIMIT,
+      FORKED_PROCESS_NAME: process.env.FORKED_PROCESS_NAME || "main",
       // old
       CLIENT_ID: process.env.CLIENT_ID,
       _set(key, value) {
@@ -12296,10 +12308,11 @@ var init_clientLibrary = __esm({
 });
 
 // src/utilities/fileSystem/app.ts
-var import_path7, NODE_MODULES_PATH, createApp, deleteApp, getComponentLibraryManifest;
+var import_fs6, import_path7, NODE_MODULES_PATH, createApp, deleteApp, getComponentLibraryManifest;
 var init_app7 = __esm({
   "src/utilities/fileSystem/app.ts"() {
     init_budibaseDir();
+    import_fs6 = __toESM(require("fs"));
     import_path7 = require("path");
     init_constants4();
     init_clientLibrary();
@@ -12317,9 +12330,19 @@ var init_app7 = __esm({
       const appId = context_exports.getAppId();
       const filename = "manifest.json";
       if (environment_default2.isDev() || environment_default2.isTest()) {
-        const path6 = (0, import_path7.join)(TOP_LEVEL_PATH, "packages/client", filename);
-        delete require.cache[require.resolve(path6)];
-        return require(path6);
+        const paths = [
+          (0, import_path7.join)(TOP_LEVEL_PATH, "packages/client", filename),
+          (0, import_path7.join)(process.cwd(), "client", filename)
+        ];
+        for (let path6 of paths) {
+          if (import_fs6.default.existsSync(path6)) {
+            delete require.cache[require.resolve(path6)];
+            return require(path6);
+          }
+        }
+        throw new Error(
+          `Unable to find ${filename} in development environment (may need to build).`
+        );
       }
       if (!appId) {
         throw new Error("No app ID found - cannot get component libraries");
@@ -12349,19 +12372,19 @@ var init_app7 = __esm({
 async function getPluginImpl(path5, plugin) {
   var _a2;
   const hash2 = (_a2 = plugin.schema) == null ? void 0 : _a2.hash;
-  if (!import_fs6.default.existsSync(path5)) {
-    import_fs6.default.mkdirSync(path5);
+  if (!import_fs7.default.existsSync(path5)) {
+    import_fs7.default.mkdirSync(path5);
   }
   const filename = (0, import_path8.join)(path5, plugin.name);
   const metadataName = `${filename}.bbmetadata`;
-  if (import_fs6.default.existsSync(filename)) {
-    const currentHash = import_fs6.default.readFileSync(metadataName, "utf8");
+  if (import_fs7.default.existsSync(filename)) {
+    const currentHash = import_fs7.default.readFileSync(metadataName, "utf8");
     if (currentHash === hash2) {
       return require(filename);
     } else {
       console.log(`Updating plugin: ${plugin.name}`);
       delete require.cache[require.resolve(filename)];
-      import_fs6.default.unlinkSync(filename);
+      import_fs7.default.unlinkSync(filename);
     }
   }
   const pluginKey = objectStore_exports2.getPluginJSKey(plugin);
@@ -12369,15 +12392,15 @@ async function getPluginImpl(path5, plugin) {
     objectStore_exports2.ObjectStoreBuckets.PLUGINS,
     pluginKey
   );
-  import_fs6.default.writeFileSync(filename, pluginJs);
-  import_fs6.default.writeFileSync(metadataName, hash2);
+  import_fs7.default.writeFileSync(filename, pluginJs);
+  import_fs7.default.writeFileSync(metadataName, hash2);
   return require(filename);
 }
-var import_fs6, import_path8, DATASOURCE_PATH, AUTOMATION_PATH, getPluginMetadata, getDatasourcePlugin, getAutomationPlugin;
+var import_fs7, import_path8, DATASOURCE_PATH, AUTOMATION_PATH, getPluginMetadata, getDatasourcePlugin, getAutomationPlugin;
 var init_plugin5 = __esm({
   "src/utilities/fileSystem/plugin.ts"() {
     init_budibaseDir();
-    import_fs6 = __toESM(require("fs"));
+    import_fs7 = __toESM(require("fs"));
     import_path8 = require("path");
     init_src2();
     DATASOURCE_PATH = (0, import_path8.join)(budibaseTempDir2(), "datasource");
@@ -12385,8 +12408,8 @@ var init_plugin5 = __esm({
     getPluginMetadata = async (path5) => {
       let metadata = {};
       try {
-        const pkg2 = import_fs6.default.readFileSync((0, import_path8.join)(path5, "package.json"), "utf8");
-        const schema = import_fs6.default.readFileSync((0, import_path8.join)(path5, "schema.json"), "utf8");
+        const pkg2 = import_fs7.default.readFileSync((0, import_path8.join)(path5, "package.json"), "utf8");
+        const schema = import_fs7.default.readFileSync((0, import_path8.join)(path5, "schema.json"), "utf8");
         metadata.schema = JSON.parse(schema);
         metadata.package = JSON.parse(pkg2);
         if (!metadata.package.name || !metadata.package.version || !metadata.package.description) {
@@ -13654,21 +13677,21 @@ __export(version_exports, {
   getLicenseVersion: () => getLicenseVersion,
   getProVersion: () => getProVersion
 });
-var import_fs7, import_path9, getLicenseVersion, getProVersion;
+var import_fs8, import_path9, getLicenseVersion, getProVersion;
 var init_version2 = __esm({
   "../pro/packages/pro/src/constants/version.ts"() {
     init_src2();
-    import_fs7 = __toESM(require("fs"));
+    import_fs8 = __toESM(require("fs"));
     import_path9 = __toESM(require("path"));
     getLicenseVersion = () => {
       if (environment_default.isDev()) {
         const DEV_VER_FILENAME = "dev-version.txt";
         const verFile = import_path9.default.join(objectStore_exports2.budibaseTempDir(), DEV_VER_FILENAME);
-        if (import_fs7.default.existsSync(verFile)) {
-          return import_fs7.default.readFileSync(verFile, "utf8");
+        if (import_fs8.default.existsSync(verFile)) {
+          return import_fs8.default.readFileSync(verFile, "utf8");
         } else {
           const devVer = utils_exports2.newid();
-          import_fs7.default.writeFileSync(verFile, devVer);
+          import_fs8.default.writeFileSync(verFile, devVer);
           return devVer;
         }
       } else {
@@ -14114,21 +14137,21 @@ function getOfflineLicense() {
   }
 }
 function getOfflineLicenseFromDisk() {
-  if (import_fs8.default.existsSync(LICENSE_FILE_PATH)) {
-    const token = import_fs8.default.readFileSync(LICENSE_FILE_PATH, { encoding: "utf-8" });
+  if (import_fs9.default.existsSync(LICENSE_FILE_PATH)) {
+    const token = import_fs9.default.readFileSync(LICENSE_FILE_PATH, { encoding: "utf-8" });
     return import_jsonwebtoken.default.verify(token, PUBLIC_KEY, { algorithms: ["RS256"] });
   }
 }
 function writeOfflineLicenseToDisk(signedLicense) {
-  import_fs8.default.writeFileSync(LICENSE_FILE_PATH, signedLicense, { encoding: "utf-8" });
+  import_fs9.default.writeFileSync(LICENSE_FILE_PATH, signedLicense, { encoding: "utf-8" });
 }
 function deleteOfflineLicense() {
-  import_fs8.default.rmSync(LICENSE_FILE_PATH, { force: true });
+  import_fs9.default.rmSync(LICENSE_FILE_PATH, { force: true });
 }
-var import_fs8, import_path10, import_os2, import_jsonwebtoken, SUB_DIRECTORY, DIRECTORY, OFFLINE_LICENSE_FILE, LICENSE_FILE_PATH, PUBLIC_KEY;
+var import_fs9, import_path10, import_os2, import_jsonwebtoken, SUB_DIRECTORY, DIRECTORY, OFFLINE_LICENSE_FILE, LICENSE_FILE_PATH, PUBLIC_KEY;
 var init_offline = __esm({
   "../pro/packages/pro/src/sdk/licensing/licenses/offline.ts"() {
-    import_fs8 = __toESM(require("fs"));
+    import_fs9 = __toESM(require("fs"));
     import_path10 = require("path");
     import_os2 = require("os");
     import_jsonwebtoken = __toESM(require("jsonwebtoken"));
@@ -14137,8 +14160,8 @@ var init_offline = __esm({
     DIRECTORY = (0, import_path10.join)((0, import_os2.tmpdir)(), SUB_DIRECTORY);
     OFFLINE_LICENSE_FILE = "offline_license.txt";
     LICENSE_FILE_PATH = (0, import_path10.join)(DIRECTORY, OFFLINE_LICENSE_FILE);
-    if (!import_fs8.default.existsSync(DIRECTORY)) {
-      import_fs8.default.mkdirSync(DIRECTORY);
+    if (!import_fs9.default.existsSync(DIRECTORY)) {
+      import_fs9.default.mkdirSync(DIRECTORY);
     }
     PUBLIC_KEY = "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvz3jePLCFBXZ19c8Dpkv\nXtSgOhKFOcvQdo/LV0KJRUzQWDPWuO4ILtBtnqhjtIzZH4CH0qCYBet5L6Qr4CM1\nl2HXiAD1Q2rlHNW9wDaYyKb1F5f+v4RyqCAyzlkwRdksmkLeECTboojNnmRCrE3C\n8suunQP5bEScqEY2kclqzSf8e6xqMzPUg3mL/pNa1iEv7TuLbU9nJfgR36l0WmZY\n94fWnSaT8OSXSqcxsaByf06gfS3HAoTJNc7eqz1Hf9fUORQGPUAnFK8cT3SfdA36\nd/o3ZWE1TTj1zYwlCLN5qRKr3hU8nC3xEYNEbkB9SfTRaOq9Q7P8WmfLkoCPm3pR\nmwIDAQAB\n-----END PUBLIC KEY-----\n";
   }
@@ -15593,12 +15616,12 @@ var init_groups6 = __esm({
 
 // ../pro/packages/pro/src/utilities/fileSystem.ts
 function loadJSFile(directory, name) {
-  return import_fs9.default.readFileSync((0, import_path11.join)(directory, name), "utf8");
+  return import_fs10.default.readFileSync((0, import_path11.join)(directory, name), "utf8");
 }
-var import_fs9, import_path11;
+var import_fs10, import_path11;
 var init_fileSystem2 = __esm({
   "../pro/packages/pro/src/utilities/fileSystem.ts"() {
-    import_fs9 = __toESM(require("fs"));
+    import_fs10 = __toESM(require("fs"));
     import_path11 = require("path");
   }
 });
@@ -18567,8 +18590,8 @@ async function runBackup(trigger3, tenantId, appId, opts) {
       }
     });
     await updateMetadata2("complete" /* COMPLETE */, { filename, contents });
-    if (import_fs10.default.existsSync(tarPath)) {
-      import_fs10.default.rmSync(tarPath);
+    if (import_fs11.default.existsSync(tarPath)) {
+      import_fs11.default.rmSync(tarPath);
     }
   } catch (err) {
     logging_exports.logAlert("App backup error", err);
@@ -18626,14 +18649,14 @@ async function exportProcessor(job, opts) {
     });
   });
 }
-var import_fs10;
+var import_fs11;
 var init_processing = __esm({
   "../pro/packages/pro/src/sdk/backups/processing.ts"() {
     init_src2();
     init_backup5();
     init_src();
     init_queue4();
-    import_fs10 = __toESM(require("fs"));
+    import_fs11 = __toESM(require("fs"));
   }
 });
 
@@ -19316,15 +19339,15 @@ async function downloadBackup(ctx) {
   const backupId = ctx.params.backupId;
   const { metadata, path: path5 } = await backups_default.downloadAppBackup(backupId);
   ctx.attachment(`backup-${metadata.timestamp}.tar.gz`);
-  ctx.body = import_fs11.default.createReadStream(path5);
+  ctx.body = import_fs12.default.createReadStream(path5);
 }
-var import_fs11;
+var import_fs12;
 var init_backups3 = __esm({
   "../pro/packages/pro/src/api/controllers/apps/backups.ts"() {
     init_src();
     init_sdk2();
     init_src2();
-    import_fs11 = __toESM(require("fs"));
+    import_fs12 = __toESM(require("fs"));
   }
 });
 
@@ -21867,13 +21890,21 @@ async function updateAppUpdatedAt(ctx) {
   }
   await db_exports.doWithDB(appId, async (db2) => {
     var _a2;
-    const metadata = await db2.get(DocumentType2.APP_METADATA);
-    metadata.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
-    metadata.updatedBy = getGlobalIDFromUserMetadataID2((_a2 = ctx.user) == null ? void 0 : _a2.userId);
-    const response2 = await db2.put(metadata);
-    metadata._rev = response2.rev;
-    await cache_exports.app.invalidateAppMetadata(appId, metadata);
-    await setDebounce(appId, DEBOUNCE_TIME_SEC);
+    try {
+      const metadata = await db2.get(DocumentType2.APP_METADATA);
+      metadata.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
+      metadata.updatedBy = getGlobalIDFromUserMetadataID2((_a2 = ctx.user) == null ? void 0 : _a2.userId);
+      const response2 = await db2.put(metadata);
+      metadata._rev = response2.rev;
+      await cache_exports.app.invalidateAppMetadata(appId, metadata);
+      await setDebounce(appId, DEBOUNCE_TIME_SEC);
+    } catch (err) {
+      if ((err == null ? void 0 : err.status) === 409) {
+        return;
+      } else {
+        throw err;
+      }
+    }
   });
 }
 async function builder(ctx) {
@@ -24371,13 +24402,17 @@ var init_threads = __esm({
         this.count = opts.count ? opts.count : 1;
         this.disableThreading = this.shouldDisableThreading();
         if (!this.disableThreading) {
+          console.debug(
+            `[${environment_default2.FORKED_PROCESS_NAME}] initialising worker farm type=${type}`
+          );
           const workerOpts = {
             autoStart: true,
             maxConcurrentWorkers: this.count,
             workerOptions: {
               env: {
                 ...process.env,
-                FORKED_PROCESS: "1"
+                FORKED_PROCESS: "1",
+                FORKED_PROCESS_NAME: type
               }
             }
           };
@@ -24387,6 +24422,10 @@ var init_threads = __esm({
           }
           this.workers = (0, import_worker_farm.default)(workerOpts, typeToFile(type), ["execute"]);
           _Thread.workerRefs.push(this.workers);
+        } else {
+          console.debug(
+            `[${environment_default2.FORKED_PROCESS_NAME}] skipping worker farm type=${type}`
+          );
         }
       }
       shouldDisableThreading() {
@@ -24398,9 +24437,7 @@ var init_threads = __esm({
           function fire(worker) {
             worker.execute(job, (err, response2) => {
               if (err && err.type === "TimeoutError") {
-                reject(
-                  new Error(`Query response time exceeded ${timeout2}ms timeout.`)
-                );
+                reject(new Error(`Thread timeout exceeded ${timeout2}ms timeout.`));
               } else if (err) {
                 reject(err);
               } else {
@@ -24737,8 +24774,10 @@ function makeVariableKey(queryId, variable) {
 }
 function threadSetup() {
   if (environment_default2.isTest() || environment_default2.DISABLE_THREADING || !environment_default2.isInThread()) {
+    console.debug(`[${environment_default2.FORKED_PROCESS_NAME}] thread setup skipped`);
     return;
   }
+  console.debug(`[${environment_default2.FORKED_PROCESS_NAME}] thread setup running`);
   init10();
 }
 async function checkCacheForDynamicVariable(queryId, variable) {
@@ -24840,7 +24879,7 @@ async function exportDB(dbName, opts = {}) {
   return db_exports.doWithDB(dbName, async (db2) => {
     if (opts == null ? void 0 : opts.exportPath) {
       const path5 = opts == null ? void 0 : opts.exportPath;
-      const writeStream = import_fs12.default.createWriteStream(path5);
+      const writeStream = import_fs13.default.createWriteStream(path5);
       await db2.dump(writeStream, exportOpts);
       return path5;
     } else {
@@ -24875,7 +24914,7 @@ async function exportApp(appId, config) {
           ObjectStoreBuckets2.APPS,
           (0, import_path12.join)(appPath, path5)
         );
-        import_fs12.default.writeFileSync((0, import_path12.join)(tmpPath, path5), contents);
+        import_fs13.default.writeFileSync((0, import_path12.join)(tmpPath, path5), contents);
       }
     } else {
       tmpPath = await objectStore_exports2.retrieveDirectory(
@@ -24885,13 +24924,13 @@ async function exportApp(appId, config) {
     }
   }
   const downloadedPath = (0, import_path12.join)(tmpPath, appPath);
-  if (import_fs12.default.existsSync(downloadedPath)) {
-    const allFiles = import_fs12.default.readdirSync(downloadedPath);
+  if (import_fs13.default.existsSync(downloadedPath)) {
+    const allFiles = import_fs13.default.readdirSync(downloadedPath);
     for (let file of allFiles) {
       const path5 = (0, import_path12.join)(downloadedPath, file);
-      import_fs12.default.renameSync(path5, (0, import_path12.join)(downloadedPath, "..", file));
+      import_fs13.default.renameSync(path5, (0, import_path12.join)(downloadedPath, "..", file));
     }
-    import_fs12.default.rmdirSync(downloadedPath);
+    import_fs13.default.rmdirSync(downloadedPath);
   }
   const dbPath = (0, import_path12.join)(tmpPath, DB_EXPORT_FILE);
   await exportDB(appId, {
@@ -24899,8 +24938,8 @@ async function exportApp(appId, config) {
     exportPath: dbPath
   });
   if (config == null ? void 0 : config.tar) {
-    const tarPath = tarFilesToTmp(tmpPath, import_fs12.default.readdirSync(tmpPath));
-    import_fs12.default.rmSync(tmpPath, { recursive: true, force: true });
+    const tarPath = tarFilesToTmp(tmpPath, import_fs13.default.readdirSync(tmpPath));
+    import_fs13.default.rmSync(tmpPath, { recursive: true, force: true });
     return tarPath;
   } else {
     return tmpPath;
@@ -24914,7 +24953,7 @@ async function streamExportApp(appId, excludeRows) {
   });
   return streamFile(tmpPath);
 }
-var import_fs12, import_path12, uuid3, tar3, MemoryStream2;
+var import_fs13, import_path12, uuid3, tar3, MemoryStream2;
 var init_exports2 = __esm({
   "src/sdk/app/backups/exports.ts"() {
     init_src2();
@@ -24923,7 +24962,7 @@ var init_exports2 = __esm({
     init_constants4();
     init_utils9();
     init_constants7();
-    import_fs12 = __toESM(require("fs"));
+    import_fs13 = __toESM(require("fs"));
     import_path12 = require("path");
     init_environment3();
     uuid3 = require("uuid/v4");
@@ -25004,16 +25043,16 @@ async function getTemplateStream(template) {
     throw new Error("Cannot import a non-text based file.");
   }
   if (template.file) {
-    return import_fs13.default.createReadStream(template.file.path);
+    return import_fs14.default.createReadStream(template.file.path);
   } else if (template.key) {
     const [type, name] = template.key.split("/");
     const tmpPath = await downloadTemplate(type, name);
-    return import_fs13.default.createReadStream((0, import_path13.join)(tmpPath, name, "db", "dump.txt"));
+    return import_fs14.default.createReadStream((0, import_path13.join)(tmpPath, name, "db", "dump.txt"));
   }
 }
 function untarFile(file) {
   const tmpPath = (0, import_path13.join)(budibaseTempDir2(), uuid4());
-  import_fs13.default.mkdirSync(tmpPath);
+  import_fs14.default.mkdirSync(tmpPath);
   tar4.extract({
     sync: true,
     cwd: tmpPath,
@@ -25022,20 +25061,20 @@ function untarFile(file) {
   return tmpPath;
 }
 function getGlobalDBFile(tmpPath) {
-  return import_fs13.default.readFileSync((0, import_path13.join)(tmpPath, GLOBAL_DB_EXPORT_FILE), "utf8");
+  return import_fs14.default.readFileSync((0, import_path13.join)(tmpPath, GLOBAL_DB_EXPORT_FILE), "utf8");
 }
 function getListOfAppsInMulti(tmpPath) {
-  return import_fs13.default.readdirSync(tmpPath).filter((dir) => dir !== GLOBAL_DB_EXPORT_FILE);
+  return import_fs14.default.readdirSync(tmpPath).filter((dir) => dir !== GLOBAL_DB_EXPORT_FILE);
 }
 async function importApp(appId, db2, template) {
   var _a2, _b2;
   let prodAppId = db_exports.getProdAppID(appId);
   let dbStream;
   const isTar = template.file && ((_b2 = (_a2 = template == null ? void 0 : template.file) == null ? void 0 : _a2.type) == null ? void 0 : _b2.endsWith("gzip"));
-  const isDirectory = template.file && import_fs13.default.lstatSync(template.file.path).isDirectory();
+  const isDirectory = template.file && import_fs14.default.lstatSync(template.file.path).isDirectory();
   if (template.file && (isTar || isDirectory)) {
     const tmpPath = isTar ? untarFile(template.file) : template.file.path;
-    const contents = import_fs13.default.readdirSync(tmpPath);
+    const contents = import_fs14.default.readdirSync(tmpPath);
     if (contents.length) {
       let promises = [];
       let excludedFiles = [GLOBAL_DB_EXPORT_FILE, DB_EXPORT_FILE];
@@ -25045,7 +25084,7 @@ async function importApp(appId, db2, template) {
           continue;
         }
         filename = (0, import_path13.join)(prodAppId, filename);
-        if (import_fs13.default.lstatSync(path5).isDirectory()) {
+        if (import_fs14.default.lstatSync(path5).isDirectory()) {
           promises.push(
             objectStore_exports2.uploadDirectory(ObjectStoreBuckets2.APPS, path5, filename)
           );
@@ -25061,7 +25100,7 @@ async function importApp(appId, db2, template) {
       }
       await Promise.all(promises);
     }
-    dbStream = import_fs13.default.createReadStream((0, import_path13.join)(tmpPath, DB_EXPORT_FILE));
+    dbStream = import_fs14.default.createReadStream((0, import_path13.join)(tmpPath, DB_EXPORT_FILE));
   } else {
     dbStream = await getTemplateStream(template);
   }
@@ -25073,7 +25112,7 @@ async function importApp(appId, db2, template) {
   await updateAutomations(prodAppId, db2);
   return ok;
 }
-var import_path13, import_fs13, uuid4, tar4;
+var import_path13, import_fs14, uuid4, tar4;
 var init_imports = __esm({
   "src/sdk/app/backups/imports.ts"() {
     init_src2();
@@ -25083,7 +25122,7 @@ var init_imports = __esm({
     init_fileSystem();
     init_constants4();
     import_path13 = require("path");
-    import_fs13 = __toESM(require("fs"));
+    import_fs14 = __toESM(require("fs"));
     init_sdk3();
     init_src();
     uuid4 = require("uuid/v4");
@@ -37486,10 +37525,26 @@ var init_AutomationEmitter = __esm({
 });
 
 // src/automations/logging/index.ts
+function sanitiseResults(results) {
+  const message = `[removed] - max results size of ${MAX_LOG_SIZE_MB}MB exceeded`;
+  for (let step of results.steps) {
+    step.inputs = {
+      message
+    };
+    step.outputs = {
+      message,
+      success: step.outputs.success
+    };
+  }
+}
 async function storeLog2(automation, results) {
   if (environment_default2.DISABLE_AUTOMATION_LOGS) {
     return;
   }
+  const bytes = (0, import_object_sizeof.default)(results);
+  if (bytes / MB_IN_BYTES > MAX_LOG_SIZE_MB) {
+    sanitiseResults(results);
+  }
   await automations_exports.logs.storeLog(automation, results);
 }
 async function checkAppMetadata(apps2) {
@@ -37514,17 +37569,21 @@ async function checkAppMetadata(apps2) {
   }
   return apps2;
 }
+var import_object_sizeof, MAX_LOG_SIZE_MB, MB_IN_BYTES;
 var init_logging3 = __esm({
   "src/automations/logging/index.ts"() {
     init_environment3();
     init_src4();
     init_src2();
+    import_object_sizeof = __toESM(require("object-sizeof"));
+    MAX_LOG_SIZE_MB = 5;
+    MB_IN_BYTES = 1024 * 1024;
   }
 });
 
 // src/threads/automation.ts
-function getLoopIterations(loopStep, input) {
-  const binding = typecastForLooping(loopStep, input);
+function getLoopIterations(loopStep) {
+  let binding = loopStep.inputs.binding;
   if (!binding) {
     return 0;
   }
@@ -37558,7 +37617,7 @@ function executeSynchronously(job) {
     });
   });
 }
-var import_string_templates8, import_fp8, FILTER_STEP_ID, LOOP_STEP_ID, CRON_STEP_ID, STOPPED_STATUS, Orchestrator, removeStalled;
+var import_string_templates8, import_fp8, import_perf_hooks2, FILTER_STEP_ID, LOOP_STEP_ID, CRON_STEP_ID, STOPPED_STATUS, Orchestrator, removeStalled;
 var init_automation4 = __esm({
   "src/threads/automation.ts"() {
     init_utils18();
@@ -37574,6 +37633,7 @@ var init_automation4 = __esm({
     init_src2();
     import_string_templates8 = __toESM(require_src2());
     import_fp8 = require("lodash/fp");
+    import_perf_hooks2 = require("perf_hooks");
     init_utils20();
     init_environment3();
     utils_default.threadSetup();
@@ -37585,7 +37645,6 @@ var init_automation4 = __esm({
       constructor(job) {
         let automation = job.data.automation;
         let triggerOutput = job.data.event;
-        let timeout2 = job.data.event.timeout;
         const metadata = triggerOutput.metadata;
         this._chainCount = metadata ? metadata.automationChainCount : 0;
         this._appId = triggerOutput.appId;
@@ -37719,7 +37778,7 @@ var init_automation4 = __esm({
         });
       }
       async execute() {
-        var _a2;
+        var _a2, _b2;
         this._context.env = await getEnvironmentVariables2();
         let automation = this._automation;
         let stopped = false;
@@ -37738,6 +37797,7 @@ var init_automation4 = __esm({
             return;
           }
         }
+        const start2 = import_perf_hooks2.performance.now();
         for (let step of automation.definition.steps) {
           if (timeoutFlag) {
             break;
@@ -37756,20 +37816,16 @@ var init_automation4 = __esm({
           }
           if (loopStep) {
             input = await (0, import_string_templates8.processObject)(loopStep.inputs, this._context);
-            iterations = getLoopIterations(loopStep, input);
+            iterations = getLoopIterations(loopStep);
           }
           for (let index2 = 0; index2 < iterations; index2++) {
             let originalStepInput = (0, import_fp8.cloneDeep)(step.inputs);
             if (loopStep && input.binding) {
-              let newInput = await (0, import_string_templates8.processObject)(
-                loopStep.inputs,
-                (0, import_fp8.cloneDeep)(this._context)
-              );
               let tempOutput = { items: loopSteps, iterations: iterationCount };
               try {
-                newInput.binding = typecastForLooping(
+                loopStep.inputs.binding = typecastForLooping(
                   loopStep,
-                  newInput
+                  loopStep.inputs
                 );
               } catch (err) {
                 this.updateContextAndOutput(loopStepNumber, step, tempOutput, {
@@ -37782,7 +37838,7 @@ var init_automation4 = __esm({
               }
               let item = [];
               if (typeof loopStep.inputs.binding === "string" && loopStep.inputs.option === "String") {
-                item = stringSplit(newInput.binding);
+                item = stringSplit(loopStep.inputs.binding);
               } else if (Array.isArray(loopStep.inputs.binding)) {
                 item = loopStep.inputs.binding;
               }
@@ -37925,7 +37981,21 @@ var init_automation4 = __esm({
             loopSteps = [];
           }
         }
-        await storeLog2(this._automation, this.executionOutput);
+        const end2 = import_perf_hooks2.performance.now();
+        const executionTime = end2 - start2;
+        console.info(`Execution time: ${executionTime} milliseconds`, {
+          _logKey: "automation",
+          executionTime
+        });
+        try {
+          await storeLog2(this._automation, this.executionOutput);
+        } catch (e) {
+          if (e.status === 413 && ((_b2 = e.request) == null ? void 0 : _b2.data)) {
+            delete e.request.data;
+            e.request.data = { message: "removed due to large size" };
+          }
+          logging_exports.logAlert("Error writing automation log", e);
+        }
         if (isProdAppID2(this._appId) && isRecurring(automation) && metadata) {
           await this.updateMetadata(metadata);
         }
@@ -41003,7 +41073,7 @@ function fetchLevels(ctx) {
 async function fetch40(ctx) {
   const db2 = context_exports.getAppDB();
   const dbRoles = await getAllDBRoles(db2);
-  let permissions2 = {};
+  let permissions = {};
   for (let role of dbRoles) {
     if (!role.permissions) {
       continue;
@@ -41016,11 +41086,11 @@ async function fetch40(ctx) {
       const levels = Array.isArray(levelArr) ? levelArr : [levelArr];
       const perms = {};
       levels.forEach((level) => perms[level] = roleId);
-      permissions2[resource] = perms;
+      permissions[resource] = perms;
     }
   }
   const finalPermissions = {};
-  for (let [resource, permission] of Object.entries(permissions2)) {
+  for (let [resource, permission] of Object.entries(permissions)) {
     const basePerms = getBasePermissions(resource);
     finalPermissions[resource] = Object.assign(basePerms, permission);
   }
@@ -41035,7 +41105,7 @@ async function getResourcePerms(ctx) {
     })
   );
   const rolesList = body2.rows.map((row2) => row2.doc);
-  let permissions2 = {};
+  let permissions = {};
   for (let level of SUPPORTED_LEVELS) {
     for (let role of rolesList) {
       const rolePerms = roles_exports.checkForRoleResourceArray(
@@ -41043,11 +41113,11 @@ async function getResourcePerms(ctx) {
         resourceId
       );
       if (rolePerms && rolePerms[resourceId] && rolePerms[resourceId].indexOf(level) !== -1) {
-        permissions2[level] = roles_exports.getExternalRoleID(role._id);
+        permissions[level] = roles_exports.getExternalRoleID(role._id);
       }
     }
   }
-  ctx.body = Object.assign(getBasePermissions(resourceId), permissions2);
+  ctx.body = Object.assign(getBasePermissions(resourceId), permissions);
 }
 async function addPermission(ctx) {
   ctx.body = await updatePermissionOnRole(
@@ -42910,7 +42980,7 @@ async function prepareUpload({ s3Key, bucket, metadata, file }) {
     key: response2.Key
   };
 }
-var import_string_templates10, import_aws_sdk4, import_fs14, uuid6, send2, toggleBetaUiFeature, serveBuilder, uploadFile, deleteObjects, serveApp, serveBuilderPreview, serveClientLibrary, getSignedUploadURL;
+var import_string_templates10, import_aws_sdk4, import_fs15, uuid6, send2, toggleBetaUiFeature, serveBuilder, uploadFile, deleteObjects, serveApp, serveBuilderPreview, serveClientLibrary, getSignedUploadURL;
 var init_static = __esm({
   "src/api/controllers/static/index.ts"() {
     init_centralPath();
@@ -42921,7 +42991,7 @@ var init_static = __esm({
     init_utils9();
     init_src2();
     import_aws_sdk4 = __toESM(require("aws-sdk"));
-    import_fs14 = __toESM(require("fs"));
+    import_fs15 = __toESM(require("fs"));
     init_sdk3();
     init_src4();
     require("svelte/register");
@@ -42937,8 +43007,8 @@ var init_static = __esm({
         return;
       }
       let builderPath = resolve(TOP_LEVEL_PATH, "new_design_ui");
-      if (!import_fs14.default.existsSync(builderPath)) {
-        import_fs14.default.mkdirSync(builderPath);
+      if (!import_fs15.default.existsSync(builderPath)) {
+        import_fs15.default.mkdirSync(builderPath);
       }
       await objectStore_exports2.downloadTarballDirect(
         "https://cdn.budi.live/beta:design_ui/new_ui.tar.gz",
@@ -44437,7 +44507,7 @@ function watch() {
     usePolling: true,
     interval: 250
   }).on("all", async (event, path5) => {
-    if (!(path5 == null ? void 0 : path5.endsWith(".tar.gz")) || !import_fs15.default.existsSync(path5)) {
+    if (!(path5 == null ? void 0 : path5.endsWith(".tar.gz")) || !import_fs16.default.existsSync(path5)) {
       return;
     }
     await tenancy.doInTenant(constants_exports.DEFAULT_TENANT_ID, async () => {
@@ -44453,13 +44523,13 @@ function watch() {
     });
   });
 }
-var import_path15, import_chokidar, import_fs15;
+var import_path15, import_chokidar, import_fs16;
 var init_watch = __esm({
   "src/watch.ts"() {
     import_path15 = __toESM(require("path"));
     init_environment3();
     import_chokidar = __toESM(require("chokidar"));
-    import_fs15 = __toESM(require("fs"));
+    import_fs16 = __toESM(require("fs"));
     init_src2();
     init_plugins5();
   }
@@ -44515,7 +44585,7 @@ async function startup(app2, server2) {
       shutdown9(server2);
     }
   }
-  if (environment_default2.SELF_HOSTED && !environment_default2.MULTI_TENANCY && environment_default2.PLUGINS_DIR && import_fs16.default.existsSync(environment_default2.PLUGINS_DIR)) {
+  if (environment_default2.SELF_HOSTED && !environment_default2.MULTI_TENANCY && environment_default2.PLUGINS_DIR && import_fs17.default.existsSync(environment_default2.PLUGINS_DIR)) {
     watch();
   }
   await installation_exports.checkInstallVersion();
@@ -44550,14 +44620,14 @@ async function startup(app2, server2) {
     }
   }
 }
-var import_fs16, STARTUP_RAN;
+var import_fs17, STARTUP_RAN;
 var init_startup = __esm({
   "src/startup.ts"() {
     init_environment3();
     init_redis4();
     init_workerRequests();
     init_src2();
-    import_fs16 = __toESM(require("fs"));
+    import_fs17 = __toESM(require("fs"));
     init_watch();
     init_automations8();
     init_fileSystem();