@budibase/backend-core 2.13.0 → 2.13.3

package/dist/index.js

@@ -2722,10 +2722,11 @@ __export(utils_exports, {
   SEPARATOR: () => SEPARATOR2,
   SelectableDatabase: () => SelectableDatabase,
   addDbPrefix: () => addDbPrefix,
+  getRedisConnectionDetails: () => getRedisConnectionDetails,
   getRedisOptions: () => getRedisOptions,
   removeDbPrefix: () => removeDbPrefix
 });
-function getRedisOptions() {
+function getRedisConnectionDetails() {
   let password = environment_default.REDIS_PASSWORD;
   let url = environment_default.REDIS_URL.split("//");
   url = url.length > 1 ? url[1] : url[0];
@@ -2737,25 +2738,33 @@ function getRedisOptions() {
     url = url[0];
   }
   const [host, port] = url.split(":");
-  let redisProtocolUrl;
-  if (/rediss?:\/\//.test(environment_default.REDIS_URL)) {
-    redisProtocolUrl = environment_default.REDIS_URL;
-  }
-  const opts = {
-    connectTimeout: CONNECT_TIMEOUT_MS
+  return {
+    host,
+    password,
+    port: parseInt(port)
   };
+}
+function getRedisOptions() {
+  const { host, password, port } = getRedisConnectionDetails();
+  let redisOpts = {
+    connectTimeout: CONNECT_TIMEOUT_MS,
+    port,
+    host,
+    password
+  };
+  let opts = redisOpts;
   if (environment_default.REDIS_CLUSTERED) {
-    opts.redisOptions = {};
-    opts.redisOptions.tls = {};
-    opts.redisOptions.password = password;
-    opts.slotsRefreshTimeout = SLOT_REFRESH_MS;
-    opts.dnsLookup = (address, callback) => callback(null, address);
-  } else {
-    opts.host = host;
-    opts.port = port;
-    opts.password = password;
+    opts = {
+      connectTimeout: CONNECT_TIMEOUT_MS,
+      redisOptions: {
+        ...redisOpts,
+        tls: {}
+      },
+      slotsRefreshTimeout: SLOT_REFRESH_MS,
+      dnsLookup: (address, callback) => callback(null, address)
+    };
   }
-  return { opts, host, port: parseInt(port), redisProtocolUrl };
+  return opts;
 }
 function addDbPrefix(db, key) {
   if (key.includes(db)) {
@@ -2801,7 +2810,7 @@ var init_utils2 = __esm({
     SelectableDatabase = /* @__PURE__ */ ((SelectableDatabase2) => {
       SelectableDatabase2[SelectableDatabase2["DEFAULT"] = 0] = "DEFAULT";
       SelectableDatabase2[SelectableDatabase2["SOCKET_IO"] = 1] = "SOCKET_IO";
-      SelectableDatabase2[SelectableDatabase2["UNUSED_1"] = 2] = "UNUSED_1";
+      SelectableDatabase2[SelectableDatabase2["RATE_LIMITING"] = 2] = "RATE_LIMITING";
       SelectableDatabase2[SelectableDatabase2["UNUSED_2"] = 3] = "UNUSED_2";
       SelectableDatabase2[SelectableDatabase2["UNUSED_3"] = 4] = "UNUSED_3";
       SelectableDatabase2[SelectableDatabase2["UNUSED_4"] = 5] = "UNUSED_4";
@@ -2901,11 +2910,10 @@ function init2(selectDb = DEFAULT_SELECT_DB) {
   if (client) {
     client.disconnect();
   }
-  const { redisProtocolUrl, opts, host, port } = getRedisOptions();
+  const { host, port } = getRedisConnectionDetails();
+  const opts = getRedisOptions();
   if (CLUSTERED) {
     client = new RedisCore.Cluster([{ host, port }], opts);
-  } else if (redisProtocolUrl) {
-    client = new RedisCore(redisProtocolUrl);
   } else {
     client = new RedisCore(opts);
   }
@@ -5611,6 +5619,8 @@ __export(src_exports, {
   DEFAULT_TENANT_ID: () => DEFAULT_TENANT_ID,
   DeprecatedViews: () => DeprecatedViews,
   DocumentType: () => DocumentType,
+  Duration: () => Duration,
+  DurationType: () => DurationType,
   EmailUnavailableError: () => EmailUnavailableError,
   ErrorCode: () => ErrorCode,
   FeatureDisabledError: () => FeatureDisabledError,
@@ -7328,6 +7338,8 @@ var import_events2 = __toESM(require("events"));
 // src/utils/index.ts
 var utils_exports3 = {};
 __export(utils_exports3, {
+  Duration: () => Duration,
+  DurationType: () => DurationType,
   clearCookie: () => clearCookie,
   compare: () => compare,
   getAppIdFromCtx: () => getAppIdFromCtx,
@@ -7512,6 +7524,51 @@ function validEmail(value) {
   );
 }
 
+// src/utils/Duration.ts
+var DurationType = /* @__PURE__ */ ((DurationType2) => {
+  DurationType2["MILLISECONDS"] = "milliseconds";
+  DurationType2["SECONDS"] = "seconds";
+  DurationType2["MINUTES"] = "minutes";
+  DurationType2["HOURS"] = "hours";
+  DurationType2["DAYS"] = "days";
+  return DurationType2;
+})(DurationType || {});
+var conversion = {
+  milliseconds: 1,
+  seconds: 1e3,
+  minutes: 60 * 1e3,
+  hours: 60 * 60 * 1e3,
+  days: 24 * 60 * 60 * 1e3
+};
+var Duration = class _Duration {
+  static convert(from, to, duration) {
+    const milliseconds = duration * conversion[from];
+    return milliseconds / conversion[to];
+  }
+  static from(from, duration) {
+    return {
+      to: (to) => {
+        return _Duration.convert(from, to, duration);
+      },
+      toMs: () => {
+        return _Duration.convert(from, "milliseconds" /* MILLISECONDS */, duration);
+      }
+    };
+  }
+  static fromSeconds(duration) {
+    return _Duration.from("seconds" /* SECONDS */, duration);
+  }
+  static fromMinutes(duration) {
+    return _Duration.from("minutes" /* MINUTES */, duration);
+  }
+  static fromHours(duration) {
+    return _Duration.from("hours" /* HOURS */, duration);
+  }
+  static fromDays(duration) {
+    return _Duration.from("days" /* DAYS */, duration);
+  }
+};
+
 // src/queue/inMemoryQueue.ts
 function newJob(queue, message) {
   return {
@@ -7527,7 +7584,7 @@ var InMemoryQueue = class {
    * @param opts This is not used by the in memory queue as there is no real use
    * case when in memory, but is the same API as Bull
    */
-  constructor(name, opts = null) {
+  constructor(name, opts) {
     this._name = name;
     this._opts = opts;
     this._messages = [];
@@ -7749,7 +7806,9 @@ function logging(queue, jobQueue) {
 
 // src/queue/queue.ts
 init_timers2();
-var CLEANUP_PERIOD_MS = 60 * 1e3;
+var QUEUE_LOCK_MS = Duration.fromMinutes(5).toMs();
+var QUEUE_LOCK_RENEW_INTERNAL_MS = Duration.fromSeconds(30).toMs();
+var CLEANUP_PERIOD_MS = Duration.fromSeconds(60).toMs();
 var QUEUES = [];
 var cleanupInterval;
 async function cleanup2() {
@@ -7758,8 +7817,15 @@ async function cleanup2() {
   }
 }
 function createQueue(jobQueue, opts = {}) {
-  const { opts: redisOpts, redisProtocolUrl } = getRedisOptions();
-  const queueConfig = redisProtocolUrl || { redis: redisOpts };
+  const redisOpts = getRedisOptions();
+  const queueConfig = {
+    redis: redisOpts,
+    settings: {
+      maxStalledCount: 0,
+      lockDuration: QUEUE_LOCK_MS,
+      lockRenewTime: QUEUE_LOCK_RENEW_INTERNAL_MS
+    }
+  };
   let queue;
   if (!environment_default.isTest()) {
     queue = new import_bull.default(jobQueue, queueConfig);
@@ -12765,6 +12831,8 @@ var init8 = (opts = {}) => {
   DEFAULT_TENANT_ID,
   DeprecatedViews,
   DocumentType,
+  Duration,
+  DurationType,
   EmailUnavailableError,
   ErrorCode,
   FeatureDisabledError,