dexie-cloud-addon 4.0.1-beta.35 → 4.0.1-beta.37

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

@@ -2517,7 +2517,7 @@
                     }
                 }
                 // Already authenticated according to given hints.
-                return;
+                return false;
             }
             const context = new AuthPersistedContext(db, {
                 claims: {},
@@ -2542,6 +2542,7 @@
             // Make sure to resync as the new login will be authorized
             // for new realms.
             triggerSync(db, "pull");
+            return true;
         });
     }
 
@@ -2615,6 +2616,36 @@
         }
     }
 
+    const events = globalThis['lbc-events'] || (globalThis['lbc-events'] = new Map());
+    function addListener(name, listener) {
+        if (events.has(name)) {
+            events.get(name).push(listener);
+        }
+        else {
+            events.set(name, [listener]);
+        }
+    }
+    function removeListener(name, listener) {
+        const listeners = events.get(name);
+        if (listeners) {
+            const idx = listeners.indexOf(listener);
+            if (idx !== -1) {
+                listeners.splice(idx, 1);
+            }
+        }
+    }
+    function dispatch(ev) {
+        const listeners = events.get(ev.type);
+        if (listeners) {
+            listeners.forEach(listener => {
+                try {
+                    listener(ev);
+                }
+                catch (_a) {
+                }
+            });
+        }
+    }
     class BroadcastedAndLocalEvent extends rxjs.Observable {
         constructor(name) {
             const bc = typeof BroadcastChannel === "undefined"
@@ -2628,16 +2659,24 @@
                     subscriber.next(ev.data);
                 }
                 let unsubscribe;
-                self.addEventListener(`lbc-${name}`, onCustomEvent);
-                if (bc instanceof SWBroadcastChannel) {
-                    unsubscribe = bc.subscribe(message => subscriber.next(message));
+                //self.addEventListener(`lbc-${name}`, onCustomEvent); // Fails in service workers
+                addListener(`lbc-${name}`, onCustomEvent); // Works better in service worker
+                try {
+                    if (bc instanceof SWBroadcastChannel) {
+                        unsubscribe = bc.subscribe(message => subscriber.next(message));
+                    }
+                    else {
+                        console.debug("BroadcastedAndLocalEvent: bc.addEventListener()", name, "bc is a", bc);
+                        bc.addEventListener("message", onMessageEvent);
+                    }
                 }
-                else {
-                    console.debug("BroadcastedAndLocalEvent: bc.addEventListener()", name, "bc is a", bc);
-                    bc.addEventListener("message", onMessageEvent);
+                catch (err) {
+                    // Service workers might fail to subscribe outside its initial script.
+                    console.warn('Failed to subscribe to broadcast channel', err);
                 }
                 return () => {
-                    self.removeEventListener(`lbc-${name}`, onCustomEvent);
+                    //self.removeEventListener(`lbc-${name}`, onCustomEvent);
+                    removeListener(`lbc-${name}`, onCustomEvent);
                     if (bc instanceof SWBroadcastChannel) {
                         unsubscribe();
                     }
@@ -2653,7 +2692,8 @@
             console.debug("BroadcastedAndLocalEvent: bc.postMessage()", Object.assign({}, message), "bc is a", this.bc);
             this.bc.postMessage(message);
             const ev = new CustomEvent(`lbc-${this.name}`, { detail: message });
-            self.dispatchEvent(ev);
+            //self.dispatchEvent(ev);
+            dispatch(ev);
         }
     }
 
@@ -3396,7 +3436,10 @@
     function cloneChange(change, rewriteValues) {
         // clone on demand:
         return Object.assign(Object.assign({}, change), { muts: rewriteValues
-                ? change.muts.map((m) => (Object.assign(Object.assign({}, m), { keys: m.keys.slice(), values: m.values.slice() })))
+                ? change.muts.map((m) => {
+                    return (m.type === 'insert' || m.type === 'upsert') && m.values
+                        ? Object.assign(Object.assign({}, m), { keys: m.keys.slice(), values: m.values.slice() }) : Object.assign(Object.assign({}, m), { keys: m.keys.slice() });
+                })
                 : change.muts.map((m) => (Object.assign(Object.assign({}, m), { keys: m.keys.slice() }))) });
     }
 
@@ -3642,7 +3685,7 @@
         return _sync
             .apply(this, arguments)
             .then(() => {
-            if (!(syncOptions === null || syncOptions === void 0 ? void 0 : syncOptions.justCheckIfNeeded)) {
+            if (!(syncOptions === null || syncOptions === void 0 ? void 0 : syncOptions.justCheckIfNeeded)) { // && syncOptions?.purpose !== 'push') {
                 db.syncStateChangedEvent.next({
                     phase: 'in-sync',
                 });
@@ -3741,12 +3784,12 @@
                 }
                 return [clientChanges, syncState, baseRevs];
             }));
-            const syncIsNeeded = clientChangeSet.some((set) => set.muts.some((mut) => mut.keys.length > 0));
+            const pushSyncIsNeeded = clientChangeSet.some((set) => set.muts.some((mut) => mut.keys.length > 0));
             if (justCheckIfNeeded) {
-                console.debug('Sync is needed:', syncIsNeeded);
-                return syncIsNeeded;
+                console.debug('Sync is needed:', pushSyncIsNeeded);
+                return pushSyncIsNeeded;
             }
-            if (purpose === 'push' && !syncIsNeeded) {
+            if (purpose === 'push' && !pushSyncIsNeeded) {
                 // The purpose of this request was to push changes
                 return false;
             }
@@ -3864,6 +3907,7 @@
                 return yield _sync(db, options, schema, { isInitialSync, cancelToken });
             }
             console.debug('SYNC DONE', { isInitialSync });
+            db.syncCompleteEvent.next();
             return false; // Not needed anymore
         });
     }
@@ -4143,6 +4187,7 @@
         if (!db) {
             const localSyncEvent = new rxjs.Subject();
             let syncStateChangedEvent = new BroadcastedAndLocalEvent(`syncstatechanged-${dx.name}`);
+            let syncCompleteEvent = new BroadcastedAndLocalEvent(`synccomplete-${dx.name}`);
             localSyncEvent['id'] = ++static_counter;
             let initiallySynced = false;
             db = {
@@ -4186,6 +4231,9 @@
                 get syncStateChangedEvent() {
                     return syncStateChangedEvent;
                 },
+                get syncCompleteEvent() {
+                    return syncCompleteEvent;
+                },
                 dx,
             };
             const helperMethods = {
@@ -4217,6 +4265,7 @@
                 },
                 reconfigure() {
                     syncStateChangedEvent = new BroadcastedAndLocalEvent(`syncstatechanged-${dx.name}`);
+                    syncCompleteEvent = new BroadcastedAndLocalEvent(`synccomplete-${dx.name}`);
                 },
             };
             Object.assign(db, helperMethods);
@@ -5120,7 +5169,15 @@
         function createObservable() {
             return db.cloud.persistedSyncState.pipe(filter((syncState) => syncState === null || syncState === void 0 ? void 0 : syncState.serverRevision), // Don't connect before there's no initial sync performed.
             take(1), // Don't continue waking up whenever syncState change
-            switchMap((syncState) => db.cloud.currentUser.pipe(map((userLogin) => [userLogin, syncState]))), switchMap(([userLogin, syncState]) => userIsReallyActive.pipe(map((isActive) => [isActive ? userLogin : null, syncState]))), switchMap(([userLogin, syncState]) => __awaiter(this, void 0, void 0, function* () { return [userLogin, yield computeRealmSetHash(syncState)]; })), switchMap(([userLogin, realmSetHash]) => 
+            switchMap((syncState) => db.cloud.currentUser.pipe(map((userLogin) => [userLogin, syncState]))), switchMap(([userLogin, syncState]) => userIsReallyActive.pipe(map((isActive) => [isActive ? userLogin : null, syncState]))), switchMap(([userLogin, syncState]) => {
+                if ((userLogin === null || userLogin === void 0 ? void 0 : userLogin.isLoggedIn) && !(syncState === null || syncState === void 0 ? void 0 : syncState.realms.includes(userLogin.userId))) {
+                    // We're in an in-between state when user is logged in but the user's realms are not yet synced.
+                    // Don't make this change reconnect the websocket just yet. Wait till syncState is updated
+                    // to iclude the user's realm.
+                    return db.cloud.persistedSyncState.pipe(filter((syncState) => (syncState === null || syncState === void 0 ? void 0 : syncState.realms.includes(userLogin.userId)) || false), take(1), map((syncState) => [userLogin, syncState]));
+                }
+                return new rxjs.BehaviorSubject([userLogin, syncState]);
+            }), switchMap(([userLogin, syncState]) => __awaiter(this, void 0, void 0, function* () { return [userLogin, yield computeRealmSetHash(syncState)]; })), switchMap(([userLogin, realmSetHash]) => 
             // Let server end query changes from last entry of same client-ID and forward.
             // If no new entries, server won't bother the client. If new entries, server sends only those
             // and the baseRev of the last from same client-ID.
@@ -5989,6 +6046,7 @@
             localSyncWorker = null;
             currentUserEmitter.next(UNAUTHORIZED_USER);
         });
+        const syncComplete = new rxjs.Subject();
         dexie.cloud = {
             version: '{version}',
             options: Object.assign({}, DEFAULT_OPTIONS),
@@ -6001,6 +6059,9 @@
                 phase: 'initial',
                 status: 'not-started',
             }),
+            events: {
+                syncComplete,
+            },
             persistedSyncState: new rxjs.BehaviorSubject(undefined),
             userInteraction: new rxjs.BehaviorSubject(undefined),
             webSocketStatus: new rxjs.BehaviorSubject('not-started'),
@@ -6094,6 +6155,8 @@
                 if (!db.cloud.isServiceWorkerDB) {
                     subscriptions.push(computeSyncState(db).subscribe(dexie.cloud.syncState));
                 }
+                // Forward db.syncCompleteEvent to be publicly consumable via db.cloud.events.syncComplete:
+                subscriptions.push(db.syncCompleteEvent.subscribe(syncComplete));
                 //verifyConfig(db.cloud.options); Not needed (yet at least!)
                 // Verify the user has allowed version increment.
                 if (!db.tables.every((table) => table.core)) {
@@ -6201,15 +6264,16 @@
                     ]).toPromise();
                 }
                 // HERE: If requireAuth, do athentication now.
+                let changedUser = false;
                 if ((_c = db.cloud.options) === null || _c === void 0 ? void 0 : _c.requireAuth) {
-                    yield login(db);
+                    changedUser = yield login(db);
                 }
                 if (localSyncWorker)
                     localSyncWorker.stop();
                 localSyncWorker = null;
                 throwIfClosed();
                 if (db.cloud.usingServiceWorker && ((_d = db.cloud.options) === null || _d === void 0 ? void 0 : _d.databaseUrl)) {
-                    registerSyncEvent(db, 'push').catch(() => { });
+                    registerSyncEvent(db, changedUser ? 'pull' : 'push').catch(() => { });
                     registerPeriodicSyncEvent(db).catch(() => { });
                 }
                 else if (((_e = db.cloud.options) === null || _e === void 0 ? void 0 : _e.databaseUrl) &&
@@ -6218,7 +6282,7 @@
                     // There's no SW. Start SyncWorker instead.
                     localSyncWorker = LocalSyncWorker(db, db.cloud.options, db.cloud.schema);
                     localSyncWorker.start();
-                    triggerSync(db, 'push');
+                    triggerSync(db, changedUser ? 'pull' : 'push');
                 }
                 // Listen to online event and do sync.
                 throwIfClosed();