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

package/dist/modern/service-worker.js

@@ -4745,7 +4745,7 @@ async function performInitialSync(db, cloudOptions, cloudSchema) {
     console.debug("Done initial sync");
 }
 
-const USER_INACTIVITY_TIMEOUT = 300000; // 300_000;
+const USER_INACTIVITY_TIMEOUT = 180000; // 3 minutes
 const INACTIVE_WAIT_TIME = 20000;
 // This observable will be emitted to later down....
 const userIsActive = new BehaviorSubject(true);
@@ -4759,9 +4759,13 @@ const userIsActive = new BehaviorSubject(true);
 //   for just a short time.
 const userIsReallyActive = new BehaviorSubject(true);
 userIsActive
-    .pipe(switchMap((isActive) => isActive
-    ? of(true)
-    : of(false).pipe(delay(INACTIVE_WAIT_TIME))), distinctUntilChanged())
+    .pipe(switchMap((isActive) => {
+    //console.debug('SyncStatus: DUBB: isActive changed to', isActive);
+    return isActive
+        ? of(true)
+        : of(false).pipe(delay(INACTIVE_WAIT_TIME))
+            ;
+}), distinctUntilChanged())
     .subscribe(userIsReallyActive);
 //
 // First create some corner-stone observables to build the flow on
@@ -4776,7 +4780,7 @@ const documentBecomesHidden = visibilityStateIsChanged.pipe(filter(() => documen
 const documentBecomesVisible = visibilityStateIsChanged.pipe(filter(() => document.visibilityState === 'visible'));
 // Any of various user-activity-related events happen:
 const userDoesSomething = typeof window !== 'undefined'
-    ? merge(documentBecomesVisible, fromEvent(window, 'mousemove'), fromEvent(window, 'keydown'), fromEvent(window, 'wheel'), fromEvent(window, 'touchmove'))
+    ? merge(documentBecomesVisible, fromEvent(window, 'mousedown'), fromEvent(window, 'mousemove'), fromEvent(window, 'keydown'), fromEvent(window, 'wheel'), fromEvent(window, 'touchmove'))
     : of({});
 if (typeof document !== 'undefined') {
     //
@@ -4827,6 +4831,7 @@ class WSConnection extends Subscription$1 {
     constructor(databaseUrl, rev, realmSetHash, clientIdentity, token, tokenExpiration, subscriber, messageProducer, webSocketStatus) {
         super(() => this.teardown());
         this.id = ++counter;
+        this.reconnecting = false;
         console.debug('New WebSocket Connection', this.id, token ? 'authorized' : 'unauthorized');
         this.databaseUrl = databaseUrl;
         this.rev = rev;
@@ -4846,7 +4851,7 @@ class WSConnection extends Subscription$1 {
         this.disconnect();
     }
     disconnect() {
-        this.webSocketStatus.next("disconnected");
+        this.webSocketStatus.next('disconnected');
         if (this.pinger) {
             clearInterval(this.pinger);
             this.pinger = null;
@@ -4864,11 +4869,18 @@ class WSConnection extends Subscription$1 {
         }
     }
     reconnect() {
-        this.disconnect();
-        this.connect();
+        if (this.reconnecting)
+            return;
+        this.reconnecting = true;
+        try {
+            this.disconnect();
+        }
+        catch { }
+        this.connect()
+            .catch(() => { })
+            .then(() => (this.reconnecting = false)); // finally()
     }
     async connect() {
-        this.webSocketStatus.next("connecting");
         this.lastServerActivity = new Date();
         if (this.pauseUntil && this.pauseUntil > new Date()) {
             console.debug('WS not reconnecting just yet', {
@@ -4883,12 +4895,14 @@ class WSConnection extends Subscription$1 {
         if (!this.databaseUrl)
             throw new Error(`Cannot connect without a database URL`);
         if (this.closed) {
+            //console.debug('SyncStatus: DUBB: Ooops it was closed!');
             return;
         }
         if (this.tokenExpiration && this.tokenExpiration < new Date()) {
             this.subscriber.error(new TokenExpiredError()); // Will be handled in connectWebSocket.ts.
             return;
         }
+        this.webSocketStatus.next('connecting');
         this.pinger = setInterval(async () => {
             if (this.closed) {
                 console.debug('pinger check', this.id, 'CLOSED.');
@@ -4935,7 +4949,7 @@ class WSConnection extends Subscription$1 {
         const searchParams = new URLSearchParams();
         if (this.subscriber.closed)
             return;
-        searchParams.set('v', "2");
+        searchParams.set('v', '2');
         searchParams.set('rev', this.rev);
         searchParams.set('realmsHash', this.realmSetHash);
         searchParams.set('clientId', this.clientIdentity);
@@ -4974,23 +4988,30 @@ class WSConnection extends Subscription$1 {
             }
         };
         try {
+            let everConnected = false;
             await new Promise((resolve, reject) => {
                 ws.onopen = (event) => {
                     console.debug('dexie-cloud WebSocket onopen');
+                    everConnected = true;
                     resolve(null);
                 };
                 ws.onerror = (event) => {
-                    const error = event.error || new Error('WebSocket Error');
-                    this.disconnect();
-                    this.subscriber.error(error);
-                    this.webSocketStatus.next("error");
-                    reject(error);
+                    if (!everConnected) {
+                        const error = event.error || new Error('WebSocket Error');
+                        this.subscriber.error(error);
+                        this.webSocketStatus.next('error');
+                        reject(error);
+                    }
+                    else {
+                        this.reconnect();
+                    }
                 };
             });
-            this.messageProducerSubscription = this.messageProducer.subscribe(msg => {
+            this.messageProducerSubscription = this.messageProducer.subscribe((msg) => {
                 if (!this.closed) {
-                    if (msg.type === 'ready' && this.webSocketStatus.value !== 'connected') {
-                        this.webSocketStatus.next("connected");
+                    if (msg.type === 'ready' &&
+                        this.webSocketStatus.value !== 'connected') {
+                        this.webSocketStatus.next('connected');
                     }
                     this.ws?.send(TSON.stringify(msg));
                 }
@@ -5027,9 +5048,9 @@ function connectWebSocket(db) {
         rev: syncState.serverRevision,
     })));
     function createObservable() {
-        return db.cloud.persistedSyncState.pipe(filter(syncState => syncState?.serverRevision), // Don't connect before there's no initial sync performed.
+        return db.cloud.persistedSyncState.pipe(filter((syncState) => syncState?.serverRevision), // Don't connect before there's no initial sync performed.
         take(1), // Don't continue waking up whenever syncState change
-        switchMap((syncState) => db.cloud.currentUser.pipe(map(userLogin => [userLogin, syncState]))), switchMap(([userLogin, syncState]) => userIsReallyActive.pipe(map((isActive) => [isActive ? userLogin : null, syncState]))), switchMap(async ([userLogin, syncState]) => [userLogin, await computeRealmSetHash(syncState)]), switchMap(([userLogin, realmSetHash]) => 
+        switchMap((syncState) => db.cloud.currentUser.pipe(map((userLogin) => [userLogin, syncState]))), switchMap(([userLogin, syncState]) => userIsReallyActive.pipe(map((isActive) => [isActive ? userLogin : null, syncState]))), switchMap(async ([userLogin, syncState]) => [userLogin, await computeRealmSetHash(syncState)]), switchMap(([userLogin, realmSetHash]) => 
         // 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.
@@ -5052,7 +5073,10 @@ function connectWebSocket(db) {
             else {
                 return throwError(error);
             }
-        }), catchError((error) => from$1(waitAndReconnectWhenUserDoesSomething(error)).pipe(switchMap(() => createObservable()))));
+        }), catchError((error) => {
+            db.cloud.webSocketStatus.next("error");
+            return from$1(waitAndReconnectWhenUserDoesSomething(error)).pipe(switchMap(() => createObservable()));
+        }));
     }
     return createObservable().subscribe((msg) => {
         if (msg) {
@@ -5476,6 +5500,21 @@ function createSharedValueObservable(o, defaultValue) {
     return rv;
 }
 
+const getGlobalRolesObservable = associate((db) => {
+    return createSharedValueObservable(liveQuery(() => db.roles
+        .where({ realmId: 'rlm-public' })
+        .toArray()
+        .then((roles) => {
+        const rv = {};
+        for (const role of roles
+            .slice()
+            .sort((a, b) => (a.sortOrder || 0) - (b.sortOrder || 0))) {
+            rv[role.name] = role;
+        }
+        return rv;
+    })), {});
+});
+
 const getCurrentUserEmitter = associate((db) => new BehaviorSubject(UNAUTHORIZED_USER));
 
 const getInternalAccessControlObservable = associate((db) => {
@@ -5577,18 +5616,38 @@ function mergePermissions(...permissions) {
 }
 
 const getPermissionsLookupObservable = associate((db) => {
-    const o = getInternalAccessControlObservable(db._novip);
-    return mapValueObservable(o, ({ selfMembers, realms, userId }) => {
+    const o = createSharedValueObservable(combineLatest([
+        getInternalAccessControlObservable(db._novip),
+        getGlobalRolesObservable(db._novip),
+    ]).pipe(map(([{ selfMembers, realms, userId }, globalRoles]) => ({
+        selfMembers,
+        realms,
+        userId,
+        globalRoles,
+    }))), {
+        selfMembers: [],
+        realms: [],
+        userId: UNAUTHORIZED_USER.userId,
+        globalRoles: {},
+    });
+    return mapValueObservable(o, ({ selfMembers, realms, userId, globalRoles }) => {
         const rv = realms
-            .map((realm) => ({
-            ...realm,
-            permissions: realm.owner === userId
-                ? { manage: '*' }
-                : mergePermissions(...selfMembers
-                    .filter((m) => m.realmId === realm.realmId)
-                    .map((m) => m.permissions)
-                    .filter((p) => p)),
-        }))
+            .map((realm) => {
+            const selfRealmMembers = selfMembers.filter((m) => m.realmId === realm.realmId);
+            const directPermissionSets = selfRealmMembers
+                .map((m) => m.permissions)
+                .filter((p) => p);
+            const rolePermissionSets = flatten(selfRealmMembers.map((m) => m.roles).filter((roleName) => roleName))
+                .map((role) => globalRoles[role])
+                .filter((role) => role)
+                .map((role) => role.permissions);
+            return {
+                ...realm,
+                permissions: realm.owner === userId
+                    ? { manage: '*' }
+                    : mergePermissions(...directPermissionSets, ...rolePermissionSets),
+            };
+        })
             .reduce((p, c) => ({ ...p, [c.realmId]: c }), {
             [userId]: {
                 realmId: userId,
@@ -5672,7 +5731,7 @@ function permissions(dexie, obj, tableName) {
         const realm = permissionsLookup[realmId || dexie.cloud.currentUserId];
         if (!realm)
             return new PermissionChecker({}, tableName, !owner || owner === dexie.cloud.currentUserId);
-        return new PermissionChecker(realm.permissions, tableName, !owner || owner === dexie.cloud.currentUserId);
+        return new PermissionChecker(realm.permissions, tableName, realmId === dexie.cloud.currentUserId || owner === dexie.cloud.currentUserId);
     };
     const o = source.pipe(map(mapper));
     o.getValue = () => mapper(source.getValue());
@@ -5728,7 +5787,7 @@ function dexieCloud(dexie) {
         currentUserEmitter.next(UNAUTHORIZED_USER);
     });
     dexie.cloud = {
-        version: '4.0.0-beta.15',
+        version: '4.0.0-beta.16',
         options: { ...DEFAULT_OPTIONS },
         schema: null,
         serverState: null,
@@ -5749,6 +5808,7 @@ function dexieCloud(dexie) {
             await login(db, hint);
         },
         invites: getInvitesObservable(dexie),
+        roles: getGlobalRolesObservable(dexie),
         configure(options) {
             options = dexie.cloud.options = { ...dexie.cloud.options, ...options };
             configuredProgramatically = true;
@@ -5969,7 +6029,7 @@ function dexieCloud(dexie) {
         }
     }
 }
-dexieCloud.version = '4.0.0-beta.15';
+dexieCloud.version = '4.0.0-beta.16';
 Dexie.Cloud = dexieCloud;
 
 // In case the SW lives for a while, let it reuse already opened connections: