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

package/dist/types/DexieCloudAPI.d.ts

@@ -1,5 +1,5 @@
 import { DexieCloudOptions } from './DexieCloudOptions';
-import { DexieCloudSchema } from 'dexie-cloud-common';
+import { DBRealmRole, DexieCloudSchema } from 'dexie-cloud-common';
 import { UserLogin } from './db/entities/UserLogin';
 import * as Rx from 'rxjs';
 import { PersistedSyncState } from './db/entities/PersistedSyncState';
@@ -22,6 +22,9 @@ export interface DexieCloudAPI {
     persistedSyncState: Rx.BehaviorSubject<PersistedSyncState | undefined>;
     userInteraction: Rx.BehaviorSubject<DXCUserInteraction | undefined>;
     invites: Rx.Observable<Invite[]>;
+    roles: Rx.Observable<{
+        [roleName: string]: DBRealmRole;
+    }>;
     usingServiceWorker?: boolean;
     /** Login using Dexie Cloud OTP or Demo user.
      *

package/dist/types/DexieCloudEntity.d.ts

@@ -0,0 +1,8 @@
+import Dexie, { Entity, IndexableType, OwnClonableProperties, TableProp } from 'dexie';
+export declare class DexieCloudEntity<DexieSubClass extends Dexie = Dexie> extends Entity<DexieSubClass> {
+    realmId: string;
+    owner: string;
+    can(...args: [verb: 'add', table: TableProp<DexieSubClass> | string] | [verb: 'update', ...fields: (keyof OwnClonableProperties<this>)[]] | [verb: 'delete']): boolean;
+    $id(): IndexableType;
+    isRealm(): boolean;
+}

package/dist/types/WSObservable.d.ts

@@ -61,6 +61,7 @@ export declare class WSConnection extends Subscription {
     constructor(databaseUrl: string, rev: string, realmSetHash: string, clientIdentity: string, token: string | undefined, tokenExpiration: Date | undefined, subscriber: Subscriber<WSConnectionMsg>, messageProducer: Observable<WSClientToServerMsg>, webSocketStatus: BehaviorSubject<DXCWebSocketStatus>);
     private teardown;
     private disconnect;
+    reconnecting: boolean;
     reconnect(): void;
     connect(): Promise<void>;
 }

package/dist/types/WebSocketStatus.d.ts

@@ -0,0 +1 @@
+export declare type WebSocketStatus = "not-started" | "connecting" | "connected" | "error" | "asleep";

package/dist/types/createMyMembersObservable.d.ts

@@ -0,0 +1,14 @@
+import Dexie from 'dexie';
+import { DBPermissionSet, DBRealm, DBRealmMember } from 'dexie-cloud-common';
+import { Observable } from 'rxjs';
+import { UserLogin } from './db/entities/UserLogin';
+export declare function createMyMembersObservable(db: Dexie, currentUserObservable: Observable<UserLogin>): Observable<{
+    invites: Array<DBRealmMember & {
+        realm: DBRealm;
+    }>;
+    permissions: {
+        [realmId: string]: DBRealm & {
+            permissions: DBPermissionSet;
+        };
+    };
+}>;

package/dist/types/currentUserObservable.d.ts

@@ -0,0 +1,3 @@
+import Dexie from "dexie";
+import { BehaviorSubject } from "rxjs";
+export declare const currentUserEmitter: (x: Dexie) => BehaviorSubject<import("./db/entities/UserLogin").UserLogin>;

package/dist/types/getGlobalRolesObservable.d.ts

@@ -0,0 +1,5 @@
+import Dexie from 'dexie';
+import { DBRealmRole } from 'dexie-cloud-common';
+export declare const getGlobalRolesObservable: (x: Dexie) => import("./mapValueObservable").ObservableWithCurrentValue<{
+    [roleName: string]: DBRealmRole;
+}>;

package/dist/types/getInvitesObservable.d.ts

@@ -4,7 +4,7 @@ export declare const getInvitesObservable: (x: Dexie) => import("./mapValueObser
     realm: import("dexie-cloud-common").DBRealm & {
         permissions: import("dexie-cloud-common").DBPermissionSet;
     };
-    id?: string | undefined;
+    id: string;
     userId?: string | undefined;
     email?: string | undefined;
     name?: string | undefined;

package/dist/types/helpers/BroadcastedLocalEvent.d.ts

@@ -0,0 +1,8 @@
+import { Observable } from "rxjs";
+import { SWBroadcastChannel } from "./SWBroadcastChannel";
+export declare class BroadcastedAndLocalEvent<T> extends Observable<T> {
+    name: string;
+    bc: BroadcastChannel | SWBroadcastChannel;
+    constructor(name: string);
+    next(message: T): void;
+}

package/dist/types/helpers/visibleState.d.ts

@@ -0,0 +1 @@
+export declare function getVisibilityStateObservable(): import("rxjs").Observable<VisibilityState>;

package/dist/types/permissionsLookup.d.ts

@@ -0,0 +1,9 @@
+import Dexie from 'dexie';
+import { DBPermissionSet, DBRealm } from 'dexie-cloud-common';
+import { Observable } from 'rxjs';
+export declare type PermissionsLookupObservable = Observable<{
+    [realmId: string]: DBRealm & {
+        permissions: DBPermissionSet;
+    };
+}>;
+export declare const getPermissionsLookupObservable: (x: Dexie) => PermissionsLookupObservable;

package/dist/types/permissionsLookupObservable.d.ts

@@ -0,0 +1,14 @@
+import Dexie from 'dexie';
+import { DBPermissionSet, DBRealm, DBRealmMember } from 'dexie-cloud-common';
+import { Observable } from 'rxjs';
+import { UserLogin } from './db/entities/UserLogin';
+export declare function createMyMembersObservable(db: Dexie, currentUserObservable: Observable<UserLogin>): Observable<{
+    invites: Array<DBRealmMember & {
+        realm: DBRealm;
+    }>;
+    permissions: {
+        [realmId: string]: DBRealm & {
+            permissions: DBPermissionSet;
+        };
+    };
+}>;

package/dist/types/sync/globalizePrivateIds.d.ts

@@ -0,0 +1,4 @@
+import { DBCoreSchema } from 'dexie';
+import { DBOperationsSet } from 'dexie-cloud-common';
+import { UserLogin } from '../db/entities/UserLogin';
+export declare function encodePrimaryKeys(schema: DBCoreSchema, currentUser: UserLogin, changes: DBOperationsSet): DBOperationsSet;

package/dist/types/sync/syncServerToClientOnly.d.ts

@@ -0,0 +1,3 @@
+import { DexieCloudDB } from '../db/DexieCloudDB';
+import { ChangesFromServerMessage } from '../WSObservable';
+export declare function syncServerToClientOnly(db: DexieCloudDB, { baseRev, newRev, changes, realmSetHash }: ChangesFromServerMessage): import("rxjs").Observable<void>;

package/dist/types/types/LoginState.d.ts

@@ -0,0 +1,41 @@
+export declare type LoginState = LoginStateSilent | LoginStateInteraction | LoginStateError;
+export interface LoginStateSilent {
+    type: 'silent';
+}
+export declare type LoginStateInteraction = (Alert | EmailRequested | OTPRequested) & {
+    type: 'interaction';
+    alerts?: {
+        type: 'error' | 'warning' | 'info';
+        message: string;
+    }[];
+    isWorking?: boolean;
+    onSubmit: (params: LoginPromptReply) => void;
+    onCancel: () => void;
+};
+export declare type LoginPromptReply = {
+    email?: string;
+    otp?: string;
+    name?: string;
+};
+export interface LoginStateError {
+    type: 'error';
+    message: string;
+}
+interface Alert {
+    interactionType: 'alert';
+    alerts: {
+        type: 'error' | 'warning' | 'info';
+        message: string;
+    }[];
+    submitText: 'OK';
+}
+interface EmailRequested {
+    interactionType: 'emailRequested';
+    submitText: 'Send OTP';
+}
+interface OTPRequested {
+    interactionType: 'otpRequested';
+    isWorking: boolean;
+    submitText: 'Login';
+}
+export {};

package/dist/types/types/SyncConnectionStatus.d.ts

@@ -0,0 +1 @@
+export declare type SyncConnectionStatus = "not-started" | "connecting" | "connected" | "disconnected" | "error" | "offline";

package/dist/types/types/SyncFlowStatus.d.ts

@@ -0,0 +1,6 @@
+export declare type SyncPhase = "initial" | "not-in-sync" | "pushing" | "pulling" | "in-sync" | 'error' | 'offline';
+export interface SyncFlowStatus {
+    phase: SyncPhase;
+    progress?: number;
+    error?: Error;
+}

package/dist/types/types/SyncStatus.d.ts

@@ -0,0 +1,6 @@
+export declare type SyncPhase = "initial" | "not-in-sync" | "pushing" | "pulling" | "in-sync" | 'error' | 'offline';
+export interface SyncStatus {
+    phase: SyncPhase;
+    progress?: number;
+    error?: Error;
+}

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

@@ -108,7 +108,7 @@
      *
      * ==========================================================================
      *
-     * Version 4.0.0-beta.15, Mon Dec 20 2021
+     * Version 4.0.0-beta.16, Fri Apr 01 2022
      *
      * https://dexie.org
      *
@@ -5462,7 +5462,7 @@
             });
         });
     }
-    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 rxjs.BehaviorSubject(true);
@@ -5476,9 +5476,12 @@
     //   for just a short time.
     var userIsReallyActive = new rxjs.BehaviorSubject(true);
     userIsActive
-        .pipe(switchMap(function (isActive) { return isActive
-        ? rxjs.of(true)
-        : rxjs.of(false).pipe(delay(INACTIVE_WAIT_TIME)); }), distinctUntilChanged())
+        .pipe(switchMap(function (isActive) {
+        //console.debug('SyncStatus: DUBB: isActive changed to', isActive);
+        return isActive
+            ? rxjs.of(true)
+            : rxjs.of(false).pipe(delay(INACTIVE_WAIT_TIME));
+    }), distinctUntilChanged())
         .subscribe(userIsReallyActive);
     //
     // First create some corner-stone observables to build the flow on
@@ -5493,7 +5496,7 @@
     var documentBecomesVisible = visibilityStateIsChanged.pipe(filter(function () { return document.visibilityState === 'visible'; }));
     // Any of various user-activity-related events happen:
     var userDoesSomething = typeof window !== 'undefined'
-        ? rxjs.merge(documentBecomesVisible, rxjs.fromEvent(window, 'mousemove'), rxjs.fromEvent(window, 'keydown'), rxjs.fromEvent(window, 'wheel'), rxjs.fromEvent(window, 'touchmove'))
+        ? rxjs.merge(documentBecomesVisible, rxjs.fromEvent(window, 'mousedown'), rxjs.fromEvent(window, 'mousemove'), rxjs.fromEvent(window, 'keydown'), rxjs.fromEvent(window, 'wheel'), rxjs.fromEvent(window, 'touchmove'))
         : rxjs.of({});
     if (typeof document !== 'undefined') {
         //
@@ -5548,6 +5551,7 @@
         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;
@@ -5568,7 +5572,7 @@
             this.disconnect();
         };
         WSConnection.prototype.disconnect = function () {
-            this.webSocketStatus.next("disconnected");
+            this.webSocketStatus.next('disconnected');
             if (this.pinger) {
                 clearInterval(this.pinger);
                 this.pinger = null;
@@ -5586,17 +5590,25 @@
             }
         };
         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', {
@@ -5611,12 +5623,14 @@
                             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) {
@@ -5666,7 +5680,7 @@
                             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);
@@ -5707,17 +5721,23 @@
                             _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:
@@ -5725,8 +5745,9 @@
                             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));
                                 }
@@ -5835,7 +5856,10 @@
                 else {
                     return rxjs.throwError(error);
                 }
-            }), catchError(function (error) { return rxjs.from(waitAndReconnectWhenUserDoesSomething(error)).pipe(switchMap(function () { return createObservable(); })); }));
+            }), catchError(function (error) {
+                db.cloud.webSocketStatus.next("error");
+                return rxjs.from(waitAndReconnectWhenUserDoesSomething(error)).pipe(switchMap(function () { return createObservable(); }));
+            }));
         }
         return createObservable().subscribe(function (msg) {
             if (msg) {
@@ -6476,6 +6500,21 @@
         rv.getValue = function () { return currentValue; };
         return rv;
     }
+    var getGlobalRolesObservable = associate(function (db) {
+        return createSharedValueObservable(Dexie.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 rxjs.BehaviorSubject(UNAUTHORIZED_USER); });
     var getInternalAccessControlObservable = associate(function (db) {
         return createSharedValueObservable(getCurrentUserEmitter(db._novip).pipe(switchMap(function (currentUser) { return Dexie.liveQuery(function () { return db.transaction('r', 'realms', 'members', function () { return Promise.all([
@@ -6578,17 +6617,40 @@
         return reduced;
     }
     var getPermissionsLookupObservable = associate(function (db) {
-        var o = getInternalAccessControlObservable(db._novip);
+        var o = createSharedValueObservable(rxjs.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)));
@@ -6686,7 +6748,7 @@
             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()); };
@@ -6760,7 +6822,7 @@
             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,
@@ -6794,6 +6856,7 @@
                 });
             },
             invites: getInvitesObservable(dexie),
+            roles: getGlobalRolesObservable(dexie),
             configure: function (options) {
                 options = dexie.cloud.options = __assign(__assign({}, dexie.cloud.options), options);
                 configuredProgramatically = true;
@@ -7089,7 +7152,7 @@
             });
         }
     }
-    dexieCloud.version = '4.0.0-beta.15';
+    dexieCloud.version = '4.0.0-beta.16';
     Dexie__default["default"].Cloud = dexieCloud;
 
     exports["default"] = dexieCloud;