@budibase/server 2.7.6 → 2.7.7

package/dist/index.js

@@ -2782,23 +2782,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) => {
@@ -2816,7 +2816,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())
@@ -4532,11 +4532,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}`);
           });
@@ -6131,7 +6131,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];
@@ -10838,12 +10838,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 });
       }
     );
   });
@@ -10864,12 +10864,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 });
       }
     );
   });
@@ -12135,7 +12135,7 @@ var init_environment3 = __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 (isDev2() && environment2.DISABLE_THREADING == null) {
       environment2._set("DISABLE_THREADING", "1");
@@ -12163,7 +12163,7 @@ var init_filesystem = __esm({
     import_tar = __toESM(require("tar"));
     init_environment3();
     uuid2 = require("uuid/v4");
-    TOP_LEVEL_PATH = environment_default2.TOP_LEVEL_PATH || (0, import_path5.join)(__dirname, "..", "..", "..");
+    TOP_LEVEL_PATH = environment_default2.TOP_LEVEL_PATH || (0, import_path5.resolve)((0, import_path5.join)(__dirname, "..", "..", ".."));
     init9 = () => {
       const tempDir = budibaseTempDir2();
       if (!import_fs4.default.existsSync(tempDir)) {
@@ -24198,7 +24198,7 @@ var init_datasource_bb_default = __esm({
 
 // src/utilities/index.ts
 function wait(ms) {
-  return new Promise((resolve2) => setTimeout(resolve2, ms));
+  return new Promise((resolve3) => setTimeout(resolve3, ms));
 }
 function removeFromArray(array, element) {
   const index2 = array.indexOf(element);
@@ -24499,7 +24499,7 @@ var init_threads = __esm({
       }
       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") {
@@ -24507,7 +24507,7 @@ var init_threads = __esm({
               } else if (err) {
                 reject(err);
               } else {
-                resolve2(response2);
+                resolve3(response2);
               }
             });
           }
@@ -24521,15 +24521,15 @@ var init_threads = __esm({
         });
       }
       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) {
@@ -26377,13 +26377,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();
             }
           });
         });
@@ -28134,7 +28134,7 @@ var init_s3 = __esm({
           Key: query3.key
         }).createReadStream();
         let csvError = false;
-        return new Promise((resolve2, reject) => {
+        return new Promise((resolve3, reject) => {
           stream3.on("error", (err) => {
             reject(err);
           });
@@ -28142,7 +28142,7 @@ var init_s3 = __esm({
             csvError = true;
           });
           stream3.on("finish", () => {
-            resolve2(response2);
+            resolve3(response2);
           });
         }).catch((err) => {
           if (csvError) {
@@ -37905,7 +37905,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);
@@ -43314,7 +43314,7 @@ var init_static = __esm({
         };
         return;
       }
-      let builderPath = resolve(TOP_LEVEL_PATH, "new_design_ui");
+      let builderPath = join3(TOP_LEVEL_PATH, "new_design_ui");
       if (!import_fs15.default.existsSync(builderPath)) {
         import_fs15.default.mkdirSync(builderPath);
       }
@@ -43328,7 +43328,7 @@ var init_static = __esm({
       };
     };
     serveBuilder = async function(ctx) {
-      const builderPath = resolve(TOP_LEVEL_PATH, "builder");
+      const builderPath = join3(TOP_LEVEL_PATH, "builder");
       await send2(ctx, ctx.file, { root: builderPath });
     };
     uploadFile = async function(ctx) {