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

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

@@ -101,7 +101,7 @@ function __spreadArray$1(to, from, pack) {
  *
  * ==========================================================================
  *
- * Version 4.0.0-beta.15, Mon Dec 20 2021
+ * Version 4.0.0-beta.16, Fri Apr 01 2022
  *
  * https://dexie.org
  *
@@ -5455,7 +5455,7 @@ function performInitialSync(db, cloudOptions, cloudSchema) {
         });
     });
 }
-var USER_INACTIVITY_TIMEOUT = 300000; // 300_000;
+var USER_INACTIVITY_TIMEOUT = 180000; // 3 minutes
 var INACTIVE_WAIT_TIME = 20000;
 // This observable will be emitted to later down....
 var userIsActive = new BehaviorSubject(true);
@@ -5469,9 +5469,12 @@ var userIsActive = new BehaviorSubject(true);
 //   for just a short time.
 var userIsReallyActive = new BehaviorSubject(true);
 userIsActive
-    .pipe(switchMap(function (isActive) { return isActive
-    ? of(true)
-    : of(false).pipe(delay(INACTIVE_WAIT_TIME)); }), distinctUntilChanged())
+    .pipe(switchMap(function (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
@@ -5486,7 +5489,7 @@ var documentBecomesHidden = visibilityStateIsChanged.pipe(filter(function () { r
 var documentBecomesVisible = visibilityStateIsChanged.pipe(filter(function () { return document.visibilityState === 'visible'; }));
 // Any of various user-activity-related events happen:
 var 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') {
     //
@@ -5541,6 +5544,7 @@ var WSConnection = /** @class */ (function (_super_1) {
     function WSConnection(databaseUrl, rev, realmSetHash, clientIdentity, token, tokenExpiration, subscriber, messageProducer, webSocketStatus) {
         var _this_1 = _super_1.call(this, function () { return _this_1.teardown(); }) || this;
         _this_1.id = ++counter;
+        _this_1.reconnecting = false;
         console.debug('New WebSocket Connection', _this_1.id, token ? 'authorized' : 'unauthorized');
         _this_1.databaseUrl = databaseUrl;
         _this_1.rev = rev;
@@ -5561,7 +5565,7 @@ var WSConnection = /** @class */ (function (_super_1) {
         this.disconnect();
     };
     WSConnection.prototype.disconnect = function () {
-        this.webSocketStatus.next("disconnected");
+        this.webSocketStatus.next('disconnected');
         if (this.pinger) {
             clearInterval(this.pinger);
             this.pinger = null;
@@ -5579,17 +5583,25 @@ var WSConnection = /** @class */ (function (_super_1) {
         }
     };
     WSConnection.prototype.reconnect = function () {
-        this.disconnect();
-        this.connect();
+        var _this_1 = this;
+        if (this.reconnecting)
+            return;
+        this.reconnecting = true;
+        try {
+            this.disconnect();
+        }
+        catch (_e) { }
+        this.connect()
+            .catch(function () { })
+            .then(function () { return (_this_1.reconnecting = false); }); // finally()
     };
     WSConnection.prototype.connect = function () {
         return __awaiter$1(this, void 0, void 0, function () {
-            var wsUrl, searchParams, ws;
+            var wsUrl, searchParams, ws, everConnected_1;
             var _this_1 = this;
             return __generator$1(this, function (_e) {
                 switch (_e.label) {
                     case 0:
-                        this.webSocketStatus.next("connecting");
                         this.lastServerActivity = new Date();
                         if (this.pauseUntil && this.pauseUntil > new Date()) {
                             console.debug('WS not reconnecting just yet', {
@@ -5604,12 +5616,14 @@ var WSConnection = /** @class */ (function (_super_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 [2 /*return*/];
                         }
                         if (this.tokenExpiration && this.tokenExpiration < new Date()) {
                             this.subscriber.error(new TokenExpiredError()); // Will be handled in connectWebSocket.ts.
                             return [2 /*return*/];
                         }
+                        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) {
@@ -5659,7 +5673,7 @@ var WSConnection = /** @class */ (function (_super_1) {
                         searchParams = new URLSearchParams();
                         if (this.subscriber.closed)
                             return [2 /*return*/];
-                        searchParams.set('v', "2");
+                        searchParams.set('v', '2');
                         searchParams.set('rev', this.rev);
                         searchParams.set('realmsHash', this.realmSetHash);
                         searchParams.set('clientId', this.clientIdentity);
@@ -5700,17 +5714,23 @@ var WSConnection = /** @class */ (function (_super_1) {
                         _e.label = 1;
                     case 1:
                         _e.trys.push([1, 3, , 4]);
+                        everConnected_1 = false;
                         return [4 /*yield*/, new Promise(function (resolve, reject) {
                                 ws.onopen = function (event) {
                                     console.debug('dexie-cloud WebSocket onopen');
+                                    everConnected_1 = true;
                                     resolve(null);
                                 };
                                 ws.onerror = function (event) {
-                                    var error = event.error || new Error('WebSocket Error');
-                                    _this_1.disconnect();
-                                    _this_1.subscriber.error(error);
-                                    _this_1.webSocketStatus.next("error");
-                                    reject(error);
+                                    if (!everConnected_1) {
+                                        var error = event.error || new Error('WebSocket Error');
+                                        _this_1.subscriber.error(error);
+                                        _this_1.webSocketStatus.next('error');
+                                        reject(error);
+                                    }
+                                    else {
+                                        _this_1.reconnect();
+                                    }
                                 };
                             })];
                     case 2:
@@ -5718,8 +5738,9 @@ var WSConnection = /** @class */ (function (_super_1) {
                         this.messageProducerSubscription = this.messageProducer.subscribe(function (msg) {
                             var _e;
                             if (!_this_1.closed) {
-                                if (msg.type === 'ready' && _this_1.webSocketStatus.value !== 'connected') {
-                                    _this_1.webSocketStatus.next("connected");
+                                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));
                             }
@@ -5828,7 +5849,10 @@ function connectWebSocket(db) {
             else {
                 return throwError(error);
             }
-        }), catchError(function (error) { return from$1(waitAndReconnectWhenUserDoesSomething(error)).pipe(switchMap(function () { return createObservable(); })); }));
+        }), catchError(function (error) {
+            db.cloud.webSocketStatus.next("error");
+            return from$1(waitAndReconnectWhenUserDoesSomething(error)).pipe(switchMap(function () { return createObservable(); }));
+        }));
     }
     return createObservable().subscribe(function (msg) {
         if (msg) {
@@ -6469,6 +6493,21 @@ function createSharedValueObservable(o, defaultValue) {
     rv.getValue = function () { return currentValue; };
     return rv;
 }
+var getGlobalRolesObservable = associate(function (db) {
+    return createSharedValueObservable(liveQuery(function () { return db.roles
+        .where({ realmId: 'rlm-public' })
+        .toArray()
+        .then(function (roles) {
+        var rv = {};
+        for (var _e = 0, _f = roles
+            .slice()
+            .sort(function (a, b) { return (a.sortOrder || 0) - (b.sortOrder || 0); }); _e < _f.length; _e++) {
+            var role = _f[_e];
+            rv[role.name] = role;
+        }
+        return rv;
+    }); }), {});
+});
 var getCurrentUserEmitter = associate(function (db) { return new BehaviorSubject(UNAUTHORIZED_USER); });
 var getInternalAccessControlObservable = associate(function (db) {
     return createSharedValueObservable(getCurrentUserEmitter(db._novip).pipe(switchMap(function (currentUser) { return liveQuery(function () { return db.transaction('r', 'realms', 'members', function () { return Promise.all([
@@ -6571,17 +6610,40 @@ function mergePermissions() {
     return reduced;
 }
 var getPermissionsLookupObservable = associate(function (db) {
-    var o = getInternalAccessControlObservable(db._novip);
+    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];
+        return ({
+            selfMembers: selfMembers,
+            realms: realms,
+            userId: userId,
+            globalRoles: globalRoles,
+        });
+    })), {
+        selfMembers: [],
+        realms: [],
+        userId: UNAUTHORIZED_USER.userId,
+        globalRoles: {},
+    });
     return mapValueObservable(o, function (_e) {
         var _f;
-        var selfMembers = _e.selfMembers, realms = _e.realms, userId = _e.userId;
+        var selfMembers = _e.selfMembers, realms = _e.realms, userId = _e.userId, globalRoles = _e.globalRoles;
         var rv = realms
-            .map(function (realm) { return (__assign(__assign({}, realm), { permissions: realm.owner === userId
-                ? { manage: '*' }
-                : mergePermissions.apply(void 0, selfMembers
-                    .filter(function (m) { return m.realmId === realm.realmId; })
-                    .map(function (m) { return m.permissions; })
-                    .filter(function (p) { return p; })) })); })
+            .map(function (realm) {
+            var selfRealmMembers = selfMembers.filter(function (m) { return m.realmId === realm.realmId; });
+            var directPermissionSets = selfRealmMembers
+                .map(function (m) { return m.permissions; })
+                .filter(function (p) { return p; });
+            var rolePermissionSets = flatten(selfRealmMembers.map(function (m) { return m.roles; }).filter(function (roleName) { return roleName; }))
+                .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
+                    ? { 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)));
@@ -6679,7 +6741,7 @@ function permissions(dexie, obj, tableName) {
         var 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);
     };
     var o = source.pipe(map(mapper));
     o.getValue = function () { return mapper(source.getValue()); };
@@ -6753,7 +6815,7 @@ function dexieCloud(dexie) {
         currentUserEmitter.next(UNAUTHORIZED_USER);
     });
     dexie.cloud = {
-        version: '4.0.0-beta.15',
+        version: '4.0.0-beta.16',
         options: __assign({}, DEFAULT_OPTIONS),
         schema: null,
         serverState: null,
@@ -6787,6 +6849,7 @@ function dexieCloud(dexie) {
             });
         },
         invites: getInvitesObservable(dexie),
+        roles: getGlobalRolesObservable(dexie),
         configure: function (options) {
             options = dexie.cloud.options = __assign(__assign({}, dexie.cloud.options), options);
             configuredProgramatically = true;
@@ -7082,7 +7145,7 @@ function dexieCloud(dexie) {
         });
     }
 }
-dexieCloud.version = '4.0.0-beta.15';
+dexieCloud.version = '4.0.0-beta.16';
 Dexie.Cloud = dexieCloud;
 
 export { dexieCloud as default, dexieCloud, getTiedObjectId, getTiedRealmId };