dexie-cloud-addon 4.0.3 → 4.0.5

package/dist/modern/service-worker.js

@@ -8,7 +8,7 @@
  *
  * ==========================================================================
  *
- * Version 4.0.3, Sat Apr 13 2024
+ * Version 4.0.5, Sat May 04 2024
  *
  * https://dexie.org
  *
@@ -17,7 +17,7 @@
  */
 
 import Dexie, { PropModification, cmp, liveQuery } from 'dexie';
-import { Observable as Observable$1, BehaviorSubject, Subject, firstValueFrom, from as from$1, filter as filter$1, fromEvent, of, merge, Subscription as Subscription$1, throwError, combineLatest, map as map$1, share, timer as timer$1 } from 'rxjs';
+import { Observable as Observable$1, BehaviorSubject, firstValueFrom, Subject, from as from$1, filter as filter$1, fromEvent, of, merge, Subscription as Subscription$1, throwError, combineLatest, map as map$1, share, timer as timer$1 } from 'rxjs';
 
 /******************************************************************************
 Copyright (c) Microsoft Corporation.
@@ -3903,9 +3903,7 @@ function MessagesFromServerConsumer(db) {
                     // If the sync worker or service worker is syncing, wait 'til thei're done.
                     // It's no need to have two channels at the same time - even though it wouldnt
                     // be a problem - this is an optimization.
-                    yield db.cloud.syncState
-                        .pipe(filter(({ phase }) => phase === 'in-sync' || phase === 'error'), take(1))
-                        .toPromise();
+                    yield firstValueFrom(db.cloud.syncState.pipe(filter(({ phase }) => phase === 'in-sync' || phase === 'error')));
                     console.debug('processing msg', msg);
                     const persistedSyncState = db.cloud.persistedSyncState.value;
                     //syncState.
@@ -4427,11 +4425,16 @@ function login(db, hints) {
         const origUserId = currentUser.userId;
         if (currentUser.isLoggedIn && (!hints || (!hints.email && !hints.userId))) {
             const licenseStatus = ((_a = currentUser.license) === null || _a === void 0 ? void 0 : _a.status) || 'ok';
-            if (licenseStatus === 'ok' && currentUser.accessToken && (!currentUser.accessTokenExpiration || currentUser.accessTokenExpiration.getTime() > Date.now())) {
+            if (licenseStatus === 'ok' &&
+                currentUser.accessToken &&
+                (!currentUser.accessTokenExpiration ||
+                    currentUser.accessTokenExpiration.getTime() > Date.now())) {
                 // Already authenticated according to given hints. And license is valid.
                 return false;
             }
-            if (currentUser.refreshToken && (!currentUser.refreshTokenExpiration || currentUser.refreshTokenExpiration.getTime() > Date.now())) {
+            if (currentUser.refreshToken &&
+                (!currentUser.refreshTokenExpiration ||
+                    currentUser.refreshTokenExpiration.getTime() > Date.now())) {
                 // Refresh the token
                 yield loadAccessToken(db);
                 return false;
@@ -4443,7 +4446,8 @@ function login(db, hints) {
             lastLogin: new Date(0),
         });
         yield authenticate(db.cloud.options.databaseUrl, context, db.cloud.options.fetchTokens || otpFetchTokenCallback(db), db.cloud.userInteraction, hints);
-        if (origUserId !== UNAUTHORIZED_USER.userId && context.userId !== origUserId) {
+        if (origUserId !== UNAUTHORIZED_USER.userId &&
+            context.userId !== origUserId) {
             // User was logged in before, but now logged in as another user.
             yield logout(db);
         }
@@ -4462,7 +4466,7 @@ function login(db, hints) {
         yield setCurrentUser(db, context);
         // Make sure to resync as the new login will be authorized
         // for new realms.
-        triggerSync(db, "pull");
+        triggerSync(db, 'pull');
         return context.userId !== origUserId;
     });
 }
@@ -5408,7 +5412,7 @@ function waitAndReconnectWhenUserDoesSomething(error) {
         yield sleep$1(3000);
         // Wait til user does something (move mouse, tap, scroll, click etc)
         console.debug('waiting for someone to do something');
-        yield userDoesSomething.pipe(take(1)).toPromise();
+        yield firstValueFrom(userDoesSomething);
         console.debug('someone did something!');
     });
 }
@@ -6299,7 +6303,7 @@ function dexieCloud(dexie) {
     const syncComplete = new Subject();
     dexie.cloud = {
         // @ts-ignore
-        version: "4.0.3",
+        version: "4.0.5",
         options: Object.assign({}, DEFAULT_OPTIONS),
         schema: null,
         get currentUserId() {
@@ -6357,10 +6361,8 @@ function dexieCloud(dexie) {
                     const syncState = db.cloud.persistedSyncState.value;
                     triggerSync(db, purpose);
                     if (wait) {
-                        const newSyncState = yield db.cloud.persistedSyncState
-                            .pipe(filter((newSyncState) => (newSyncState === null || newSyncState === void 0 ? void 0 : newSyncState.timestamp) != null &&
-                            (!syncState || newSyncState.timestamp > syncState.timestamp)), take(1))
-                            .toPromise();
+                        const newSyncState = yield firstValueFrom(db.cloud.persistedSyncState.pipe(filter((newSyncState) => (newSyncState === null || newSyncState === void 0 ? void 0 : newSyncState.timestamp) != null &&
+                            (!syncState || newSyncState.timestamp > syncState.timestamp))));
                         if (newSyncState === null || newSyncState === void 0 ? void 0 : newSyncState.error) {
                             throw new Error(`Sync error: ` + newSyncState.error);
                         }
@@ -6371,16 +6373,14 @@ function dexieCloud(dexie) {
                     triggerSync(db, purpose);
                     if (wait) {
                         console.debug('db.cloud.login() is waiting for sync completion...');
-                        yield from$1(liveQuery(() => __awaiter(this, void 0, void 0, function* () {
+                        yield firstValueFrom(from$1(liveQuery(() => __awaiter(this, void 0, void 0, function* () {
                             const syncNeeded = yield isSyncNeeded(db);
                             const newSyncState = yield db.getPersistedSyncState();
                             if ((newSyncState === null || newSyncState === void 0 ? void 0 : newSyncState.timestamp) !== (syncState === null || syncState === void 0 ? void 0 : syncState.timestamp) &&
                                 (newSyncState === null || newSyncState === void 0 ? void 0 : newSyncState.error))
                                 throw new Error(`Sync error: ` + newSyncState.error);
                             return syncNeeded;
-                        })))
-                            .pipe(filter((isNeeded) => !isNeeded), take(1))
-                            .toPromise();
+                        }))).pipe(filter((isNeeded) => !isNeeded)));
                         console.debug('Done waiting for sync completion because we have nothing to push anymore');
                     }
                 }
@@ -6429,7 +6429,7 @@ function dexieCloud(dexie) {
             const swRegistrations = 'serviceWorker' in navigator
                 ? yield navigator.serviceWorker.getRegistrations()
                 : [];
-            const initiallySynced = yield db.transaction('rw', db.$syncState, () => __awaiter(this, void 0, void 0, function* () {
+            const [initiallySynced, lastSyncedRealms] = yield db.transaction('rw', db.$syncState, () => __awaiter(this, void 0, void 0, function* () {
                 var _h, _j;
                 const { options, schema } = db.cloud;
                 const [persistedOptions, persistedSchema, persistedSyncState] = yield Promise.all([
@@ -6502,7 +6502,7 @@ function dexieCloud(dexie) {
                     // Let's assign all props as the newPersistedSchems should be what we should be working with.
                     Object.assign(schema, newPersistedSchema);
                 }
-                return persistedSyncState === null || persistedSyncState === void 0 ? void 0 : persistedSyncState.initiallySynced;
+                return [persistedSyncState === null || persistedSyncState === void 0 ? void 0 : persistedSyncState.initiallySynced, persistedSyncState === null || persistedSyncState === void 0 ? void 0 : persistedSyncState.realms];
             }));
             if (initiallySynced) {
                 db.setInitiallySynced(true);
@@ -6522,15 +6522,26 @@ function dexieCloud(dexie) {
                 // with things from the database and not just the default values.
                 // This is so that when db.open() completes, user should be safe
                 // to subscribe to these observables and get actual data.
-                yield combineLatest([
+                yield firstValueFrom(combineLatest([
                     currentUserEmitter.pipe(skip(1), take(1)),
                     db.cloud.persistedSyncState.pipe(skip(1), take(1)),
-                ]).toPromise();
+                ]));
             }
             // 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) {
-                changedUser = yield login(db);
+                if (!user.isLoggedIn) {
+                    changedUser = yield login(db);
+                }
+            }
+            if (user.isLoggedIn && (!lastSyncedRealms || !lastSyncedRealms.includes(user.userId))) {
+                // User has been logged in but this is not reflected in the sync state.
+                // This can happen if page is reloaded after login but before the sync call following
+                // the login was complete.
+                // The user is to be viewed as changed becuase current syncState does not reflect the presence
+                // of the logged-in user.
+                changedUser = true; // Set changedUser to true to trigger a pull-sync later down.
             }
             if (localSyncWorker)
                 localSyncWorker.stop();
@@ -6576,7 +6587,7 @@ function dexieCloud(dexie) {
     }
 }
 // @ts-ignore
-dexieCloud.version = "4.0.3";
+dexieCloud.version = "4.0.5";
 Dexie.Cloud = dexieCloud;
 
 // In case the SW lives for a while, let it reuse already opened connections: