dexie-cloud-addon 4.0.7 → 4.0.8

package/dist/modern/DexieCloudOptions.d.ts

@@ -1,10 +1,11 @@
-import { TokenFinalResponse } from 'dexie-cloud-common';
+import type { TokenFinalResponse } from 'dexie-cloud-common';
+import type { LoginHints } from './DexieCloudAPI';
 export interface PeriodicSyncOptions {
     minInterval?: number;
 }
 export interface DexieCloudOptions {
     databaseUrl: string;
-    requireAuth?: boolean;
+    requireAuth?: boolean | LoginHints;
     tryUseServiceWorker?: boolean;
     periodicSync?: PeriodicSyncOptions;
     customLoginGui?: boolean;

package/dist/modern/dexie-cloud-addon.js

@@ -8,7 +8,7 @@
  *
  * ==========================================================================
  *
- * Version 4.0.7, Sun May 26 2024
+ * Version 4.0.8, Tue Jun 04 2024
  *
  * https://dexie.org
  *
@@ -4156,13 +4156,15 @@ function filterServerChangesThroughAddedClientChanges(serverChanges, addedClient
     return toDBOperationSet(changes);
 }
 
+const LIMIT_NUM_MESSAGES_PER_TIME = 10; // Allow a maximum of 10 messages per...
+const TIME_WINDOW = 10000; // ...10 seconds.
+const PAUSE_PERIOD = 1000; // Pause for 1 second if reached
 function MessagesFromServerConsumer(db) {
     const queue = [];
     const readyToServe = new BehaviorSubject(true);
     const event = new BehaviorSubject(null);
     let isWorking = false;
-    let loopWarning = 0;
-    let loopDetection = [0, 0, 0, 0, 0, 0, 0, 0, 0, Date.now()];
+    let loopDetection = new Array(LIMIT_NUM_MESSAGES_PER_TIME).fill(0);
     event.subscribe(() => __awaiter(this, void 0, void 0, function* () {
         if (isWorking)
             return;
@@ -4176,20 +4178,11 @@ function MessagesFromServerConsumer(db) {
             }
             finally {
                 if (loopDetection[loopDetection.length - 1] - loopDetection[0] <
-                    10000) {
+                    TIME_WINDOW) {
                     // Ten loops within 10 seconds. Slow down!
-                    if (Date.now() - loopWarning < 5000) {
-                        // Last time we did this, we ended up here too. Wait for a minute.
-                        console.warn(`Slowing down websocket loop for one minute`);
-                        loopWarning = Date.now() + 60000;
-                        yield new Promise((resolve) => setTimeout(resolve, 60000));
-                    }
-                    else {
-                        // This is a one-time event. Just pause 10 seconds.
-                        console.warn(`Slowing down websocket loop for 10 seconds`);
-                        loopWarning = Date.now() + 10000;
-                        yield new Promise((resolve) => setTimeout(resolve, 10000));
-                    }
+                    // This is a one-time event. Just pause 10 seconds.
+                    console.warn(`Slowing down websocket loop for ${PAUSE_PERIOD} milliseconds`);
+                    yield new Promise((resolve) => setTimeout(resolve, PAUSE_PERIOD));
                 }
                 isWorking = false;
                 readyToServe.next(true);
@@ -6317,7 +6310,7 @@ function dexieCloud(dexie) {
     const syncComplete = new Subject();
     dexie.cloud = {
         // @ts-ignore
-        version: "4.0.7",
+        version: "4.0.8",
         options: Object.assign({}, DEFAULT_OPTIONS),
         schema: null,
         get currentUserId() {
@@ -6544,8 +6537,19 @@ function dexieCloud(dexie) {
             // HERE: If requireAuth, do athentication now.
             let changedUser = false;
             const user = yield db.getCurrentUser();
-            if ((_c = db.cloud.options) === null || _c === void 0 ? void 0 : _c.requireAuth) {
-                if (!user.isLoggedIn) {
+            const requireAuth = (_c = db.cloud.options) === null || _c === void 0 ? void 0 : _c.requireAuth;
+            if (requireAuth) {
+                if (typeof requireAuth === 'object') {
+                    // requireAuth contains login hints. Check if we already fulfil it:
+                    if (!user.isLoggedIn ||
+                        (requireAuth.userId && user.userId !== requireAuth.userId) ||
+                        (requireAuth.email && user.email !== requireAuth.email)) {
+                        // If not, login the configured user:
+                        changedUser = yield login(db, requireAuth);
+                    }
+                }
+                else if (!user.isLoggedIn) {
+                    // requireAuth is true and user is not logged in
                     changedUser = yield login(db);
                 }
             }
@@ -6601,7 +6605,7 @@ function dexieCloud(dexie) {
     }
 }
 // @ts-ignore
-dexieCloud.version = "4.0.7";
+dexieCloud.version = "4.0.8";
 Dexie.Cloud = dexieCloud;
 
 export { dexieCloud as default, dexieCloud, getTiedObjectId, getTiedRealmId, resolveText };