@budibase/server 2.7.5-alpha.0 → 2.7.7-alpha.0

package/Dockerfile

@@ -14,7 +14,7 @@ ENV SERVICE=app-service
 ENV POSTHOG_TOKEN=phc_bIjZL7oh2GEUd2vqvTBH8WvrX0fWTFQMs6H5KQxiUxU
 ENV TENANT_FEATURE_FLAGS=*:LICENSING,*:USER_GROUPS,*:ONBOARDING_TOUR
 ENV ACCOUNT_PORTAL_URL=https://account.budibase.app
-
+ENV TOP_LEVEL_PATH=/
 
 # handle node-gyp
 RUN apt-get update \

package/dist/automation.js

@@ -145,7 +145,7 @@ var init_environment = __esm({
       isInThread: () => {
         return process.env.FORKED_PROCESS;
       },
-      TOP_LEVEL_PATH: process.env.TOP_LEVEL_PATH
+      TOP_LEVEL_PATH: process.env.TOP_LEVEL_PATH || process.env.SERVER_TOP_LEVEL_PATH
     };
     if (isDev() && environment.DISABLE_THREADING == null) {
       environment._set("DISABLE_THREADING", "1");
@@ -2855,23 +2855,23 @@ function init2(selectDb = DEFAULT_SELECT_DB) {
   CLIENTS[selectDb] = client3;
 }
 function waitForConnection(selectDb = DEFAULT_SELECT_DB) {
-  return new Promise((resolve2) => {
+  return new Promise((resolve3) => {
     if (pickClient(selectDb) == null) {
       init2();
     } else if (CONNECTED) {
-      resolve2("");
+      resolve3("");
       return;
     }
     const interval = set(() => {
       if (CONNECTED) {
         clear(interval);
-        resolve2("");
+        resolve3("");
       }
     }, 500);
   });
 }
 function promisifyStream(stream3, client3) {
-  return new Promise((resolve2, reject) => {
+  return new Promise((resolve3, reject) => {
     const outputKeys = /* @__PURE__ */ new Set();
     stream3.on("data", (keys2) => {
       keys2.forEach((key) => {
@@ -2889,7 +2889,7 @@ function promisifyStream(stream3, client3) {
           getPromises.push(client3.get(key));
         }
         const jsonArray = await Promise.all(getPromises);
-        resolve2(
+        resolve3(
           keysArray.map((key) => ({
             key: removeDbPrefix(key),
             value: JSON.parse(jsonArray.shift())
@@ -4492,11 +4492,11 @@ var init_Replication = __esm({
         return Promise.all([closePouchDB(this.source), closePouchDB(this.target)]);
       }
       promisify(operation, opts = {}) {
-        return new Promise((resolve2) => {
+        return new Promise((resolve3) => {
           operation(this.target, opts).on("denied", function(err) {
             throw new Error(`Denied: Document failed to replicate ${err}`);
           }).on("complete", function(info) {
-            return resolve2(info);
+            return resolve3(info);
           }).on("error", function(err) {
             throw new Error(`Replication Error: ${err}`);
           });
@@ -6091,7 +6091,7 @@ function isClient(ctx) {
   return ctx.headers["x-budibase-type" /* TYPE */] === "client";
 }
 function timeout(timeMs) {
-  return new Promise((resolve2) => setTimeout(resolve2, timeMs));
+  return new Promise((resolve3) => setTimeout(resolve3, timeMs));
 }
 function isAudited(event) {
   return !!AuditedEventFriendlyName[event];
@@ -10551,12 +10551,12 @@ async function refreshOIDCAccessToken(chosenConfig, refreshToken) {
       return strategy._getOAuth2Client(enrichedConfig);
     }
   });
-  return new Promise((resolve2) => {
+  return new Promise((resolve3) => {
     refresh.requestNewAccessToken(
       "oidc" /* OIDC */,
       refreshToken,
       (err, accessToken, refreshToken2, params2) => {
-        resolve2({ err, accessToken, refreshToken: refreshToken2, params: params2 });
+        resolve3({ err, accessToken, refreshToken: refreshToken2, params: params2 });
       }
     );
   });
@@ -10577,12 +10577,12 @@ async function refreshGoogleAccessToken(config, refreshToken) {
     );
   }
   refresh.use(strategy);
-  return new Promise((resolve2) => {
+  return new Promise((resolve3) => {
     refresh.requestNewAccessToken(
       "google" /* GOOGLE */,
       refreshToken,
       (err, accessToken, refreshToken2, params2) => {
-        resolve2({ err, accessToken, refreshToken: refreshToken2, params: params2 });
+        resolve3({ err, accessToken, refreshToken: refreshToken2, params: params2 });
       }
     );
   });
@@ -19361,7 +19361,7 @@ var init_utils13 = __esm({
 
 // src/utilities/index.ts
 function wait(ms) {
-  return new Promise((resolve2) => setTimeout(resolve2, ms));
+  return new Promise((resolve3) => setTimeout(resolve3, ms));
 }
 function checkSlashesInUrl2(url) {
   return url.replace(/(https?:\/\/)|(\/)+/g, "$1$2");
@@ -19519,7 +19519,7 @@ var init_filesystem = __esm({
     import_tar = __toESM(require("tar"));
     init_environment();
     uuid2 = require("uuid/v4");
-    TOP_LEVEL_PATH = environment_default.TOP_LEVEL_PATH || (0, import_path7.join)(__dirname, "..", "..", "..");
+    TOP_LEVEL_PATH = environment_default.TOP_LEVEL_PATH || (0, import_path7.resolve)((0, import_path7.join)(__dirname, "..", "..", ".."));
     apiFileReturn = (contents) => {
       const path2 = (0, import_path7.join)(budibaseTempDir2(), uuid2());
       import_fs9.default.writeFileSync(path2, contents);
@@ -21142,13 +21142,13 @@ var init_postgres = __esm({
       }
       closeConnection() {
         const pg = this;
-        return new Promise((resolve2, reject) => {
+        return new Promise((resolve3, reject) => {
           this.client.end((err) => {
             pg.open = false;
             if (err) {
               reject(err);
             } else {
-              resolve2();
+              resolve3();
             }
           });
         });
@@ -22899,7 +22899,7 @@ var init_s3 = __esm({
           Key: query.key
         }).createReadStream();
         let csvError = false;
-        return new Promise((resolve2, reject) => {
+        return new Promise((resolve3, reject) => {
           stream3.on("error", (err) => {
             reject(err);
           });
@@ -22907,7 +22907,7 @@ var init_s3 = __esm({
             csvError = true;
           });
           stream3.on("finish", () => {
-            resolve2(response2);
+            resolve3(response2);
           });
         }).catch((err) => {
           if (csvError) {
@@ -26993,7 +26993,7 @@ var _Thread = class {
   }
   run(job) {
     const timeout2 = this.timeoutMs;
-    return new Promise((resolve2, reject) => {
+    return new Promise((resolve3, reject) => {
       function fire(worker) {
         worker.execute(job, (err, response2) => {
           if (err && err.type === "TimeoutError") {
@@ -27001,7 +27001,7 @@ var _Thread = class {
           } else if (err) {
             reject(err);
           } else {
-            resolve2(response2);
+            resolve3(response2);
           }
         });
       }
@@ -27015,15 +27015,15 @@ var _Thread = class {
     });
   }
   static stopThreads() {
-    return new Promise((resolve2) => {
+    return new Promise((resolve3) => {
       if (_Thread.workerRefs.length === 0) {
-        resolve2();
+        resolve3();
       }
       let count = 0;
       function complete() {
         count++;
         if (count >= _Thread.workerRefs.length) {
-          resolve2();
+          resolve3();
         }
       }
       for (let worker of _Thread.workerRefs) {
@@ -32559,7 +32559,7 @@ function executeSynchronously(job) {
   if (!appId) {
     throw new Error("Unable to execute, event doesn't contain app ID.");
   }
-  const timeoutPromise = new Promise((resolve2, reject) => {
+  const timeoutPromise = new Promise((resolve3, reject) => {
     setTimeout(() => {
       reject(new Error("Timeout exceeded"));
     }, job.data.event.timeout || 12e3);