dexie-cloud-addon 4.0.3 → 4.0.5

package/dist/umd/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
  *
@@ -3906,9 +3906,7 @@
                         // 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 rxjs.firstValueFrom(db.cloud.syncState.pipe(filter(({ phase }) => phase === 'in-sync' || phase === 'error')));
                         console.debug('processing msg', msg);
                         const persistedSyncState = db.cloud.persistedSyncState.value;
                         //syncState.
@@ -4430,11 +4428,16 @@
             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;
@@ -4446,7 +4449,8 @@
                 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);
             }
@@ -4465,7 +4469,7 @@
             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;
         });
     }
@@ -5411,7 +5415,7 @@
             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 rxjs.firstValueFrom(userDoesSomething);
             console.debug('someone did something!');
         });
     }
@@ -6302,7 +6306,7 @@
         const syncComplete = new rxjs.Subject();
         dexie.cloud = {
             // @ts-ignore
-            version: "4.0.3",
+            version: "4.0.5",
             options: Object.assign({}, DEFAULT_OPTIONS),
             schema: null,
             get currentUserId() {
@@ -6360,10 +6364,8 @@
                         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 rxjs.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);
                             }
@@ -6374,16 +6376,14 @@
                         triggerSync(db, purpose);
                         if (wait) {
                             console.debug('db.cloud.login() is waiting for sync completion...');
-                            yield rxjs.from(Dexie.liveQuery(() => __awaiter(this, void 0, void 0, function* () {
+                            yield rxjs.firstValueFrom(rxjs.from(Dexie.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');
                         }
                     }
@@ -6432,7 +6432,7 @@
                 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([
@@ -6505,7 +6505,7 @@
                         // 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);
@@ -6525,15 +6525,26 @@
                     // 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 rxjs.combineLatest([
+                    yield rxjs.firstValueFrom(rxjs.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();
@@ -6579,7 +6590,7 @@
         }
     }
     // @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: