dexie-cloud-addon 4.0.1-beta.34 → 4.0.1-beta.36

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

@@ -1,7 +1,7 @@
 import Dexie, { liveQuery, cmp } from 'dexie';
 import { BehaviorSubject, fromEvent, of, merge, from as from$1, Observable as Observable$1, Subscription as Subscription$1, Subject, combineLatest, map as map$1, share, timer as timer$1, throwError } from 'rxjs';
 
-/*! *****************************************************************************
+/******************************************************************************
 Copyright (c) Microsoft Corporation.
 
 Permission to use, copy, modify, and/or distribute this software for any
@@ -88,7 +88,7 @@ function __spreadArray$1(to, from, pack) {
             ar[i] = from[i];
         }
     }
-    return to.concat(ar || from);
+    return to.concat(ar || Array.prototype.slice.call(from));
 }
 
 /* ==========================================================================
@@ -101,14 +101,14 @@ function __spreadArray$1(to, from, pack) {
  *
  * ==========================================================================
  *
- * Version 4.0.1-beta.34, Mon Mar 27 2023
+ * Version 4.0.1-beta.36, Mon Apr 17 2023
  *
  * https://dexie.org
  *
  * Apache License Version 2.0, January 2004, http://www.apache.org/licenses/
  *
  */
-/*! *****************************************************************************
+/******************************************************************************
 Copyright (c) Microsoft Corporation.
 
 Permission to use, copy, modify, and/or distribute this software for any
@@ -273,7 +273,7 @@ function __spreadArray(to, from, pack) {
                 ar[i] = from[i];
             }
         }
-    return to.concat(ar || from);
+    return to.concat(ar || Array.prototype.slice.call(from));
 }
 function __await(v) {
     return this instanceof __await ? (this.v = v, this) : new __await(v);
@@ -1400,7 +1400,6 @@ var AsyncAction = (function (_super) {
         return _this;
     }
     AsyncAction.prototype.schedule = function (state, delay) {
-        var _a;
         if (delay === void 0) {
             delay = 0;
         }
@@ -1415,7 +1414,7 @@ var AsyncAction = (function (_super) {
         }
         this.pending = true;
         this.delay = delay;
-        this.id = (_a = this.id) !== null && _a !== void 0 ? _a : this.requestAsyncId(scheduler, this.id, delay);
+        this.id = this.id || this.requestAsyncId(scheduler, this.id, delay);
         return this;
     };
     AsyncAction.prototype.requestAsyncId = function (scheduler, _id, delay) {
@@ -1431,9 +1430,7 @@ var AsyncAction = (function (_super) {
         if (delay != null && this.delay === delay && this.pending === false) {
             return id;
         }
-        if (id != null) {
-            intervalProvider.clearInterval(id);
-        }
+        intervalProvider.clearInterval(id);
         return undefined;
     };
     AsyncAction.prototype.execute = function (state, delay) {
@@ -1512,6 +1509,7 @@ var AsyncScheduler = (function (_super) {
         var _this = _super.call(this, SchedulerAction, now) || this;
         _this.actions = [];
         _this._active = false;
+        _this._scheduled = undefined;
         return _this;
     }
     AsyncScheduler.prototype.flush = function (action) {
@@ -1910,7 +1908,7 @@ function delayWhen(delayDurationSelector, subscriptionDelay) {
             return concat$1(subscriptionDelay.pipe(take(1), ignoreElements()), source.pipe(delayWhen(delayDurationSelector)));
         };
     }
-    return mergeMap(function (value, index) { return innerFrom(delayDurationSelector(value, index)).pipe(take(1), mapTo(value)); });
+    return mergeMap(function (value, index) { return delayDurationSelector(value, index).pipe(take(1), mapTo(value)); });
 }
 function delay(due, scheduler) {
     if (scheduler === void 0) {
@@ -2396,13 +2394,22 @@ function userAuthenticate(context, fetchToken, userInteraction, hints) {
         var _k, privateKey, publicKey, publicKeySPKI, publicKeyPEM, response2, error_1;
         return __generator$1(this, function (_l) {
             switch (_l.label) {
-                case 0: return [4 /*yield*/, crypto.subtle.generateKey({
-                        name: 'RSASSA-PKCS1-v1_5',
-                        modulusLength: 2048,
-                        publicExponent: new Uint8Array([0x01, 0x00, 0x01]),
-                        hash: { name: 'SHA-256' },
-                    }, false, // Non-exportable...
-                    ['sign', 'verify'])];
+                case 0:
+                    if (!crypto.subtle) {
+                        if (typeof location !== 'undefined' && location.protocol === 'http:') {
+                            throw new Error("Dexie Cloud Addon needs to use WebCrypto, but your browser has disabled it due to being served from an insecure location. Please serve it from https or http://localhost:<port> (See https://stackoverflow.com/questions/46670556/how-to-enable-crypto-subtle-for-unsecure-origins-in-chrome/46671627#46671627)");
+                        }
+                        else {
+                            throw new Error("This browser does not support WebCrypto.");
+                        }
+                    }
+                    return [4 /*yield*/, crypto.subtle.generateKey({
+                            name: 'RSASSA-PKCS1-v1_5',
+                            modulusLength: 2048,
+                            publicExponent: new Uint8Array([0x01, 0x00, 0x01]),
+                            hash: { name: 'SHA-256' },
+                        }, false, // Non-exportable...
+                        ['sign', 'verify'])];
                 case 1:
                     _k = _l.sent(), privateKey = _k.privateKey, publicKey = _k.publicKey;
                     if (!privateKey || !publicKey)
@@ -2451,7 +2458,7 @@ function userAuthenticate(context, fetchToken, userInteraction, hints) {
                             type: 'error',
                             messageCode: 'GENERIC_ERROR',
                             message: "We're having a problem authenticating right now.",
-                            messageParams: {}
+                            messageParams: {},
                         }).catch(function () { })];
                 case 8:
                     _l.sent();
@@ -2717,7 +2724,7 @@ function setCurrentUser(db, user) {
 }
 function login(db, hints) {
     return __awaiter(this, void 0, void 0, function () {
-        var currentUser, context;
+        var currentUser, context, e_6;
         return __generator$1(this, function (_k) {
             switch (_k.label) {
                 case 0: return [4 /*yield*/, db.getCurrentUser()];
@@ -2733,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: {},
@@ -2742,16 +2749,31 @@ function login(db, hints) {
                     return [4 /*yield*/, authenticate(db.cloud.options.databaseUrl, context, db.cloud.options.fetchTokens || otpFetchTokenCallback(db), db.cloud.userInteraction, hints)];
                 case 2:
                     _k.sent();
-                    return [4 /*yield*/, context.save()];
+                    _k.label = 3;
                 case 3:
-                    _k.sent();
-                    return [4 /*yield*/, setCurrentUser(db, context)];
+                    _k.trys.push([3, 5, , 6]);
+                    return [4 /*yield*/, context.save()];
                 case 4:
+                    _k.sent();
+                    return [3 /*break*/, 6];
+                case 5:
+                    e_6 = _k.sent();
+                    try {
+                        if (e_6.name === 'DataCloneError') {
+                            console.debug("Login context property names:", Object.keys(context));
+                            console.debug("Login context:", context);
+                            console.debug("Login context JSON:", JSON.stringify(context));
+                        }
+                    }
+                    catch (_a) { }
+                    throw e_6;
+                case 6: return [4 /*yield*/, setCurrentUser(db, context)];
+                case 7:
                     _k.sent();
                     // Make sure to resync as the new login will be authorized
                     // for new realms.
                     triggerSync(db, "pull");
-                    return [2 /*return*/];
+                    return [2 /*return*/, true];
             }
         });
     });
@@ -2827,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) {
@@ -2842,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();
                 }
@@ -2868,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));
@@ -4050,7 +4111,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',
             });
@@ -4108,7 +4169,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) {
@@ -4185,12 +4246,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];
                     }
@@ -4365,6 +4426,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
             }
         });
@@ -4758,6 +4820,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 = {
@@ -4801,6 +4864,9 @@ function DexieCloudDB(dx) {
             get syncStateChangedEvent() {
                 return syncStateChangedEvent_1;
             },
+            get syncCompleteEvent() {
+                return syncCompleteEvent_1;
+            },
             dx: dx,
         };
         var helperMethods = {
@@ -4833,6 +4899,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);
@@ -5766,6 +5833,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) {
@@ -6961,8 +7037,9 @@ function dexieCloud(dexie) {
         localSyncWorker = null;
         currentUserEmitter.next(UNAUTHORIZED_USER);
     });
+    var syncComplete = new Subject();
     dexie.cloud = {
-        version: '4.0.1-beta.34',
+        version: '4.0.1-beta.36',
         options: Object.assign({}, DEFAULT_OPTIONS),
         schema: null,
         get currentUserId() {
@@ -6973,6 +7050,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'),
@@ -7090,7 +7170,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) {
@@ -7106,6 +7186,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; })) {
@@ -7245,10 +7327,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)
@@ -7256,7 +7339,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) &&
@@ -7265,7 +7348,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();
@@ -7295,7 +7378,7 @@ function dexieCloud(dexie) {
         });
     }
 }
-dexieCloud.version = '4.0.1-beta.34';
+dexieCloud.version = '4.0.1-beta.36';
 Dexie.Cloud = dexieCloud;
 
 export { dexieCloud as default, dexieCloud, getTiedObjectId, getTiedRealmId };