dexie-cloud-addon 4.1.0-alpha.2 → 4.1.0-alpha.5

package/dist/modern/WSObservable.d.ts

@@ -3,6 +3,7 @@ import { BehaviorSubject, Observable, Subscriber, Subscription } from 'rxjs';
 import { DXCWebSocketStatus } from './DXCWebSocketStatus';
 import type { YClientMessage } from 'dexie-cloud-common';
 import { DexieCloudDB } from './db/DexieCloudDB';
+import { UserLogin } from './dexie-cloud-client';
 export type WSClientToServerMsg = ReadyForChangesMessage | YClientMessage;
 export interface ReadyForChangesMessage {
     type: 'ready';
@@ -41,7 +42,7 @@ export interface TokenExpiredMessage {
     type: 'token-expired';
 }
 export declare class WSObservable extends Observable<WSConnectionMsg> {
-    constructor(db: DexieCloudDB, rev: string, realmSetHash: string, clientIdentity: string, messageProducer: Observable<WSClientToServerMsg>, webSocketStatus: BehaviorSubject<DXCWebSocketStatus>, token?: string, tokenExpiration?: Date);
+    constructor(db: DexieCloudDB, rev: string, realmSetHash: string, clientIdentity: string, messageProducer: Observable<WSClientToServerMsg>, webSocketStatus: BehaviorSubject<DXCWebSocketStatus>, user: UserLogin);
 }
 export declare class WSConnection extends Subscription {
     db: DexieCloudDB;
@@ -53,8 +54,7 @@ export declare class WSConnection extends Subscription {
     rev: string;
     realmSetHash: string;
     clientIdentity: string;
-    token: string | undefined;
-    tokenExpiration: Date | undefined;
+    user: UserLogin;
     subscriber: Subscriber<WSConnectionMsg>;
     pauseUntil?: Date;
     messageProducer: Observable<WSClientToServerMsg>;
@@ -62,7 +62,7 @@ export declare class WSConnection extends Subscription {
     id: number;
     private pinger;
     private subscriptions;
-    constructor(db: DexieCloudDB, rev: string, realmSetHash: string, clientIdentity: string, token: string | undefined, tokenExpiration: Date | undefined, subscriber: Subscriber<WSConnectionMsg>, messageProducer: Observable<WSClientToServerMsg>, webSocketStatus: BehaviorSubject<DXCWebSocketStatus>);
+    constructor(db: DexieCloudDB, rev: string, realmSetHash: string, clientIdentity: string, user: UserLogin, subscriber: Subscriber<WSConnectionMsg>, messageProducer: Observable<WSClientToServerMsg>, webSocketStatus: BehaviorSubject<DXCWebSocketStatus>);
     private teardown;
     private disconnect;
     reconnecting: boolean;

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

@@ -8,7 +8,7 @@
  *
  * ==========================================================================
  *
- * Version 4.1.0-alpha.2, Mon Oct 07 2024
+ * Version 4.1.0-alpha.5, Mon Oct 14 2024
  *
  * https://dexie.org
  *
@@ -4967,13 +4967,12 @@ function $Y(db) {
  * @param db
  * @returns
  */
-function listYClientMessagesAndStateVector(db) {
-    var _a;
+function listYClientMessagesAndStateVector(db, tablesToSync) {
     return __awaiter(this, void 0, void 0, function* () {
         const result = [];
         const lastUpdateIds = {};
-        for (const table of db.tables) {
-            if (table.schema.yProps && ((_a = db.cloud.schema) === null || _a === void 0 ? void 0 : _a[table.name].markedForSync)) {
+        for (const table of tablesToSync) {
+            if (table.schema.yProps) {
                 for (const yProp of table.schema.yProps) {
                     const Y = $Y(db); // This is how we retrieve the user-provided Y library
                     const yTable = db.table(yProp.updatesTable); // the updates-table for this combo of table+propName
@@ -5107,7 +5106,7 @@ function applyYServerMessages(yMessages, db) {
 }
 
 function updateYSyncStates(lastUpdateIdsBeforeSync, receivedUntilsAfterSync, db, serverRevision) {
-    var _a, _b;
+    var _a, _b, _c, _d, _e;
     return __awaiter(this, void 0, void 0, function* () {
         // We want to update unsentFrom for each yTable to the value specified in first argument
         //  because we got those values before we synced with server and here we are back from server
@@ -5115,7 +5114,7 @@ function updateYSyncStates(lastUpdateIdsBeforeSync, receivedUntilsAfterSync, db,
         //  we can safely store unsentFrom to a value of the last update + 1 here.
         // We also want to update receivedUntil for each yTable to the value specified in the second argument,
         //  because that contains the highest resulted id of each update from server after storing it.
-        // We could do these two tasks separately, but that would require two update calls on the same YSyncState, so 
+        // We could do these two tasks separately, but that would require two update calls on the same YSyncState, so
         // to optimize the dexie calls, we merge these two maps into a single one so we can do a single update request
         // per yTable.
         const mergedSpec = {};
@@ -5127,28 +5126,42 @@ function updateYSyncStates(lastUpdateIdsBeforeSync, receivedUntilsAfterSync, db,
             (_b = mergedSpec[yTable]) !== null && _b !== void 0 ? _b : (mergedSpec[yTable] = {});
             mergedSpec[yTable].receivedUntil = lastUpdateId;
         }
-        // Now go through the merged map and update YSyncStates accordingly:
-        for (const [yTable, { unsentFrom, receivedUntil }] of Object.entries(mergedSpec)) {
+        // Now go through all yTables and update their YSyncStates:
+        const allYTables = Object.values(db.dx._dbSchema)
+            .filter((tblSchema) => tblSchema.yProps)
+            .map((tblSchema) => tblSchema.yProps.map((yProp) => yProp.updatesTable))
+            .flat();
+        for (const yTable of allYTables) {
+            const mergedEntry = mergedSpec[yTable];
+            const unsentFrom = (_c = mergedEntry === null || mergedEntry === void 0 ? void 0 : mergedEntry.unsentFrom) !== null && _c !== void 0 ? _c : 1;
+            const receivedUntil = (_e = (_d = mergedEntry === null || mergedEntry === void 0 ? void 0 : mergedEntry.receivedUntil) !== null && _d !== void 0 ? _d : 
+            // from local because we are in the same parent transaction (in sync.ts) that
+            // applied all updates from the server
+            (yield db
+                .table(yTable)
+                .where('i')
+                .between(1, Infinity) // Because i might be string DEXIE_CLOUD_SYNCER_ID if not a number.
+                .reverse()
+                .limit(1)
+                .primaryKeys())[0]) !== null && _e !== void 0 ? _e : 0;
             // We're already in a transaction, but for the sake of
             // code readability and correctness, let's launch an atomic sub transaction:
             yield db.transaction('rw', yTable, () => __awaiter(this, void 0, void 0, function* () {
-                const state = yield db.table(yTable).get(DEXIE_CLOUD_SYNCER_ID);
+                const state = yield db
+                    .table(yTable)
+                    .get(DEXIE_CLOUD_SYNCER_ID);
                 if (!state) {
                     yield db.table(yTable).add({
                         i: DEXIE_CLOUD_SYNCER_ID,
-                        unsentFrom: unsentFrom || 1,
-                        receivedUntil: receivedUntil || 0,
+                        unsentFrom,
+                        receivedUntil,
                         serverRev: serverRevision,
                     });
                 }
                 else {
-                    if (unsentFrom) {
-                        state.unsentFrom = Math.max(unsentFrom, state.unsentFrom || 1);
-                    }
-                    if (receivedUntil) {
-                        state.receivedUntil = Math.max(receivedUntil, state.receivedUntil || 0);
-                        state.serverRev = serverRevision;
-                    }
+                    state.unsentFrom = Math.max(unsentFrom, state.unsentFrom || 1);
+                    state.receivedUntil = Math.max(receivedUntil, state.receivedUntil || 0);
+                    state.serverRev = serverRevision;
                     yield db.table(yTable).put(state);
                 }
             }));
@@ -5161,7 +5174,9 @@ const BINSTREAM_TYPE_TABLE_AND_PROP = 2;
 const BINSTREAM_TYPE_DOCUMENT = 3;
 function downloadYDocsFromServer(db, databaseUrl, { yDownloadedRealms, realms }) {
     return __awaiter(this, void 0, void 0, function* () {
-        if (yDownloadedRealms && realms && realms.every(realmId => yDownloadedRealms[realmId] === '*')) {
+        if (yDownloadedRealms &&
+            realms &&
+            realms.every((realmId) => yDownloadedRealms[realmId] === '*')) {
             return; // Already done!
         }
         console.debug('Downloading Y.Docs from added realms');
@@ -5201,16 +5216,19 @@ function downloadYDocsFromServer(db, databaseUrl, { yDownloadedRealms, realms })
                             yield yTable.bulkAdd(docsToInsert);
                             docsToInsert = [];
                         }
-                        if (currentRealmId && currentTable && currentProp && (lastDoc || completedRealm)) {
-                            yield db.$syncState.update('syncState', completedRealm
-                                ? '*'
-                                : {
-                                    [`yDownloadedRealms.${currentRealmId}`]: {
+                        if (currentRealmId &&
+                            ((currentTable && currentProp && lastDoc) || completedRealm)) {
+                            yield db.$syncState.update('syncState', (syncState) => {
+                                const yDownloadedRealms = syncState.yDownloadedRealms || {};
+                                yDownloadedRealms[currentRealmId] = completedRealm
+                                    ? '*'
+                                    : {
                                         tbl: currentTable,
                                         prop: currentProp,
                                         key: lastDoc.k,
-                                    },
-                                });
+                                    };
+                                syncState.yDownloadedRealms = yDownloadedRealms;
+                            });
                         }
                     });
                 }
@@ -5360,7 +5378,7 @@ function _sync(db, options, schema, { isInitialSync, cancelToken, justCheckIfNee
             const syncState = yield db.getPersistedSyncState();
             const baseRevs = yield db.$baseRevs.toArray();
             let clientChanges = yield listClientChanges(mutationTables);
-            const yResults = yield listYClientMessagesAndStateVector(db);
+            const yResults = yield listYClientMessagesAndStateVector(db, tablesToSync);
             throwIfCancelled(cancelToken);
             if (doSyncify) {
                 const alreadySyncedRealms = [
@@ -6613,7 +6631,7 @@ class TokenExpiredError extends Error {
 
 function createYClientUpdateObservable(db) {
     const yTableRecords = flatten(db.tables
-        .filter((table) => { var _a; return ((_a = db.cloud.schema) === null || _a === void 0 ? void 0 : _a[table.name].markedForSync) && table.schema.yProps; })
+        .filter((table) => { var _a, _b; return ((_b = (_a = db.cloud.schema) === null || _a === void 0 ? void 0 : _a[table.name]) === null || _b === void 0 ? void 0 : _b.markedForSync) && table.schema.yProps; })
         .map((table) => table.schema.yProps.map((p) => ({
         table: table.name,
         ydocProp: p.prop,
@@ -6644,7 +6662,12 @@ function createYClientUpdateObservable(db) {
                 };
             });
         }));
-    })).pipe(mergeMap$1((messages) => messages)); // Flattens the array of messages. If messageProducer emits empty array, nothing is emitted but if messageProducer emits array of messages, they are emitted one by one.
+    })).pipe(
+    // Flatten the array of messages.
+    // If messageProducer emits empty array, nothing is emitted
+    // but if messageProducer emits array of messages, they are
+    // emitted one by one.
+    mergeMap$1((messages) => messages));
 }
 
 function getAwarenessLibrary(db) {
@@ -6661,25 +6684,24 @@ const SERVER_PING_TIMEOUT = 20000;
 const CLIENT_PING_INTERVAL = 30000;
 const FAIL_RETRY_WAIT_TIME = 60000;
 class WSObservable extends Observable$1 {
-    constructor(db, rev, realmSetHash, clientIdentity, messageProducer, webSocketStatus, token, tokenExpiration) {
-        super((subscriber) => new WSConnection(db, rev, realmSetHash, clientIdentity, token, tokenExpiration, subscriber, messageProducer, webSocketStatus));
+    constructor(db, rev, realmSetHash, clientIdentity, messageProducer, webSocketStatus, user) {
+        super((subscriber) => new WSConnection(db, rev, realmSetHash, clientIdentity, user, subscriber, messageProducer, webSocketStatus));
     }
 }
 let counter = 0;
 class WSConnection extends Subscription$1 {
-    constructor(db, rev, realmSetHash, clientIdentity, token, tokenExpiration, subscriber, messageProducer, webSocketStatus) {
+    constructor(db, rev, realmSetHash, clientIdentity, user, subscriber, messageProducer, webSocketStatus) {
         super(() => this.teardown());
         this.id = ++counter;
         this.subscriptions = new Set();
         this.reconnecting = false;
-        console.debug('New WebSocket Connection', this.id, token ? 'authorized' : 'unauthorized');
+        console.debug('New WebSocket Connection', this.id, user.accessToken ? 'authorized' : 'unauthorized');
         this.db = db;
         this.databaseUrl = db.cloud.options.databaseUrl;
         this.rev = rev;
         this.realmSetHash = realmSetHash;
         this.clientIdentity = clientIdentity;
-        this.token = token;
-        this.tokenExpiration = tokenExpiration;
+        this.user = user;
         this.subscriber = subscriber;
         this.lastUserActivity = new Date();
         this.messageProducer = messageProducer;
@@ -6739,7 +6761,8 @@ class WSConnection extends Subscription$1 {
                 //console.debug('SyncStatus: DUBB: Ooops it was closed!');
                 return;
             }
-            if (this.tokenExpiration && this.tokenExpiration < new Date()) {
+            const tokenExpiration = this.user.accessTokenExpiration;
+            if (tokenExpiration && tokenExpiration < new Date()) {
                 this.subscriber.error(new TokenExpiredError()); // Will be handled in connectWebSocket.ts.
                 return;
             }
@@ -6794,8 +6817,8 @@ class WSConnection extends Subscription$1 {
             searchParams.set('rev', this.rev);
             searchParams.set('realmsHash', this.realmSetHash);
             searchParams.set('clientId', this.clientIdentity);
-            if (this.token) {
-                searchParams.set('token', this.token);
+            if (this.user.accessToken) {
+                searchParams.set('token', this.user.accessToken);
             }
             // Connect the WebSocket to given url:
             console.debug('dexie-cloud WebSocket create');
@@ -6881,7 +6904,9 @@ class WSConnection extends Subscription$1 {
                         }
                     }
                 }));
-                this.subscriptions.add(createYClientUpdateObservable(this.db).subscribe(this.db.messageProducer));
+                if (this.user.isLoggedIn && !isEagerSyncDisabled(this.db)) {
+                    this.subscriptions.add(createYClientUpdateObservable(this.db).subscribe(this.db.messageProducer));
+                }
             }
             catch (error) {
                 this.pauseUntil = new Date(Date.now() + FAIL_RETRY_WAIT_TIME);
@@ -6961,7 +6986,7 @@ function connectWebSocket(db) {
             // 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) {
-                return new WSObservable(db, db.cloud.persistedSyncState.value.serverRevision, realmSetHash, db.cloud.persistedSyncState.value.clientIdentity, messageProducer, db.cloud.webSocketStatus, userLogin.accessToken, userLogin.accessTokenExpiration);
+                return new WSObservable(db, db.cloud.persistedSyncState.value.serverRevision, realmSetHash, db.cloud.persistedSyncState.value.clientIdentity, messageProducer, db.cloud.webSocketStatus, userLogin);
             }
             else {
                 return from$1([]);
@@ -7768,9 +7793,9 @@ const getInvitesObservable = associate((db) => {
 });
 
 function createYHandler(db) {
-    const awap = getAwarenessLibrary(db);
     return (provider) => {
         var _a;
+        const awap = getAwarenessLibrary(db);
         const doc = provider.doc;
         const { parentTable, parentId, parentProp, updatesTable } = doc.meta;
         if (!((_a = db.cloud.schema) === null || _a === void 0 ? void 0 : _a[parentTable].markedForSync)) {
@@ -7782,7 +7807,8 @@ function createYHandler(db) {
         awareness.on('update', ({ added, updated, removed }, origin) => {
             // Send the update
             const changedClients = added.concat(updated).concat(removed);
-            if (origin !== 'server') {
+            const user = db.cloud.currentUser.value;
+            if (origin !== 'server' && user.isLoggedIn && !isEagerSyncDisabled(db)) {
                 const update = awap.encodeAwarenessUpdate(awareness, changedClients);
                 db.messageProducer.next({
                     type: 'aware',
@@ -7823,7 +7849,8 @@ function createYHandler(db) {
                 // Keep "connected" state in a variable so we can check it after async operations
                 connected = wsStatus === 'connected';
                 // We are or got connected. Open the document on the server.
-                if (wsStatus === "connected") {
+                const user = db.cloud.currentUser.value;
+                if (wsStatus === "connected" && user.isLoggedIn && !isEagerSyncDisabled(db)) {
                     ++currentFlowId;
                     openDocumentOnServer().catch(error => {
                         console.warn(`Error catched in createYHandler.ts: ${error}`);
@@ -7936,7 +7963,7 @@ function dexieCloud(dexie) {
     const syncComplete = new Subject();
     dexie.cloud = {
         // @ts-ignore
-        version: "4.1.0-alpha.2",
+        version: "4.1.0-alpha.5",
         options: Object.assign({}, DEFAULT_OPTIONS),
         schema: null,
         get currentUserId() {
@@ -8238,7 +8265,7 @@ function dexieCloud(dexie) {
     }
 }
 // @ts-ignore
-dexieCloud.version = "4.1.0-alpha.2";
+dexieCloud.version = "4.1.0-alpha.5";
 Dexie.Cloud = dexieCloud;
 
 export { dexieCloud as default, dexieCloud, getTiedObjectId, getTiedRealmId, resolveText };