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

package/dist/module-es5/dexie-cloud-addon.js

@@ -101,7 +101,7 @@ function __spreadArray$1(to, from, pack) {
  *
  * ==========================================================================
  *
- * Version 4.0.1-beta.35, Tue Apr 11 2023
+ * Version 4.0.1-beta.37, Mon Apr 17 2023
  *
  * https://dexie.org
  *
@@ -2740,7 +2740,7 @@ function login(db, hints) {
                             }
                         }
                         // Already authenticated according to given hints.
-                        return [2 /*return*/];
+                        return [2 /*return*/, false];
                     }
                     context = new AuthPersistedContext(db, {
                         claims: {},
@@ -2773,7 +2773,7 @@ function login(db, hints) {
                     // Make sure to resync as the new login will be authorized
                     // for new realms.
                     triggerSync(db, "pull");
-                    return [2 /*return*/];
+                    return [2 /*return*/, true];
             }
         });
     });
@@ -2849,6 +2849,36 @@ var SWBroadcastChannel = /** @class */ (function () {
     };
     return SWBroadcastChannel;
 }());
+var 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) {
+    var listeners = events.get(name);
+    if (listeners) {
+        var idx = listeners.indexOf(listener);
+        if (idx !== -1) {
+            listeners.splice(idx, 1);
+        }
+    }
+}
+function dispatch(ev) {
+    var listeners = events.get(ev.type);
+    if (listeners) {
+        listeners.forEach(function (listener) {
+            try {
+                listener(ev);
+            }
+            catch (_a) {
+            }
+        });
+    }
+}
 var BroadcastedAndLocalEvent = /** @class */ (function (_super_1) {
     __extends$1(BroadcastedAndLocalEvent, _super_1);
     function BroadcastedAndLocalEvent(name) {
@@ -2864,16 +2894,24 @@ var BroadcastedAndLocalEvent = /** @class */ (function (_super_1) {
                 subscriber.next(ev.data);
             }
             var unsubscribe;
-            self.addEventListener("lbc-".concat(name), onCustomEvent);
-            if (bc instanceof SWBroadcastChannel) {
-                unsubscribe = bc.subscribe(function (message) { return subscriber.next(message); });
+            //self.addEventListener(`lbc-${name}`, onCustomEvent); // Fails in service workers
+            addListener("lbc-".concat(name), onCustomEvent); // Works better in service worker
+            try {
+                if (bc instanceof SWBroadcastChannel) {
+                    unsubscribe = bc.subscribe(function (message) { return 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 function () {
-                self.removeEventListener("lbc-".concat(name), onCustomEvent);
+                //self.removeEventListener(`lbc-${name}`, onCustomEvent);
+                removeListener("lbc-".concat(name), onCustomEvent);
                 if (bc instanceof SWBroadcastChannel) {
                     unsubscribe();
                 }
@@ -2890,7 +2928,8 @@ var BroadcastedAndLocalEvent = /** @class */ (function (_super_1) {
         console.debug("BroadcastedAndLocalEvent: bc.postMessage()", Object.assign({}, message), "bc is a", this.bc);
         this.bc.postMessage(message);
         var ev = new CustomEvent("lbc-".concat(this.name), { detail: message });
-        self.dispatchEvent(ev);
+        //self.dispatchEvent(ev);
+        dispatch(ev);
     };
     return BroadcastedAndLocalEvent;
 }(Observable$1));
@@ -3712,7 +3751,10 @@ function encodeIdsForServer(schema, currentUser, changes) {
 function cloneChange(change, rewriteValues) {
     // clone on demand:
     return Object.assign(Object.assign({}, change), { muts: rewriteValues
-            ? change.muts.map(function (m) { return (Object.assign(Object.assign({}, m), { keys: m.keys.slice(), values: m.values.slice() })); })
+            ? change.muts.map(function (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(function (m) { return (Object.assign(Object.assign({}, m), { keys: m.keys.slice() })); }) });
 }
 //import {BisonWebStreamReader} from "dreambase-library/dist/typeson-simplified/BisonWebStreamReader";
@@ -4072,7 +4114,7 @@ function sync(db, options, schema, syncOptions) {
     return _sync
         .apply(this, arguments)
         .then(function () {
-        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',
             });
@@ -4130,7 +4172,7 @@ function _sync(db, options, schema, _k) {
     } : _k, isInitialSync = _l.isInitialSync, cancelToken = _l.cancelToken, justCheckIfNeeded = _l.justCheckIfNeeded, purpose = _l.purpose;
     var _a;
     return __awaiter(this, void 0, void 0, function () {
-        var databaseUrl, currentUser, tablesToSync, mutationTables, persistedSyncState, readyForSyncification, tablesToSyncify, doSyncify, _k, clientChangeSet, syncState, baseRevs, syncIsNeeded, latestRevisions, clientIdentity, res, done;
+        var databaseUrl, currentUser, tablesToSync, mutationTables, persistedSyncState, readyForSyncification, tablesToSyncify, doSyncify, _k, clientChangeSet, syncState, baseRevs, pushSyncIsNeeded, latestRevisions, clientIdentity, res, done;
         var _this_1 = this;
         return __generator$1(this, function (_l) {
             switch (_l.label) {
@@ -4207,12 +4249,12 @@ function _sync(db, options, schema, _k) {
                     }); })];
                 case 5:
                     _k = _l.sent(), clientChangeSet = _k[0], syncState = _k[1], baseRevs = _k[2];
-                    syncIsNeeded = clientChangeSet.some(function (set) { return set.muts.some(function (mut) { return mut.keys.length > 0; }); });
+                    pushSyncIsNeeded = clientChangeSet.some(function (set) { return set.muts.some(function (mut) { return mut.keys.length > 0; }); });
                     if (justCheckIfNeeded) {
-                        console.debug('Sync is needed:', syncIsNeeded);
-                        return [2 /*return*/, syncIsNeeded];
+                        console.debug('Sync is needed:', pushSyncIsNeeded);
+                        return [2 /*return*/, pushSyncIsNeeded];
                     }
-                    if (purpose === 'push' && !syncIsNeeded) {
+                    if (purpose === 'push' && !pushSyncIsNeeded) {
                         // The purpose of this request was to push changes
                         return [2 /*return*/, false];
                     }
@@ -4387,6 +4429,7 @@ function _sync(db, options, schema, _k) {
                 case 8: return [2 /*return*/, _l.sent()];
                 case 9:
                     console.debug('SYNC DONE', { isInitialSync: isInitialSync });
+                    db.syncCompleteEvent.next();
                     return [2 /*return*/, false]; // Not needed anymore
             }
         });
@@ -4780,6 +4823,7 @@ function DexieCloudDB(dx) {
     if (!db) {
         var localSyncEvent = new Subject();
         var syncStateChangedEvent_1 = new BroadcastedAndLocalEvent("syncstatechanged-".concat(dx.name));
+        var syncCompleteEvent_1 = new BroadcastedAndLocalEvent("synccomplete-".concat(dx.name));
         localSyncEvent['id'] = ++static_counter;
         var initiallySynced_1 = false;
         db = {
@@ -4823,6 +4867,9 @@ function DexieCloudDB(dx) {
             get syncStateChangedEvent() {
                 return syncStateChangedEvent_1;
             },
+            get syncCompleteEvent() {
+                return syncCompleteEvent_1;
+            },
             dx: dx,
         };
         var helperMethods = {
@@ -4855,6 +4902,7 @@ function DexieCloudDB(dx) {
             },
             reconfigure: function () {
                 syncStateChangedEvent_1 = new BroadcastedAndLocalEvent("syncstatechanged-".concat(dx.name));
+                syncCompleteEvent_1 = new BroadcastedAndLocalEvent("synccomplete-".concat(dx.name));
             },
         };
         Object.assign(db, helperMethods);
@@ -5788,6 +5836,15 @@ function connectWebSocket(db) {
         switchMap(function (syncState) { return db.cloud.currentUser.pipe(map(function (userLogin) { return [userLogin, syncState]; })); }), switchMap(function (_k) {
             var userLogin = _k[0], syncState = _k[1];
             return userIsReallyActive.pipe(map(function (isActive) { return [isActive ? userLogin : null, syncState]; }));
+        }), switchMap(function (_k) {
+            var userLogin = _k[0], syncState = _k[1];
+            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(function (syncState) { return (syncState === null || syncState === void 0 ? void 0 : syncState.realms.includes(userLogin.userId)) || false; }), take(1), map(function (syncState) { return [userLogin, syncState]; }));
+            }
+            return new BehaviorSubject([userLogin, syncState]);
         }), switchMap(function (_k) {
             var userLogin = _k[0], syncState = _k[1];
             return __awaiter(_this_1, void 0, void 0, function () { var _k; return __generator$1(this, function (_l) {
@@ -6983,8 +7040,9 @@ function dexieCloud(dexie) {
         localSyncWorker = null;
         currentUserEmitter.next(UNAUTHORIZED_USER);
     });
+    var syncComplete = new Subject();
     dexie.cloud = {
-        version: '4.0.1-beta.35',
+        version: '4.0.1-beta.37',
         options: Object.assign({}, DEFAULT_OPTIONS),
         schema: null,
         get currentUserId() {
@@ -6995,6 +7053,9 @@ function dexieCloud(dexie) {
             phase: 'initial',
             status: 'not-started',
         }),
+        events: {
+            syncComplete: syncComplete,
+        },
         persistedSyncState: new BehaviorSubject(undefined),
         userInteraction: new BehaviorSubject(undefined),
         webSocketStatus: new BehaviorSubject('not-started'),
@@ -7112,7 +7173,7 @@ function dexieCloud(dexie) {
     function onDbReady(dexie) {
         var _a, _b, _c, _d, _e, _f, _g;
         return __awaiter(this, void 0, void 0, function () {
-            var db, swRegistrations, _k, initiallySynced;
+            var db, swRegistrations, _k, initiallySynced, changedUser;
             var _this_1 = this;
             return __generator$1(this, function (_l) {
                 switch (_l.label) {
@@ -7128,6 +7189,8 @@ function dexieCloud(dexie) {
                         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(function (table) { return table.core; })) {
@@ -7267,10 +7330,11 @@ function dexieCloud(dexie) {
                         _l.sent();
                         _l.label = 8;
                     case 8:
+                        changedUser = false;
                         if (!((_c = db.cloud.options) === null || _c === void 0 ? void 0 : _c.requireAuth)) return [3 /*break*/, 10];
                         return [4 /*yield*/, login(db)];
                     case 9:
-                        _l.sent();
+                        changedUser = _l.sent();
                         _l.label = 10;
                     case 10:
                         if (localSyncWorker)
@@ -7278,7 +7342,7 @@ function dexieCloud(dexie) {
                         localSyncWorker = null;
                         throwIfClosed();
                         if (db.cloud.usingServiceWorker && ((_d = db.cloud.options) === null || _d === void 0 ? void 0 : _d.databaseUrl)) {
-                            registerSyncEvent(db, 'push').catch(function () { });
+                            registerSyncEvent(db, changedUser ? 'pull' : 'push').catch(function () { });
                             registerPeriodicSyncEvent(db).catch(function () { });
                         }
                         else if (((_e = db.cloud.options) === null || _e === void 0 ? void 0 : _e.databaseUrl) &&
@@ -7287,7 +7351,7 @@ function dexieCloud(dexie) {
                             // 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();
@@ -7317,7 +7381,7 @@ function dexieCloud(dexie) {
         });
     }
 }
-dexieCloud.version = '4.0.1-beta.35';
+dexieCloud.version = '4.0.1-beta.37';
 Dexie.Cloud = dexieCloud;
 
 export { dexieCloud as default, dexieCloud, getTiedObjectId, getTiedRealmId };