dexie-cloud-addon 4.0.1-beta.58 → 4.0.1-rc.2

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

@@ -8,7 +8,7 @@
  *
  * ==========================================================================
  *
- * Version 4.0.1-beta.58, Tue Feb 20 2024
+ * Version 4.0.1-rc.2, Wed Mar 20 2024
  *
  * https://dexie.org
  *
@@ -16,7 +16,7 @@
  * 
  */
 
-import Dexie, { cmp, liveQuery } from 'dexie';
+import Dexie, { PropModification, cmp, liveQuery } from 'dexie';
 import { firstValueFrom, from as from$1, filter as filter$1, Observable as Observable$1, BehaviorSubject, Subject, fromEvent, of, merge, Subscription as Subscription$1, throwError, combineLatest, map as map$1, share, timer as timer$1 } from 'rxjs';
 
 /******************************************************************************
@@ -50,6 +50,18 @@ function __extends(d, b) {
     d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
 }
 
+function __rest(s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+}
+
 function __awaiter(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) {
@@ -2602,16 +2614,11 @@ function login(db, hints) {
         const origUserId = currentUser.userId;
         if (currentUser.isLoggedIn && (!hints || (!hints.email && !hints.userId))) {
             const licenseStatus = ((_a = currentUser.license) === null || _a === void 0 ? void 0 : _a.status) || 'ok';
-            if (licenseStatus === 'ok' &&
-                currentUser.accessToken &&
-                (!currentUser.accessTokenExpiration ||
-                    currentUser.accessTokenExpiration.getTime() > Date.now())) {
+            if (licenseStatus === 'ok' && currentUser.accessToken && (!currentUser.accessTokenExpiration || currentUser.accessTokenExpiration.getTime() > Date.now())) {
                 // Already authenticated according to given hints. And license is valid.
                 return false;
             }
-            if (currentUser.refreshToken &&
-                (!currentUser.refreshTokenExpiration ||
-                    currentUser.refreshTokenExpiration.getTime() > Date.now())) {
+            if (currentUser.refreshToken && (!currentUser.refreshTokenExpiration || currentUser.refreshTokenExpiration.getTime() > Date.now())) {
                 // Refresh the token
                 yield loadAccessToken(db);
                 return false;
@@ -2623,8 +2630,7 @@ function login(db, hints) {
             lastLogin: new Date(0),
         });
         yield authenticate(db.cloud.options.databaseUrl, context, db.cloud.options.fetchTokens || otpFetchTokenCallback(db), db.cloud.userInteraction, hints);
-        if (origUserId !== UNAUTHORIZED_USER.userId &&
-            context.userId !== origUserId) {
+        if (origUserId !== UNAUTHORIZED_USER.userId && context.userId !== origUserId) {
             // User was logged in before, but now logged in as another user.
             yield logout(db);
         }
@@ -2643,7 +2649,7 @@ function login(db, hints) {
         yield setCurrentUser(db, context);
         // Make sure to resync as the new login will be authorized
         // for new realms.
-        triggerSync(db, 'pull');
+        triggerSync(db, "pull");
         return context.userId !== origUserId;
     });
 }
@@ -3467,7 +3473,7 @@ class FakeBigInt {
         this.v = value;
     }
 }
-const defs = Object.assign(Object.assign({}, undefinedDef), (hasBigIntSupport
+const defs = Object.assign(Object.assign(Object.assign({}, undefinedDef), (hasBigIntSupport
     ? {}
     : {
         bigint: {
@@ -3477,7 +3483,16 @@ const defs = Object.assign(Object.assign({}, undefinedDef), (hasBigIntSupport
             },
             revive: ({ v, }) => new FakeBigInt(v)
         }
-    }));
+    })), { PropModification: {
+        test: (val) => val instanceof PropModification,
+        replace: (propModification) => {
+            return Object.assign({ $t: 'PropModification' }, propModification);
+        },
+        revive: (_a) => {
+            var propModification = __rest(_a, ["$t"]);
+            return new PropModification(propModification);
+        }
+    } });
 const TSON = TypesonSimplified(builtin, defs);
 const BISON = Bison(defs);
 
@@ -5415,10 +5430,11 @@ function connectWebSocket(db) {
             }
             return new BehaviorSubject([userLogin, syncState]);
         }), switchMap(([userLogin, syncState]) => __awaiter(this, void 0, void 0, function* () { return [userLogin, yield computeRealmSetHash(syncState)]; })), distinctUntilChanged(([prevUser, prevHash], [currUser, currHash]) => prevUser === currUser && prevHash === currHash), switchMap(([userLogin, realmSetHash]) => {
+            var _a;
             // 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.
-            if (userLogin) {
+            if (userLogin && ((_a = db.cloud.persistedSyncState) === null || _a === void 0 ? void 0 : _a.value)) {
                 return new WSObservable(db.cloud.options.databaseUrl, db.cloud.persistedSyncState.value.serverRevision, realmSetHash, db.cloud.persistedSyncState.value.clientIdentity, messageProducer, db.cloud.webSocketStatus, userLogin.accessToken, userLogin.accessTokenExpiration);
             }
             else {
@@ -6270,7 +6286,7 @@ function dexieCloud(dexie) {
     const syncComplete = new Subject();
     dexie.cloud = {
         // @ts-ignore
-        version: "4.0.1-beta.58",
+        version: "4.0.1-rc.2",
         options: Object.assign({}, DEFAULT_OPTIONS),
         schema: null,
         get currentUserId() {
@@ -6501,10 +6517,7 @@ function dexieCloud(dexie) {
             // HERE: If requireAuth, do athentication now.
             let changedUser = false;
             if ((_c = db.cloud.options) === null || _c === void 0 ? void 0 : _c.requireAuth) {
-                const user = yield db.getCurrentUser();
-                if (!user.isLoggedIn) {
-                    changedUser = yield login(db);
-                }
+                changedUser = yield login(db);
             }
             if (localSyncWorker)
                 localSyncWorker.stop();
@@ -6550,7 +6563,7 @@ function dexieCloud(dexie) {
     }
 }
 // @ts-ignore
-dexieCloud.version = "4.0.1-beta.58";
+dexieCloud.version = "4.0.1-rc.2";
 Dexie.Cloud = dexieCloud;
 
 export { dexieCloud as default, dexieCloud, getTiedObjectId, getTiedRealmId, resolveText };