@budibase/server 2.6.19-alpha.40 → 2.6.19-alpha.42

package/dist/automation.js

@@ -1795,7 +1795,6 @@ var init_environment3 = __esm({
       REDIS_URL: process.env.REDIS_URL || "localhost:6379",
       REDIS_PASSWORD: process.env.REDIS_PASSWORD,
       REDIS_CLUSTERED: process.env.REDIS_CLUSTERED,
-      MOCK_REDIS: process.env.MOCK_REDIS,
       MINIO_ACCESS_KEY: process.env.MINIO_ACCESS_KEY,
       MINIO_SECRET_KEY: process.env.MINIO_SECRET_KEY,
       AWS_REGION: process.env.AWS_REGION,
@@ -1822,6 +1821,7 @@ var init_environment3 = __esm({
       GLOBAL_BUCKET_NAME: process.env.GLOBAL_BUCKET_NAME || DefaultBucketName.GLOBAL,
       PLUGIN_BUCKET_NAME: process.env.PLUGIN_BUCKET_NAME || DefaultBucketName.PLUGINS,
       USE_COUCH: process.env.USE_COUCH || true,
+      MOCK_REDIS: process.env.MOCK_REDIS,
       DEFAULT_LICENSE: process.env.DEFAULT_LICENSE,
       SERVICE: process.env.SERVICE || "budibase",
       LOG_LEVEL: process.env.LOG_LEVEL || "info",
@@ -2697,7 +2697,7 @@ function getRedisOptions() {
     opts.port = port;
     opts.password = password;
   }
-  return { opts, host, port, redisProtocolUrl };
+  return { opts, host, port: parseInt(port), redisProtocolUrl };
 }
 function addDbPrefix(db2, key) {
   if (key.includes(db2)) {
@@ -2806,6 +2806,7 @@ function connectionError(selectDb, timeout2, err) {
   }, RETRY_PERIOD_MS);
 }
 function init2(selectDb = DEFAULT_SELECT_DB) {
+  const RedisCore = environment_default2.MOCK_REDIS ? MockRedis : import_ioredis.default;
   let timeout2;
   CLOSED = false;
   let client3 = pickClient(selectDb);
@@ -2813,7 +2814,7 @@ function init2(selectDb = DEFAULT_SELECT_DB) {
     return;
   }
   if (environment_default2.MOCK_REDIS) {
-    CLIENTS[selectDb] = new Redis(getRedisOptions());
+    CLIENTS[selectDb] = new RedisCore(getRedisOptions());
   }
   timeout2 = setTimeout(() => {
     if (!CONNECTED) {
@@ -2829,11 +2830,11 @@ function init2(selectDb = DEFAULT_SELECT_DB) {
   }
   const { redisProtocolUrl, opts, host, port } = getRedisOptions();
   if (CLUSTERED) {
-    client3 = new Redis.Cluster([{ host, port }], opts);
+    client3 = new RedisCore.Cluster([{ host, port }], opts);
   } else if (redisProtocolUrl) {
-    client3 = new Redis(redisProtocolUrl);
+    client3 = new RedisCore(redisProtocolUrl);
   } else {
-    client3 = new Redis(opts);
+    client3 = new RedisCore(opts);
   }
   client3.on("end", (err) => {
     if (environment_default2.isTest()) {
@@ -2897,13 +2898,14 @@ function promisifyStream(stream3, client3) {
     });
   });
 }
-var Redis, RETRY_PERIOD_MS, STARTUP_TIMEOUT_MS, CLUSTERED, DEFAULT_SELECT_DB, CLOSED, CLIENTS, CONNECTED, RedisWrapper, redis_default;
+var import_ioredis, MockRedis, RETRY_PERIOD_MS, STARTUP_TIMEOUT_MS, CLUSTERED, DEFAULT_SELECT_DB, CLOSED, CLIENTS, CONNECTED, RedisWrapper, redis_default;
 var init_redis = __esm({
   "../backend-core/src/redis/redis.ts"() {
     init_environment3();
+    import_ioredis = __toESM(require("ioredis"));
     init_utils2();
     init_timers2();
-    Redis = environment_default2.MOCK_REDIS ? require("ioredis-mock") : require("ioredis");
+    MockRedis = require("ioredis-mock");
     RETRY_PERIOD_MS = 2e3;
     STARTUP_TIMEOUT_MS = 5e3;
     CLUSTERED = environment_default2.REDIS_CLUSTERED;
@@ -11524,6 +11526,7 @@ var init_src2 = __esm({
     init_cache();
     init_objectStore2();
     init_redis2();
+    init_redis2();
     init_redlockImpl();
     init_utils5();
     init_errors3();
@@ -13962,6 +13965,7 @@ var init_users7 = __esm({
 
 // ../pro/packages/pro/src/utilities/delay.ts
 async function backOff(fn2, errMsg) {
+  let error;
   let attempts = 5, success = false, response2, first = true;
   for (; attempts > 0; attempts--) {
     try {
@@ -13973,10 +13977,11 @@ async function backOff(fn2, errMsg) {
       success = true;
       break;
     } catch (err) {
+      error = err;
     }
   }
   if (!success) {
-    logging_exports.logAlert(`Failed to backoff`, errMsg);
+    logging_exports.logAlert(`Failed to backoff: ${errMsg}`, error);
   }
   return response2;
 }
@@ -24388,11 +24393,11 @@ var init_firebase = __esm({
 });
 
 // src/integrations/redis.ts
-var import_ioredis, SCHEMA14, RedisIntegration, redis_default2;
+var import_ioredis2, SCHEMA14, RedisIntegration, redis_default2;
 var init_redis4 = __esm({
   "src/integrations/redis.ts"() {
     init_src();
-    import_ioredis = __toESM(require("ioredis"));
+    import_ioredis2 = __toESM(require("ioredis"));
     SCHEMA14 = {
       docs: "https://redis.io/docs/",
       description: "Redis is a caching tool, providing powerful key-value store capabilities.",
@@ -24473,7 +24478,7 @@ var init_redis4 = __esm({
     RedisIntegration = class {
       constructor(config) {
         this.config = config;
-        this.client = new import_ioredis.default({
+        this.client = new import_ioredis2.default({
           host: this.config.host,
           port: this.config.port,
           username: this.config.username,
@@ -24537,7 +24542,13 @@ var init_redis4 = __esm({
           }
           const pipeline = this.client.pipeline(pipelineCommands);
           const result = await pipeline.exec();
-          return result.map((output) => output[1]);
+          return result == null ? void 0 : result.map((output) => {
+            if (typeof output === "string") {
+              return output;
+            } else if (Array.isArray(output)) {
+              return output[1];
+            }
+          });
         });
       }
     };
@@ -25988,6 +25999,7 @@ var init_redis5 = __esm({
   "src/utilities/redis.ts"() {
     init_src2();
     init_utils13();
+    init_environment();
   }
 });
 
@@ -26359,6 +26371,7 @@ var init_websockets = __esm({
     init_client2();
     init_grid();
     init_builder2();
+    init_environment();
   }
 });
 
@@ -26387,14 +26400,14 @@ async function fetch16(type) {
   }
 }
 async function processUploaded(plugin, source) {
-  var _a;
+  var _a, _b;
   const { metadata, directory } = await fileUpload(plugin);
   plugin_exports.validate(metadata == null ? void 0 : metadata.schema);
   if (!environment_default.SELF_HOSTED && ((_a = metadata == null ? void 0 : metadata.schema) == null ? void 0 : _a.type) !== "component" /* COMPONENT */) {
     throw new Error("Only component plugins are supported outside of self-host");
   }
   const doc = await sdk_exports.plugins.storePlugin(metadata, directory, source);
-  clientAppSocket.emit("plugin-update", { name: doc.name, hash: doc.hash });
+  (_b = clientAppSocket) == null ? void 0 : _b.emit("plugin-update", { name: doc.name, hash: doc.hash });
   return doc;
 }
 var init_plugins4 = __esm({
@@ -32040,10 +32053,17 @@ function getLoopIterations(loopStep) {
   if (!binding) {
     return 0;
   }
+  const isString = typeof binding === "string";
+  try {
+    if (isString) {
+      binding = JSON.parse(binding);
+    }
+  } catch (err) {
+  }
   if (Array.isArray(binding)) {
     return binding.length;
   }
-  if (typeof binding === "string") {
+  if (isString) {
     return stringSplit(binding).length;
   }
   return 0;