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

package/dist/index.js

@@ -1710,7 +1710,6 @@ var init_environment2 = __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,
@@ -1737,6 +1736,7 @@ var init_environment2 = __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",
@@ -2612,7 +2612,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)) {
@@ -2733,6 +2733,7 @@ function connectionError(selectDb, timeout2, err) {
   }, RETRY_PERIOD_MS);
 }
 function init2(selectDb = DEFAULT_SELECT_DB) {
+  const RedisCore = environment_default.MOCK_REDIS ? MockRedis : import_ioredis.default;
   let timeout2;
   CLOSED = false;
   let client3 = pickClient(selectDb);
@@ -2740,7 +2741,7 @@ function init2(selectDb = DEFAULT_SELECT_DB) {
     return;
   }
   if (environment_default.MOCK_REDIS) {
-    CLIENTS[selectDb] = new Redis(getRedisOptions());
+    CLIENTS[selectDb] = new RedisCore(getRedisOptions());
   }
   timeout2 = setTimeout(() => {
     if (!CONNECTED) {
@@ -2756,11 +2757,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_default.isTest()) {
@@ -2824,13 +2825,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_environment2();
+    import_ioredis = __toESM(require("ioredis"));
     init_utils2();
     init_timers2();
-    Redis = environment_default.MOCK_REDIS ? require("ioredis-mock") : require("ioredis");
+    MockRedis = require("ioredis-mock");
     RETRY_PERIOD_MS = 2e3;
     STARTUP_TIMEOUT_MS = 5e3;
     CLUSTERED = environment_default.REDIS_CLUSTERED;
@@ -11861,6 +11863,7 @@ var init_src2 = __esm({
     init_cache();
     init_objectStore2();
     init_redis2();
+    init_redis2();
     init_redlockImpl();
     init_utils5();
     init_errors3();
@@ -21814,7 +21817,9 @@ async function init17() {
   await debounceClient.init();
   await flagClient.init();
   socketClient2 = await redis_exports.clients.getSocketClient();
-  socketSubClient = socketClient2.getClient().duplicate();
+  if (!environment_default2.isTest()) {
+    socketSubClient = socketClient2.getClient().duplicate();
+  }
 }
 async function shutdown6() {
   console.log("REDIS SHUTDOWN");
@@ -21889,6 +21894,7 @@ var init_redis4 = __esm({
   "src/utilities/redis.ts"() {
     init_src2();
     init_utils9();
+    init_environment3();
     APP_DEV_LOCK_SECONDS = 600;
     AUTOMATION_TEST_FLAG_SECONDS = 60;
   }
@@ -29612,11 +29618,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_redis5 = __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.",
@@ -29697,7 +29703,7 @@ var init_redis5 = __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,
@@ -29761,7 +29767,13 @@ var init_redis5 = __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];
+            }
+          });
         });
       }
     };
@@ -31655,7 +31667,7 @@ var init_builder2 = __esm({
         super(app2, server2, "/socket/builder", [authorized_default(permissions_exports.BUILDER)]);
       }
       async onConnect(socket) {
-        socket.on("SelectApp" /* SelectApp */, async (appId, callback) => {
+        socket == null ? void 0 : socket.on("SelectApp" /* SelectApp */, async (appId, callback) => {
           await this.joinRoom(socket, appId);
           const sessions = await this.getRoomSessions(appId);
           callback({ users: sessions });
@@ -31677,12 +31689,14 @@ var init_builder2 = __esm({
         }
       }
       emitTableUpdate(ctx, table2) {
+        var _a2;
         this.io.in(ctx.appId).emit("TableChange" /* TableChange */, { id: table2._id, table: table2 });
-        gridSocket.emitTableUpdate(table2);
+        (_a2 = gridSocket) == null ? void 0 : _a2.emitTableUpdate(table2);
       }
       emitTableDeletion(ctx, id) {
+        var _a2;
         this.io.in(ctx.appId).emit("TableChange" /* TableChange */, { id, table: null });
-        gridSocket.emitTableDeletion(id);
+        (_a2 = gridSocket) == null ? void 0 : _a2.emitTableDeletion(id);
       }
       emitDatasourceUpdate(ctx, datasource2) {
         this.io.in(ctx.appId).emit("DatasourceChange" /* DatasourceChange */, {
@@ -31704,10 +31718,13 @@ var init_websockets = __esm({
     init_client2();
     init_grid();
     init_builder2();
+    init_environment3();
     initialise = (app2, server2) => {
-      clientAppSocket = new ClientAppWebsocket(app2, server2);
-      gridSocket = new GridSocket(app2, server2);
-      builderSocket = new BuilderSocket(app2, server2);
+      if (!environment_default2.isTest()) {
+        clientAppSocket = new ClientAppWebsocket(app2, server2);
+        gridSocket = new GridSocket(app2, server2);
+        builderSocket = new BuilderSocket(app2, server2);
+      }
     };
   }
 });
@@ -31737,14 +31754,14 @@ async function fetch17(type) {
   }
 }
 async function processUploaded(plugin, source) {
-  var _a2;
+  var _a2, _b2;
   const { metadata, directory } = await fileUpload(plugin);
   plugin_exports.validate(metadata == null ? void 0 : metadata.schema);
   if (!environment_default2.SELF_HOSTED && ((_a2 = metadata == null ? void 0 : metadata.schema) == null ? void 0 : _a2.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 });
+  (_b2 = clientAppSocket) == null ? void 0 : _b2.emit("plugin-update", { name: doc.name, hash: doc.hash });
   return doc;
 }
 var init_plugins4 = __esm({
@@ -34436,6 +34453,20 @@ async function getConnector(datasource2) {
   }
   return new Connector(datasource2.config);
 }
+async function getAndMergeDatasource(datasource2) {
+  let existingDatasource;
+  if (datasource2._id) {
+    existingDatasource = await sdk_default.datasources.get(datasource2._id);
+  }
+  let enrichedDatasource = datasource2;
+  if (existingDatasource) {
+    enrichedDatasource = sdk_default.datasources.mergeConfigs(
+      datasource2,
+      existingDatasource
+    );
+  }
+  return await sdk_default.datasources.enrich(enrichedDatasource);
+}
 async function buildSchemaHelper(datasource2) {
   const connector = await getConnector(datasource2);
   await connector.buildSchema(datasource2._id, datasource2.entities);
@@ -34496,17 +34527,7 @@ async function fetch22(ctx) {
 }
 async function verify(ctx) {
   const { datasource: datasource2 } = ctx.request.body;
-  let existingDatasource;
-  if (datasource2._id) {
-    existingDatasource = await sdk_default.datasources.get(datasource2._id);
-  }
-  let enrichedDatasource = datasource2;
-  if (existingDatasource) {
-    enrichedDatasource = sdk_default.datasources.mergeConfigs(
-      datasource2,
-      existingDatasource
-    );
-  }
+  const enrichedDatasource = await getAndMergeDatasource(datasource2);
   const connector = await getConnector(enrichedDatasource);
   if (!connector.testConnection) {
     ctx.throw(400, "Connection information verification not supported");
@@ -34518,9 +34539,9 @@ async function verify(ctx) {
   };
 }
 async function information(ctx) {
-  const datasourceId = ctx.params.datasourceId;
-  const datasource2 = await sdk_default.datasources.get(datasourceId, { enriched: true });
-  const connector = await getConnector(datasource2);
+  const { datasource: datasource2 } = ctx.request.body;
+  const enrichedDatasource = await getAndMergeDatasource(datasource2);
+  const connector = await getConnector(enrichedDatasource);
   if (!connector.getTableNames) {
     ctx.throw(400, "Table name fetching not supported by datasource");
   }
@@ -34594,7 +34615,7 @@ async function invalidateVariables(existingDatasource, updatedDatasource) {
   await invalidateDynamicVariables(toInvalidate);
 }
 async function update7(ctx) {
-  var _a2, _b2;
+  var _a2, _b2, _c;
   const db2 = context_exports.getAppDB();
   const datasourceId = ctx.params.datasourceId;
   let datasource2 = await sdk_default.datasources.get(datasourceId);
@@ -34623,9 +34644,10 @@ async function update7(ctx) {
   ctx.body = {
     datasource: await sdk_default.datasources.removeSecretSingle(datasource2)
   };
-  builderSocket.emitDatasourceUpdate(ctx, datasource2);
+  (_c = builderSocket) == null ? void 0 : _c.emitDatasourceUpdate(ctx, datasource2);
 }
 async function save13(ctx) {
+  var _a2;
   const db2 = context_exports.getAppDB();
   const plus = ctx.request.body.datasource.plus;
   const fetchSchema = ctx.request.body.fetchSchema;
@@ -34657,7 +34679,7 @@ async function save13(ctx) {
     response2.error = schemaError;
   }
   ctx.body = response2;
-  builderSocket.emitDatasourceUpdate(ctx, datasource2);
+  (_a2 = builderSocket) == null ? void 0 : _a2.emitDatasourceUpdate(ctx, datasource2);
 }
 async function destroyInternalTablesBySourceId(datasourceId) {
   const db2 = context_exports.getAppDB();
@@ -34684,6 +34706,7 @@ async function destroyInternalTablesBySourceId(datasourceId) {
   }
 }
 async function destroy12(ctx) {
+  var _a2;
   const db2 = context_exports.getAppDB();
   const datasourceId = ctx.params.datasourceId;
   const datasource2 = await sdk_default.datasources.get(datasourceId);
@@ -34703,7 +34726,7 @@ async function destroy12(ctx) {
   await events_exports.datasource.deleted(datasource2);
   ctx.message = `Datasource deleted.`;
   ctx.status = 200;
-  builderSocket.emitDatasourceDeletion(ctx, datasourceId);
+  (_a2 = builderSocket) == null ? void 0 : _a2.emitDatasourceDeletion(ctx, datasourceId);
 }
 async function find8(ctx) {
   const database = context_exports.getAppDB();
@@ -36805,6 +36828,7 @@ async function find10(ctx) {
   ctx.body = await sdk_default.tables.getTable(tableId);
 }
 async function save16(ctx) {
+  var _a2;
   const appId = ctx.appId;
   const table2 = ctx.request.body;
   const isImport = table2.rows;
@@ -36821,9 +36845,10 @@ async function save16(ctx) {
   ctx.message = `Table ${table2.name} saved successfully.`;
   ctx.eventEmitter && ctx.eventEmitter.emitTable(`table:save`, appId, savedTable);
   ctx.body = savedTable;
-  builderSocket.emitTableUpdate(ctx, savedTable);
+  (_a2 = builderSocket) == null ? void 0 : _a2.emitTableUpdate(ctx, savedTable);
 }
 async function destroy15(ctx) {
+  var _a2;
   const appId = ctx.appId;
   const tableId = ctx.params.tableId;
   const deletedTable = await pickApi2({ tableId }).destroy(ctx);
@@ -36832,7 +36857,7 @@ async function destroy15(ctx) {
   ctx.status = 200;
   ctx.table = deletedTable;
   ctx.body = { message: `Table ${tableId} deleted.` };
-  builderSocket.emitTableDeletion(ctx, tableId);
+  (_a2 = builderSocket) == null ? void 0 : _a2.emitTableDeletion(ctx, tableId);
 }
 async function bulkImport3(ctx) {
   const tableId = ctx.params.tableId;
@@ -37727,10 +37752,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;
@@ -39773,6 +39805,7 @@ async function fetch32(ctx) {
   ctx.body = await getViews();
 }
 async function save18(ctx) {
+  var _a2;
   const db2 = context_exports.getAppDB();
   const { originalName, ...viewToSave } = ctx.request.body;
   const existingTable = await db2.get(ctx.request.body.tableId);
@@ -39799,7 +39832,7 @@ async function save18(ctx) {
   await db2.put(table2);
   await handleViewEvents(existingTable.views[viewName], table2.views[viewName]);
   ctx.body = table2.views[viewName];
-  builderSocket.emitTableUpdate(ctx, table2);
+  (_a2 = builderSocket) == null ? void 0 : _a2.emitTableUpdate(ctx, table2);
 }
 async function calculationEvents(existingView, newView) {
   const existingCalculation = existingView && existingView.calculation;
@@ -39837,6 +39870,7 @@ async function handleViewEvents(existingView, newView) {
   await filterEvents(existingView, newView);
 }
 async function destroy18(ctx) {
+  var _a2;
   const db2 = context_exports.getAppDB();
   const viewName = decodeURIComponent(ctx.params.viewName);
   const view2 = await deleteView(viewName);
@@ -39845,7 +39879,7 @@ async function destroy18(ctx) {
   await db2.put(table2);
   await events_exports.view.deleted(view2);
   ctx.body = view2;
-  builderSocket.emitTableUpdate(ctx, table2);
+  (_a2 = builderSocket) == null ? void 0 : _a2.emitTableUpdate(ctx, table2);
 }
 async function exportView(ctx) {
   const viewName = decodeURIComponent(ctx.query.view);
@@ -41344,8 +41378,8 @@ var init_datasource6 = __esm({
       "/api/datasources/verify",
       authorized_default(permissions_exports.BUILDER),
       verify
-    ).get(
-      "/api/datasources/:datasourceId/info",
+    ).post(
+      "/api/datasources/info",
       authorized_default(permissions_exports.BUILDER),
       information
     ).get(
@@ -42962,7 +42996,7 @@ async function upload2(ctx) {
   }
 }
 async function create8(ctx) {
-  var _a2;
+  var _a2, _b2;
   const { source, url, headers, githubToken } = ctx.request.body;
   try {
     let metadata;
@@ -42993,7 +43027,7 @@ async function create8(ctx) {
       );
     }
     const doc = await sdk_exports.plugins.storePlugin(metadata, directory, source);
-    clientAppSocket.emit("plugins-update", { name, hash: doc.hash });
+    (_b2 = clientAppSocket) == null ? void 0 : _b2.emit("plugins-update", { name, hash: doc.hash });
     ctx.body = {
       message: "Plugin uploaded successfully",
       plugins: [doc]