dexie-cloud-addon 4.0.0-beta.16 → 4.0.0-beta.19

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

@@ -43,7 +43,7 @@ var __assign = function() {
     return __assign.apply(this, arguments);
 };
 
-function __awaiter$1(thisArg, _arguments, P, generator) {
+function __awaiter$2(thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
@@ -101,13 +101,46 @@ function __spreadArray$1(to, from, pack) {
  *
  * ==========================================================================
  *
- * Version 4.0.0-beta.16, Fri Apr 01 2022
+ * Version 4.0.0-beta.19, Fri May 20 2022
  *
  * 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
+purpose with or without fee is hereby granted.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
+REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+***************************************************************************** */
+function __awaiter$1(thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try {
+            step(generator.next(value));
+        }
+        catch (e) {
+            reject(e);
+        } }
+        function rejected(value) { try {
+            step(generator["throw"](value));
+        }
+        catch (e) {
+            reject(e);
+        } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+}
 //@ts-check
 var randomFillSync = crypto.getRandomValues;
 function assert(b) {
@@ -240,8 +273,8 @@ function applyOperation(target, table, op) {
                     switch (entry.type) {
                         case "ups":
                             // Adjust the existing upsert with additional updates
-                            for (var _e = 0, _f = Object.entries(changeSpec); _e < _f.length; _e++) {
-                                var _g = _f[_e], propPath = _g[0], value = _g[1];
+                            for (var _k = 0, _l = Object.entries(changeSpec); _k < _l.length; _k++) {
+                                var _m = _l[_k], propPath = _m[0], value = _m[1];
                                 setByKeyPath(entry.val, propPath, value);
                             }
                             break;
@@ -268,10 +301,10 @@ function applyOperation(target, table, op) {
     return target;
 }
 function applyOperations(target, ops) {
-    for (var _e = 0, ops_1 = ops; _e < ops_1.length; _e++) {
-        var _f = ops_1[_e], table = _f.table, muts = _f.muts;
-        for (var _g = 0, muts_1 = muts; _g < muts_1.length; _g++) {
-            var mut = muts_1[_g];
+    for (var _k = 0, ops_1 = ops; _k < ops_1.length; _k++) {
+        var _l = ops_1[_k], table = _l.table, muts = _l.muts;
+        for (var _m = 0, muts_1 = muts; _m < muts_1.length; _m++) {
+            var mut = muts_1[_m];
             applyOperation(target, table, mut);
         }
     }
@@ -280,10 +313,10 @@ function subtractChanges(target, // Server change set
 changesToSubtract // additional mutations on client during syncWithServer()
 ) {
     var _a, _b, _c;
-    for (var _e = 0, _f = Object.entries(changesToSubtract); _e < _f.length; _e++) {
-        var _g = _f[_e], table = _g[0], mutationSet = _g[1];
-        for (var _h = 0, _j = Object.entries(mutationSet); _h < _j.length; _h++) {
-            var _k = _j[_h], key = _k[0], mut = _k[1];
+    for (var _k = 0, _l = Object.entries(changesToSubtract); _k < _l.length; _k++) {
+        var _m = _l[_k], table = _m[0], mutationSet = _m[1];
+        for (var _o = 0, _p = Object.entries(mutationSet); _o < _p.length; _o++) {
+            var _q = _p[_o], key = _q[0], mut = _q[1];
             switch (mut.type) {
                 case 'ups':
                     {
@@ -313,8 +346,8 @@ changesToSubtract // additional mutations on client during syncWithServer()
                         switch (targetMut.type) {
                             case 'ups':
                                 // Adjust the server upsert with locally updated values.
-                                for (var _l = 0, _m = Object.entries(mut.mod); _l < _m.length; _l++) {
-                                    var _o = _m[_l], propPath = _o[0], value = _o[1];
+                                for (var _r = 0, _s = Object.entries(mut.mod); _r < _s.length; _r++) {
+                                    var _t = _s[_r], propPath = _t[0], value = _t[1];
                                     setByKeyPath(targetMut.val, propPath, value);
                                 }
                                 break;
@@ -323,8 +356,8 @@ changesToSubtract // additional mutations on client during syncWithServer()
                                 break;
                             case 'upd':
                                 // Remove the local update props from the server update mutation.
-                                for (var _p = 0, _q = Object.keys(mut.mod); _p < _q.length; _p++) {
-                                    var propPath = _q[_p];
+                                for (var _u = 0, _v = Object.keys(mut.mod); _u < _v.length; _u++) {
+                                    var propPath = _v[_u];
                                     delete targetMut.mod[propPath];
                                 }
                                 break;
@@ -347,10 +380,10 @@ function toDBOperationSet(inSet) {
     var txid = randomString$1(16);
     // Convert data into a temporary map to collect mutations of same table and type
     var map = {};
-    for (var _e = 0, _f = Object.entries(inSet); _e < _f.length; _e++) {
-        var _g = _f[_e], table = _g[0], ops = _g[1];
-        for (var _h = 0, _j = Object.entries(ops); _h < _j.length; _h++) {
-            var _k = _j[_h], key = _k[0], op = _k[1];
+    for (var _k = 0, _l = Object.entries(inSet); _k < _l.length; _k++) {
+        var _m = _l[_k], table = _m[0], ops = _m[1];
+        for (var _o = 0, _p = Object.entries(ops); _o < _p.length; _o++) {
+            var _q = _p[_o], key = _q[0], op = _q[1];
             var mapEntry = map[table] || (map[table] = {});
             var ops_2 = mapEntry[op.type] || (mapEntry[op.type] = []);
             ops_2.push(Object.assign({ key: key }, op)); // DBKeyMutation doesn't contain key, so we need to bring it in.
@@ -358,14 +391,14 @@ function toDBOperationSet(inSet) {
     }
     // Start computing the resulting format:
     var result = [];
-    for (var _l = 0, _m = Object.entries(map); _l < _m.length; _l++) {
-        var _o = _m[_l], table = _o[0], ops = _o[1];
+    for (var _r = 0, _s = Object.entries(map); _r < _s.length; _r++) {
+        var _t = _s[_r], table = _t[0], ops = _t[1];
         var resultEntry = {
             table: table,
             muts: [],
         };
-        for (var _p = 0, _q = Object.entries(ops); _p < _q.length; _p++) {
-            var _r = _q[_p], optype = _r[0], muts = _r[1];
+        for (var _u = 0, _v = Object.entries(ops); _u < _v.length; _u++) {
+            var _w = _v[_u], optype = _w[0], muts = _w[1];
             switch (optype) {
                 case "ups": {
                     var op = {
@@ -2012,18 +2045,18 @@ var hasComplainedAboutSyncEvent = false;
 function registerSyncEvent(db, purpose) {
     return __awaiter$1(this, void 0, void 0, function () {
         var sw, e_3;
-        return __generator$1(this, function (_e) {
-            switch (_e.label) {
+        return __generator$1(this, function (_k) {
+            switch (_k.label) {
                 case 0:
-                    _e.trys.push([0, 4, , 5]);
+                    _k.trys.push([0, 4, , 5]);
                     return [4 /*yield*/, navigator.serviceWorker.ready];
                 case 1:
-                    sw = _e.sent();
+                    sw = _k.sent();
                     if (!(purpose === "push" && sw.sync)) return [3 /*break*/, 3];
                     return [4 /*yield*/, sw.sync.register("dexie-cloud:".concat(db.name))];
                 case 2:
-                    _e.sent();
-                    _e.label = 3;
+                    _k.sent();
+                    _k.label = 3;
                 case 3:
                     if (sw.active) {
                         // Use postMessage for pull syncs and for browsers not supporting sync event (Firefox, Safari).
@@ -2039,7 +2072,7 @@ function registerSyncEvent(db, purpose) {
                     }
                     return [2 /*return*/];
                 case 4:
-                    e_3 = _e.sent();
+                    e_3 = _k.sent();
                     if (!hasComplainedAboutSyncEvent) {
                         console.debug("Dexie Cloud: Could not register sync event", e_3);
                         hasComplainedAboutSyncEvent = true;
@@ -2051,36 +2084,36 @@ function registerSyncEvent(db, purpose) {
     });
 }
 function registerPeriodicSyncEvent(db) {
-    var _e;
+    var _a;
     return __awaiter$1(this, void 0, void 0, function () {
         var periodicSync, e_4, e_5;
-        return __generator$1(this, function (_f) {
-            switch (_f.label) {
+        return __generator$1(this, function (_k) {
+            switch (_k.label) {
                 case 0:
-                    _f.trys.push([0, 8, , 9]);
+                    _k.trys.push([0, 8, , 9]);
                     return [4 /*yield*/, navigator.serviceWorker.ready];
                 case 1:
-                    periodicSync = (_f.sent()).periodicSync;
+                    periodicSync = (_k.sent()).periodicSync;
                     if (!periodicSync) return [3 /*break*/, 6];
-                    _f.label = 2;
+                    _k.label = 2;
                 case 2:
-                    _f.trys.push([2, 4, , 5]);
-                    return [4 /*yield*/, periodicSync.register("dexie-cloud:".concat(db.name), (_e = db.cloud.options) === null || _e === void 0 ? void 0 : _e.periodicSync)];
+                    _k.trys.push([2, 4, , 5]);
+                    return [4 /*yield*/, periodicSync.register("dexie-cloud:".concat(db.name), (_a = db.cloud.options) === null || _a === void 0 ? void 0 : _a.periodicSync)];
                 case 3:
-                    _f.sent();
+                    _k.sent();
                     console.debug("Dexie Cloud: Successfully registered periodicsync event for ".concat(db.name));
                     return [3 /*break*/, 5];
                 case 4:
-                    e_4 = _f.sent();
+                    e_4 = _k.sent();
                     console.debug("Dexie Cloud: Failed to register periodic sync. Your PWA must be installed to allow background sync.", e_4);
                     return [3 /*break*/, 5];
                 case 5: return [3 /*break*/, 7];
                 case 6:
                     console.debug("Dexie Cloud: periodicSync not supported.");
-                    _f.label = 7;
+                    _k.label = 7;
                 case 7: return [3 /*break*/, 9];
                 case 8:
-                    e_5 = _f.sent();
+                    e_5 = _k.sent();
                     console.debug("Dexie Cloud: Could not register periodicSync for ".concat(db.name), e_5);
                     return [3 /*break*/, 9];
                 case 9: return [2 /*return*/];
@@ -2114,7 +2147,7 @@ var b64encode = typeof Buffer !== "undefined"
     : function (b) { return btoa(String.fromCharCode.apply(null, b)); };
 function interactWithUser(userInteraction, req) {
     return new Promise(function (resolve, reject) {
-        var interactionProps = __assign(__assign({}, req), { onSubmit: function (res) {
+        var interactionProps = Object.assign(Object.assign({}, req), { onSubmit: function (res) {
                 userInteraction.next(undefined);
                 resolve(res);
             }, onCancel: function () {
@@ -2135,8 +2168,8 @@ function interactWithUser(userInteraction, req) {
 }
 function alertUser(userInteraction, title) {
     var alerts = [];
-    for (var _e = 2; _e < arguments.length; _e++) {
-        alerts[_e - 2] = arguments[_e];
+    for (var _k = 2; _k < arguments.length; _k++) {
+        alerts[_k - 2] = arguments[_k];
     }
     return interactWithUser(userInteraction, {
         type: 'message-alert',
@@ -2148,11 +2181,11 @@ function alertUser(userInteraction, title) {
 function promptForEmail(userInteraction, title, emailHint) {
     return __awaiter$1(this, void 0, void 0, function () {
         var email;
-        return __generator$1(this, function (_e) {
-            switch (_e.label) {
+        return __generator$1(this, function (_k) {
+            switch (_k.label) {
                 case 0:
                     email = emailHint || '';
-                    _e.label = 1;
+                    _k.label = 1;
                 case 1:
                     if (!(!email || !/^[\w-\.]+@([\w-]+\.)+[\w-]{2,10}$/.test(email))) return [3 /*break*/, 3];
                     return [4 /*yield*/, interactWithUser(userInteraction, {
@@ -2176,7 +2209,7 @@ function promptForEmail(userInteraction, title, emailHint) {
                             },
                         })];
                 case 2:
-                    email = (_e.sent()).email;
+                    email = (_k.sent()).email;
                     return [3 /*break*/, 1];
                 case 3: return [2 /*return*/, email];
             }
@@ -2186,8 +2219,8 @@ function promptForEmail(userInteraction, title, emailHint) {
 function promptForOTP(userInteraction, email, alert) {
     return __awaiter$1(this, void 0, void 0, function () {
         var alerts, otp;
-        return __generator$1(this, function (_e) {
-            switch (_e.label) {
+        return __generator$1(this, function (_k) {
+            switch (_k.label) {
                 case 0:
                     alerts = [
                         {
@@ -2213,44 +2246,44 @@ function promptForOTP(userInteraction, email, alert) {
                             },
                         })];
                 case 1:
-                    otp = (_e.sent()).otp;
+                    otp = (_k.sent()).otp;
                     return [2 /*return*/, otp];
             }
         });
     });
 }
 function loadAccessToken(db) {
-    var _e, _f;
+    var _a, _b;
     return __awaiter$1(this, void 0, void 0, function () {
         var currentUser, accessToken, accessTokenExpiration, refreshToken, refreshTokenExpiration, claims, expTime, refreshExpTime, refreshedLogin;
-        return __generator$1(this, function (_g) {
-            switch (_g.label) {
+        return __generator$1(this, function (_k) {
+            switch (_k.label) {
                 case 0: return [4 /*yield*/, db.getCurrentUser()];
                 case 1:
-                    currentUser = _g.sent();
+                    currentUser = _k.sent();
                     accessToken = currentUser.accessToken, accessTokenExpiration = currentUser.accessTokenExpiration, refreshToken = currentUser.refreshToken, refreshTokenExpiration = currentUser.refreshTokenExpiration, claims = currentUser.claims;
                     if (!accessToken)
                         return [2 /*return*/];
-                    expTime = (_e = accessTokenExpiration === null || accessTokenExpiration === void 0 ? void 0 : accessTokenExpiration.getTime()) !== null && _e !== void 0 ? _e : Infinity;
+                    expTime = (_a = accessTokenExpiration === null || accessTokenExpiration === void 0 ? void 0 : accessTokenExpiration.getTime()) !== null && _a !== void 0 ? _a : Infinity;
                     if (expTime > Date.now()) {
                         return [2 /*return*/, accessToken];
                     }
                     if (!refreshToken) {
                         throw new Error("Refresh token missing");
                     }
-                    refreshExpTime = (_f = refreshTokenExpiration === null || refreshTokenExpiration === void 0 ? void 0 : refreshTokenExpiration.getTime()) !== null && _f !== void 0 ? _f : Infinity;
+                    refreshExpTime = (_b = refreshTokenExpiration === null || refreshTokenExpiration === void 0 ? void 0 : refreshTokenExpiration.getTime()) !== null && _b !== void 0 ? _b : Infinity;
                     if (refreshExpTime <= Date.now()) {
                         throw new Error("Refresh token has expired");
                     }
                     return [4 /*yield*/, refreshAccessToken(db.cloud.options.databaseUrl, currentUser)];
                 case 2:
-                    refreshedLogin = _g.sent();
+                    refreshedLogin = _k.sent();
                     return [4 /*yield*/, db.table('$logins').update(claims.sub, {
                             accessToken: refreshedLogin.accessToken,
                             accessTokenExpiration: refreshedLogin.accessTokenExpiration,
                         })];
                 case 3:
-                    _g.sent();
+                    _k.sent();
                     return [2 /*return*/, refreshedLogin.accessToken];
             }
         });
@@ -2258,8 +2291,8 @@ function loadAccessToken(db) {
 }
 function authenticate(url, context, fetchToken, userInteraction, hints) {
     return __awaiter$1(this, void 0, void 0, function () {
-        return __generator$1(this, function (_e) {
-            switch (_e.label) {
+        return __generator$1(this, function (_k) {
+            switch (_k.label) {
                 case 0:
                     if (!(context.accessToken &&
                         context.accessTokenExpiration.getTime() > Date.now())) return [3 /*break*/, 1];
@@ -2269,9 +2302,9 @@ function authenticate(url, context, fetchToken, userInteraction, hints) {
                         (!context.refreshTokenExpiration ||
                             context.refreshTokenExpiration.getTime() > Date.now()))) return [3 /*break*/, 3];
                     return [4 /*yield*/, refreshAccessToken(url, context)];
-                case 2: return [2 /*return*/, _e.sent()];
+                case 2: return [2 /*return*/, _k.sent()];
                 case 3: return [4 /*yield*/, userAuthenticate(context, fetchToken, userInteraction, hints)];
-                case 4: return [2 /*return*/, _e.sent()];
+                case 4: return [2 /*return*/, _k.sent()];
             }
         });
     });
@@ -2279,8 +2312,8 @@ function authenticate(url, context, fetchToken, userInteraction, hints) {
 function refreshAccessToken(url, login) {
     return __awaiter$1(this, void 0, void 0, function () {
         var time_stamp, signing_algorithm, textEncoder, data, binarySignature, signature, tokenRequest, res, response;
-        return __generator$1(this, function (_e) {
-            switch (_e.label) {
+        return __generator$1(this, function (_k) {
+            switch (_k.label) {
                 case 0:
                     if (!login.refreshToken)
                         throw new Error("Cannot refresh token - refresh token is missing.");
@@ -2292,7 +2325,7 @@ function refreshAccessToken(url, login) {
                     data = textEncoder.encode(login.refreshToken + time_stamp);
                     return [4 /*yield*/, crypto.subtle.sign(signing_algorithm, login.nonExportablePrivateKey, data)];
                 case 1:
-                    binarySignature = _e.sent();
+                    binarySignature = _k.sent();
                     signature = b64encode(binarySignature);
                     tokenRequest = {
                         grant_type: 'refresh_token',
@@ -2309,12 +2342,12 @@ function refreshAccessToken(url, login) {
                             mode: 'cors',
                         })];
                 case 2:
-                    res = _e.sent();
+                    res = _k.sent();
                     if (res.status !== 200)
                         throw new Error("RefreshToken: Status ".concat(res.status, " from ").concat(url, "/token"));
                     return [4 /*yield*/, res.json()];
                 case 3:
-                    response = _e.sent();
+                    response = _k.sent();
                     login.accessToken = response.accessToken;
                     login.accessTokenExpiration = response.accessTokenExpiration
                         ? new Date(response.accessTokenExpiration)
@@ -2326,9 +2359,9 @@ function refreshAccessToken(url, login) {
 }
 function userAuthenticate(context, fetchToken, userInteraction, hints) {
     return __awaiter$1(this, void 0, void 0, function () {
-        var _e, privateKey, publicKey, publicKeySPKI, publicKeyPEM, response2, error_1;
-        return __generator$1(this, function (_f) {
-            switch (_f.label) {
+        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,
@@ -2337,24 +2370,24 @@ function userAuthenticate(context, fetchToken, userInteraction, hints) {
                     }, false, // Non-exportable...
                     ['sign', 'verify'])];
                 case 1:
-                    _e = _f.sent(), privateKey = _e.privateKey, publicKey = _e.publicKey;
+                    _k = _l.sent(), privateKey = _k.privateKey, publicKey = _k.publicKey;
                     if (!privateKey || !publicKey)
                         throw new Error("Could not generate RSA keypair"); // Typings suggest these can be undefined...
                     context.nonExportablePrivateKey = privateKey; //...but storable!
                     return [4 /*yield*/, crypto.subtle.exportKey('spki', publicKey)];
                 case 2:
-                    publicKeySPKI = _f.sent();
+                    publicKeySPKI = _l.sent();
                     publicKeyPEM = spkiToPEM(publicKeySPKI);
                     context.publicKey = publicKey;
-                    _f.label = 3;
+                    _l.label = 3;
                 case 3:
-                    _f.trys.push([3, 7, , 9]);
+                    _l.trys.push([3, 7, , 9]);
                     return [4 /*yield*/, fetchToken({
                             public_key: publicKeyPEM,
                             hints: hints,
                         })];
                 case 4:
-                    response2 = _f.sent();
+                    response2 = _l.sent();
                     if (response2.type !== 'tokens')
                         throw new Error("Unexpected response type from token endpoint: ".concat(response2.type));
                     context.accessToken = response2.accessToken;
@@ -2375,11 +2408,11 @@ function userAuthenticate(context, fetchToken, userInteraction, hints) {
                             alerts: response2.alerts,
                         })];
                 case 5:
-                    _f.sent();
-                    _f.label = 6;
+                    _l.sent();
+                    _l.label = 6;
                 case 6: return [2 /*return*/, context];
                 case 7:
-                    error_1 = _f.sent();
+                    error_1 = _l.sent();
                     return [4 /*yield*/, alertUser(userInteraction, 'Authentication Failed', {
                             type: 'error',
                             messageCode: 'GENERIC_ERROR',
@@ -2387,7 +2420,7 @@ function userAuthenticate(context, fetchToken, userInteraction, hints) {
                             messageParams: {}
                         }).catch(function () { })];
                 case 8:
-                    _f.sent();
+                    _l.sent();
                     throw error_1;
                 case 9: return [2 /*return*/];
             }
@@ -2430,7 +2463,7 @@ var AuthPersistedContext = /** @class */ (function () {
     AuthPersistedContext.prototype.save = function () {
         return __awaiter$1(this, void 0, void 0, function () {
             var db;
-            return __generator$1(this, function (_e) {
+            return __generator$1(this, function (_k) {
                 db = wm$1.get(this);
                 db.table("$logins").put(this);
                 return [2 /*return*/];
@@ -2457,21 +2490,21 @@ var HttpError = /** @class */ (function (_super_1) {
 }(Error));
 function otpFetchTokenCallback(db) {
     var userInteraction = db.cloud.userInteraction;
-    return function otpAuthenticate(_e) {
-        var _f;
-        var public_key = _e.public_key, hints = _e.hints;
+    return function otpAuthenticate(_k) {
+        var public_key = _k.public_key, hints = _k.hints;
+        var _a;
         return __awaiter$1(this, void 0, void 0, function () {
-            var tokenRequest, url, demo_user, email, res1, errMsg, response, otp, res2, errorText, _g, errMsg, response2;
-            return __generator$1(this, function (_h) {
-                switch (_h.label) {
+            var tokenRequest, url, demo_user, email, res1, errMsg, response, otp, res2, errorText, _k, errMsg, response2;
+            return __generator$1(this, function (_l) {
+                switch (_l.label) {
                     case 0:
-                        url = (_f = db.cloud.options) === null || _f === void 0 ? void 0 : _f.databaseUrl;
+                        url = (_a = db.cloud.options) === null || _a === void 0 ? void 0 : _a.databaseUrl;
                         if (!url)
                             throw new Error("No database URL given.");
                         if (!((hints === null || hints === void 0 ? void 0 : hints.grant_type) === 'demo')) return [3 /*break*/, 2];
                         return [4 /*yield*/, promptForEmail(userInteraction, 'Enter a demo user email', (hints === null || hints === void 0 ? void 0 : hints.email) || (hints === null || hints === void 0 ? void 0 : hints.userId))];
                     case 1:
-                        demo_user = _h.sent();
+                        demo_user = _l.sent();
                         tokenRequest = {
                             demo_user: demo_user,
                             grant_type: 'demo',
@@ -2481,25 +2514,25 @@ function otpFetchTokenCallback(db) {
                         return [3 /*break*/, 4];
                     case 2: return [4 /*yield*/, promptForEmail(userInteraction, 'Enter email address', hints === null || hints === void 0 ? void 0 : hints.email)];
                     case 3:
-                        email = _h.sent();
+                        email = _l.sent();
                         tokenRequest = {
                             email: email,
                             grant_type: 'otp',
                             scopes: ['ACCESS_DB'],
                             public_key: public_key,
                         };
-                        _h.label = 4;
+                        _l.label = 4;
                     case 4: return [4 /*yield*/, fetch("".concat(url, "/token"), {
                             body: JSON.stringify(tokenRequest),
                             method: 'post',
                             headers: { 'Content-Type': 'application/json', mode: 'cors' },
                         })];
                     case 5:
-                        res1 = _h.sent();
+                        res1 = _l.sent();
                         if (!(res1.status !== 200)) return [3 /*break*/, 8];
                         return [4 /*yield*/, res1.text()];
                     case 6:
-                        errMsg = _h.sent();
+                        errMsg = _l.sent();
                         return [4 /*yield*/, alertUser(userInteraction, "Token request failed", {
                                 type: 'error',
                                 messageCode: 'GENERIC_ERROR',
@@ -2507,11 +2540,11 @@ function otpFetchTokenCallback(db) {
                                 messageParams: {}
                             }).catch(function () { })];
                     case 7:
-                        _h.sent();
+                        _l.sent();
                         throw new HttpError(res1, errMsg);
                     case 8: return [4 /*yield*/, res1.json()];
                     case 9:
-                        response = _h.sent();
+                        response = _l.sent();
                         if (!(response.type === 'tokens')) return [3 /*break*/, 10];
                         // Demo user request can get a "tokens" response right away
                         return [2 /*return*/, response];
@@ -2521,7 +2554,7 @@ function otpFetchTokenCallback(db) {
                             throw new Error("Unexpected response from ".concat(url, "/token"));
                         return [4 /*yield*/, promptForOTP(userInteraction, tokenRequest.email)];
                     case 11:
-                        otp = _h.sent();
+                        otp = _l.sent();
                         tokenRequest.otp = otp || '';
                         tokenRequest.otp_id = response.otp_id;
                         return [4 /*yield*/, fetch("".concat(url, "/token"), {
@@ -2531,14 +2564,14 @@ function otpFetchTokenCallback(db) {
                                 mode: 'cors',
                             })];
                     case 12:
-                        res2 = _h.sent();
-                        _h.label = 13;
+                        res2 = _l.sent();
+                        _l.label = 13;
                     case 13:
                         if (!(res2.status === 401)) return [3 /*break*/, 17];
                         return [4 /*yield*/, res2.text()];
                     case 14:
-                        errorText = _h.sent();
-                        _g = tokenRequest;
+                        errorText = _l.sent();
+                        _k = tokenRequest;
                         return [4 /*yield*/, promptForOTP(userInteraction, tokenRequest.email, {
                                 type: 'error',
                                 messageCode: 'INVALID_OTP',
@@ -2546,7 +2579,7 @@ function otpFetchTokenCallback(db) {
                                 messageParams: {}
                             })];
                     case 15:
-                        _g.otp = _h.sent();
+                        _k.otp = _l.sent();
                         return [4 /*yield*/, fetch("".concat(url, "/token"), {
                                 body: JSON.stringify(tokenRequest),
                                 method: 'post',
@@ -2554,13 +2587,13 @@ function otpFetchTokenCallback(db) {
                                 mode: 'cors',
                             })];
                     case 16:
-                        res2 = _h.sent();
+                        res2 = _l.sent();
                         return [3 /*break*/, 13];
                     case 17:
                         if (!(res2.status !== 200)) return [3 /*break*/, 20];
                         return [4 /*yield*/, res2.text()];
                     case 18:
-                        errMsg = _h.sent();
+                        errMsg = _l.sent();
                         return [4 /*yield*/, alertUser(userInteraction, "OTP Authentication Failed", {
                                 type: 'error',
                                 messageCode: 'GENERIC_ERROR',
@@ -2568,11 +2601,11 @@ function otpFetchTokenCallback(db) {
                                 messageParams: {}
                             }).catch(function () { })];
                     case 19:
-                        _h.sent();
+                        _l.sent();
                         throw new HttpError(res2, errMsg);
                     case 20: return [4 /*yield*/, res2.json()];
                     case 21:
-                        response2 = _h.sent();
+                        response2 = _l.sent();
                         return [2 /*return*/, response2];
                     case 22: throw new Error("Unexpected response from ".concat(url, "/token"));
                 }
@@ -2595,19 +2628,19 @@ function setCurrentUser(db, user) {
     return __awaiter$1(this, void 0, void 0, function () {
         var $logins;
         var _this_1 = this;
-        return __generator$1(this, function (_e) {
-            switch (_e.label) {
+        return __generator$1(this, function (_k) {
+            switch (_k.label) {
                 case 0:
                     if (user.userId === db.cloud.currentUserId)
                         return [2 /*return*/]; // Already this user.
                     $logins = db.table('$logins');
                     return [4 /*yield*/, db.transaction('rw', $logins, function (tx) { return __awaiter$1(_this_1, void 0, void 0, function () {
                             var existingLogins;
-                            return __generator$1(this, function (_e) {
-                                switch (_e.label) {
+                            return __generator$1(this, function (_k) {
+                                switch (_k.label) {
                                     case 0: return [4 /*yield*/, $logins.toArray()];
                                     case 1:
-                                        existingLogins = _e.sent();
+                                        existingLogins = _k.sent();
                                         return [4 /*yield*/, Promise.all(existingLogins
                                                 .filter(function (login) { return login.userId !== user.userId && login.isLoggedIn; })
                                                 .map(function (login) {
@@ -2615,19 +2648,19 @@ function setCurrentUser(db, user) {
                                                 return $logins.put(login);
                                             }))];
                                     case 2:
-                                        _e.sent();
+                                        _k.sent();
                                         user.isLoggedIn = true;
                                         user.lastLogin = new Date();
                                         return [4 /*yield*/, user.save()];
                                     case 3:
-                                        _e.sent();
+                                        _k.sent();
                                         console.debug('Saved new user', user.email);
                                         return [2 /*return*/];
                                 }
                             });
                         }); })];
                 case 1:
-                    _e.sent();
+                    _k.sent();
                     return [4 /*yield*/, new Promise(function (resolve) {
                             if (db.cloud.currentUserId === user.userId) {
                                 resolve(null);
@@ -2642,7 +2675,7 @@ function setCurrentUser(db, user) {
                             }
                         })];
                 case 2:
-                    _e.sent();
+                    _k.sent();
                     return [2 /*return*/];
             }
         });
@@ -2651,11 +2684,11 @@ function setCurrentUser(db, user) {
 function login(db, hints) {
     return __awaiter$1(this, void 0, void 0, function () {
         var currentUser, context;
-        return __generator$1(this, function (_e) {
-            switch (_e.label) {
+        return __generator$1(this, function (_k) {
+            switch (_k.label) {
                 case 0: return [4 /*yield*/, db.getCurrentUser()];
                 case 1:
-                    currentUser = _e.sent();
+                    currentUser = _k.sent();
                     if (currentUser.isLoggedIn) {
                         if (hints) {
                             if (hints.email && db.cloud.currentUser.value.email !== hints.email) {
@@ -2674,13 +2707,13 @@ 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:
-                    _e.sent();
+                    _k.sent();
                     return [4 /*yield*/, context.save()];
                 case 3:
-                    _e.sent();
+                    _k.sent();
                     return [4 /*yield*/, setCurrentUser(db, context)];
                 case 4:
-                    _e.sent();
+                    _k.sent();
                     // Make sure to resync as the new login will be authorized
                     // for new realms.
                     triggerSync(db, "pull");
@@ -2701,7 +2734,7 @@ try {
     Object.freeze(UNAUTHORIZED_USER);
     Object.freeze(UNAUTHORIZED_USER.claims);
 }
-catch (_e) { }
+catch (_a) { }
 var swHolder = {};
 var swContainer = self.document && navigator.serviceWorker; // self.document is to verify we're not the SW ourself
 if (swContainer)
@@ -2709,9 +2742,9 @@ if (swContainer)
 if (typeof self !== 'undefined' && 'clients' in self && !self.document) {
     // We are the service worker. Propagate messages to all our clients.
     addEventListener('message', function (ev) {
-        var _e, _f;
-        if ((_f = (_e = ev.data) === null || _e === void 0 ? void 0 : _e.type) === null || _f === void 0 ? void 0 : _f.startsWith('sw-broadcast-')) {
-            __spreadArray$1([], self['clients'].matchAll({ includeUncontrolled: true }), true).forEach(function (client) { var _e; return client.id !== ((_e = ev.source) === null || _e === void 0 ? void 0 : _e.id) && client.postMessage(ev.data); });
+        var _a, _b;
+        if ((_b = (_a = ev.data) === null || _a === void 0 ? void 0 : _a.type) === null || _b === void 0 ? void 0 : _b.startsWith('sw-broadcast-')) {
+            __spreadArray$1([], self['clients'].matchAll({ includeUncontrolled: true }), true).forEach(function (client) { var _a; return client.id !== ((_a = ev.source) === null || _a === void 0 ? void 0 : _a.id) && client.postMessage(ev.data); });
         }
     });
 }
@@ -2724,8 +2757,8 @@ var SWBroadcastChannel = /** @class */ (function () {
         if (!swContainer)
             return function () { };
         var forwarder = function (ev) {
-            var _e;
-            if (((_e = ev.data) === null || _e === void 0 ? void 0 : _e.type) === "sw-broadcast-".concat(_this_1.name)) {
+            var _a;
+            if (((_a = ev.data) === null || _a === void 0 ? void 0 : _a.type) === "sw-broadcast-".concat(_this_1.name)) {
                 listener(ev.data.message);
             }
         };
@@ -2734,7 +2767,7 @@ var SWBroadcastChannel = /** @class */ (function () {
     };
     SWBroadcastChannel.prototype.postMessage = function (message) {
         var _this_1 = this;
-        var _e;
+        var _a;
         if (typeof self['clients'] === 'object') {
             // We're a service worker. Propagate to our browser clients.
             __spreadArray$1([], self['clients'].matchAll({ includeUncontrolled: true }), true).forEach(function (client) { return client.postMessage({
@@ -2745,7 +2778,7 @@ var SWBroadcastChannel = /** @class */ (function () {
         else if (swHolder.registration) {
             // We're a client (browser window or other worker)
             // Post to SW so it can repost to all its clients and to itself
-            (_e = swHolder.registration.active) === null || _e === void 0 ? void 0 : _e.postMessage({
+            (_a = swHolder.registration.active) === null || _a === void 0 ? void 0 : _a.postMessage({
                 type: "sw-broadcast-".concat(this.name),
                 message: message
             });
@@ -2791,25 +2824,25 @@ var BroadcastedAndLocalEvent = /** @class */ (function (_super_1) {
         return _this_1;
     }
     BroadcastedAndLocalEvent.prototype.next = function (message) {
-        console.debug("BroadcastedAndLocalEvent: bc.postMessage()", __assign({}, message), "bc is a", this.bc);
+        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);
     };
     return BroadcastedAndLocalEvent;
 }(Observable$1));
-function computeRealmSetHash(_e) {
-    var realms = _e.realms, inviteRealms = _e.inviteRealms;
+function computeRealmSetHash(_k) {
+    var realms = _k.realms, inviteRealms = _k.inviteRealms;
     return __awaiter$1(this, void 0, void 0, function () {
         var data, byteArray, digestBytes, base64;
-        return __generator$1(this, function (_f) {
-            switch (_f.label) {
+        return __generator$1(this, function (_k) {
+            switch (_k.label) {
                 case 0:
                     data = JSON.stringify(__spreadArray$1(__spreadArray$1([], realms.map(function (realmId) { return ({ realmId: realmId, accepted: true }); }), true), inviteRealms.map(function (realmId) { return ({ realmId: realmId, accepted: false }); }), true).sort(function (a, b) { return a.realmId < b.realmId ? -1 : a.realmId > b.realmId ? 1 : 0; }));
                     byteArray = new TextEncoder().encode(data);
                     return [4 /*yield*/, crypto.subtle.digest('SHA-1', byteArray)];
                 case 1:
-                    digestBytes = _f.sent();
+                    digestBytes = _k.sent();
                     base64 = b64encode(digestBytes);
                     return [2 /*return*/, base64];
             }
@@ -2818,14 +2851,14 @@ function computeRealmSetHash(_e) {
 }
 function getSyncableTables(db) {
     return Object.entries(db.cloud.schema || {})
-        .filter(function (_e) {
-        var markedForSync = _e[1].markedForSync;
+        .filter(function (_k) {
+        var markedForSync = _k[1].markedForSync;
         return markedForSync;
     })
-        .map(function (_e) {
-        var tbl = _e[0];
-        return db.tables.filter(function (_e) {
-            var name = _e.name;
+        .map(function (_k) {
+        var tbl = _k[0];
+        return db.tables.filter(function (_k) {
+            var name = _k.name;
             return name === tbl;
         })[0];
     })
@@ -2835,8 +2868,8 @@ function getMutationTable(tableName) {
     return "$".concat(tableName, "_mutations");
 }
 function getTableFromMutationTable(mutationTable) {
-    var _e;
-    var tableName = (_e = /^\$(.*)_mutations$/.exec(mutationTable)) === null || _e === void 0 ? void 0 : _e[1];
+    var _a;
+    var tableName = (_a = /^\$(.*)_mutations$/.exec(mutationTable)) === null || _a === void 0 ? void 0 : _a[1];
     if (!tableName)
         throw new Error("Given mutationTable ".concat(mutationTable, " is not correct"));
     return tableName;
@@ -2845,17 +2878,17 @@ var concat = [].concat;
 function flatten(a) {
     return concat.apply([], a);
 }
-function listClientChanges(mutationTables, db, _e) {
-    var _f = _e === void 0 ? {} : _e, _g = _f.since, since = _g === void 0 ? {} : _g, _h = _f.limit, limit = _h === void 0 ? Infinity : _h;
+function listClientChanges(mutationTables, db, _k) {
+    var _l = _k === void 0 ? {} : _k, _m = _l.since, since = _m === void 0 ? {} : _m, _o = _l.limit, limit = _o === void 0 ? Infinity : _o;
     return __awaiter$1(this, void 0, void 0, function () {
-        var allMutsOnTables, sorted, result, currentEntry, currentTxid, _j, sorted_1, _k, table, mut;
+        var allMutsOnTables, sorted, result, currentEntry, currentTxid, _k, sorted_1, _l, table, mut;
         var _this_1 = this;
-        return __generator$1(this, function (_l) {
-            switch (_l.label) {
+        return __generator$1(this, function (_m) {
+            switch (_m.label) {
                 case 0: return [4 /*yield*/, Promise.all(mutationTables.map(function (mutationTable) { return __awaiter$1(_this_1, void 0, void 0, function () {
                         var tableName, lastRevision, query, muts;
-                        return __generator$1(this, function (_e) {
-                            switch (_e.label) {
+                        return __generator$1(this, function (_k) {
+                            switch (_k.label) {
                                 case 0:
                                     tableName = getTableFromMutationTable(mutationTable.name);
                                     lastRevision = since[tableName];
@@ -2866,7 +2899,7 @@ function listClientChanges(mutationTables, db, _e) {
                                         query = query.limit(limit);
                                     return [4 /*yield*/, query.toArray()];
                                 case 1:
-                                    muts = _e.sent();
+                                    muts = _k.sent();
                                     //const objTable = db.table(tableName);
                                     /*for (const mut of muts) {
                                       if (mut.type === "insert" || mut.type === "upsert") {
@@ -2881,13 +2914,13 @@ function listClientChanges(mutationTables, db, _e) {
                         });
                     }); }))];
                 case 1:
-                    allMutsOnTables = _l.sent();
+                    allMutsOnTables = _m.sent();
                     sorted = flatten(allMutsOnTables).sort(function (a, b) { return a.mut.ts - b.mut.ts; });
                     result = [];
                     currentEntry = null;
                     currentTxid = null;
-                    for (_j = 0, sorted_1 = sorted; _j < sorted_1.length; _j++) {
-                        _k = sorted_1[_j], table = _k.table, mut = _k.mut;
+                    for (_k = 0, sorted_1 = sorted; _k < sorted_1.length; _k++) {
+                        _l = sorted_1[_k], table = _l.table, mut = _l.mut;
                         if (currentEntry &&
                             currentEntry.table === table &&
                             currentTxid === mut.txid) {
@@ -2917,8 +2950,8 @@ function listSyncifiedChanges(tablesToSyncify, currentUser, schema, alreadySynce
     return __awaiter$1(this, void 0, void 0, function () {
         var txid, ignoredRealms_1, upserts;
         var _this_1 = this;
-        return __generator$1(this, function (_e) {
-            switch (_e.label) {
+        return __generator$1(this, function (_k) {
+            switch (_k.label) {
                 case 0:
                     txid = "upload-".concat(randomString(8));
                     if (!currentUser.isLoggedIn) return [3 /*break*/, 2];
@@ -2926,8 +2959,8 @@ function listSyncifiedChanges(tablesToSyncify, currentUser, schema, alreadySynce
                     ignoredRealms_1 = new Set(alreadySyncedRealms || []);
                     return [4 /*yield*/, Promise.all(tablesToSyncify.map(function (table) { return __awaiter$1(_this_1, void 0, void 0, function () {
                             var extractKey, dexieCloudTableSchema, query, unsyncedObjects, mut;
-                            return __generator$1(this, function (_e) {
-                                switch (_e.label) {
+                            return __generator$1(this, function (_k) {
+                                switch (_k.label) {
                                     case 0:
                                         extractKey = table.core.schema.primaryKey.extractKey;
                                         if (!extractKey)
@@ -2948,7 +2981,7 @@ function listSyncifiedChanges(tablesToSyncify, currentUser, schema, alreadySynce
                                             });
                                         return [4 /*yield*/, query.toArray()];
                                     case 1:
-                                        unsyncedObjects = _e.sent();
+                                        unsyncedObjects = _k.sent();
                                         if (unsyncedObjects.length > 0) {
                                             mut = {
                                                 type: 'upsert',
@@ -2972,7 +3005,7 @@ function listSyncifiedChanges(tablesToSyncify, currentUser, schema, alreadySynce
                             });
                         }); }))];
                 case 1:
-                    upserts = _e.sent();
+                    upserts = _k.sent();
                     return [2 /*return*/, upserts.filter(function (op) { return op.muts.length > 0; })];
                 case 2: return [2 /*return*/, []];
             }
@@ -3001,12 +3034,12 @@ function escapeDollarProps(value) {
     if (!dollarKeys)
         return value;
     var clone = __assign({}, value);
-    for (var _e = 0, dollarKeys_1 = dollarKeys; _e < dollarKeys_1.length; _e++) {
-        var k_1 = dollarKeys_1[_e];
+    for (var _k = 0, dollarKeys_1 = dollarKeys; _k < dollarKeys_1.length; _k++) {
+        var k_1 = dollarKeys_1[_k];
         delete clone[k_1];
     }
-    for (var _f = 0, dollarKeys_2 = dollarKeys; _f < dollarKeys_2.length; _f++) {
-        var k_2 = dollarKeys_2[_f];
+    for (var _l = 0, dollarKeys_2 = dollarKeys; _l < dollarKeys_2.length; _l++) {
+        var k_2 = dollarKeys_2[_l];
         clone["$" + k_2] = value[k_2];
     }
     return clone;
@@ -3016,8 +3049,8 @@ var ObjectDef = {
 };
 function TypesonSimplified() {
     var typeDefsInputs = [];
-    for (var _e = 0; _e < arguments.length; _e++) {
-        typeDefsInputs[_e] = arguments[_e];
+    for (var _k = 0; _k < arguments.length; _k++) {
+        typeDefsInputs[_k] = arguments[_k];
     }
     var typeDefs = typeDefsInputs.reduce(function (p, c) { return (__assign(__assign({}, p), c)); }, typeDefsInputs.reduce(function (p, c) { return (__assign(__assign({}, c), p)); }, {}));
     var protoMap = new WeakMap();
@@ -3051,13 +3084,13 @@ function TypesonSimplified() {
                     // Unescape dollar props
                     value = __assign({}, value);
                     // Delete keys that children wanted us to delete
-                    for (var _e = 0, _f = top[1]; _e < _f.length; _e++) {
-                        var k_3 = _f[_e];
+                    for (var _k = 0, _l = top[1]; _k < _l.length; _k++) {
+                        var k_3 = _l[_k];
                         delete value[k_3];
                     }
                     // Set keys that children wanted us to set
-                    for (var _g = 0, _h = Object.entries(top[2]); _g < _h.length; _g++) {
-                        var _j = _h[_g], k_4 = _j[0], v_1 = _j[1];
+                    for (var _m = 0, _o = Object.entries(top[2]); _m < _o.length; _m++) {
+                        var _p = _o[_m], k_4 = _p[0], v_1 = _p[1];
                         value[k_4] = v_1;
                     }
                     stack.pop();
@@ -3105,8 +3138,8 @@ function TypesonSimplified() {
                 if (typeDef !== undefined)
                     return typeDef; // Null counts to! So the caching of Array.prototype also counts.
                 var toStringTag_1 = getToStringTag(realVal);
-                var entry = Object.entries(typeDefs).find(function (_e) {
-                    var typeName = _e[0], typeDef = _e[1];
+                var entry = Object.entries(typeDefs).find(function (_k) {
+                    var typeName = _k[0], typeDef = _k[1];
                     var _a, _b;
                     return (_b = (_a = typeDef === null || typeDef === void 0 ? void 0 : typeDef.test) === null || _a === void 0 ? void 0 : _a.call(typeDef, realVal, toStringTag_1)) !== null && _b !== void 0 ? _b : typeName === toStringTag_1;
                 });
@@ -3138,8 +3171,8 @@ var BisonBinaryTypes = {
                 i: i,
             };
         },
-        revive: function (_e, altChannel) {
-            var i = _e.i, mimeType = _e.mimeType;
+        revive: function (_k, altChannel) {
+            var i = _k.i, mimeType = _k.mimeType;
             return new Blob([altChannel[i]], { type: mimeType });
         },
     },
@@ -3158,8 +3191,8 @@ var numberDef = {
                     return num;
             }
         },
-        revive: function (_e) {
-            var v = _e.v;
+        revive: function (_k) {
+            var v = _k.v;
             return Number(v);
         },
     },
@@ -3178,8 +3211,8 @@ var DateDef = {
             $t: "Date",
             v: isNaN(date.getTime()) ? "NaN" : date.toISOString(),
         }); },
-        revive: function (_e) {
-            var v = _e.v;
+        revive: function (_k) {
+            var v = _k.v;
             return new Date(v === "NaN" ? NaN : Date.parse(v));
         },
     },
@@ -3190,8 +3223,8 @@ var SetDef = {
             $t: "Set",
             v: Array.from(set.entries()),
         }); },
-        revive: function (_e) {
-            var v = _e.v;
+        revive: function (_k) {
+            var v = _k.v;
             return new Set(v);
         },
     },
@@ -3202,8 +3235,8 @@ var MapDef = {
             $t: "Map",
             v: Array.from(map.entries()),
         }); },
-        revive: function (_e) {
-            var v = _e.v;
+        revive: function (_k) {
+            var v = _k.v;
             return new Map(v);
         },
     },
@@ -3229,8 +3262,8 @@ var TypedArraysDefs = [
     "BigInt64Array",
     "BigUint64Array",
 ].reduce(function (specs, typeName) {
-    var _e;
-    return (__assign(__assign({}, specs), (_e = {}, _e[typeName] = {
+    var _k;
+    return (__assign(__assign({}, specs), (_k = {}, _k[typeName] = {
         // Replace passes the the typed array into $t, buffer so that
         // the ArrayBuffer typedef takes care of further handling of the buffer:
         // {$t:"Uint8Array",buffer:{$t:"ArrayBuffer",idx:0}}
@@ -3245,13 +3278,13 @@ var TypedArraysDefs = [
             };
             return result;
         },
-        revive: function (_e, _, typeDefs) {
-            var v = _e.v;
+        revive: function (_k, _, typeDefs) {
+            var v = _k.v;
             var TypedArray = _global[typeName];
             return (TypedArray &&
                 new TypedArray(typeDefs.ArrayBuffer.revive({ v: v }, _, typeDefs)));
         },
-    }, _e)));
+    }, _k)));
 }, {});
 function b64LexEncode(b) {
     return b64ToLex(b64encode(b));
@@ -3345,8 +3378,8 @@ var DECODE_TABLE = {
     "|": "/",
 };
 var ENCODE_TABLE = {};
-for (var _f = 0, _g = Object.keys(DECODE_TABLE); _f < _g.length; _f++) {
-    var c_1 = _g[_f];
+for (var _k = 0, _l = Object.keys(DECODE_TABLE); _k < _l.length; _k++) {
+    var c_1 = _l[_k];
     ENCODE_TABLE[DECODE_TABLE[c_1]] = c_1;
 }
 var ArrayBufferDef = {
@@ -3355,8 +3388,8 @@ var ArrayBufferDef = {
             $t: "ArrayBuffer",
             v: b64LexEncode(ab),
         }); },
-        revive: function (_e) {
-            var v = _e.v;
+        revive: function (_k) {
+            var v = _k.v;
             var ba = b64LexDecode(v);
             return ba.buffer.byteLength === ba.byteLength
                 ? ba.buffer
@@ -3398,8 +3431,8 @@ var BlobDef = {
                 : b64encode(string2ArrayBuffer(readBlobSync(blob))),
             type: blob.type,
         }); },
-        revive: function (_e) {
-            var type = _e.type, v = _e.v;
+        revive: function (_k) {
+            var type = _k.type, v = _k.v;
             var ab = b64decode(v);
             return typeof Blob !== undefined
                 ? new Blob([ab])
@@ -3410,13 +3443,13 @@ var BlobDef = {
 var builtin = __assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign({}, numberDef), bigIntDef), DateDef), SetDef), MapDef), TypedArraysDefs), ArrayBufferDef), BlobDef);
 function Bison() {
     var typeDefsInputs = [];
-    for (var _e = 0; _e < arguments.length; _e++) {
-        typeDefsInputs[_e] = arguments[_e];
+    for (var _k = 0; _k < arguments.length; _k++) {
+        typeDefsInputs[_k] = arguments[_k];
     }
     var tson = TypesonSimplified.apply(void 0, __spreadArray$1([builtin, BisonBinaryTypes], typeDefsInputs, false));
     return {
         toBinary: function (value) {
-            var _e = this.stringify(value), blob = _e[0], json = _e[1];
+            var _k = this.stringify(value), blob = _k[0], json = _k[1];
             var lenBuf = new ArrayBuffer(4);
             new DataView(lenBuf).setUint32(0, blob.size);
             return new Blob([lenBuf, blob, json]);
@@ -3432,16 +3465,16 @@ function Bison() {
             return [blob, json];
         },
         parse: function (json, binData) {
-            return __awaiter$1(this, void 0, void 0, function () {
+            return __awaiter$2(this, void 0, void 0, function () {
                 var pos, arrayBuffers, buf, view, len, ab;
-                return __generator$1(this, function (_e) {
-                    switch (_e.label) {
+                return __generator$1(this, function (_k) {
+                    switch (_k.label) {
                         case 0:
                             pos = 0;
                             arrayBuffers = [];
                             return [4 /*yield*/, readBlobBinary(binData)];
                         case 1:
-                            buf = _e.sent();
+                            buf = _k.sent();
                             view = new DataView(buf);
                             while (pos < buf.byteLength) {
                                 len = view.getUint32(pos);
@@ -3456,21 +3489,21 @@ function Bison() {
             });
         },
         fromBinary: function (blob) {
-            return __awaiter$1(this, void 0, void 0, function () {
-                var len, _e, binData, json;
-                return __generator$1(this, function (_f) {
-                    switch (_f.label) {
+            return __awaiter$2(this, void 0, void 0, function () {
+                var len, _k, binData, json;
+                return __generator$1(this, function (_l) {
+                    switch (_l.label) {
                         case 0:
-                            _e = DataView.bind;
+                            _k = DataView.bind;
                             return [4 /*yield*/, readBlobBinary(blob.slice(0, 4))];
                         case 1:
-                            len = new (_e.apply(DataView, [void 0, _f.sent()]))().getUint32(0);
+                            len = new (_k.apply(DataView, [void 0, _l.sent()]))().getUint32(0);
                             binData = blob.slice(4, len + 4);
                             return [4 /*yield*/, readBlob(blob.slice(len + 4))];
                         case 2:
-                            json = _f.sent();
+                            json = _l.sent();
                             return [4 /*yield*/, this.parse(json, binData)];
-                        case 3: return [2 /*return*/, _f.sent()];
+                        case 3: return [2 /*return*/, _l.sent()];
                     }
                 });
             });
@@ -3536,16 +3569,16 @@ var FakeBigInt = /** @class */ (function () {
     };
     return FakeBigInt;
 }());
-var defs = __assign(__assign({}, undefinedDef), (hasBigIntSupport
+var defs = Object.assign(Object.assign({}, undefinedDef), (hasBigIntSupport
     ? {}
     : {
         bigint: {
             test: function (val) { return val instanceof FakeBigInt; },
             replace: function (fakeBigInt) {
-                return __assign({ $t: 'bigint' }, fakeBigInt);
+                return Object.assign({ $t: 'bigint' }, fakeBigInt);
             },
-            revive: function (_e) {
-                var v = _e.v;
+            revive: function (_k) {
+                var v = _k.v;
                 return new FakeBigInt(v);
             }
         }
@@ -3593,24 +3626,24 @@ function encodeIdsForServer(schema, currentUser, changes) {
         });
         rv.push(changeClone);
     };
-    for (var _e = 0, changes_1 = changes; _e < changes_1.length; _e++) {
-        var change = changes_1[_e];
+    for (var _k = 0, changes_1 = changes; _k < changes_1.length; _k++) {
+        var change = changes_1[_k];
         _loop_2(change);
     }
     return rv;
 }
 function cloneChange(change, rewriteValues) {
     // clone on demand:
-    return __assign(__assign({}, change), { muts: rewriteValues
-            ? change.muts.map(function (m) { return (__assign(__assign({}, m), { keys: m.keys.slice(), values: m.values.slice() })); })
-            : change.muts.map(function (m) { return (__assign(__assign({}, m), { keys: m.keys.slice() })); }) });
+    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 (Object.assign(Object.assign({}, m), { keys: m.keys.slice() })); }) });
 }
 //import {BisonWebStreamReader} from "dreambase-library/dist/typeson-simplified/BisonWebStreamReader";
 function syncWithServer(changes, syncState, baseRevs, db, databaseUrl, schema, clientIdentity, currentUser) {
     return __awaiter$1(this, void 0, void 0, function () {
-        var headers, accessToken, syncRequest, res, _e, _f, _g, text, syncRes;
-        return __generator$1(this, function (_h) {
-            switch (_h.label) {
+        var headers, accessToken, syncRequest, res, _k, _l, _m, text, syncRes;
+        return __generator$1(this, function (_o) {
+            switch (_o.label) {
                 case 0:
                     headers = {
                         Accept: 'application/json, application/x-bison, application/x-bison-stream',
@@ -3618,7 +3651,7 @@ function syncWithServer(changes, syncState, baseRevs, db, databaseUrl, schema, c
                     };
                     return [4 /*yield*/, loadAccessToken(db)];
                 case 1:
-                    accessToken = _h.sent();
+                    accessToken = _o.sent();
                     if (accessToken) {
                         headers.Authorization = "Bearer ".concat(accessToken);
                     }
@@ -3645,7 +3678,7 @@ function syncWithServer(changes, syncState, baseRevs, db, databaseUrl, schema, c
                             body: TSON.stringify(syncRequest)
                         })];
                 case 2:
-                    res = _h.sent();
+                    res = _o.sent();
                     //const contentLength = Number(res.headers.get('content-length'));
                     db.syncStateChangedEvent.next({
                         phase: 'pulling'
@@ -3653,20 +3686,20 @@ function syncWithServer(changes, syncState, baseRevs, db, databaseUrl, schema, c
                     if (!res.ok) {
                         throw new HttpError(res);
                     }
-                    _e = res.headers.get('content-type');
-                    switch (_e) {
+                    _k = res.headers.get('content-type');
+                    switch (_k) {
                         case 'application/x-bison': return [3 /*break*/, 3];
                         case 'application/x-bison-stream': return [3 /*break*/, 5];
                         case 'application/json': return [3 /*break*/, 5];
                     }
                     return [3 /*break*/, 5];
                 case 3:
-                    _g = (_f = BISON).fromBinary;
+                    _m = (_l = BISON).fromBinary;
                     return [4 /*yield*/, res.blob()];
-                case 4: return [2 /*return*/, _g.apply(_f, [_h.sent()])];
+                case 4: return [2 /*return*/, _m.apply(_l, [_o.sent()])];
                 case 5: return [4 /*yield*/, res.text()];
                 case 6:
-                    text = _h.sent();
+                    text = _o.sent();
                     syncRes = TSON.parse(text);
                     return [2 /*return*/, syncRes];
             }
@@ -3675,16 +3708,16 @@ function syncWithServer(changes, syncState, baseRevs, db, databaseUrl, schema, c
 }
 function modifyLocalObjectsWithNewUserId(syncifiedTables, currentUser, alreadySyncedRealms) {
     return __awaiter$1(this, void 0, void 0, function () {
-        var ignoredRealms, _e, syncifiedTables_1, table;
-        return __generator$1(this, function (_f) {
-            switch (_f.label) {
+        var ignoredRealms, _k, syncifiedTables_1, table;
+        return __generator$1(this, function (_l) {
+            switch (_l.label) {
                 case 0:
                     ignoredRealms = new Set(alreadySyncedRealms || []);
-                    _e = 0, syncifiedTables_1 = syncifiedTables;
-                    _f.label = 1;
+                    _k = 0, syncifiedTables_1 = syncifiedTables;
+                    _l.label = 1;
                 case 1:
-                    if (!(_e < syncifiedTables_1.length)) return [3 /*break*/, 9];
-                    table = syncifiedTables_1[_e];
+                    if (!(_k < syncifiedTables_1.length)) return [3 /*break*/, 9];
+                    table = syncifiedTables_1[_k];
                     if (!(table.name === "members")) return [3 /*break*/, 3];
                     // members
                     return [4 /*yield*/, table.toCollection().modify(function (member) {
@@ -3694,7 +3727,7 @@ function modifyLocalObjectsWithNewUserId(syncifiedTables, currentUser, alreadySy
                         })];
                 case 2:
                     // members
-                    _f.sent();
+                    _l.sent();
                     return [3 /*break*/, 8];
                 case 3:
                     if (!(table.name === "roles")) return [3 /*break*/, 4];
@@ -3709,7 +3742,7 @@ function modifyLocalObjectsWithNewUserId(syncifiedTables, currentUser, alreadySy
                         })];
                 case 5:
                     // realms
-                    _f.sent();
+                    _l.sent();
                     return [3 /*break*/, 8];
                 case 6: 
                 // application entities
@@ -3724,10 +3757,10 @@ function modifyLocalObjectsWithNewUserId(syncifiedTables, currentUser, alreadySy
                     })];
                 case 7:
                     // application entities
-                    _f.sent();
-                    _f.label = 8;
+                    _l.sent();
+                    _l.label = 8;
                 case 8:
-                    _e++;
+                    _k++;
                     return [3 /*break*/, 1];
                 case 9: return [2 /*return*/];
             }
@@ -3747,8 +3780,8 @@ self.addEventListener('online', function () { return isOnline = true; });
 self.addEventListener('offline', function () { return isOnline = false; });
 function updateBaseRevs(db, schema, latestRevisions, serverRev) {
     return __awaiter$1(this, void 0, void 0, function () {
-        return __generator$1(this, function (_e) {
-            switch (_e.label) {
+        return __generator$1(this, function (_k) {
+            switch (_k.label) {
                 case 0: return [4 /*yield*/, db.$baseRevs.bulkPut(Object.keys(schema)
                         .filter(function (table) { return schema[table].markedForSync; })
                         .map(function (tableName) {
@@ -3760,7 +3793,7 @@ function updateBaseRevs(db, schema, latestRevisions, serverRev) {
                         };
                     }))];
                 case 1:
-                    _e.sent();
+                    _k.sent();
                     return [2 /*return*/];
             }
         });
@@ -3768,8 +3801,8 @@ function updateBaseRevs(db, schema, latestRevisions, serverRev) {
 }
 function getLatestRevisionsPerTable(clientChangeSet, lastRevisions) {
     if (lastRevisions === void 0) { lastRevisions = {}; }
-    for (var _e = 0, clientChangeSet_1 = clientChangeSet; _e < clientChangeSet_1.length; _e++) {
-        var _f = clientChangeSet_1[_e], table = _f.table, muts = _f.muts;
+    for (var _k = 0, clientChangeSet_1 = clientChangeSet; _k < clientChangeSet_1.length; _k++) {
+        var _l = clientChangeSet_1[_k], table = _l.table, muts = _l.muts;
         var lastRev = muts.length > 0 ? muts[muts.length - 1].rev : null;
         lastRevisions[table] = lastRev || lastRevisions[table] || 0;
     }
@@ -3778,18 +3811,18 @@ function getLatestRevisionsPerTable(clientChangeSet, lastRevisions) {
 function bulkUpdate(table, keys, changeSpecs) {
     return __awaiter$1(this, void 0, void 0, function () {
         var objs, resultKeys, resultObjs;
-        return __generator$1(this, function (_e) {
-            switch (_e.label) {
+        return __generator$1(this, function (_k) {
+            switch (_k.label) {
                 case 0: return [4 /*yield*/, table.bulkGet(keys)];
                 case 1:
-                    objs = _e.sent();
+                    objs = _k.sent();
                     resultKeys = [];
                     resultObjs = [];
                     keys.forEach(function (key, idx) {
                         var obj = objs[idx];
                         if (obj) {
-                            for (var _e = 0, _f = Object.entries(changeSpecs[idx]); _e < _f.length; _e++) {
-                                var _g = _f[_e], keyPath = _g[0], value = _g[1];
+                            for (var _k = 0, _l = Object.entries(changeSpecs[idx]); _k < _l.length; _k++) {
+                                var _m = _l[_k], keyPath = _m[0], value = _m[1];
                                 if (keyPath === table.schema.primKey.keyPath) {
                                     if (cmp(value, key) !== 0) {
                                         throw new Error("Cannot change primary key");
@@ -3807,7 +3840,7 @@ function bulkUpdate(table, keys, changeSpecs) {
                             ? table.bulkPut(resultObjs, resultKeys)
                             : table.bulkPut(resultObjs))];
                 case 2:
-                    _e.sent();
+                    _k.sent();
                     return [2 /*return*/];
             }
         });
@@ -3815,15 +3848,15 @@ function bulkUpdate(table, keys, changeSpecs) {
 }
 function applyServerChanges(changes, db) {
     return __awaiter$1(this, void 0, void 0, function () {
-        var _loop_3, _e, changes_2, _f, tableName, muts;
-        return __generator$1(this, function (_g) {
-            switch (_g.label) {
+        var _loop_3, _k, changes_2, _l, tableName, muts;
+        return __generator$1(this, function (_m) {
+            switch (_m.label) {
                 case 0:
                     console.debug('Applying server changes', changes, Dexie.currentTransaction);
                     _loop_3 = function (tableName, muts) {
-                        var table, primaryKey, keyDecoder, _loop_4, _h, muts_2, mut;
-                        return __generator$1(this, function (_j) {
-                            switch (_j.label) {
+                        var table, primaryKey, keyDecoder, _loop_4, _o, muts_2, mut;
+                        return __generator$1(this, function (_p) {
+                            switch (_p.label) {
                                 case 0:
                                     table = db.table(tableName);
                                     if (!table)
@@ -3838,7 +3871,7 @@ function applyServerChanges(changes, db) {
                                                         // On server, array keys are transformed to JSON string representation
                                                         return JSON.parse(key);
                                                     }
-                                                    catch (_e) { }
+                                                    catch (_a) { }
                                                 return key;
                                             case '#':
                                                 // Decode private ID (do the opposite from what's done in encodeIdsForServer())
@@ -3851,13 +3884,13 @@ function applyServerChanges(changes, db) {
                                         }
                                     };
                                     _loop_4 = function (mut) {
-                                        var keys, _k;
-                                        return __generator$1(this, function (_l) {
-                                            switch (_l.label) {
+                                        var keys, _q;
+                                        return __generator$1(this, function (_r) {
+                                            switch (_r.label) {
                                                 case 0:
                                                     keys = mut.keys.map(keyDecoder);
-                                                    _k = mut.type;
-                                                    switch (_k) {
+                                                    _q = mut.type;
+                                                    switch (_q) {
                                                         case 'insert': return [3 /*break*/, 1];
                                                         case 'upsert': return [3 /*break*/, 6];
                                                         case 'modify': return [3 /*break*/, 11];
@@ -3869,7 +3902,7 @@ function applyServerChanges(changes, db) {
                                                     if (!primaryKey.outbound) return [3 /*break*/, 3];
                                                     return [4 /*yield*/, table.bulkAdd(mut.values, keys)];
                                                 case 2:
-                                                    _l.sent();
+                                                    _r.sent();
                                                     return [3 /*break*/, 5];
                                                 case 3:
                                                     keys.forEach(function (key, i) {
@@ -3878,14 +3911,14 @@ function applyServerChanges(changes, db) {
                                                     });
                                                     return [4 /*yield*/, table.bulkAdd(mut.values)];
                                                 case 4:
-                                                    _l.sent();
-                                                    _l.label = 5;
+                                                    _r.sent();
+                                                    _r.label = 5;
                                                 case 5: return [3 /*break*/, 20];
                                                 case 6:
                                                     if (!primaryKey.outbound) return [3 /*break*/, 8];
                                                     return [4 /*yield*/, table.bulkPut(mut.values, keys)];
                                                 case 7:
-                                                    _l.sent();
+                                                    _r.sent();
                                                     return [3 /*break*/, 10];
                                                 case 8:
                                                     keys.forEach(function (key, i) {
@@ -3894,59 +3927,59 @@ function applyServerChanges(changes, db) {
                                                     });
                                                     return [4 /*yield*/, table.bulkPut(mut.values)];
                                                 case 9:
-                                                    _l.sent();
-                                                    _l.label = 10;
+                                                    _r.sent();
+                                                    _r.label = 10;
                                                 case 10: return [3 /*break*/, 20];
                                                 case 11:
                                                     if (!(keys.length === 1)) return [3 /*break*/, 13];
                                                     return [4 /*yield*/, table.update(keys[0], mut.changeSpec)];
                                                 case 12:
-                                                    _l.sent();
+                                                    _r.sent();
                                                     return [3 /*break*/, 15];
                                                 case 13: return [4 /*yield*/, table.where(':id').anyOf(keys).modify(mut.changeSpec)];
                                                 case 14:
-                                                    _l.sent();
-                                                    _l.label = 15;
+                                                    _r.sent();
+                                                    _r.label = 15;
                                                 case 15: return [3 /*break*/, 20];
                                                 case 16: return [4 /*yield*/, bulkUpdate(table, keys, mut.changeSpecs)];
                                                 case 17:
-                                                    _l.sent();
+                                                    _r.sent();
                                                     return [3 /*break*/, 20];
                                                 case 18: return [4 /*yield*/, table.bulkDelete(keys)];
                                                 case 19:
-                                                    _l.sent();
+                                                    _r.sent();
                                                     return [3 /*break*/, 20];
                                                 case 20: return [2 /*return*/];
                                             }
                                         });
                                     };
-                                    _h = 0, muts_2 = muts;
-                                    _j.label = 1;
+                                    _o = 0, muts_2 = muts;
+                                    _p.label = 1;
                                 case 1:
-                                    if (!(_h < muts_2.length)) return [3 /*break*/, 4];
-                                    mut = muts_2[_h];
+                                    if (!(_o < muts_2.length)) return [3 /*break*/, 4];
+                                    mut = muts_2[_o];
                                     return [5 /*yield**/, _loop_4(mut)];
                                 case 2:
-                                    _j.sent();
-                                    _j.label = 3;
+                                    _p.sent();
+                                    _p.label = 3;
                                 case 3:
-                                    _h++;
+                                    _o++;
                                     return [3 /*break*/, 1];
                                 case 4: return [2 /*return*/];
                             }
                         });
                     };
-                    _e = 0, changes_2 = changes;
-                    _g.label = 1;
+                    _k = 0, changes_2 = changes;
+                    _m.label = 1;
                 case 1:
-                    if (!(_e < changes_2.length)) return [3 /*break*/, 4];
-                    _f = changes_2[_e], tableName = _f.table, muts = _f.muts;
+                    if (!(_k < changes_2.length)) return [3 /*break*/, 4];
+                    _l = changes_2[_k], tableName = _l.table, muts = _l.muts;
                     return [5 /*yield**/, _loop_3(tableName, muts)];
                 case 2:
-                    _g.sent();
-                    _g.label = 3;
+                    _m.sent();
+                    _m.label = 3;
                 case 3:
-                    _e++;
+                    _k++;
                     return [3 /*break*/, 1];
                 case 4: return [2 /*return*/];
             }
@@ -3966,8 +3999,8 @@ function sync(db, options, schema, syncOptions) {
         }
     })
         .catch(function (error) { return __awaiter$1(_this_1, void 0, void 0, function () {
-        return __generator$1(this, function (_e) {
-            switch (_e.label) {
+        return __generator$1(this, function (_k) {
+            switch (_k.label) {
                 case 0:
                     if (syncOptions === null || syncOptions === void 0 ? void 0 : syncOptions.justCheckIfNeeded)
                         return [2 /*return*/, Promise.reject(error)]; // Just rethrow.
@@ -3988,9 +4021,9 @@ function sync(db, options, schema, syncOptions) {
                     return [4 /*yield*/, new Promise(function (resolve) { return setTimeout(resolve, 500); })];
                 case 1:
                     // Retry again in 500 ms but if it fails again, don't retry.
-                    _e.sent();
-                    return [4 /*yield*/, sync(db, options, schema, __assign(__assign({}, syncOptions), { retryImmediatelyOnFetchError: false }))];
-                case 2: return [2 /*return*/, _e.sent()];
+                    _k.sent();
+                    return [4 /*yield*/, sync(db, options, schema, Object.assign(Object.assign({}, syncOptions), { retryImmediatelyOnFetchError: false }))];
+                case 2: return [2 /*return*/, _k.sent()];
                 case 3: 
                 // Make sure that no matter whether sync() explodes or not,
                 // always update the timestamp. Also store the error.
@@ -4001,7 +4034,7 @@ function sync(db, options, schema, syncOptions) {
                 case 4:
                     // Make sure that no matter whether sync() explodes or not,
                     // always update the timestamp. Also store the error.
-                    _e.sent();
+                    _k.sent();
                     db.syncStateChangedEvent.next({
                         phase: isOnline ? 'error' : 'offline',
                         error: error,
@@ -4011,31 +4044,31 @@ function sync(db, options, schema, syncOptions) {
         });
     }); });
 }
-function _sync(db, options, schema, _e) {
-    var _f;
-    var _g = _e === void 0 ? {
+function _sync(db, options, schema, _k) {
+    var _l = _k === void 0 ? {
         isInitialSync: false,
-    } : _e, isInitialSync = _g.isInitialSync, cancelToken = _g.cancelToken, justCheckIfNeeded = _g.justCheckIfNeeded, purpose = _g.purpose;
+    } : _k, isInitialSync = _l.isInitialSync, cancelToken = _l.cancelToken, justCheckIfNeeded = _l.justCheckIfNeeded, purpose = _l.purpose;
+    var _a;
     return __awaiter$1(this, void 0, void 0, function () {
-        var databaseUrl, currentUser, tablesToSync, mutationTables, persistedSyncState, tablesToSyncify, doSyncify, _h, clientChangeSet, syncState, baseRevs, syncIsNeeded, latestRevisions, clientIdentity, res, done;
+        var databaseUrl, currentUser, tablesToSync, mutationTables, persistedSyncState, tablesToSyncify, doSyncify, _k, clientChangeSet, syncState, baseRevs, syncIsNeeded, latestRevisions, clientIdentity, res, done;
         var _this_1 = this;
-        return __generator$1(this, function (_j) {
-            switch (_j.label) {
+        return __generator$1(this, function (_l) {
+            switch (_l.label) {
                 case 0:
                     if (!justCheckIfNeeded) {
                         console.debug('SYNC STARTED', { isInitialSync: isInitialSync, purpose: purpose });
                     }
-                    if (!((_f = db.cloud.options) === null || _f === void 0 ? void 0 : _f.databaseUrl))
+                    if (!((_a = db.cloud.options) === null || _a === void 0 ? void 0 : _a.databaseUrl))
                         throw new Error("Internal error: sync must not be called when no databaseUrl is configured");
                     databaseUrl = options.databaseUrl;
                     return [4 /*yield*/, db.getCurrentUser()];
                 case 1:
-                    currentUser = _j.sent();
+                    currentUser = _l.sent();
                     tablesToSync = currentUser.isLoggedIn ? getSyncableTables(db) : [];
                     mutationTables = tablesToSync.map(function (tbl) { return db.table(getMutationTable(tbl.name)); });
                     return [4 /*yield*/, db.getPersistedSyncState()];
                 case 2:
-                    persistedSyncState = _j.sent();
+                    persistedSyncState = _l.sent();
                     tablesToSyncify = !isInitialSync && currentUser.isLoggedIn
                         ? getTablesToSyncify(db, persistedSyncState)
                         : [];
@@ -4046,8 +4079,8 @@ function _sync(db, options, schema, _e) {
                         return [2 /*return*/, true];
                     //console.debug('sync doSyncify is true');
                     return [4 /*yield*/, db.transaction('rw', tablesToSyncify, function (tx) { return __awaiter$1(_this_1, void 0, void 0, function () {
-                            return __generator$1(this, function (_e) {
-                                switch (_e.label) {
+                            return __generator$1(this, function (_k) {
+                                switch (_k.label) {
                                     case 0:
                                         // @ts-ignore
                                         tx.idbtrans.disableChangeTracking = true;
@@ -4055,35 +4088,35 @@ function _sync(db, options, schema, _e) {
                                         tx.idbtrans.disableAccessControl = true; // TODO: Take care of this flag in access control middleware!
                                         return [4 /*yield*/, modifyLocalObjectsWithNewUserId(tablesToSyncify, currentUser, persistedSyncState === null || persistedSyncState === void 0 ? void 0 : persistedSyncState.realms)];
                                     case 1:
-                                        _e.sent();
+                                        _k.sent();
                                         return [2 /*return*/];
                                 }
                             });
                         }); })];
                 case 3:
                     //console.debug('sync doSyncify is true');
-                    _j.sent();
+                    _l.sent();
                     throwIfCancelled(cancelToken);
-                    _j.label = 4;
+                    _l.label = 4;
                 case 4: return [4 /*yield*/, db.transaction('r', db.tables, function () { return __awaiter$1(_this_1, void 0, void 0, function () {
                         var syncState, baseRevs, clientChanges, alreadySyncedRealms, syncificationInserts;
-                        return __generator$1(this, function (_e) {
-                            switch (_e.label) {
+                        return __generator$1(this, function (_k) {
+                            switch (_k.label) {
                                 case 0: return [4 /*yield*/, db.getPersistedSyncState()];
                                 case 1:
-                                    syncState = _e.sent();
+                                    syncState = _k.sent();
                                     return [4 /*yield*/, db.$baseRevs.toArray()];
                                 case 2:
-                                    baseRevs = _e.sent();
+                                    baseRevs = _k.sent();
                                     return [4 /*yield*/, listClientChanges(mutationTables)];
                                 case 3:
-                                    clientChanges = _e.sent();
+                                    clientChanges = _k.sent();
                                     throwIfCancelled(cancelToken);
                                     if (!doSyncify) return [3 /*break*/, 5];
                                     alreadySyncedRealms = __spreadArray$1(__spreadArray$1([], ((persistedSyncState === null || persistedSyncState === void 0 ? void 0 : persistedSyncState.realms) || []), true), ((persistedSyncState === null || persistedSyncState === void 0 ? void 0 : persistedSyncState.inviteRealms) || []), true);
                                     return [4 /*yield*/, listSyncifiedChanges(tablesToSyncify, currentUser, schema, alreadySyncedRealms)];
                                 case 4:
-                                    syncificationInserts = _e.sent();
+                                    syncificationInserts = _k.sent();
                                     throwIfCancelled(cancelToken);
                                     clientChanges = clientChanges.concat(syncificationInserts);
                                     return [2 /*return*/, [clientChanges, syncState, baseRevs]];
@@ -4092,7 +4125,7 @@ function _sync(db, options, schema, _e) {
                         });
                     }); })];
                 case 5:
-                    _h = _j.sent(), clientChangeSet = _h[0], syncState = _h[1], baseRevs = _h[2];
+                    _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; }); });
                     if (justCheckIfNeeded) {
                         console.debug('Sync is needed:', syncIsNeeded);
@@ -4110,12 +4143,12 @@ function _sync(db, options, schema, _e) {
                     throwIfCancelled(cancelToken);
                     return [4 /*yield*/, syncWithServer(clientChangeSet, syncState, baseRevs, db, databaseUrl, schema, clientIdentity, currentUser)];
                 case 6:
-                    res = _j.sent();
+                    res = _l.sent();
                     console.debug('Sync response', res);
                     return [4 /*yield*/, db.transaction('rw', db.tables, function (tx) { return __awaiter$1(_this_1, void 0, void 0, function () {
-                            var _e, _f, tableName, addedClientChanges, _loop_5, _g, mutationTables_1, mutTable, syncState, newSyncState, filteredChanges;
-                            return __generator$1(this, function (_h) {
-                                switch (_h.label) {
+                            var _k, _l, tableName, addedClientChanges, _loop_5, _m, mutationTables_1, mutTable, syncState, newSyncState, filteredChanges;
+                            return __generator$1(this, function (_o) {
+                                switch (_o.label) {
                                     case 0:
                                         // @ts-ignore
                                         tx.idbtrans.disableChangeTracking = true;
@@ -4123,8 +4156,8 @@ function _sync(db, options, schema, _e) {
                                         tx.idbtrans.disableAccessControl = true; // TODO: Take care of this flag in access control middleware!
                                         // Update db.cloud.schema from server response.
                                         // Local schema MAY include a subset of tables, so do not force all tables into local schema.
-                                        for (_e = 0, _f = Object.keys(schema); _e < _f.length; _e++) {
-                                            tableName = _f[_e];
+                                        for (_k = 0, _l = Object.keys(schema); _k < _l.length; _k++) {
+                                            tableName = _l[_k];
                                             if (res.schema[tableName]) {
                                                 // Write directly into configured schema. This code can only be executed alone.
                                                 schema[tableName] = res.schema[tableName];
@@ -4132,16 +4165,16 @@ function _sync(db, options, schema, _e) {
                                         }
                                         return [4 /*yield*/, db.$syncState.put(schema, 'schema')];
                                     case 1:
-                                        _h.sent();
+                                        _o.sent();
                                         return [4 /*yield*/, listClientChanges(mutationTables, db, {
                                                 since: latestRevisions,
                                             })];
                                     case 2:
-                                        addedClientChanges = _h.sent();
+                                        addedClientChanges = _o.sent();
                                         _loop_5 = function (mutTable) {
                                             var tableName, latestRev;
-                                            return __generator$1(this, function (_j) {
-                                                switch (_j.label) {
+                                            return __generator$1(this, function (_p) {
+                                                switch (_p.label) {
                                                     case 0:
                                                         tableName = getTableFromMutationTable(mutTable.name);
                                                         if (!!addedClientChanges.some(function (ch) { return ch.table === tableName && ch.muts.length > 0; })) return [3 /*break*/, 2];
@@ -4158,7 +4191,7 @@ function _sync(db, options, schema, _e) {
                                                         // to the server.
                                                         // It is therefore safe to clear all changes (which is faster than
                                                         // deleting a range)
-                                                        _j.sent();
+                                                        _p.sent();
                                                         return [3 /*break*/, 5];
                                                     case 2:
                                                         if (!latestRevisions[tableName]) return [3 /*break*/, 4];
@@ -4173,25 +4206,25 @@ function _sync(db, options, schema, _e) {
                                                                     .delete(),
                                                             ])];
                                                     case 3:
-                                                        _j.sent();
+                                                        _p.sent();
                                                         return [3 /*break*/, 5];
                                                     case 4:
-                                                        _j.label = 5;
+                                                        _p.label = 5;
                                                     case 5: return [2 /*return*/];
                                                 }
                                             });
                                         };
-                                        _g = 0, mutationTables_1 = mutationTables;
-                                        _h.label = 3;
+                                        _m = 0, mutationTables_1 = mutationTables;
+                                        _o.label = 3;
                                     case 3:
-                                        if (!(_g < mutationTables_1.length)) return [3 /*break*/, 6];
-                                        mutTable = mutationTables_1[_g];
+                                        if (!(_m < mutationTables_1.length)) return [3 /*break*/, 6];
+                                        mutTable = mutationTables_1[_m];
                                         return [5 /*yield**/, _loop_5(mutTable)];
                                     case 4:
-                                        _h.sent();
-                                        _h.label = 5;
+                                        _o.sent();
+                                        _o.label = 5;
                                     case 5:
-                                        _g++;
+                                        _m++;
                                         return [3 /*break*/, 3];
                                     case 6:
                                         // Update latestRevisions object according to additional changes:
@@ -4214,10 +4247,10 @@ function _sync(db, options, schema, _e) {
                                         // The purpose of this operation is to mark a start revision (per table)
                                         // so that all client-mutations that come after this, will be mapped to current
                                         // server revision.
-                                        _h.sent();
+                                        _o.sent();
                                         return [4 /*yield*/, db.getPersistedSyncState()];
                                     case 8:
-                                        syncState = _h.sent();
+                                        syncState = _o.sent();
                                         //
                                         // Delete objects from removed realms
                                         //
@@ -4226,7 +4259,7 @@ function _sync(db, options, schema, _e) {
                                         //
                                         // Delete objects from removed realms
                                         //
-                                        _h.sent();
+                                        _o.sent();
                                         newSyncState = syncState || {
                                             syncedTables: [],
                                             latestRevisions: {},
@@ -4254,7 +4287,7 @@ function _sync(db, options, schema, _e) {
                                         //
                                         // apply server changes
                                         //
-                                        _h.sent();
+                                        _o.sent();
                                         //
                                         // Update syncState
                                         //
@@ -4264,11 +4297,11 @@ function _sync(db, options, schema, _e) {
                             });
                         }); })];
                 case 7:
-                    done = _j.sent();
+                    done = _l.sent();
                     if (!!done) return [3 /*break*/, 9];
                     console.debug('MORE SYNC NEEDED. Go for it again!');
                     return [4 /*yield*/, _sync(db, options, schema, { isInitialSync: isInitialSync, cancelToken: cancelToken })];
-                case 8: return [2 /*return*/, _j.sent()];
+                case 8: return [2 /*return*/, _l.sent()];
                 case 9:
                     console.debug('SYNC DONE', { isInitialSync: isInitialSync });
                     return [2 /*return*/, false]; // Not needed anymore
@@ -4278,9 +4311,9 @@ function _sync(db, options, schema, _e) {
 }
 function deleteObjectsFromRemovedRealms(db, res, prevState) {
     return __awaiter$1(this, void 0, void 0, function () {
-        var deletedRealms, rejectedRealms, previousRealmSet, previousInviteRealmSet, updatedRealmSet, updatedTotalRealmSet, _e, previousRealmSet_1, realmId, _f, _g, realmId, tables, _loop_6, _h, tables_1, table;
-        return __generator$1(this, function (_j) {
-            switch (_j.label) {
+        var deletedRealms, rejectedRealms, previousRealmSet, previousInviteRealmSet, updatedRealmSet, updatedTotalRealmSet, _k, previousRealmSet_1, realmId, _l, _m, realmId, tables, _loop_6, _o, tables_1, table;
+        return __generator$1(this, function (_p) {
+            switch (_p.label) {
                 case 0:
                     deletedRealms = new Set();
                     rejectedRealms = new Set();
@@ -4288,8 +4321,8 @@ function deleteObjectsFromRemovedRealms(db, res, prevState) {
                     previousInviteRealmSet = prevState ? prevState.inviteRealms : [];
                     updatedRealmSet = new Set(res.realms);
                     updatedTotalRealmSet = new Set(res.realms.concat(res.inviteRealms));
-                    for (_e = 0, previousRealmSet_1 = previousRealmSet; _e < previousRealmSet_1.length; _e++) {
-                        realmId = previousRealmSet_1[_e];
+                    for (_k = 0, previousRealmSet_1 = previousRealmSet; _k < previousRealmSet_1.length; _k++) {
+                        realmId = previousRealmSet_1[_k];
                         if (!updatedRealmSet.has(realmId)) {
                             rejectedRealms.add(realmId);
                             if (!updatedTotalRealmSet.has(realmId)) {
@@ -4297,8 +4330,8 @@ function deleteObjectsFromRemovedRealms(db, res, prevState) {
                             }
                         }
                     }
-                    for (_f = 0, _g = previousInviteRealmSet.concat(previousRealmSet); _f < _g.length; _f++) {
-                        realmId = _g[_f];
+                    for (_l = 0, _m = previousInviteRealmSet.concat(previousRealmSet); _l < _m.length; _l++) {
+                        realmId = _m[_l];
                         if (!updatedTotalRealmSet.has(realmId)) {
                             deletedRealms.add(realmId);
                         }
@@ -4307,8 +4340,8 @@ function deleteObjectsFromRemovedRealms(db, res, prevState) {
                     tables = getSyncableTables(db);
                     _loop_6 = function (table) {
                         var realmsToDelete;
-                        return __generator$1(this, function (_k) {
-                            switch (_k.label) {
+                        return __generator$1(this, function (_q) {
+                            switch (_q.label) {
                                 case 0:
                                     realmsToDelete = ['realms', 'members', 'roles'].includes(table.name)
                                         ? deletedRealms // These tables should spare rejected ones.
@@ -4326,7 +4359,7 @@ function deleteObjectsFromRemovedRealms(db, res, prevState) {
                                 case 1:
                                     // There's an index to use:
                                     //console.debug(`REMOVAL: deleting all ${table.name} where realmId anyOf `, JSON.stringify([...realmsToDelete]));
-                                    _k.sent();
+                                    _q.sent();
                                     return [3 /*break*/, 4];
                                 case 2: 
                                 // No index to use:
@@ -4337,23 +4370,23 @@ function deleteObjectsFromRemovedRealms(db, res, prevState) {
                                 case 3:
                                     // No index to use:
                                     //console.debug(`REMOVAL: deleting all ${table.name} where realmId is any of `, JSON.stringify([...realmsToDelete]), realmsToDelete.size);
-                                    _k.sent();
-                                    _k.label = 4;
+                                    _q.sent();
+                                    _q.label = 4;
                                 case 4: return [2 /*return*/];
                             }
                         });
                     };
-                    _h = 0, tables_1 = tables;
-                    _j.label = 1;
+                    _o = 0, tables_1 = tables;
+                    _p.label = 1;
                 case 1:
-                    if (!(_h < tables_1.length)) return [3 /*break*/, 4];
-                    table = tables_1[_h];
+                    if (!(_o < tables_1.length)) return [3 /*break*/, 4];
+                    table = tables_1[_o];
                     return [5 /*yield**/, _loop_6(table)];
                 case 2:
-                    _j.sent();
-                    _j.label = 3;
+                    _p.sent();
+                    _p.label = 3;
                 case 3:
-                    _h++;
+                    _o++;
                     return [3 /*break*/, 1];
                 case 4: return [2 /*return*/];
             }
@@ -4377,8 +4410,8 @@ function MessagesFromServerConsumer(db) {
     var loopWarning = 0;
     var loopDetection = [0, 0, 0, 0, 0, 0, 0, 0, 0, Date.now()];
     event.subscribe(function () { return __awaiter$1(_this_1, void 0, void 0, function () {
-        return __generator$1(this, function (_e) {
-            switch (_e.label) {
+        return __generator$1(this, function (_k) {
+            switch (_k.label) {
                 case 0:
                     if (isWorking)
                         return [2 /*return*/];
@@ -4387,12 +4420,12 @@ function MessagesFromServerConsumer(db) {
                     loopDetection.shift();
                     loopDetection.push(Date.now());
                     readyToServe.next(false);
-                    _e.label = 1;
+                    _k.label = 1;
                 case 1:
-                    _e.trys.push([1, , 3, 8]);
+                    _k.trys.push([1, , 3, 8]);
                     return [4 /*yield*/, consumeQueue()];
                 case 2:
-                    _e.sent();
+                    _k.sent();
                     return [3 /*break*/, 8];
                 case 3:
                     if (!(loopDetection[loopDetection.length - 1] - loopDetection[0] <
@@ -4403,7 +4436,7 @@ function MessagesFromServerConsumer(db) {
                     loopWarning = Date.now() + 60000;
                     return [4 /*yield*/, new Promise(function (resolve) { return setTimeout(resolve, 60000); })];
                 case 4:
-                    _e.sent();
+                    _k.sent();
                     return [3 /*break*/, 7];
                 case 5:
                     // This is a one-time event. Just pause 10 seconds.
@@ -4411,8 +4444,8 @@ function MessagesFromServerConsumer(db) {
                     loopWarning = Date.now() + 10000;
                     return [4 /*yield*/, new Promise(function (resolve) { return setTimeout(resolve, 10000); })];
                 case 6:
-                    _e.sent();
-                    _e.label = 7;
+                    _k.sent();
+                    _k.label = 7;
                 case 7:
                     isWorking = false;
                     readyToServe.next(true);
@@ -4426,28 +4459,28 @@ function MessagesFromServerConsumer(db) {
         event.next(null);
     }
     function consumeQueue() {
-        var _e, _f, _g;
+        var _a, _b, _c;
         return __awaiter$1(this, void 0, void 0, function () {
             var _loop_7;
             var _this_1 = this;
-            return __generator$1(this, function (_h) {
-                switch (_h.label) {
+            return __generator$1(this, function (_k) {
+                switch (_k.label) {
                     case 0:
                         _loop_7 = function () {
-                            var msg, persistedSyncState, _j, user, refreshedLogin, error_2;
-                            return __generator$1(this, function (_k) {
-                                switch (_k.label) {
+                            var msg, persistedSyncState, _l, user, refreshedLogin, error_2;
+                            return __generator$1(this, function (_m) {
+                                switch (_m.label) {
                                     case 0:
                                         msg = queue.shift();
-                                        _k.label = 1;
+                                        _m.label = 1;
                                     case 1:
-                                        _k.trys.push([1, 13, , 14]);
+                                        _m.trys.push([1, 13, , 14]);
                                         // 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.
                                         return [4 /*yield*/, db.cloud.syncState
-                                                .pipe(filter(function (_e) {
-                                                var phase = _e.phase;
+                                                .pipe(filter(function (_k) {
+                                                var phase = _k.phase;
                                                 return phase === 'in-sync' || phase === 'error';
                                             }), take(1))
                                                 .toPromise()];
@@ -4455,14 +4488,14 @@ 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.
-                                        _k.sent();
+                                        _m.sent();
                                         console.debug('processing msg', msg);
                                         persistedSyncState = db.cloud.persistedSyncState.value;
                                         //syncState.
                                         if (!msg)
                                             return [2 /*return*/, "continue"];
-                                        _j = msg.type;
-                                        switch (_j) {
+                                        _l = msg.type;
+                                        switch (_l) {
                                             case 'token-expired': return [3 /*break*/, 3];
                                             case 'realm-added': return [3 /*break*/, 6];
                                             case 'realm-accepted': return [3 /*break*/, 7];
@@ -4476,7 +4509,7 @@ function MessagesFromServerConsumer(db) {
                                         user = db.cloud.currentUser.value;
                                         return [4 /*yield*/, refreshAccessToken(db.cloud.options.databaseUrl, user)];
                                     case 4:
-                                        refreshedLogin = _k.sent();
+                                        refreshedLogin = _m.sent();
                                         // Persist updated access token
                                         return [4 /*yield*/, db.table('$logins').update(user.userId, {
                                                 accessToken: refreshedLogin.accessToken,
@@ -4484,7 +4517,7 @@ function MessagesFromServerConsumer(db) {
                                             })];
                                     case 5:
                                         // Persist updated access token
-                                        _k.sent();
+                                        _m.sent();
                                         // Updating $logins will trigger emission of db.cloud.currentUser observable, which
                                         // in turn will lead to that connectWebSocket.ts will reconnect the socket with the
                                         // new token. So we don't need to do anything more here.
@@ -4501,8 +4534,8 @@ function MessagesFromServerConsumer(db) {
                                         return [3 /*break*/, 12];
                                     case 8:
                                         //if (
-                                        ((_e = persistedSyncState === null || persistedSyncState === void 0 ? void 0 : persistedSyncState.realms) === null || _e === void 0 ? void 0 : _e.includes(msg.realm)) ||
-                                            ((_f = persistedSyncState === null || persistedSyncState === void 0 ? void 0 : persistedSyncState.inviteRealms) === null || _f === void 0 ? void 0 : _f.includes(msg.realm));
+                                        ((_a = persistedSyncState === null || persistedSyncState === void 0 ? void 0 : persistedSyncState.realms) === null || _a === void 0 ? void 0 : _a.includes(msg.realm)) ||
+                                            ((_b = persistedSyncState === null || persistedSyncState === void 0 ? void 0 : persistedSyncState.inviteRealms) === null || _b === void 0 ? void 0 : _b.includes(msg.realm));
                                         //) {
                                         triggerSync(db, 'pull');
                                         //}
@@ -4512,14 +4545,14 @@ function MessagesFromServerConsumer(db) {
                                         return [3 /*break*/, 12];
                                     case 10:
                                         console.debug('changes');
-                                        if (((_g = db.cloud.syncState.value) === null || _g === void 0 ? void 0 : _g.phase) === 'error') {
+                                        if (((_c = db.cloud.syncState.value) === null || _c === void 0 ? void 0 : _c.phase) === 'error') {
                                             triggerSync(db, 'pull');
                                             return [3 /*break*/, 12];
                                         }
                                         return [4 /*yield*/, db.transaction('rw', db.dx.tables, function (tx) { return __awaiter$1(_this_1, void 0, void 0, function () {
-                                                var _e, schema, syncState, currentUser, ourRealmSetHash, clientChanges, mutationTables, filteredChanges;
-                                                return __generator$1(this, function (_f) {
-                                                    switch (_f.label) {
+                                                var _k, schema, syncState, currentUser, ourRealmSetHash, clientChanges, mutationTables, filteredChanges;
+                                                return __generator$1(this, function (_l) {
+                                                    switch (_l.label) {
                                                         case 0:
                                                             // @ts-ignore
                                                             tx.idbtrans.disableChangeTracking = true;
@@ -4531,7 +4564,7 @@ function MessagesFromServerConsumer(db) {
                                                                     db.getCurrentUser(),
                                                                 ])];
                                                         case 1:
-                                                            _e = _f.sent(), schema = _e[0], syncState = _e[1], currentUser = _e[2];
+                                                            _k = _l.sent(), schema = _k[0], syncState = _k[1], currentUser = _k[2];
                                                             console.debug('ws message queue: in transaction');
                                                             if (!syncState || !schema || !currentUser) {
                                                                 console.debug('required vars not present', {
@@ -4566,7 +4599,7 @@ function MessagesFromServerConsumer(db) {
                                                                 // Keep TX in non-IDB work
                                                                 computeRealmSetHash(syncState))];
                                                         case 2:
-                                                            ourRealmSetHash = _f.sent();
+                                                            ourRealmSetHash = _l.sent();
                                                             console.debug('ourRealmSetHash', ourRealmSetHash);
                                                             if (ourRealmSetHash !== msg.realmSetHash) {
                                                                 console.debug('not same realmSetHash', msg.realmSetHash);
@@ -4580,9 +4613,9 @@ function MessagesFromServerConsumer(db) {
                                                             mutationTables = getSyncableTables(db).map(function (tbl) { return db.table(getMutationTable(tbl.name)); });
                                                             return [4 /*yield*/, listClientChanges(mutationTables)];
                                                         case 3:
-                                                            clientChanges = _f.sent();
+                                                            clientChanges = _l.sent();
                                                             console.debug('msg queue: client changes', clientChanges);
-                                                            _f.label = 4;
+                                                            _l.label = 4;
                                                         case 4:
                                                             if (!(msg.changes.length > 0)) return [3 /*break*/, 6];
                                                             filteredChanges = filterServerChangesThroughAddedClientChanges(msg.changes, clientChanges);
@@ -4592,8 +4625,8 @@ function MessagesFromServerConsumer(db) {
                                                             console.debug('applying filtered server changes', filteredChanges);
                                                             return [4 /*yield*/, applyServerChanges(filteredChanges, db)];
                                                         case 5:
-                                                            _f.sent();
-                                                            _f.label = 6;
+                                                            _l.sent();
+                                                            _l.label = 6;
                                                         case 6:
                                                             // Update latest revisions per table in case there are unsynced changes
                                                             // This can be a real case in future when we allow non-eagery sync.
@@ -4604,37 +4637,37 @@ function MessagesFromServerConsumer(db) {
                                                             console.debug('Updating baseRefs', syncState.latestRevisions);
                                                             return [4 /*yield*/, updateBaseRevs(db, schema, syncState.latestRevisions, msg.newRev)];
                                                         case 7:
-                                                            _f.sent();
+                                                            _l.sent();
                                                             //
                                                             // Update syncState
                                                             //
                                                             console.debug('Updating syncState', syncState);
                                                             return [4 /*yield*/, db.$syncState.put(syncState, 'syncState')];
                                                         case 8:
-                                                            _f.sent();
+                                                            _l.sent();
                                                             return [2 /*return*/];
                                                     }
                                                 });
                                             }); })];
                                     case 11:
-                                        _k.sent();
+                                        _m.sent();
                                         console.debug('msg queue: done with rw transaction');
                                         return [3 /*break*/, 12];
                                     case 12: return [3 /*break*/, 14];
                                     case 13:
-                                        error_2 = _k.sent();
+                                        error_2 = _m.sent();
                                         console.error("Error in msg queue", error_2);
                                         return [3 /*break*/, 14];
                                     case 14: return [2 /*return*/];
                                 }
                             });
                         };
-                        _h.label = 1;
+                        _k.label = 1;
                     case 1:
                         if (!(queue.length > 0)) return [3 /*break*/, 3];
                         return [5 /*yield**/, _loop_7()];
                     case 2:
-                        _h.sent();
+                        _k.sent();
                         return [3 /*break*/, 1];
                     case 3: return [2 /*return*/];
                 }
@@ -4776,10 +4809,10 @@ function toStringTag(o) {
     return toString.call(o).slice(8, -1);
 }
 function getEffectiveKeys(primaryKey, req) {
-    var _e;
+    var _a;
     if (req.type === 'delete')
         return req.keys;
-    return ((_e = req.keys) === null || _e === void 0 ? void 0 : _e.slice()) || req.values.map(primaryKey.extractKey);
+    return ((_a = req.keys) === null || _a === void 0 ? void 0 : _a.slice()) || req.values.map(primaryKey.extractKey);
 }
 function applyToUpperBitFix(orig, bits) {
     return ((bits & 1 ? orig[0].toUpperCase() : orig[0].toLowerCase()) +
@@ -4869,7 +4902,7 @@ function createIdGenerationMiddleware(db) {
         name: 'idGenerationMiddleware',
         level: 1,
         create: function (core) {
-            return __assign(__assign({}, core), { table: function (tableName) {
+            return Object.assign(Object.assign({}, core), { table: function (tableName) {
                     var table = core.table(tableName);
                     function generateOrVerifyAtKeys(req, idPrefix) {
                         var valueClones = null;
@@ -4895,17 +4928,17 @@ function createIdGenerationMiddleware(db) {
                                     "If you want to generate IDs programmatically, remove '@' from the schema to get rid of this constraint. Dexie Cloud supports custom IDs as long as they are random and globally unique.");
                             }
                         });
-                        return table.mutate(__assign(__assign({}, req), { keys: keys, values: valueClones || req.values }));
+                        return table.mutate(Object.assign(Object.assign({}, req), { keys: keys, values: valueClones || req.values }));
                     }
-                    return __assign(__assign({}, table), { mutate: function (req) {
-                            var _e, _f;
+                    return Object.assign(Object.assign({}, table), { mutate: function (req) {
+                            var _a, _b;
                             // @ts-ignore
                             if (req.trans.disableChangeTracking) {
                                 // Disable ID policy checks and ID generation
                                 return table.mutate(req);
                             }
                             if (req.type === 'add' || req.type === 'put') {
-                                var cloudTableSchema = (_e = db.cloud.schema) === null || _e === void 0 ? void 0 : _e[tableName];
+                                var cloudTableSchema = (_a = db.cloud.schema) === null || _a === void 0 ? void 0 : _a[tableName];
                                 if (!(cloudTableSchema === null || cloudTableSchema === void 0 ? void 0 : cloudTableSchema.generatedGlobalId)) {
                                     if (cloudTableSchema === null || cloudTableSchema === void 0 ? void 0 : cloudTableSchema.markedForSync) {
                                         // Just make sure primary key is of a supported type:
@@ -4921,7 +4954,7 @@ function createIdGenerationMiddleware(db) {
                                     }
                                 }
                                 else {
-                                    if (((_f = db.cloud.options) === null || _f === void 0 ? void 0 : _f.databaseUrl) && !db.initiallySynced) {
+                                    if (((_b = db.cloud.options) === null || _b === void 0 ? void 0 : _b.databaseUrl) && !db.initiallySynced) {
                                         // A database URL is configured but no initial sync has been performed.
                                         var keys_1 = getEffectiveKeys(table.schema.primaryKey, req);
                                         // Check if the operation would yield any INSERT. If so, complain! We never want wrong ID prefixes stored.
@@ -4953,31 +4986,31 @@ function createImplicitPropSetterMiddleware(db) {
         name: 'implicitPropSetterMiddleware',
         level: 1,
         create: function (core) {
-            return __assign(__assign({}, core), { table: function (tableName) {
+            return Object.assign(Object.assign({}, core), { table: function (tableName) {
                     var table = core.table(tableName);
-                    return __assign(__assign({}, table), { mutate: function (req) {
-                            var _e, _f, _g, _h;
+                    return Object.assign(Object.assign({}, table), { mutate: function (req) {
+                            var _a, _b, _c, _d;
                             // @ts-ignore
                             if (req.trans.disableChangeTracking) {
                                 return table.mutate(req);
                             }
                             var trans = req.trans;
-                            if ((_f = (_e = db.cloud.schema) === null || _e === void 0 ? void 0 : _e[tableName]) === null || _f === void 0 ? void 0 : _f.markedForSync) {
+                            if ((_b = (_a = db.cloud.schema) === null || _a === void 0 ? void 0 : _a[tableName]) === null || _b === void 0 ? void 0 : _b.markedForSync) {
                                 if (req.type === 'add' || req.type === 'put') {
                                     // No matter if user is logged in or not, make sure "owner" and "realmId" props are set properly.
                                     // If not logged in, this will be changed upon syncification of the tables (next sync after login),
                                     // however, application code will work better if we can always rely on that the properties realmId
                                     // and owner are set. Application code may index them and query them based on db.cloud.currentUserId,
                                     // and expect them to be returned. That scenario must work also when db.cloud.currentUserId === 'unauthorized'.
-                                    for (var _j = 0, _k = req.values; _j < _k.length; _j++) {
-                                        var obj = _k[_j];
+                                    for (var _k = 0, _l = req.values; _k < _l.length; _k++) {
+                                        var obj = _l[_k];
                                         if (!obj.owner) {
                                             obj.owner = trans.currentUser.userId;
                                         }
                                         if (!obj.realmId) {
                                             obj.realmId = trans.currentUser.userId;
                                         }
-                                        var key = (_h = (_g = table.schema.primaryKey).extractKey) === null || _h === void 0 ? void 0 : _h.call(_g, obj);
+                                        var key = (_d = (_c = table.schema.primaryKey).extractKey) === null || _d === void 0 ? void 0 : _d.call(_c, obj);
                                         if (typeof key === 'string' && key[0] === '#') {
                                             // Add $ts prop for put operations and
                                             // disable update operations as well as consistent
@@ -5022,11 +5055,11 @@ function allSettled(possiblePromises) {
 var counter$1 = 0;
 function guardedTable(table) {
     var prop = "$lock" + (++counter$1);
-    return __assign(__assign({}, table), { count: readLock(table.count, prop), get: readLock(table.get, prop), getMany: readLock(table.getMany, prop), openCursor: readLock(table.openCursor, prop), query: readLock(table.query, prop), mutate: writeLock(table.mutate, prop) });
+    return Object.assign(Object.assign({}, table), { count: readLock(table.count, prop), get: readLock(table.get, prop), getMany: readLock(table.getMany, prop), openCursor: readLock(table.openCursor, prop), query: readLock(table.query, prop), mutate: writeLock(table.mutate, prop) });
 }
 function readLock(fn, prop) {
     return function readLocker(req) {
-        var _e = req.trans[prop] || (req.trans[prop] = { writers: [], readers: [] }), readers = _e.readers, writers = _e.writers;
+        var _k = req.trans[prop] || (req.trans[prop] = { writers: [], readers: [] }), readers = _k.readers, writers = _k.writers;
         var numWriters = writers.length;
         var promise = (numWriters > 0
             ? writers[numWriters - 1].then(function () { return fn(req); }, function () { return fn(req); })
@@ -5037,7 +5070,7 @@ function readLock(fn, prop) {
 }
 function writeLock(fn, prop) {
     return function writeLocker(req) {
-        var _e = req.trans[prop] || (req.trans[prop] = { writers: [], readers: [] }), readers = _e.readers, writers = _e.writers;
+        var _k = req.trans[prop] || (req.trans[prop] = { writers: [], readers: [] }), readers = _k.readers, writers = _k.writers;
         var promise = (writers.length > 0
             ? writers[writers.length - 1].then(function () { return fn(req); }, function () { return fn(req); })
             : readers.length > 0
@@ -5056,8 +5089,8 @@ var outstandingTransactions = new BehaviorSubject(new Set());
  * changes to server and cleanup the tracked mutations once the server has
  * ackowledged that it got them.
  */
-function createMutationTrackingMiddleware(_e) {
-    var currentUserObservable = _e.currentUserObservable, db = _e.db;
+function createMutationTrackingMiddleware(_k) {
+    var currentUserObservable = _k.currentUserObservable, db = _k.db;
     return {
         stack: 'dbcore',
         name: 'MutationTrackingMiddleware',
@@ -5071,14 +5104,14 @@ function createMutationTrackingMiddleware(_e) {
                     core.table("$".concat(tbl.name, "_mutations"))
                 ]; }));
             }
-            catch (_e) {
+            catch (_a) {
                 throwVersionIncrementNeeded();
             }
-            return __assign(__assign({}, core), { transaction: function (tables, mode) {
+            return Object.assign(Object.assign({}, core), { transaction: function (tables, mode) {
                     var tx;
                     if (mode === 'readwrite') {
                         var mutationTables = tables
-                            .filter(function (tbl) { var _e, _f; return (_f = (_e = db.cloud.schema) === null || _e === void 0 ? void 0 : _e[tbl]) === null || _f === void 0 ? void 0 : _f.markedForSync; })
+                            .filter(function (tbl) { var _a, _b; return (_b = (_a = db.cloud.schema) === null || _a === void 0 ? void 0 : _a[tbl]) === null || _b === void 0 ? void 0 : _b.markedForSync; })
                             .map(function (tbl) { return getMutationTable(tbl); });
                         tx = core.transaction(__spreadArray$1(__spreadArray$1([], tables, true), mutationTables, true), mode);
                     }
@@ -5101,8 +5134,8 @@ function createMutationTrackingMiddleware(_e) {
                             outstandingTransactions.next(outstandingTransactions.value);
                         };
                         var txComplete_1 = function () {
-                            var _e;
-                            if (tx.mutationsAdded && ((_e = db.cloud.options) === null || _e === void 0 ? void 0 : _e.databaseUrl)) {
+                            var _a;
+                            if (tx.mutationsAdded && ((_a = db.cloud.options) === null || _a === void 0 ? void 0 : _a.databaseUrl)) {
                                 if (db.cloud.usingServiceWorker) {
                                     console.debug('registering sync event');
                                     registerSyncEvent(db, "push");
@@ -5126,7 +5159,7 @@ function createMutationTrackingMiddleware(_e) {
                             // make sure to set the mutationsAdded flag on transaction.
                             // This is also done in mutateAndLog() as that function talks to a
                             // lower level DBCore and wouldn't be catched by this code.
-                            return __assign(__assign({}, table), { mutate: function (req) {
+                            return Object.assign(Object.assign({}, table), { mutate: function (req) {
                                     if (req.type === 'add' || req.type === 'put') {
                                         req.trans.mutationsAdded = true;
                                     }
@@ -5134,7 +5167,7 @@ function createMutationTrackingMiddleware(_e) {
                                 } });
                         }
                         else if (tableName === '$logins') {
-                            return __assign(__assign({}, table), { mutate: function (req) {
+                            return Object.assign(Object.assign({}, table), { mutate: function (req) {
                                     //console.debug('Mutating $logins table', req);
                                     return table
                                         .mutate(req)
@@ -5156,16 +5189,16 @@ function createMutationTrackingMiddleware(_e) {
                     }
                     var schema = table.schema;
                     var mutsTable = mutTableMap.get(tableName);
-                    return guardedTable(__assign(__assign({}, table), { mutate: function (req) {
-                            var _e, _f, _g;
+                    return guardedTable(Object.assign(Object.assign({}, table), { mutate: function (req) {
+                            var _a, _b, _c;
                             var trans = req.trans;
                             if (!trans.txid)
                                 return table.mutate(req); // Upgrade transactions not guarded by us.
                             if (trans.disableChangeTracking)
                                 return table.mutate(req);
-                            if (!((_f = (_e = db.cloud.schema) === null || _e === void 0 ? void 0 : _e[tableName]) === null || _f === void 0 ? void 0 : _f.markedForSync))
+                            if (!((_b = (_a = db.cloud.schema) === null || _a === void 0 ? void 0 : _a[tableName]) === null || _b === void 0 ? void 0 : _b.markedForSync))
                                 return table.mutate(req);
-                            if (!((_g = trans.currentUser) === null || _g === void 0 ? void 0 : _g.isLoggedIn)) {
+                            if (!((_c = trans.currentUser) === null || _c === void 0 ? void 0 : _c.isLoggedIn)) {
                                 // Unauthorized user should not log mutations.
                                 // Instead, after login all local data should be logged at once.
                                 return table.mutate(req);
@@ -5265,7 +5298,7 @@ function createMutationTrackingMiddleware(_e) {
 }
 function overrideParseStoresSpec(origFunc, dexie) {
     return function (stores, dbSchema) {
-        var storesClone = __assign(__assign({}, DEXIE_CLOUD_SCHEMA), stores);
+        var storesClone = Object.assign(Object.assign({}, DEXIE_CLOUD_SCHEMA), stores);
         var cloudSchema = dexie.cloud.schema || (dexie.cloud.schema = {});
         var allPrefixes = new Set();
         Object.keys(storesClone).forEach(function (tableName) {
@@ -5296,160 +5329,16 @@ function overrideParseStoresSpec(origFunc, dexie) {
         return rv;
     };
 }
-var SECONDS = 1000;
-var MINUTES = 60 * SECONDS;
-var myId = randomString(16);
-var GUARDED_JOB_HEARTBEAT = 1 * SECONDS;
-var GUARDED_JOB_TIMEOUT = 1 * MINUTES;
-function performGuardedJob(db, jobName, jobsTableName, job, _e) {
-    var _f = _e === void 0 ? {} : _e, awaitRemoteJob = _f.awaitRemoteJob;
-    return __awaiter$1(this, void 0, void 0, function () {
-        function aquireLock() {
-            return __awaiter$1(this, void 0, void 0, function () {
-                var gotTheLock, jobDoneObservable, err_1;
-                var _this_1 = this;
-                return __generator$1(this, function (_e) {
-                    switch (_e.label) {
-                        case 0: return [4 /*yield*/, db.transaction('rw!', jobsTableName, function () { return __awaiter$1(_this_1, void 0, void 0, function () {
-                                var currentWork;
-                                return __generator$1(this, function (_e) {
-                                    switch (_e.label) {
-                                        case 0: return [4 /*yield*/, jobsTable.get(jobName)];
-                                        case 1:
-                                            currentWork = _e.sent();
-                                            if (!!currentWork) return [3 /*break*/, 3];
-                                            // No one else is working. Let's record that we are.
-                                            return [4 /*yield*/, jobsTable.add({
-                                                    nodeId: myId,
-                                                    started: new Date(),
-                                                    heartbeat: new Date()
-                                                }, jobName)];
-                                        case 2:
-                                            // No one else is working. Let's record that we are.
-                                            _e.sent();
-                                            return [2 /*return*/, true];
-                                        case 3:
-                                            if (!(currentWork.heartbeat.getTime() <
-                                                Date.now() - GUARDED_JOB_TIMEOUT)) return [3 /*break*/, 5];
-                                            console.warn("Latest ".concat(jobName, " worker seem to have died.\n"), "The dead job started:", currentWork.started, "\n", "Last heart beat was:", currentWork.heartbeat, '\n', "We're now taking over!");
-                                            // Now, take over!
-                                            return [4 /*yield*/, jobsTable.put({
-                                                    nodeId: myId,
-                                                    started: new Date(),
-                                                    heartbeat: new Date()
-                                                }, jobName)];
-                                        case 4:
-                                            // Now, take over!
-                                            _e.sent();
-                                            return [2 /*return*/, true];
-                                        case 5: return [2 /*return*/, false];
-                                    }
-                                });
-                            }); })];
-                        case 1:
-                            gotTheLock = _e.sent();
-                            if (gotTheLock)
-                                return [2 /*return*/, true];
-                            if (!awaitRemoteJob) return [3 /*break*/, 6];
-                            _e.label = 2;
-                        case 2:
-                            _e.trys.push([2, 4, , 6]);
-                            jobDoneObservable = from$1(liveQuery(function () { return jobsTable.get(jobName); })).pipe(timeout(GUARDED_JOB_TIMEOUT), filter(function (job) { return !job; }));
-                            return [4 /*yield*/, jobDoneObservable.toPromise()];
-                        case 3:
-                            _e.sent();
-                            return [2 /*return*/, false];
-                        case 4:
-                            err_1 = _e.sent();
-                            if (err_1.name !== 'TimeoutError') {
-                                throw err_1;
-                            }
-                            return [4 /*yield*/, aquireLock()];
-                        case 5: 
-                        // Timeout stopped us! Try aquire the lock now.
-                        // It will likely succeed this time unless
-                        // another client took it.
-                        return [2 /*return*/, _e.sent()];
-                        case 6: return [2 /*return*/, false];
-                    }
-                });
-            });
-        }
-        var jobsTable, heartbeat;
-        var _this_1 = this;
-        return __generator$1(this, function (_g) {
-            switch (_g.label) {
-                case 0:
-                    jobsTable = db.table(jobsTableName);
-                    return [4 /*yield*/, aquireLock()];
-                case 1:
-                    if (!_g.sent()) return [3 /*break*/, 6];
-                    heartbeat = setInterval(function () {
-                        jobsTable.update(jobName, function (job) {
-                            if (job.nodeId === myId) {
-                                job.heartbeat = new Date();
-                            }
-                        });
-                    }, GUARDED_JOB_HEARTBEAT);
-                    _g.label = 2;
-                case 2:
-                    _g.trys.push([2, , 4, 6]);
-                    return [4 /*yield*/, job()];
-                case 3: return [2 /*return*/, _g.sent()];
-                case 4:
-                    // Stop heartbeat
-                    clearInterval(heartbeat);
-                    // Remove the persisted job state:
-                    return [4 /*yield*/, db.transaction('rw!', jobsTableName, function () { return __awaiter$1(_this_1, void 0, void 0, function () {
-                            var currentWork;
-                            return __generator$1(this, function (_e) {
-                                switch (_e.label) {
-                                    case 0: return [4 /*yield*/, jobsTable.get(jobName)];
-                                    case 1:
-                                        currentWork = _e.sent();
-                                        if (currentWork && currentWork.nodeId === myId) {
-                                            jobsTable.delete(jobName);
-                                        }
-                                        return [2 /*return*/];
-                                }
-                            });
-                        }); })];
-                case 5:
-                    // Remove the persisted job state:
-                    _g.sent();
-                    return [7 /*endfinally*/];
-                case 6: return [2 /*return*/];
-            }
-        });
-    });
-}
 function performInitialSync(db, cloudOptions, cloudSchema) {
     return __awaiter$1(this, void 0, void 0, function () {
-        var _this_1 = this;
-        return __generator$1(this, function (_e) {
-            switch (_e.label) {
+        return __generator$1(this, function (_k) {
+            switch (_k.label) {
                 case 0:
-                    console.debug("Performing initial sync");
-                    return [4 /*yield*/, performGuardedJob(db, 'initialSync', '$jobs', function () { return __awaiter$1(_this_1, void 0, void 0, function () {
-                            var syncState;
-                            return __generator$1(this, function (_e) {
-                                switch (_e.label) {
-                                    case 0: return [4 /*yield*/, db.getPersistedSyncState()];
-                                    case 1:
-                                        syncState = _e.sent();
-                                        if (!!(syncState === null || syncState === void 0 ? void 0 : syncState.initiallySynced)) return [3 /*break*/, 3];
-                                        return [4 /*yield*/, sync(db, cloudOptions, cloudSchema, { isInitialSync: true })];
-                                    case 2:
-                                        _e.sent();
-                                        _e.label = 3;
-                                    case 3: return [2 /*return*/];
-                                }
-                            });
-                        }); }, { awaitRemoteJob: true } // Don't return until the job is done!
-                        )];
+                    console.debug('Performing initial sync');
+                    return [4 /*yield*/, sync(db, cloudOptions, cloudSchema, { isInitialSync: true })];
                 case 1:
-                    _e.sent();
-                    console.debug("Done initial sync");
+                    _k.sent();
+                    console.debug('Done initial sync');
                     return [2 /*return*/];
             }
         });
@@ -5574,7 +5463,7 @@ var WSConnection = /** @class */ (function (_super_1) {
             try {
                 this.ws.close();
             }
-            catch (_e) { }
+            catch (_a) { }
         }
         this.ws = null;
         if (this.messageProducerSubscription) {
@@ -5590,7 +5479,7 @@ var WSConnection = /** @class */ (function (_super_1) {
         try {
             this.disconnect();
         }
-        catch (_e) { }
+        catch (_a) { }
         this.connect()
             .catch(function () { })
             .then(function () { return (_this_1.reconnecting = false); }); // finally()
@@ -5599,8 +5488,8 @@ var WSConnection = /** @class */ (function (_super_1) {
         return __awaiter$1(this, void 0, void 0, function () {
             var wsUrl, searchParams, ws, everConnected_1;
             var _this_1 = this;
-            return __generator$1(this, function (_e) {
-                switch (_e.label) {
+            return __generator$1(this, function (_k) {
+                switch (_k.label) {
                     case 0:
                         this.lastServerActivity = new Date();
                         if (this.pauseUntil && this.pauseUntil > new Date()) {
@@ -5626,7 +5515,7 @@ var WSConnection = /** @class */ (function (_super_1) {
                         this.webSocketStatus.next('connecting');
                         this.pinger = setInterval(function () { return __awaiter$1(_this_1, void 0, void 0, function () {
                             var _this_1 = this;
-                            return __generator$1(this, function (_e) {
+                            return __generator$1(this, function (_k) {
                                 if (this.closed) {
                                     console.debug('pinger check', this.id, 'CLOSED.');
                                     this.teardown();
@@ -5656,7 +5545,7 @@ var WSConnection = /** @class */ (function (_super_1) {
                                             }
                                         }, SERVER_PING_TIMEOUT);
                                     }
-                                    catch (_f) {
+                                    catch (_a) {
                                         console.debug('pinger catch error', this.id, 'reconnecting');
                                         this.reconnect();
                                     }
@@ -5711,9 +5600,9 @@ var WSConnection = /** @class */ (function (_super_1) {
                                 _this_1.subscriber.error(e);
                             }
                         };
-                        _e.label = 1;
+                        _k.label = 1;
                     case 1:
-                        _e.trys.push([1, 3, , 4]);
+                        _k.trys.push([1, 3, , 4]);
                         everConnected_1 = false;
                         return [4 /*yield*/, new Promise(function (resolve, reject) {
                                 ws.onopen = function (event) {
@@ -5734,20 +5623,20 @@ var WSConnection = /** @class */ (function (_super_1) {
                                 };
                             })];
                     case 2:
-                        _e.sent();
+                        _k.sent();
                         this.messageProducerSubscription = this.messageProducer.subscribe(function (msg) {
-                            var _e;
+                            var _a;
                             if (!_this_1.closed) {
                                 if (msg.type === 'ready' &&
                                     _this_1.webSocketStatus.value !== 'connected') {
                                     _this_1.webSocketStatus.next('connected');
                                 }
-                                (_e = _this_1.ws) === null || _e === void 0 ? void 0 : _e.send(TSON.stringify(msg));
+                                (_a = _this_1.ws) === null || _a === void 0 ? void 0 : _a.send(TSON.stringify(msg));
                             }
                         });
                         return [3 /*break*/, 4];
                     case 3:
-                        _e.sent();
+                        _k.sent();
                         this.pauseUntil = new Date(Date.now() + FAIL_RETRY_WAIT_TIME);
                         return [3 /*break*/, 4];
                     case 4: return [2 /*return*/];
@@ -5762,20 +5651,20 @@ function sleep(ms) {
 }
 function waitAndReconnectWhenUserDoesSomething(error) {
     return __awaiter$1(this, void 0, void 0, function () {
-        return __generator$1(this, function (_e) {
-            switch (_e.label) {
+        return __generator$1(this, function (_k) {
+            switch (_k.label) {
                 case 0:
                     console.error("WebSocket observable: error but revive when user does some active thing...", error);
                     // Sleep some seconds...
                     return [4 /*yield*/, sleep(3000)];
                 case 1:
                     // Sleep some seconds...
-                    _e.sent();
+                    _k.sent();
                     // Wait til user does something (move mouse, tap, scroll, click etc)
                     console.debug('waiting for someone to do something');
                     return [4 /*yield*/, userDoesSomething.pipe(take(1)).toPromise()];
                 case 2:
-                    _e.sent();
+                    _k.sent();
                     console.debug('someone did something!');
                     return [2 /*return*/];
             }
@@ -5783,8 +5672,8 @@ function waitAndReconnectWhenUserDoesSomething(error) {
     });
 }
 function connectWebSocket(db) {
-    var _e;
-    if (!((_e = db.cloud.options) === null || _e === void 0 ? void 0 : _e.databaseUrl)) {
+    var _a;
+    if (!((_a = db.cloud.options) === null || _a === void 0 ? void 0 : _a.databaseUrl)) {
         throw new Error("No database URL to connect WebSocket to");
     }
     var messageProducer = db.messageConsumer.readyToServe.pipe(filter(function (isReady) { return isReady; }), // When consumer is ready for new messages, produce such a message to inform server about it
@@ -5799,21 +5688,21 @@ function connectWebSocket(db) {
         var _this_1 = this;
         return db.cloud.persistedSyncState.pipe(filter(function (syncState) { return 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(function (syncState) { return db.cloud.currentUser.pipe(map(function (userLogin) { return [userLogin, syncState]; })); }), switchMap(function (_e) {
-            var userLogin = _e[0], syncState = _e[1];
+        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 (_e) {
-            var userLogin = _e[0], syncState = _e[1];
-            return __awaiter$1(_this_1, void 0, void 0, function () { var _f; return __generator$1(this, function (_g) {
-                switch (_g.label) {
+        }), switchMap(function (_k) {
+            var userLogin = _k[0], syncState = _k[1];
+            return __awaiter$1(_this_1, void 0, void 0, function () { var _k; return __generator$1(this, function (_l) {
+                switch (_l.label) {
                     case 0:
-                        _f = [userLogin];
+                        _k = [userLogin];
                         return [4 /*yield*/, computeRealmSetHash(syncState)];
-                    case 1: return [2 /*return*/, _f.concat([_g.sent()])];
+                    case 1: return [2 /*return*/, _k.concat([_l.sent()])];
                 }
             }); });
-        }), switchMap(function (_e) {
-            var userLogin = _e[0], realmSetHash = _e[1];
+        }), switchMap(function (_k) {
+            var userLogin = _k[0], realmSetHash = _k[1];
             // 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.
@@ -5825,14 +5714,14 @@ function connectWebSocket(db) {
                 console.debug('WebSocket observable: Token expired. Refreshing token...');
                 return of(true).pipe(switchMap(function () { return __awaiter$1(_this_1, void 0, void 0, function () {
                     var user, refreshedLogin;
-                    return __generator$1(this, function (_e) {
-                        switch (_e.label) {
+                    return __generator$1(this, function (_k) {
+                        switch (_k.label) {
                             case 0: return [4 /*yield*/, db.getCurrentUser()];
                             case 1:
-                                user = _e.sent();
+                                user = _k.sent();
                                 return [4 /*yield*/, refreshAccessToken(db.cloud.options.databaseUrl, user)];
                             case 2:
-                                refreshedLogin = _e.sent();
+                                refreshedLogin = _k.sent();
                                 // Persist updated access token
                                 return [4 /*yield*/, db.table('$logins').update(user.userId, {
                                         accessToken: refreshedLogin.accessToken,
@@ -5840,7 +5729,7 @@ function connectWebSocket(db) {
                                     })];
                             case 3:
                                 // Persist updated access token
-                                _e.sent();
+                                _k.sent();
                                 return [2 /*return*/];
                         }
                     });
@@ -5866,21 +5755,150 @@ function connectWebSocket(db) {
     });
 }
 function isSyncNeeded(db) {
-    var _e;
+    var _a;
     return __awaiter$1(this, void 0, void 0, function () {
-        var _f;
-        return __generator$1(this, function (_g) {
-            switch (_g.label) {
+        var _k;
+        return __generator$1(this, function (_l) {
+            switch (_l.label) {
                 case 0:
-                    if (!(((_e = db.cloud.options) === null || _e === void 0 ? void 0 : _e.databaseUrl) && db.cloud.schema)) return [3 /*break*/, 2];
+                    if (!(((_a = db.cloud.options) === null || _a === void 0 ? void 0 : _a.databaseUrl) && db.cloud.schema)) return [3 /*break*/, 2];
                     return [4 /*yield*/, sync(db, db.cloud.options, db.cloud.schema, { justCheckIfNeeded: true })];
                 case 1:
-                    _f = _g.sent();
+                    _k = _l.sent();
                     return [3 /*break*/, 3];
                 case 2:
-                    _f = false;
-                    _g.label = 3;
-                case 3: return [2 /*return*/, _f];
+                    _k = false;
+                    _l.label = 3;
+                case 3: return [2 /*return*/, _k];
+            }
+        });
+    });
+}
+var SECONDS = 1000;
+var MINUTES = 60 * SECONDS;
+var myId = randomString(16);
+var GUARDED_JOB_HEARTBEAT = 1 * SECONDS;
+var GUARDED_JOB_TIMEOUT = 1 * MINUTES;
+function performGuardedJob(db, jobName, jobsTableName, job, _k) {
+    var _l = _k === void 0 ? {} : _k, awaitRemoteJob = _l.awaitRemoteJob;
+    return __awaiter$1(this, void 0, void 0, function () {
+        function aquireLock() {
+            return __awaiter$1(this, void 0, void 0, function () {
+                var gotTheLock, jobDoneObservable, err_1;
+                var _this_1 = this;
+                return __generator$1(this, function (_k) {
+                    switch (_k.label) {
+                        case 0: return [4 /*yield*/, db.transaction('rw!', jobsTableName, function () { return __awaiter$1(_this_1, void 0, void 0, function () {
+                                var currentWork;
+                                return __generator$1(this, function (_k) {
+                                    switch (_k.label) {
+                                        case 0: return [4 /*yield*/, jobsTable.get(jobName)];
+                                        case 1:
+                                            currentWork = _k.sent();
+                                            if (!!currentWork) return [3 /*break*/, 3];
+                                            // No one else is working. Let's record that we are.
+                                            return [4 /*yield*/, jobsTable.add({
+                                                    nodeId: myId,
+                                                    started: new Date(),
+                                                    heartbeat: new Date()
+                                                }, jobName)];
+                                        case 2:
+                                            // No one else is working. Let's record that we are.
+                                            _k.sent();
+                                            return [2 /*return*/, true];
+                                        case 3:
+                                            if (!(currentWork.heartbeat.getTime() <
+                                                Date.now() - GUARDED_JOB_TIMEOUT)) return [3 /*break*/, 5];
+                                            console.warn("Latest ".concat(jobName, " worker seem to have died.\n"), "The dead job started:", currentWork.started, "\n", "Last heart beat was:", currentWork.heartbeat, '\n', "We're now taking over!");
+                                            // Now, take over!
+                                            return [4 /*yield*/, jobsTable.put({
+                                                    nodeId: myId,
+                                                    started: new Date(),
+                                                    heartbeat: new Date()
+                                                }, jobName)];
+                                        case 4:
+                                            // Now, take over!
+                                            _k.sent();
+                                            return [2 /*return*/, true];
+                                        case 5: return [2 /*return*/, false];
+                                    }
+                                });
+                            }); })];
+                        case 1:
+                            gotTheLock = _k.sent();
+                            if (gotTheLock)
+                                return [2 /*return*/, true];
+                            if (!awaitRemoteJob) return [3 /*break*/, 6];
+                            _k.label = 2;
+                        case 2:
+                            _k.trys.push([2, 4, , 6]);
+                            jobDoneObservable = from$1(liveQuery(function () { return jobsTable.get(jobName); })).pipe(timeout(GUARDED_JOB_TIMEOUT), filter(function (job) { return !job; }));
+                            return [4 /*yield*/, jobDoneObservable.toPromise()];
+                        case 3:
+                            _k.sent();
+                            return [2 /*return*/, false];
+                        case 4:
+                            err_1 = _k.sent();
+                            if (err_1.name !== 'TimeoutError') {
+                                throw err_1;
+                            }
+                            return [4 /*yield*/, aquireLock()];
+                        case 5: 
+                        // Timeout stopped us! Try aquire the lock now.
+                        // It will likely succeed this time unless
+                        // another client took it.
+                        return [2 /*return*/, _k.sent()];
+                        case 6: return [2 /*return*/, false];
+                    }
+                });
+            });
+        }
+        var jobsTable, heartbeat;
+        var _this_1 = this;
+        return __generator$1(this, function (_k) {
+            switch (_k.label) {
+                case 0:
+                    jobsTable = db.table(jobsTableName);
+                    return [4 /*yield*/, aquireLock()];
+                case 1:
+                    if (!_k.sent()) return [3 /*break*/, 6];
+                    heartbeat = setInterval(function () {
+                        jobsTable.update(jobName, function (job) {
+                            if (job.nodeId === myId) {
+                                job.heartbeat = new Date();
+                            }
+                        });
+                    }, GUARDED_JOB_HEARTBEAT);
+                    _k.label = 2;
+                case 2:
+                    _k.trys.push([2, , 4, 6]);
+                    return [4 /*yield*/, job()];
+                case 3: return [2 /*return*/, _k.sent()];
+                case 4:
+                    // Stop heartbeat
+                    clearInterval(heartbeat);
+                    // Remove the persisted job state:
+                    return [4 /*yield*/, db.transaction('rw!', jobsTableName, function () { return __awaiter$1(_this_1, void 0, void 0, function () {
+                            var currentWork;
+                            return __generator$1(this, function (_k) {
+                                switch (_k.label) {
+                                    case 0: return [4 /*yield*/, jobsTable.get(jobName)];
+                                    case 1:
+                                        currentWork = _k.sent();
+                                        if (!(currentWork && currentWork.nodeId === myId)) return [3 /*break*/, 3];
+                                        return [4 /*yield*/, jobsTable.delete(jobName)];
+                                    case 2:
+                                        _k.sent();
+                                        _k.label = 3;
+                                    case 3: return [2 /*return*/];
+                                }
+                            });
+                        }); })];
+                case 5:
+                    // Remove the persisted job state:
+                    _k.sent();
+                    return [7 /*endfinally*/];
+                case 6: return [2 /*return*/];
             }
         });
     });
@@ -5936,32 +5954,36 @@ function syncIfPossible(db, cloudOptions, cloudSchema, options) {
     function _syncIfPossible() {
         return __awaiter$1(this, void 0, void 0, function () {
             var error_4;
-            return __generator$1(this, function (_e) {
-                switch (_e.label) {
+            return __generator$1(this, function (_k) {
+                switch (_k.label) {
                     case 0:
-                        _e.trys.push([0, 6, , 7]);
-                        if (!db.cloud.usingServiceWorker) return [3 /*break*/, 3];
-                        if (!IS_SERVICE_WORKER) return [3 /*break*/, 2];
+                        _k.trys.push([0, 6, , 7]);
+                        if (!db.cloud.isServiceWorkerDB) return [3 /*break*/, 2];
+                        // We are the dedicated sync SW:
                         return [4 /*yield*/, sync(db, cloudOptions, cloudSchema, options)];
                     case 1:
-                        _e.sent();
-                        _e.label = 2;
-                    case 2: return [3 /*break*/, 5];
-                    case 3: 
-                    // We use a flow that is better suited for the case when multiple workers want to
-                    // do the same thing.
-                    return [4 /*yield*/, performGuardedJob(db, CURRENT_SYNC_WORKER, '$jobs', function () { return sync(db, cloudOptions, cloudSchema, options); })];
-                    case 4:
+                        // We are the dedicated sync SW:
+                        _k.sent();
+                        return [3 /*break*/, 5];
+                    case 2:
+                        if (!!db.cloud.usingServiceWorker) return [3 /*break*/, 4];
+                        // We use a flow that is better suited for the case when multiple workers want to
+                        // do the same thing.
+                        return [4 /*yield*/, performGuardedJob(db, CURRENT_SYNC_WORKER, '$jobs', function () { return sync(db, cloudOptions, cloudSchema, options); })];
+                    case 3:
                         // We use a flow that is better suited for the case when multiple workers want to
                         // do the same thing.
-                        _e.sent();
-                        _e.label = 5;
+                        _k.sent();
+                        return [3 /*break*/, 5];
+                    case 4:
+                        assert(false);
+                        throw new Error('Internal _syncIfPossible() - invalid precondition - should not have been called.');
                     case 5:
                         ongoingSyncs.delete(db);
                         console.debug('Done sync');
                         return [3 /*break*/, 7];
                     case 6:
-                        error_4 = _e.sent();
+                        error_4 = _k.sent();
                         ongoingSyncs.delete(db);
                         console.error("Failed to sync client changes", error_4);
                         throw error_4; // Make sure we rethrow error so that sync event is retried.
@@ -6003,8 +6025,8 @@ function LocalSyncWorker(db, cloudOptions, cloudSchema) {
         // Sync eagerly whenever a change has happened (+ initially when there's no syncState yet)
         // This initial subscribe will also trigger an sync also now.
         console.debug('Starting LocalSyncWorker', db.localSyncEvent['id']);
-        localSyncEventSubscription = db.localSyncEvent.subscribe(function (_e) {
-            var purpose = _e.purpose;
+        localSyncEventSubscription = db.localSyncEvent.subscribe(function (_k) {
+            var purpose = _k.purpose;
             try {
                 syncAndRetry(purpose || 'pull');
             }
@@ -6028,8 +6050,8 @@ function LocalSyncWorker(db, cloudOptions, cloudSchema) {
 function updateSchemaFromOptions(schema, options) {
     if (schema && options) {
         if (options.unsyncedTables) {
-            for (var _e = 0, _f = options.unsyncedTables; _e < _f.length; _e++) {
-                var tableName = _f[_e];
+            for (var _k = 0, _l = options.unsyncedTables; _k < _l.length; _k++) {
+                var tableName = _l[_k];
                 if (schema[tableName]) {
                     schema[tableName].markedForSync = false;
                 }
@@ -6038,10 +6060,10 @@ function updateSchemaFromOptions(schema, options) {
     }
 }
 function verifySchema(db) {
-    var _e, _f;
-    for (var _g = 0, _h = db.tables; _g < _h.length; _g++) {
-        var table = _h[_g];
-        if ((_f = (_e = db.cloud.schema) === null || _e === void 0 ? void 0 : _e[table.name]) === null || _f === void 0 ? void 0 : _f.markedForSync) {
+    var _a, _b;
+    for (var _k = 0, _l = db.tables; _k < _l.length; _k++) {
+        var table = _l[_k];
+        if ((_b = (_a = db.cloud.schema) === null || _a === void 0 ? void 0 : _a[table.name]) === null || _b === void 0 ? void 0 : _b.markedForSync) {
             if (table.schema.primKey.auto) {
                 throw new Dexie.SchemaError("Table ".concat(table.name, " is both autoIncremented and synced. ") +
                     "Use db.cloud.configure({unsyncedTables: [".concat(JSON.stringify(table.name), "]}) to blacklist it from sync"));
@@ -6283,8 +6305,8 @@ var Styles = {
         padding: "8px"
     }
 };
-function Dialog(_e) {
-    var children = _e.children;
+function Dialog(_k) {
+    var children = _k.children;
     return (a$1("div", null, a$1("div", { style: Styles.Darken }), a$1("div", { style: Styles.DialogOuter }, a$1("div", { style: Styles.DialogInner }, children))));
 }
 var t, u, r, o = 0, i = [], c = n.__b, f = n.__r, e = n.diffed, a = n.__c, v = n.unmount;
@@ -6318,24 +6340,24 @@ function g(n) { var t = u; "function" == typeof n.__c && n.__c(), u = t; }
 function j(n) { var t = u; n.__c = n.__(), u = t; }
 function k(n, t) { return !n || n.length !== t.length || t.some(function (t, u) { return t !== n[u]; }); }
 function w(n, t) { return "function" == typeof t ? t(n) : t; }
-function resolveText(_e) {
-    var message = _e.message; _e.messageCode; var messageParams = _e.messageParams;
+function resolveText(_k) {
+    var message = _k.message; _k.messageCode; var messageParams = _k.messageParams;
     return message.replace(/\{\w+\}/ig, function (n) { return messageParams[n.substr(1, n.length - 2)]; });
 }
-function LoginDialog(_e) {
-    var title = _e.title, alerts = _e.alerts, fields = _e.fields, onCancel = _e.onCancel, onSubmit = _e.onSubmit;
-    var _f = l({}), params = _f[0], setParams = _f[1];
+function LoginDialog(_k) {
+    var title = _k.title, alerts = _k.alerts, fields = _k.fields, onCancel = _k.onCancel, onSubmit = _k.onSubmit;
+    var _l = l({}), params = _l[0], setParams = _l[1];
     var firstFieldRef = s();
-    h(function () { var _e; return (_e = firstFieldRef.current) === null || _e === void 0 ? void 0 : _e.focus(); }, []);
+    h(function () { var _a; return (_a = firstFieldRef.current) === null || _a === void 0 ? void 0 : _a.focus(); }, []);
     return (a$1(Dialog, null, a$1(y, null, a$1("h3", { style: Styles.WindowHeader }, title), alerts.map(function (alert) { return (a$1("p", { style: Styles.Alert[alert.type] }, resolveText(alert))); }), a$1("form", { onSubmit: function (ev) {
             ev.preventDefault();
             onSubmit(params);
-        } }, Object.entries(fields).map(function (_e, idx) {
-        var fieldName = _e[0], _f = _e[1], type = _f.type, label = _f.label, placeholder = _f.placeholder;
+        } }, Object.entries(fields).map(function (_k, idx) {
+        var fieldName = _k[0], _l = _k[1], type = _l.type, label = _l.label, placeholder = _l.placeholder;
         return (a$1("label", { style: Styles.Label }, label ? "".concat(label, ": ") : '', a$1("input", { ref: idx === 0 ? firstFieldRef : undefined, type: type, name: fieldName, autoComplete: "on", style: Styles.Input, autoFocus: true, placeholder: placeholder, value: params[fieldName] || '', onInput: function (ev) {
-                var _e;
-                var _f;
-                return setParams(__assign(__assign({}, params), (_e = {}, _e[fieldName] = valueTransformer(type, (_f = ev.target) === null || _f === void 0 ? void 0 : _f['value']), _e)));
+                var _k;
+                var _a;
+                return setParams(Object.assign(Object.assign({}, params), (_k = {}, _k[fieldName] = valueTransformer(type, (_a = ev.target) === null || _a === void 0 ? void 0 : _a['value']), _k)));
             } })));
     }))), a$1("div", { style: Styles.ButtonsDiv }, a$1("button", { type: "submit", style: Styles.Button, onClick: function () { return onSubmit(params); } }, "Submit"), a$1("button", { style: Styles.Button, onClick: onCancel }, "Cancel"))));
 }
@@ -6363,12 +6385,12 @@ var LoginGui = /** @class */ (function (_super_1) {
             delete this.subscription;
         }
     };
-    LoginGui.prototype.render = function (props, _e) {
-        var userInteraction = _e.userInteraction;
+    LoginGui.prototype.render = function (props, _k) {
+        var userInteraction = _k.userInteraction;
         if (!userInteraction)
             return null;
         //if (props.db.cloud.userInteraction.observers.length > 1) return null; // Someone else subscribes.
-        return a$1(LoginDialog, __assign({}, userInteraction));
+        return a$1(LoginDialog, Object.assign({}, userInteraction));
     };
     return LoginGui;
 }(p$1));
@@ -6419,8 +6441,8 @@ function computeSyncState(db) {
         lazyWebSocketStatus,
         db.syncStateChangedEvent.pipe(startWith({ phase: 'initial' })),
         userIsReallyActive
-    ]).pipe(map(function (_e) {
-        var status = _e[0], syncState = _e[1], userIsActive = _e[2];
+    ]).pipe(map(function (_k) {
+        var status = _k[0], syncState = _k[1], userIsActive = _k[2];
         var phase = syncState.phase, error = syncState.error, progress = syncState.progress;
         var adjustedStatus = status;
         if (phase === 'error') {
@@ -6499,10 +6521,10 @@ var getGlobalRolesObservable = associate(function (db) {
         .toArray()
         .then(function (roles) {
         var rv = {};
-        for (var _e = 0, _f = roles
+        for (var _k = 0, _l = roles
             .slice()
-            .sort(function (a, b) { return (a.sortOrder || 0) - (b.sortOrder || 0); }); _e < _f.length; _e++) {
-            var role = _f[_e];
+            .sort(function (a, b) { return (a.sortOrder || 0) - (b.sortOrder || 0); }); _k < _l.length; _k++) {
+            var role = _l[_k];
             rv[role.name] = role;
         }
         return rv;
@@ -6514,8 +6536,8 @@ var getInternalAccessControlObservable = associate(function (db) {
         db.members.where({ userId: currentUser.userId }).toArray(),
         db.realms.toArray(),
         currentUser.userId,
-    ]).then(function (_e) {
-        var selfMembers = _e[0], realms = _e[1], userId = _e[2];
+    ]).then(function (_k) {
+        var selfMembers = _k[0], realms = _k[1], userId = _k[2];
         //console.debug(`PERMS: Result from liveQUery():`, JSON.stringify({selfMembers, realms, userId}, null, 2))
         return { selfMembers: selfMembers, realms: realms, userId: userId };
     }); }); }); })), {
@@ -6548,15 +6570,15 @@ function mapValueObservable(o, mapper) {
 // TODO: Move to dexie-cloud-common
 function mergePermissions() {
     var permissions = [];
-    for (var _e = 0; _e < arguments.length; _e++) {
-        permissions[_e] = arguments[_e];
+    for (var _k = 0; _k < arguments.length; _k++) {
+        permissions[_k] = arguments[_k];
     }
     if (permissions.length === 0)
         return {};
     var reduced = permissions.reduce(function (result, next) {
-        var ret = __assign({}, result);
-        for (var _e = 0, _f = Object.entries(next); _e < _f.length; _e++) {
-            var _g = _f[_e], verb = _g[0], rights = _g[1];
+        var ret = Object.assign({}, result);
+        for (var _k = 0, _l = Object.entries(next); _k < _l.length; _k++) {
+            var _m = _l[_k], verb = _m[0], rights = _m[1];
             if (verb in ret && ret[verb]) {
                 if (ret[verb] === '*')
                     continue;
@@ -6574,8 +6596,8 @@ function mergePermissions() {
                     typeof ret[verb] === 'object') {
                     // Both are objects (verb is 'update')
                     var mergedRights = ret[verb]; // because we've checked that typeof ret[verb] === 'object' and earlier that not ret[verb] === '*'.
-                    for (var _h = 0, _j = Object.entries(rights); _h < _j.length; _h++) {
-                        var _k = _j[_h], tableName = _k[0], tableRights = _k[1];
+                    for (var _o = 0, _p = Object.entries(rights); _o < _p.length; _o++) {
+                        var _q = _p[_o], tableName = _q[0], tableRights = _q[1];
                         if (mergedRights[tableName] === '*')
                             continue;
                         if (tableRights === '*') {
@@ -6613,8 +6635,8 @@ var getPermissionsLookupObservable = associate(function (db) {
     var o = createSharedValueObservable(combineLatest([
         getInternalAccessControlObservable(db._novip),
         getGlobalRolesObservable(db._novip),
-    ]).pipe(map(function (_e) {
-        var _f = _e[0], selfMembers = _f.selfMembers, realms = _f.realms, userId = _f.userId, globalRoles = _e[1];
+    ]).pipe(map(function (_k) {
+        var _l = _k[0], selfMembers = _l.selfMembers, realms = _l.realms, userId = _l.userId, globalRoles = _k[1];
         return ({
             selfMembers: selfMembers,
             realms: realms,
@@ -6627,9 +6649,9 @@ var getPermissionsLookupObservable = associate(function (db) {
         userId: UNAUTHORIZED_USER.userId,
         globalRoles: {},
     });
-    return mapValueObservable(o, function (_e) {
-        var _f;
-        var selfMembers = _e.selfMembers, realms = _e.realms, userId = _e.userId, globalRoles = _e.globalRoles;
+    return mapValueObservable(o, function (_k) {
+        var _l;
+        var selfMembers = _k.selfMembers, realms = _k.realms, userId = _k.userId, globalRoles = _k.globalRoles;
         var rv = realms
             .map(function (realm) {
             var selfRealmMembers = selfMembers.filter(function (m) { return m.realmId === realm.realmId; });
@@ -6640,21 +6662,21 @@ var getPermissionsLookupObservable = associate(function (db) {
                 .map(function (role) { return globalRoles[role]; })
                 .filter(function (role) { return role; })
                 .map(function (role) { return role.permissions; });
-            return __assign(__assign({}, realm), { permissions: realm.owner === userId
+            return Object.assign(Object.assign({}, realm), { permissions: realm.owner === userId
                     ? { manage: '*' }
                     : mergePermissions.apply(void 0, __spreadArray$1(__spreadArray$1([], directPermissionSets, false), rolePermissionSets, false)) });
         })
             .reduce(function (p, c) {
-            var _e;
-            return (__assign(__assign({}, p), (_e = {}, _e[c.realmId] = c, _e)));
-        }, (_f = {},
-            _f[userId] = {
+            var _k;
+            return (Object.assign(Object.assign({}, p), (_k = {}, _k[c.realmId] = c, _k)));
+        }, (_l = {},
+            _l[userId] = {
                 realmId: userId,
                 owner: userId,
                 name: userId,
                 permissions: { manage: '*' },
             },
-            _f));
+            _l));
         return rv;
     });
 });
@@ -6666,44 +6688,44 @@ var PermissionChecker = /** @class */ (function () {
     }
     PermissionChecker.prototype.add = function () {
         var _this_1 = this;
-        var _e;
         var tableNames = [];
-        for (var _f = 0; _f < arguments.length; _f++) {
-            tableNames[_f] = arguments[_f];
+        for (var _k = 0; _k < arguments.length; _k++) {
+            tableNames[_k] = arguments[_k];
         }
+        var _a;
         // If user can manage the whole realm, return true.
         if (this.permissions.manage === '*')
             return true;
         // If user can manage given table in realm, return true
-        if ((_e = this.permissions.manage) === null || _e === void 0 ? void 0 : _e.includes(this.tableName))
+        if ((_a = this.permissions.manage) === null || _a === void 0 ? void 0 : _a.includes(this.tableName))
             return true;
         // If user can add any type, return true
         if (this.permissions.add === '*')
             return true;
         // If user can add objects into given table names in the realm, return true
-        if (tableNames.every(function (tableName) { var _e; return (_e = _this_1.permissions.add) === null || _e === void 0 ? void 0 : _e.includes(tableName); })) {
+        if (tableNames.every(function (tableName) { var _a; return (_a = _this_1.permissions.add) === null || _a === void 0 ? void 0 : _a.includes(tableName); })) {
             return true;
         }
         return false;
     };
     PermissionChecker.prototype.update = function () {
-        var _e, _f;
         var props = [];
-        for (var _g = 0; _g < arguments.length; _g++) {
-            props[_g] = arguments[_g];
+        for (var _k = 0; _k < arguments.length; _k++) {
+            props[_k] = arguments[_k];
         }
+        var _a, _b;
         // If user is owner of this object, or if user can manage the whole realm, return true.
         if (this.isOwner || this.permissions.manage === '*')
             return true;
         // If user can manage given table in realm, return true
-        if ((_e = this.permissions.manage) === null || _e === void 0 ? void 0 : _e.includes(this.tableName))
+        if ((_a = this.permissions.manage) === null || _a === void 0 ? void 0 : _a.includes(this.tableName))
             return true;
         // If user can update any prop in any table in this realm, return true unless
         // it regards to ownership change:
         if (this.permissions.update === '*') {
             return props.every(function (prop) { return prop !== 'owner'; });
         }
-        var tablePermissions = (_f = this.permissions.update) === null || _f === void 0 ? void 0 : _f[this.tableName];
+        var tablePermissions = (_b = this.permissions.update) === null || _b === void 0 ? void 0 : _b[this.tableName];
         // If user can update any prop in table and realm, return true unless
         // accessing special props owner or realmId
         if (tablePermissions === '*')
@@ -6712,12 +6734,12 @@ var PermissionChecker = /** @class */ (function () {
         return props.every(function (prop) { return tablePermissions === null || tablePermissions === void 0 ? void 0 : tablePermissions.some(function (permittedProp) { return permittedProp === prop || (permittedProp === '*' && prop !== 'owner'); }); });
     };
     PermissionChecker.prototype.delete = function () {
-        var _e;
+        var _a;
         // If user is owner of this object, or if user can manage the whole realm, return true.
         if (this.isOwner || this.permissions.manage === '*')
             return true;
         // If user can manage given table in realm, return true
-        if ((_e = this.permissions.manage) === null || _e === void 0 ? void 0 : _e.includes(this.tableName))
+        if ((_a = this.permissions.manage) === null || _a === void 0 ? void 0 : _a.includes(this.tableName))
             return true;
         return false;
     };
@@ -6751,11 +6773,11 @@ var getInvitesObservable = associate(function (db) {
     var membersByEmail = getCurrentUserEmitter(db._novip).pipe(switchMap$1(function (currentUser) { return liveQuery(function () { return db.members.where({ email: currentUser.email || '' }).toArray(); }); }));
     var permissions = getPermissionsLookupObservable(db._novip);
     var accessControl = getInternalAccessControlObservable(db._novip);
-    return createSharedValueObservable(combineLatest([membersByEmail, accessControl, permissions]).pipe(map$1(function (_e) {
-        var membersByEmail = _e[0], accessControl = _e[1], realmLookup = _e[2];
+    return createSharedValueObservable(combineLatest([membersByEmail, accessControl, permissions]).pipe(map$1(function (_k) {
+        var membersByEmail = _k[0], accessControl = _k[1], realmLookup = _k[2];
         var reducer = function (result, m) {
-            var _e;
-            return (__assign(__assign({}, result), (_e = {}, _e[m.id] = __assign(__assign({}, m), { realm: realmLookup[m.realmId] }), _e)));
+            var _k;
+            return (Object.assign(Object.assign({}, result), (_k = {}, _k[m.id] = Object.assign(Object.assign({}, m), { realm: realmLookup[m.realmId] }), _k)));
         };
         var emailMembersById = membersByEmail.reduce(reducer, {});
         var membersById = accessControl.selfMembers.reduce(reducer, emailMembersById);
@@ -6784,16 +6806,16 @@ function dexieCloud(dexie) {
     var localSyncWorker = null;
     dexie.on('ready', function (dexie) { return __awaiter$1(_this_1, void 0, void 0, function () {
         var error_5;
-        return __generator$1(this, function (_e) {
-            switch (_e.label) {
+        return __generator$1(this, function (_k) {
+            switch (_k.label) {
                 case 0:
-                    _e.trys.push([0, 2, , 3]);
+                    _k.trys.push([0, 2, , 3]);
                     return [4 /*yield*/, onDbReady(dexie)];
                 case 1:
-                    _e.sent();
+                    _k.sent();
                     return [3 /*break*/, 3];
                 case 2:
-                    error_5 = _e.sent();
+                    error_5 = _k.sent();
                     console.error(error_5);
                     return [3 /*break*/, 3];
                 case 3: return [2 /*return*/];
@@ -6815,8 +6837,8 @@ function dexieCloud(dexie) {
         currentUserEmitter.next(UNAUTHORIZED_USER);
     });
     dexie.cloud = {
-        version: '4.0.0-beta.16',
-        options: __assign({}, DEFAULT_OPTIONS),
+        version: '4.0.0-beta.19',
+        options: Object.assign({}, DEFAULT_OPTIONS),
         schema: null,
         serverState: null,
         get currentUserId() {
@@ -6833,16 +6855,16 @@ function dexieCloud(dexie) {
         login: function (hint) {
             return __awaiter$1(this, void 0, void 0, function () {
                 var db;
-                return __generator$1(this, function (_e) {
-                    switch (_e.label) {
+                return __generator$1(this, function (_k) {
+                    switch (_k.label) {
                         case 0:
                             db = DexieCloudDB(dexie);
                             return [4 /*yield*/, db.cloud.sync()];
                         case 1:
-                            _e.sent();
+                            _k.sent();
                             return [4 /*yield*/, login(db, hint)];
                         case 2:
-                            _e.sent();
+                            _k.sent();
                             return [2 /*return*/];
                     }
                 });
@@ -6851,7 +6873,7 @@ function dexieCloud(dexie) {
         invites: getInvitesObservable(dexie),
         roles: getGlobalRolesObservable(dexie),
         configure: function (options) {
-            options = dexie.cloud.options = __assign(__assign({}, dexie.cloud.options), options);
+            options = dexie.cloud.options = Object.assign(Object.assign({}, dexie.cloud.options), options);
             configuredProgramatically = true;
             if (options.databaseUrl && options.nameSuffix) {
                 // @ts-ignore
@@ -6860,13 +6882,13 @@ function dexieCloud(dexie) {
             }
             updateSchemaFromOptions(dexie.cloud.schema, dexie.cloud.options);
         },
-        sync: function (_e) {
-            var _f = _e === void 0 ? { wait: true, purpose: 'push' } : _e, wait = _f.wait, purpose = _f.purpose;
+        sync: function (_k) {
+            var _l = _k === void 0 ? { wait: true, purpose: 'push' } : _k, wait = _l.wait, purpose = _l.purpose;
             return __awaiter$1(this, void 0, void 0, function () {
                 var db, syncState_1, newSyncState, syncState_2;
                 var _this_1 = this;
-                return __generator$1(this, function (_g) {
-                    switch (_g.label) {
+                return __generator$1(this, function (_k) {
+                    switch (_k.label) {
                         case 0:
                             if (wait === undefined)
                                 wait = true;
@@ -6880,29 +6902,29 @@ function dexieCloud(dexie) {
                                     (!syncState_1 || newSyncState.timestamp > syncState_1.timestamp); }), take(1))
                                     .toPromise()];
                         case 1:
-                            newSyncState = _g.sent();
+                            newSyncState = _k.sent();
                             if (newSyncState === null || newSyncState === void 0 ? void 0 : newSyncState.error) {
                                 throw new Error("Sync error: " + newSyncState.error);
                             }
-                            _g.label = 2;
+                            _k.label = 2;
                         case 2: return [3 /*break*/, 6];
                         case 3: return [4 /*yield*/, isSyncNeeded(db)];
                         case 4:
-                            if (!_g.sent()) return [3 /*break*/, 6];
+                            if (!_k.sent()) return [3 /*break*/, 6];
                             syncState_2 = db.cloud.persistedSyncState.value;
                             triggerSync(db, purpose);
                             if (!wait) return [3 /*break*/, 6];
                             console.debug('db.cloud.login() is waiting for sync completion...');
                             return [4 /*yield*/, from$1(liveQuery(function () { return __awaiter$1(_this_1, void 0, void 0, function () {
                                     var syncNeeded, newSyncState;
-                                    return __generator$1(this, function (_e) {
-                                        switch (_e.label) {
+                                    return __generator$1(this, function (_k) {
+                                        switch (_k.label) {
                                             case 0: return [4 /*yield*/, isSyncNeeded(db)];
                                             case 1:
-                                                syncNeeded = _e.sent();
+                                                syncNeeded = _k.sent();
                                                 return [4 /*yield*/, db.getPersistedSyncState()];
                                             case 2:
-                                                newSyncState = _e.sent();
+                                                newSyncState = _k.sent();
                                                 if ((newSyncState === null || newSyncState === void 0 ? void 0 : newSyncState.timestamp) !== (syncState_2 === null || syncState_2 === void 0 ? void 0 : syncState_2.timestamp) &&
                                                     (newSyncState === null || newSyncState === void 0 ? void 0 : newSyncState.error))
                                                     throw new Error("Sync error: " + newSyncState.error);
@@ -6913,9 +6935,9 @@ function dexieCloud(dexie) {
                                     .pipe(filter(function (isNeeded) { return !isNeeded; }), take(1))
                                     .toPromise()];
                         case 5:
-                            _g.sent();
+                            _k.sent();
                             console.debug('Done waiting for sync completion because we have nothing to push anymore');
-                            _g.label = 6;
+                            _k.label = 6;
                         case 6: return [2 /*return*/];
                     }
                 });
@@ -6926,14 +6948,14 @@ function dexieCloud(dexie) {
         },
     };
     dexie.Version.prototype['_parseStoresSpec'] = Dexie.override(dexie.Version.prototype['_parseStoresSpec'], function (origFunc) { return overrideParseStoresSpec(origFunc, dexie); });
-    dexie.Table.prototype.newId = function (_e) {
-        var _f = _e === void 0 ? {} : _e, colocateWith = _f.colocateWith;
+    dexie.Table.prototype.newId = function (_k) {
+        var _l = _k === void 0 ? {} : _k, colocateWith = _l.colocateWith;
         var shardKey = colocateWith && colocateWith.substr(colocateWith.length - 3);
         return generateKey(dexie.cloud.schema[this.name].idPrefix || '', shardKey);
     };
     dexie.Table.prototype.idPrefix = function () {
-        var _e, _f;
-        return ((_f = (_e = this.db.cloud.schema) === null || _e === void 0 ? void 0 : _e[this.name]) === null || _f === void 0 ? void 0 : _f.idPrefix) || '';
+        var _a, _b;
+        return ((_b = (_a = this.db.cloud.schema) === null || _a === void 0 ? void 0 : _a[this.name]) === null || _b === void 0 ? void 0 : _b.idPrefix) || '';
     };
     dexie.use(createMutationTrackingMiddleware({
         currentUserObservable: dexie.cloud.currentUser,
@@ -6942,20 +6964,22 @@ function dexieCloud(dexie) {
     dexie.use(createImplicitPropSetterMiddleware(DexieCloudDB(dexie)));
     dexie.use(createIdGenerationMiddleware(DexieCloudDB(dexie)));
     function onDbReady(dexie) {
-        var _e, _f, _g, _h, _j, _k;
+        var _a, _b, _c, _d, _e, _f, _g;
         return __awaiter$1(this, void 0, void 0, function () {
-            var db, swRegistrations, _l, initiallySynced;
+            var db, swRegistrations, _k, initiallySynced;
             var _this_1 = this;
-            return __generator$1(this, function (_m) {
-                switch (_m.label) {
+            return __generator$1(this, function (_l) {
+                switch (_l.label) {
                     case 0:
                         closed = false; // As Dexie calls us, we are not closed anymore. Maybe reopened? Remember db.ready event is registered with sticky flag!
                         db = DexieCloudDB(dexie);
                         // Setup default GUI:
-                        if (!IS_SERVICE_WORKER) {
-                            if (!((_e = db.cloud.options) === null || _e === void 0 ? void 0 : _e.customLoginGui)) {
+                        if (typeof window !== 'undefined' && typeof document !== 'undefined') {
+                            if (!((_a = db.cloud.options) === null || _a === void 0 ? void 0 : _a.customLoginGui)) {
                                 subscriptions.push(setupDefaultGUI(dexie));
                             }
+                        }
+                        if (!db.cloud.isServiceWorkerDB) {
                             subscriptions.push(computeSyncState(db).subscribe(dexie.cloud.syncState));
                         }
                         //verifyConfig(db.cloud.options); Not needed (yet at least!)
@@ -6966,27 +6990,26 @@ function dexieCloud(dexie) {
                         if (!('serviceWorker' in navigator)) return [3 /*break*/, 2];
                         return [4 /*yield*/, navigator.serviceWorker.getRegistrations()];
                     case 1:
-                        _l = _m.sent();
+                        _k = _l.sent();
                         return [3 /*break*/, 3];
                     case 2:
-                        _l = [];
-                        _m.label = 3;
+                        _k = [];
+                        _l.label = 3;
                     case 3:
-                        swRegistrations = _l;
+                        swRegistrations = _k;
                         return [4 /*yield*/, db.transaction('rw', db.$syncState, function () { return __awaiter$1(_this_1, void 0, void 0, function () {
-                                var _e, options, schema, _f, persistedOptions, persistedSchema, persistedSyncState, newPersistedSchema, _g, _h, _j, table, tblSchema, newTblSchema;
-                                var _k, _l;
-                                return __generator$1(this, function (_m) {
-                                    switch (_m.label) {
+                                var _h, _j, _k, options, schema, _l, persistedOptions, persistedSchema, persistedSyncState, newPersistedSchema, _m, _o, _p, table, tblSchema, newTblSchema;
+                                return __generator$1(this, function (_q) {
+                                    switch (_q.label) {
                                         case 0:
-                                            _e = db.cloud, options = _e.options, schema = _e.schema;
+                                            _k = db.cloud, options = _k.options, schema = _k.schema;
                                             return [4 /*yield*/, Promise.all([
                                                     db.getOptions(),
                                                     db.getSchema(),
                                                     db.getPersistedSyncState(),
                                                 ])];
                                         case 1:
-                                            _f = _m.sent(), persistedOptions = _f[0], persistedSchema = _f[1], persistedSyncState = _f[2];
+                                            _l = _q.sent(), persistedOptions = _l[0], persistedSchema = _l[1], persistedSyncState = _l[2];
                                             if (!!configuredProgramatically) return [3 /*break*/, 2];
                                             // Options not specified programatically (use case for SW!)
                                             // Take persisted options:
@@ -7000,10 +7023,10 @@ function dexieCloud(dexie) {
                                                 throw new Error("Internal error"); // options cannot be null if configuredProgramatically is set.
                                             return [4 /*yield*/, db.$syncState.put(options, 'options')];
                                         case 3:
-                                            _m.sent();
-                                            _m.label = 4;
+                                            _q.sent();
+                                            _q.label = 4;
                                         case 4:
-                                            if (((_k = db.cloud.options) === null || _k === void 0 ? void 0 : _k.tryUseServiceWorker) &&
+                                            if (((_h = db.cloud.options) === null || _h === void 0 ? void 0 : _h.tryUseServiceWorker) &&
                                                 'serviceWorker' in navigator &&
                                                 swRegistrations.length > 0 &&
                                                 !DISABLE_SERVICEWORKER_STRATEGY) {
@@ -7017,7 +7040,8 @@ function dexieCloud(dexie) {
                                                 // Not configured for using service worker or no service worker
                                                 // registration exists. Don't rely on service worker to do any job.
                                                 // Use LocalSyncWorker instead.
-                                                if (((_l = db.cloud.options) === null || _l === void 0 ? void 0 : _l.tryUseServiceWorker) && !IS_SERVICE_WORKER) {
+                                                if (((_j = db.cloud.options) === null || _j === void 0 ? void 0 : _j.tryUseServiceWorker) &&
+                                                    !db.cloud.isServiceWorkerDB) {
                                                     console.debug('dexie-cloud-addon: Not using service worker.', swRegistrations.length === 0
                                                         ? 'No SW registrations found.'
                                                         : 'serviceWorker' in navigator && DISABLE_SERVICEWORKER_STRATEGY
@@ -7037,11 +7061,11 @@ function dexieCloud(dexie) {
                                             if (!(!persistedSchema ||
                                                 JSON.stringify(persistedSchema) !== JSON.stringify(schema))) return [3 /*break*/, 7];
                                             newPersistedSchema = persistedSchema || {};
-                                            for (_g = 0, _h = Object.entries(schema); _g < _h.length; _g++) {
-                                                _j = _h[_g], table = _j[0], tblSchema = _j[1];
+                                            for (_m = 0, _o = Object.entries(schema); _m < _o.length; _m++) {
+                                                _p = _o[_m], table = _p[0], tblSchema = _p[1];
                                                 newTblSchema = newPersistedSchema[table];
                                                 if (!newTblSchema) {
-                                                    newPersistedSchema[table] = __assign({}, tblSchema);
+                                                    newPersistedSchema[table] = Object.assign({}, tblSchema);
                                                 }
                                                 else {
                                                     newTblSchema.markedForSync = tblSchema.markedForSync;
@@ -7051,31 +7075,31 @@ function dexieCloud(dexie) {
                                             }
                                             return [4 /*yield*/, db.$syncState.put(newPersistedSchema, 'schema')];
                                         case 6:
-                                            _m.sent();
+                                            _q.sent();
                                             // Make sure persisted table prefixes are being used instead of computed ones:
                                             // Let's assign all props as the newPersistedSchems should be what we should be working with.
                                             Object.assign(schema, newPersistedSchema);
-                                            _m.label = 7;
+                                            _q.label = 7;
                                         case 7: return [2 /*return*/, persistedSyncState === null || persistedSyncState === void 0 ? void 0 : persistedSyncState.initiallySynced];
                                     }
                                 });
                             }); })];
                     case 4:
-                        initiallySynced = _m.sent();
+                        initiallySynced = _l.sent();
                         if (initiallySynced) {
                             db.setInitiallySynced(true);
                         }
                         verifySchema(db);
-                        if (!(((_f = db.cloud.options) === null || _f === void 0 ? void 0 : _f.databaseUrl) && !initiallySynced)) return [3 /*break*/, 6];
+                        if (!(((_b = db.cloud.options) === null || _b === void 0 ? void 0 : _b.databaseUrl) && !initiallySynced)) return [3 /*break*/, 6];
                         return [4 /*yield*/, performInitialSync(db, db.cloud.options, db.cloud.schema)];
                     case 5:
-                        _m.sent();
+                        _l.sent();
                         db.setInitiallySynced(true);
-                        _m.label = 6;
+                        _l.label = 6;
                     case 6:
                         // Manage CurrentUser observable:
                         throwIfClosed();
-                        if (!!IS_SERVICE_WORKER) return [3 /*break*/, 8];
+                        if (!!db.cloud.isServiceWorkerDB) return [3 /*break*/, 8];
                         subscriptions.push(liveQuery(function () { return db.getCurrentUser(); }).subscribe(currentUserEmitter));
                         // Manage PersistendSyncState observable:
                         subscriptions.push(liveQuery(function () { return db.getPersistedSyncState(); }).subscribe(db.cloud.persistedSyncState));
@@ -7092,26 +7116,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.
-                        _m.sent();
-                        _m.label = 8;
+                        _l.sent();
+                        _l.label = 8;
                     case 8:
-                        if (!((_g = db.cloud.options) === null || _g === void 0 ? void 0 : _g.requireAuth)) return [3 /*break*/, 10];
+                        if (!((_c = db.cloud.options) === null || _c === void 0 ? void 0 : _c.requireAuth)) return [3 /*break*/, 10];
                         return [4 /*yield*/, login(db)];
                     case 9:
-                        _m.sent();
-                        _m.label = 10;
+                        _l.sent();
+                        _l.label = 10;
                     case 10:
                         if (localSyncWorker)
                             localSyncWorker.stop();
                         localSyncWorker = null;
                         throwIfClosed();
-                        if (db.cloud.usingServiceWorker && ((_h = db.cloud.options) === null || _h === void 0 ? void 0 : _h.databaseUrl)) {
+                        if (db.cloud.usingServiceWorker && ((_d = db.cloud.options) === null || _d === void 0 ? void 0 : _d.databaseUrl)) {
                             registerSyncEvent(db, 'push').catch(function () { });
                             registerPeriodicSyncEvent(db).catch(function () { });
                         }
-                        else if (((_j = db.cloud.options) === null || _j === void 0 ? void 0 : _j.databaseUrl) &&
+                        else if (((_e = db.cloud.options) === null || _e === void 0 ? void 0 : _e.databaseUrl) &&
                             db.cloud.schema &&
-                            !IS_SERVICE_WORKER) {
+                            !db.cloud.isServiceWorkerDB) {
                             // There's no SW. Start SyncWorker instead.
                             localSyncWorker = LocalSyncWorker(db, db.cloud.options, db.cloud.schema);
                             localSyncWorker.start();
@@ -7119,7 +7143,7 @@ function dexieCloud(dexie) {
                         }
                         // Listen to online event and do sync.
                         throwIfClosed();
-                        if (!IS_SERVICE_WORKER) {
+                        if (!db.cloud.isServiceWorkerDB) {
                             subscriptions.push(fromEvent(self, 'online').subscribe(function () {
                                 console.debug('online!');
                                 db.syncStateChangedEvent.next({
@@ -7133,10 +7157,10 @@ function dexieCloud(dexie) {
                                 });
                             }));
                         }
-                        // Connect WebSocket only if we're a browser window
-                        if (typeof window !== 'undefined' &&
-                            !IS_SERVICE_WORKER &&
-                            ((_k = db.cloud.options) === null || _k === void 0 ? void 0 : _k.databaseUrl)) {
+                        // Connect WebSocket unless we
+                        if (((_f = db.cloud.options) === null || _f === void 0 ? void 0 : _f.databaseUrl) &&
+                            !((_g = db.cloud.options) === null || _g === void 0 ? void 0 : _g.disableWebSocket) &&
+                            !IS_SERVICE_WORKER) {
                             subscriptions.push(connectWebSocket(db));
                         }
                         return [2 /*return*/];
@@ -7145,7 +7169,7 @@ function dexieCloud(dexie) {
         });
     }
 }
-dexieCloud.version = '4.0.0-beta.16';
+dexieCloud.version = '4.0.0-beta.19';
 Dexie.Cloud = dexieCloud;
 
 export { dexieCloud as default, dexieCloud, getTiedObjectId, getTiedRealmId };