@towns-labs/sdk 2.0.11 → 2.0.12

package/dist/sync-agent/syncAgent.js

@@ -1,9 +1,7 @@
 import { RiverConnection } from './river-connection/riverConnection';
-import { Store } from '../store/store';
 import { userIdFromAddress } from '../id';
 import { User } from './user/user';
 import { RiverDbManager } from '../riverDbManager';
-import { DB_MODELS, DB_VERSION } from './db';
 import { Spaces } from './spaces/spaces';
 import { Gdms } from './gdms/gdms';
 import { Dms } from './dms/dms';
@@ -13,7 +11,6 @@ export class SyncAgent {
     userId;
     config;
     riverConnection;
-    store;
     user;
     spaces;
     gdms;
@@ -26,9 +23,7 @@ export class SyncAgent {
         const logId = config.logId ?? shortenHexString(this.userId);
         this.log = dlog('csb:syncAgent', { defaultEnabled: true }).extend(logId);
         this.config = config;
-        this.store = new Store(this.syncAgentDbName(), DB_VERSION, DB_MODELS);
-        this.store.newTransactionGroup('SyncAgent::initialization');
-        this.riverConnection = new RiverConnection(this.store, config.townsConfig, {
+        this.riverConnection = new RiverConnection(config.townsConfig, {
             signerContext: config.context,
             cryptoStore: RiverDbManager.getCryptoDb(this.userId, this.cryptoDbName()),
             opts: {
@@ -42,16 +37,14 @@ export class SyncAgent {
             encryptionDevice: config.encryptionDevice,
             onTokenExpired: config.onTokenExpired,
         });
-        this.user = new User(this.userId, this.store, this.riverConnection);
-        this.spaces = new Spaces(this.store, this.riverConnection, this.user.memberships);
-        this.gdms = new Gdms(this.store, this.riverConnection, this.user.memberships);
-        this.dms = new Dms(this.store, this.riverConnection, this.user.memberships);
+        this.user = new User(this.userId, this.riverConnection);
+        this.spaces = new Spaces(this.riverConnection, this.user.memberships);
+        this.gdms = new Gdms(this.riverConnection, this.user.memberships);
+        this.dms = new Dms(this.riverConnection, this.user.memberships);
         // flatten out the observables
         this.observables = {
             riverAuthStatus: this.riverConnection.authStatus,
-            riverConnection: this.riverConnection,
             spaces: this.spaces,
-            user: this.user,
             userMemberships: this.user.memberships,
             userInbox: this.user.inbox,
             userMetadata: this.user.deviceKeys,
@@ -64,8 +57,6 @@ export class SyncAgent {
         if (this.stopped) {
             throw new Error('SyncAgent is stopped, please instantiate a new sync agent');
         }
-        // commit the initialization transaction, which triggers onLoaded on the models
-        await this.store.commitTransaction();
         this.log('SyncAgent::start: starting river connection');
         // start this river connection, this will log us in if the user is already signed up
         // it will leave us in a connected state otherwise, see riverConnection.authStatus

package/dist/sync-agent/syncAgent.js.map

@@ -1 +1 @@
-{"version":3,"file":"syncAgent.js","sourceRoot":"","sources":["../../src/sync-agent/syncAgent.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAwB,MAAM,oCAAoC,CAAA;AAG1F,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAA;AAEtC,OAAO,EAAE,iBAAiB,EAAE,MAAM,OAAO,CAAA;AACzC,OAAO,EAAE,IAAI,EAAa,MAAM,aAAa,CAAA;AAE7C,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAA;AAIlD,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,MAAM,CAAA;AAG5C,OAAO,EAAE,MAAM,EAAe,MAAM,iBAAiB,CAAA;AAIrD,OAAO,EAAE,IAAI,EAAkB,MAAM,aAAa,CAAA;AAClD,OAAO,EAAE,GAAG,EAAY,MAAM,WAAW,CAAA;AAEzC,OAAO,EAAE,IAAI,EAAW,gBAAgB,EAAE,MAAM,mBAAmB,CAAA;AAiBnE,MAAM,OAAO,SAAS;IAClB,GAAG,CAAS;IACZ,MAAM,CAAQ;IACd,MAAM,CAAiB;IACvB,eAAe,CAAiB;IAChC,KAAK,CAAO;IACZ,IAAI,CAAM;IACV,MAAM,CAAQ;IACd,IAAI,CAAM;IACV,GAAG,CAAK;IACA,OAAO,GAAG,KAAK,CAAA;IAEvB,gFAAgF;IAChF,WAAW,CAWV;IAED,YAAY,MAAuB;QAC/B,IAAI,CAAC,MAAM,GAAG,iBAAiB,CAAC,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC,CAAA;QAC9D,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,IAAI,gBAAgB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;QAC3D,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,eAAe,EAAE,EAAE,cAAc,EAAE,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;QACxE,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;QACpB,IAAI,CAAC,KAAK,GAAG,IAAI,KAAK,CAAC,IAAI,CAAC,eAAe,EAAE,EAAE,UAAU,EAAE,SAAS,CAAC,CAAA;QACrE,IAAI,CAAC,KAAK,CAAC,mBAAmB,CAAC,2BAA2B,CAAC,CAAA;QAC3D,IAAI,CAAC,eAAe,GAAG,IAAI,eAAe,CAAC,IAAI,CAAC,KAAK,EAAE,MAAM,CAAC,WAAW,EAAE;YACvE,aAAa,EAAE,MAAM,CAAC,OAAO;YAC7B,WAAW,EAAE,cAAc,CAAC,WAAW,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,YAAY,EAAE,CAAC;YACzE,IAAI,EAAE;gBACF,oBAAoB,EAChB,MAAM,CAAC,uBAAuB,KAAK,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC,CAAC,CAAC,SAAS;gBAClF,kBAAkB,EAAE,SAAS;gBAC7B,qBAAqB,EAAE,IAAI,CAAC,MAAM,CAAC,qBAAqB;gBACxD,kBAAkB,EAAE,MAAM,CAAC,kBAAkB;gBAC7C,KAAK,EAAE,MAAM,CAAC,KAAK;aACtB;YACD,cAAc,EAAE,MAAM,CAAC,WAAW;YAClC,gBAAgB,EAAE,MAAM,CAAC,gBAAgB;YACzC,cAAc,EAAE,MAAM,CAAC,cAAc;SACxC,CAAC,CAAA;QAEF,IAAI,CAAC,IAAI,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,eAAe,CAAC,CAAA;QACnE,IAAI,CAAC,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,eAAe,EAAE,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;QACjF,IAAI,CAAC,IAAI,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,eAAe,EAAE,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;QAC7E,IAAI,CAAC,GAAG,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,eAAe,EAAE,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;QAC3E,8BAA8B;QAC9B,IAAI,CAAC,WAAW,GAAG;YACf,eAAe,EAAE,IAAI,CAAC,eAAe,CAAC,UAAU;YAChD,eAAe,EAAE,IAAI,CAAC,eAAe;YACrC,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,eAAe,EAAE,IAAI,CAAC,IAAI,CAAC,WAAW;YACtC,SAAS,EAAE,IAAI,CAAC,IAAI,CAAC,KAAK;YAC1B,YAAY,EAAE,IAAI,CAAC,IAAI,CAAC,UAAU;YAClC,YAAY,EAAE,IAAI,CAAC,IAAI,CAAC,QAAQ;YAChC,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,GAAG,EAAE,IAAI,CAAC,GAAG;SAChB,CAAA;IACL,CAAC;IAED,KAAK,CAAC,KAAK;QACP,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACf,MAAM,IAAI,KAAK,CAAC,2DAA2D,CAAC,CAAA;QAChF,CAAC;QACD,+EAA+E;QAC/E,MAAM,IAAI,CAAC,KAAK,CAAC,iBAAiB,EAAE,CAAA;QACpC,IAAI,CAAC,GAAG,CAAC,6CAA6C,CAAC,CAAA;QACvD,oFAAoF;QACpF,kFAAkF;QAClF,MAAM,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,CAAA;QAClC,IAAI,CAAC,GAAG,CAAC,4CAA4C,CAAC,CAAA;IAC1D,CAAC;IAED,KAAK,CAAC,IAAI;QACN,IAAI,CAAC,OAAO,GAAG,IAAI,CAAA;QACnB,MAAM,IAAI,CAAC,eAAe,CAAC,IAAI,EAAE,CAAA;IACrC,CAAC;IAED,eAAe;QACX,OAAO,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,CAAA;IACnC,CAAC;IAED,iBAAiB;QACb,OAAO,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,CAAA;IACrC,CAAC;IAED,YAAY;QACR,OAAO,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAA;IAClC,CAAC;IAED,MAAM,CAAC,EAAU;QACb,MAAM,SAAS,GACX,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,aAAa,KAAK,MAAM;YAC5C,CAAC,CAAC,EAAE;YACJ,CAAC,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,aAAa,EAAE,CAAA;QACrD,MAAM,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAA;QACpF,MAAM,MAAM,GAAG,GAAG,EAAE,IAAI,IAAI,CAAC,MAAM,GAAG,SAAS,GAAG,OAAO,EAAE,CAAA;QAC3D,OAAO,MAAM,CAAA;IACjB,CAAC;CACJ"}
+{"version":3,"file":"syncAgent.js","sourceRoot":"","sources":["../../src/sync-agent/syncAgent.ts"],"names":[],"mappings":"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"}

package/dist/sync-agent/user/models/userInbox.d.ts

@@ -1,21 +1,8 @@
-import { Identifiable, Store } from '../../../store/store';
-import { UserInboxPayload_Snapshot_DeviceSummary } from '@towns-labs/proto';
-import { PersistedObservable } from '../../../observable/persistedObservable';
 import { RiverConnection } from '../../river-connection/riverConnection';
-export interface UserInboxModel extends Identifiable {
-    id: string;
-    streamId: string;
-    initialized: boolean;
-    deviceId?: string;
-    deviceSummary?: UserInboxPayload_Snapshot_DeviceSummary;
-}
-export declare class UserInbox extends PersistedObservable<UserInboxModel> {
+import { UserInboxStreamModel } from '../../../views/streams/userInboxStreams';
+import { Observable } from '../../../observable/observable';
+export declare class UserInbox extends Observable<UserInboxStreamModel> {
     private riverConnection;
-    constructor(id: string, store: Store, riverConnection: RiverConnection);
-    protected onLoaded(): void;
-    private onClientStarted;
-    private onStreamInitialized;
-    private onDeviceSummaryUpdated;
-    private initialize;
+    constructor(id: string, riverConnection: RiverConnection);
 }
 //# sourceMappingURL=userInbox.d.ts.map

package/dist/sync-agent/user/models/userInbox.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"userInbox.d.ts","sourceRoot":"","sources":["../../../../src/sync-agent/user/models/userInbox.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAgB,KAAK,EAAE,MAAM,sBAAsB,CAAA;AACxE,OAAO,EAAE,uCAAuC,EAAE,MAAM,mBAAmB,CAAA;AAC3E,OAAO,EAAE,mBAAmB,EAAuB,MAAM,yCAAyC,CAAA;AAElG,OAAO,EAAE,eAAe,EAAE,MAAM,wCAAwC,CAAA;AAOxE,MAAM,WAAW,cAAe,SAAQ,YAAY;IAChD,EAAE,EAAE,MAAM,CAAA;IACV,QAAQ,EAAE,MAAM,CAAA;IAChB,WAAW,EAAE,OAAO,CAAA;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,aAAa,CAAC,EAAE,uCAAuC,CAAA;CAC1D;AAED,qBACa,SAAU,SAAQ,mBAAmB,CAAC,cAAc,CAAC;IAI1D,OAAO,CAAC,eAAe;gBAFvB,EAAE,EAAE,MAAM,EACV,KAAK,EAAE,KAAK,EACJ,eAAe,EAAE,eAAe;cASzB,QAAQ;IAI3B,OAAO,CAAC,eAAe,CAiBtB;IAED,OAAO,CAAC,mBAAmB,CAQ1B;IAED,OAAO,CAAC,sBAAsB,CAS7B;IAED,OAAO,CAAC,UAAU;CAOrB"}
+{"version":3,"file":"userInbox.d.ts","sourceRoot":"","sources":["../../../../src/sync-agent/user/models/userInbox.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,MAAM,wCAAwC,CAAA;AACxE,OAAO,EAEH,oBAAoB,EACvB,MAAM,yCAAyC,CAAA;AAChD,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAA;AAK3D,qBAAa,SAAU,SAAQ,UAAU,CAAC,oBAAoB,CAAC;IAGvD,OAAO,CAAC,eAAe;gBADvB,EAAE,EAAE,MAAM,EACF,eAAe,EAAE,eAAe;CAe/C"}

package/dist/sync-agent/user/models/userInbox.js

@@ -1,68 +1,21 @@
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-import { check, dlogger } from '@towns-labs/utils';
-import { LoadPriority } from '../../../store/store';
-import { PersistedObservable, persistedObservable } from '../../../observable/persistedObservable';
+import { dlogger } from '@towns-labs/utils';
 import { makeUserInboxStreamId } from '../../../id';
-import { isDefined } from '../../../check';
+import { DEFAULT_USER_INBOX_STREAM_MODEL, } from '../../../views/streams/userInboxStreams';
+import { Observable } from '../../../observable/observable';
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
 const logger = dlogger('csb:userInbox');
-let UserInbox = class UserInbox extends PersistedObservable {
+export class UserInbox extends Observable {
     riverConnection;
-    constructor(id, store, riverConnection) {
-        super({ id, streamId: makeUserInboxStreamId(id), initialized: false }, store, LoadPriority.high);
+    constructor(id, riverConnection) {
+        const streamId = makeUserInboxStreamId(id);
+        super(DEFAULT_USER_INBOX_STREAM_MODEL(streamId));
         this.riverConnection = riverConnection;
-    }
-    onLoaded() {
-        this.riverConnection.registerView(this.onClientStarted);
-    }
-    onClientStarted = (client) => {
-        logger.log('onClientStarted');
-        if (this.riverConnection.client?.cryptoInitialized) {
-            const deviceId = this.riverConnection.client.userDeviceKey().deviceKey;
-            const streamView = this.riverConnection.client.stream(this.data.streamId)?.view;
-            if (streamView && deviceId) {
-                this.initialize(deviceId, streamView);
-            }
-            else if (deviceId) {
-                this.setData({ deviceId });
-            }
-        }
-        client.addListener('userInboxDeviceSummaryUpdated', this.onDeviceSummaryUpdated);
-        client.addListener('streamInitialized', this.onStreamInitialized);
-        return () => {
-            client.removeListener('userInboxDeviceSummaryUpdated', this.onDeviceSummaryUpdated);
-            client.removeListener('streamInitialized', this.onStreamInitialized);
-        };
-    };
-    onStreamInitialized = (streamId) => {
-        if (streamId === this.data.streamId) {
-            const streamView = this.riverConnection.client?.stream(this.data.streamId)?.view;
-            const deviceId = this.riverConnection.client?.userDeviceKey().deviceKey;
-            check(isDefined(deviceId), 'deviceId is not defined');
-            check(isDefined(streamView), 'streamView is not defined');
-            this.initialize(deviceId, streamView);
-        }
-    };
-    onDeviceSummaryUpdated = (streamId, deviceId, deviceSummary) => {
-        if (streamId === this.data.streamId) {
-            logger.log('onUserInboxDeviceSummaryUpdated', deviceId, deviceSummary);
-            this.setData({ deviceId, deviceSummary });
-        }
-    };
-    initialize(deviceId, streamView) {
-        this.setData({
-            initialized: true,
-            deviceId,
-            deviceSummary: streamView.userInboxContent.deviceSummary[deviceId],
+        this.riverConnection.registerView((client) => {
+            const unsub = client.streamsView.userInboxStreams.subscribe((value) => {
+                this.setValue(value[streamId] ?? this.value);
+            }, { fireImediately: true });
+            return unsub;
         });
     }
-};
-UserInbox = __decorate([
-    persistedObservable({ tableName: 'userInbox' })
-], UserInbox);
-export { UserInbox };
+}
 //# sourceMappingURL=userInbox.js.map

package/dist/sync-agent/user/models/userInbox.js.map

@@ -1 +1 @@
-{"version":3,"file":"userInbox.js","sourceRoot":"","sources":["../../../../src/sync-agent/user/models/userInbox.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"userInbox.js","sourceRoot":"","sources":["../../../../src/sync-agent/user/models/userInbox.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAA;AAC3C,OAAO,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAA;AAEnD,OAAO,EACH,+BAA+B,GAElC,MAAM,yCAAyC,CAAA;AAChD,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAA;AAE3D,6DAA6D;AAC7D,MAAM,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,CAAA;AAEvC,MAAM,OAAO,SAAU,SAAQ,UAAgC;IAG/C;IAFZ,YACI,EAAU,EACF,eAAgC;QAExC,MAAM,QAAQ,GAAG,qBAAqB,CAAC,EAAE,CAAC,CAAA;QAC1C,KAAK,CAAC,+BAA+B,CAAC,QAAQ,CAAC,CAAC,CAAA;QAHxC,oBAAe,GAAf,eAAe,CAAiB;QAKxC,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC,CAAC,MAAM,EAAE,EAAE;YACzC,MAAM,KAAK,GAAG,MAAM,CAAC,WAAW,CAAC,gBAAgB,CAAC,SAAS,CACvD,CAAC,KAAK,EAAE,EAAE;gBACN,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,CAAA;YAChD,CAAC,EACD,EAAE,cAAc,EAAE,IAAI,EAAE,CAC3B,CAAA;YACD,OAAO,KAAK,CAAA;QAChB,CAAC,CAAC,CAAA;IACN,CAAC;CACJ"}

package/dist/sync-agent/user/models/userMemberships.d.ts

@@ -1,28 +1,12 @@
-import { MembershipOp } from '@towns-labs/proto';
-import { PersistedObservable } from '../../../observable/persistedObservable';
-import { Store } from '../../../store/store';
+import { MembershipOp, UserPayload_UserMembership } from '@towns-labs/proto';
 import { RiverConnection } from '../../river-connection/riverConnection';
-export interface UserMembership {
-    streamId: string;
-    op: MembershipOp;
-    inviter?: string;
-}
-export interface UserMembershipsModel {
-    id: string;
-    streamId: string;
-    initialized: boolean;
-    memberships: Record<string, UserMembership>;
-}
-export declare class UserMemberships extends PersistedObservable<UserMembershipsModel> {
+import { UserStreamModel } from '../../../views/streams/userStreamsView';
+import { Observable } from '../../../observable/observable';
+export declare class UserMemberships extends Observable<UserStreamModel> {
     private riverConnection;
-    constructor(id: string, store: Store, riverConnection: RiverConnection);
-    protected onLoaded(): void;
-    private onClientStarted;
-    getMembership(streamId: string): UserMembership | undefined;
+    constructor(id: string, riverConnection: RiverConnection);
+    getMembership(streamId: string): UserPayload_UserMembership | undefined;
     isMember(streamId: string, membership: MembershipOp): boolean;
     isJoined(streamId: string): boolean;
-    private initialize;
-    private onStreamInitialized;
-    private onUserStreamMembershipChanged;
 }
 //# sourceMappingURL=userMemberships.d.ts.map

package/dist/sync-agent/user/models/userMemberships.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"userMemberships.d.ts","sourceRoot":"","sources":["../../../../src/sync-agent/user/models/userMemberships.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAA8B,MAAM,mBAAmB,CAAA;AAC5E,OAAO,EAAE,mBAAmB,EAAuB,MAAM,yCAAyC,CAAA;AAClG,OAAO,EAAgB,KAAK,EAAE,MAAM,sBAAsB,CAAA;AAE1D,OAAO,EAAE,eAAe,EAAE,MAAM,wCAAwC,CAAA;AAQxE,MAAM,WAAW,cAAc;IAC3B,QAAQ,EAAE,MAAM,CAAA;IAChB,EAAE,EAAE,YAAY,CAAA;IAChB,OAAO,CAAC,EAAE,MAAM,CAAA;CACnB;AAED,MAAM,WAAW,oBAAoB;IACjC,EAAE,EAAE,MAAM,CAAA;IACV,QAAQ,EAAE,MAAM,CAAA;IAChB,WAAW,EAAE,OAAO,CAAA;IACpB,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAAA;CAC9C;AAED,qBACa,eAAgB,SAAQ,mBAAmB,CAAC,oBAAoB,CAAC;IAC1E,OAAO,CAAC,eAAe,CAAiB;gBAE5B,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,eAAe,EAAE,eAAe;cASnD,QAAQ;IAI3B,OAAO,CAAC,eAAe,CAYtB;IAED,aAAa,CAAC,QAAQ,EAAE,MAAM,GAAG,cAAc,GAAG,SAAS;IAI3D,QAAQ,CAAC,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,YAAY,GAAG,OAAO;IAI7D,QAAQ,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO;IAInC,OAAO,CAAC,UAAU,CAWjB;IAED,OAAO,CAAC,mBAAmB,CAM1B;IAED,OAAO,CAAC,6BAA6B,CAUpC;CACJ"}
+{"version":3,"file":"userMemberships.d.ts","sourceRoot":"","sources":["../../../../src/sync-agent/user/models/userMemberships.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,0BAA0B,EAAE,MAAM,mBAAmB,CAAA;AAE5E,OAAO,EAAE,eAAe,EAAE,MAAM,wCAAwC,CAAA;AAExE,OAAO,EAA0B,eAAe,EAAE,MAAM,wCAAwC,CAAA;AAChG,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAA;AAM3D,qBAAa,eAAgB,SAAQ,UAAU,CAAC,eAAe,CAAC;IAC5D,OAAO,CAAC,eAAe,CAAiB;gBAE5B,EAAE,EAAE,MAAM,EAAE,eAAe,EAAE,eAAe;IAexD,aAAa,CAAC,QAAQ,EAAE,MAAM,GAAG,0BAA0B,GAAG,SAAS;IAIvE,QAAQ,CAAC,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,YAAY,GAAG,OAAO;IAI7D,QAAQ,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO;CAGtC"}

package/dist/sync-agent/user/models/userMemberships.js

@@ -1,40 +1,25 @@
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
 import { MembershipOp } from '@towns-labs/proto';
-import { PersistedObservable, persistedObservable } from '../../../observable/persistedObservable';
-import { LoadPriority } from '../../../store/store';
-import { check, dlogger } from '@towns-labs/utils';
-import { makeUserStreamId, streamIdFromBytes, userIdFromAddress } from '../../../id';
-import { isDefined } from '../../../check';
+import { dlogger } from '@towns-labs/utils';
+import { EMPTY_USER_STEAM_MODEL } from '../../../views/streams/userStreamsView';
+import { Observable } from '../../../observable/observable';
+import { makeUserStreamId } from '../../../id';
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
 const logger = dlogger('csb:userMemberships');
-let UserMemberships = class UserMemberships extends PersistedObservable {
+export class UserMemberships extends Observable {
     riverConnection;
-    constructor(id, store, riverConnection) {
-        super({ id, streamId: makeUserStreamId(id), initialized: false, memberships: {} }, store, LoadPriority.high);
+    constructor(id, riverConnection) {
+        const streamId = makeUserStreamId(id);
+        super(EMPTY_USER_STEAM_MODEL(streamId));
         this.riverConnection = riverConnection;
+        this.riverConnection.registerView((client) => {
+            const unsubFn = client.streamsView.userStreams.subscribe((x) => this.setValue(x[streamId] ?? this.value));
+            return () => {
+                unsubFn();
+            };
+        });
     }
-    onLoaded() {
-        this.riverConnection.registerView(this.onClientStarted);
-    }
-    onClientStarted = (client) => {
-        logger.log('onClientStarted');
-        const streamView = this.riverConnection.client?.stream(this.data.streamId)?.view;
-        if (streamView) {
-            this.initialize(streamView);
-        }
-        client.addListener('userStreamMembershipChanged', this.onUserStreamMembershipChanged);
-        client.addListener('streamInitialized', this.onStreamInitialized);
-        return () => {
-            client.removeListener('userStreamMembershipChanged', this.onUserStreamMembershipChanged);
-            client.removeListener('streamInitialized', this.onStreamInitialized);
-        };
-    };
     getMembership(streamId) {
-        return this.data.memberships[streamId];
+        return this.value.streamMemberships[streamId];
     }
     isMember(streamId, membership) {
         return this.getMembership(streamId)?.op === membership;
@@ -42,42 +27,5 @@ let UserMemberships = class UserMemberships extends PersistedObservable {
     isJoined(streamId) {
         return this.isMember(streamId, MembershipOp.SO_JOIN);
     }
-    initialize = (streamView) => {
-        const memberships = Object.entries(streamView.userContent.streamMemberships).reduce((acc, [streamId, payload]) => {
-            if (payload) {
-                acc[streamId] = toUserMembership(payload);
-            }
-            return acc;
-        }, {});
-        this.setData({ memberships, initialized: true });
-    };
-    onStreamInitialized = (streamId) => {
-        if (streamId === this.data.streamId) {
-            const streamView = this.riverConnection.client?.stream(this.data.streamId)?.view;
-            check(isDefined(streamView), 'streamView is not defined');
-            this.initialize(streamView);
-        }
-    };
-    onUserStreamMembershipChanged = (streamId, payload) => {
-        this.setData({
-            memberships: {
-                ...this.data.memberships,
-                [streamId]: toUserMembership(payload),
-            },
-        });
-    };
-};
-UserMemberships = __decorate([
-    persistedObservable({ tableName: 'userMemberships' })
-], UserMemberships);
-export { UserMemberships };
-function toUserMembership(payload) {
-    const { op, streamId: inStreamId } = payload;
-    const streamId = streamIdFromBytes(inStreamId);
-    return {
-        streamId,
-        op,
-        inviter: payload.inviter ? userIdFromAddress(payload.inviter) : undefined,
-    };
 }
 //# sourceMappingURL=userMemberships.js.map

package/dist/sync-agent/user/models/userMemberships.js.map

@@ -1 +1 @@
-{"version":3,"file":"userMemberships.js","sourceRoot":"","sources":["../../../../src/sync-agent/user/models/userMemberships.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"userMemberships.js","sourceRoot":"","sources":["../../../../src/sync-agent/user/models/userMemberships.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAA8B,MAAM,mBAAmB,CAAA;AAC5E,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAA;AAG3C,OAAO,EAAE,sBAAsB,EAAmB,MAAM,wCAAwC,CAAA;AAChG,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAA;AAC3D,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAA;AAE9C,6DAA6D;AAC7D,MAAM,MAAM,GAAG,OAAO,CAAC,qBAAqB,CAAC,CAAA;AAE7C,MAAM,OAAO,eAAgB,SAAQ,UAA2B;IACpD,eAAe,CAAiB;IAExC,YAAY,EAAU,EAAE,eAAgC;QACpD,MAAM,QAAQ,GAAG,gBAAgB,CAAC,EAAE,CAAC,CAAA;QACrC,KAAK,CAAC,sBAAsB,CAAC,QAAQ,CAAC,CAAC,CAAA;QAEvC,IAAI,CAAC,eAAe,GAAG,eAAe,CAAA;QACtC,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC,CAAC,MAAc,EAAE,EAAE;YACjD,MAAM,OAAO,GAAG,MAAM,CAAC,WAAW,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAC3D,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,CAC3C,CAAA;YACD,OAAO,GAAG,EAAE;gBACR,OAAO,EAAE,CAAA;YACb,CAAC,CAAA;QACL,CAAC,CAAC,CAAA;IACN,CAAC;IAED,aAAa,CAAC,QAAgB;QAC1B,OAAO,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAA;IACjD,CAAC;IAED,QAAQ,CAAC,QAAgB,EAAE,UAAwB;QAC/C,OAAO,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,EAAE,EAAE,KAAK,UAAU,CAAA;IAC1D,CAAC;IAED,QAAQ,CAAC,QAAgB;QACrB,OAAO,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,YAAY,CAAC,OAAO,CAAC,CAAA;IACxD,CAAC;CACJ"}

package/dist/sync-agent/user/models/userMetadata.d.ts

@@ -1,21 +1,8 @@
-import { Store } from '../../../store/store';
-import { UserDevice } from '@towns-labs/encryption';
-import { PersistedObservable } from '../../../observable/persistedObservable';
 import { RiverConnection } from '../../river-connection/riverConnection';
-export interface UserMetadataModel {
-    id: string;
-    streamId: string;
-    initialized: boolean;
-    deviceId?: string;
-    deviceKeys: UserDevice[];
-}
-export declare class UserMetadata extends PersistedObservable<UserMetadataModel> {
+import { UserMetadataStreamModel } from '../../../views/streams/userMetadataStreams';
+import { Observable } from '../../../observable/observable';
+export declare class UserMetadata extends Observable<UserMetadataStreamModel> {
     private riverConnection;
-    constructor(id: string, store: Store, riverConnection: RiverConnection);
-    protected onLoaded(): void;
-    private onClientStarted;
-    private onStreamInitialized;
-    private onUserMetadataUpdated;
-    private initialize;
+    constructor(id: string, riverConnection: RiverConnection);
 }
 //# sourceMappingURL=userMetadata.d.ts.map

package/dist/sync-agent/user/models/userMetadata.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"userMetadata.d.ts","sourceRoot":"","sources":["../../../../src/sync-agent/user/models/userMetadata.ts"],"names":[],"mappings":"AACA,OAAO,EAAgB,KAAK,EAAE,MAAM,sBAAsB,CAAA;AAC1D,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAA;AACnD,OAAO,EAAE,mBAAmB,EAAuB,MAAM,yCAAyC,CAAA;AAElG,OAAO,EAAE,eAAe,EAAE,MAAM,wCAAwC,CAAA;AAOxE,MAAM,WAAW,iBAAiB;IAC9B,EAAE,EAAE,MAAM,CAAA;IACV,QAAQ,EAAE,MAAM,CAAA;IAChB,WAAW,EAAE,OAAO,CAAA;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,UAAU,EAAE,UAAU,EAAE,CAAA;CAC3B;AAED,qBACa,YAAa,SAAQ,mBAAmB,CAAC,iBAAiB,CAAC;IAIhE,OAAO,CAAC,eAAe;gBAFvB,EAAE,EAAE,MAAM,EACV,KAAK,EAAE,KAAK,EACJ,eAAe,EAAE,eAAe;cASzB,QAAQ;IAI3B,OAAO,CAAC,eAAe,CAiBtB;IAED,OAAO,CAAC,mBAAmB,CAQ1B;IAED,OAAO,CAAC,qBAAqB,CAK5B;IAED,OAAO,CAAC,UAAU;CAOrB"}
+{"version":3,"file":"userMetadata.d.ts","sourceRoot":"","sources":["../../../../src/sync-agent/user/models/userMetadata.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,MAAM,wCAAwC,CAAA;AACxE,OAAO,EAEH,uBAAuB,EAC1B,MAAM,4CAA4C,CAAA;AACnD,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAA;AAK3D,qBAAa,YAAa,SAAQ,UAAU,CAAC,uBAAuB,CAAC;IAG7D,OAAO,CAAC,eAAe;gBADvB,EAAE,EAAE,MAAM,EACF,eAAe,EAAE,eAAe;CAc/C"}

package/dist/sync-agent/user/models/userMetadata.js

@@ -1,68 +1,21 @@
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-import { check, dlogger } from '@towns-labs/utils';
-import { LoadPriority } from '../../../store/store';
-import { PersistedObservable, persistedObservable } from '../../../observable/persistedObservable';
+import { dlogger } from '@towns-labs/utils';
 import { makeUserMetadataStreamId } from '../../../id';
-import { isDefined } from '../../../check';
+import { DEFAULT_USER_METADATA_STREAM_MODEL, } from '../../../views/streams/userMetadataStreams';
+import { Observable } from '../../../observable/observable';
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
 const logger = dlogger('csb:userMetadata');
-let UserMetadata = class UserMetadata extends PersistedObservable {
+export class UserMetadata extends Observable {
     riverConnection;
-    constructor(id, store, riverConnection) {
-        super({ id, streamId: makeUserMetadataStreamId(id), initialized: false, deviceKeys: [] }, store, LoadPriority.high);
+    constructor(id, riverConnection) {
+        const streamId = makeUserMetadataStreamId(id);
+        super(DEFAULT_USER_METADATA_STREAM_MODEL(streamId));
         this.riverConnection = riverConnection;
-    }
-    onLoaded() {
-        this.riverConnection.registerView(this.onClientStarted);
-    }
-    onClientStarted = (client) => {
-        logger.log('onClientStarted');
-        if (this.riverConnection.client?.cryptoInitialized) {
-            const deviceId = this.riverConnection.client.userDeviceKey().deviceKey;
-            const streamView = this.riverConnection.client.stream(this.data.streamId)?.view;
-            if (streamView && deviceId) {
-                this.initialize(deviceId, streamView);
-            }
-            else if (deviceId) {
-                this.setData({ deviceId });
-            }
-        }
-        client.addListener('userDeviceKeysUpdated', this.onUserMetadataUpdated);
-        client.addListener('streamInitialized', this.onStreamInitialized);
-        return () => {
-            client.removeListener('userDeviceKeysUpdated', this.onUserMetadataUpdated);
-            client.removeListener('streamInitialized', this.onStreamInitialized);
-        };
-    };
-    onStreamInitialized = (streamId) => {
-        if (streamId === this.data.streamId) {
-            const streamView = this.riverConnection.client?.stream(this.data.streamId)?.view;
-            const deviceId = this.riverConnection.client?.userDeviceKey().deviceKey;
-            check(isDefined(deviceId), 'deviceId is not defined');
-            check(isDefined(streamView), 'streamView is not defined');
-            this.initialize(deviceId, streamView);
-        }
-    };
-    onUserMetadataUpdated = (streamId, deviceKeys) => {
-        if (streamId === this.data.streamId) {
-            logger.log('updated', streamId, deviceKeys);
-            this.setData({ deviceKeys });
-        }
-    };
-    initialize(deviceId, streamView) {
-        this.setData({
-            initialized: true,
-            deviceId,
-            deviceKeys: streamView.userMetadataContent.deviceKeys,
+        this.riverConnection.registerView((client) => {
+            const unsub = client.streamsView.userMetadataStreams.subscribe((x) => this.setValue(x[streamId] ?? this.value));
+            return () => {
+                unsub();
+            };
         });
     }
-};
-UserMetadata = __decorate([
-    persistedObservable({ tableName: 'userMetadata' })
-], UserMetadata);
-export { UserMetadata };
+}
 //# sourceMappingURL=userMetadata.js.map

package/dist/sync-agent/user/models/userMetadata.js.map

@@ -1 +1 @@
-{"version":3,"file":"userMetadata.js","sourceRoot":"","sources":["../../../../src/sync-agent/user/models/userMetadata.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAA;AAClD,OAAO,EAAE,YAAY,EAAS,MAAM,sBAAsB,CAAA;AAE1D,OAAO,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,MAAM,yCAAyC,CAAA;AAClG,OAAO,EAAE,wBAAwB,EAAE,MAAM,aAAa,CAAA;AAGtD,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAG1C,MAAM,MAAM,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAAA;AAWnC,IAAM,YAAY,GAAlB,MAAM,YAAa,SAAQ,mBAAsC;IAIxD;IAHZ,YACI,EAAU,EACV,KAAY,EACJ,eAAgC;QAExC,KAAK,CACD,EAAE,EAAE,EAAE,QAAQ,EAAE,wBAAwB,CAAC,EAAE,CAAC,EAAE,WAAW,EAAE,KAAK,EAAE,UAAU,EAAE,EAAE,EAAE,EAClF,KAAK,EACL,YAAY,CAAC,IAAI,CACpB,CAAA;QANO,oBAAe,GAAf,eAAe,CAAiB;IAO5C,CAAC;IAEkB,QAAQ;QACvB,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC,IAAI,CAAC,eAAe,CAAC,CAAA;IAC3D,CAAC;IAEO,eAAe,GAAG,CAAC,MAAc,EAAE,EAAE;QACzC,MAAM,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAA;QAC7B,IAAI,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE,iBAAiB,EAAE,CAAC;YACjD,MAAM,QAAQ,GAAG,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,aAAa,EAAE,CAAC,SAAS,CAAA;YACtE,MAAM,UAAU,GAAG,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,IAAI,CAAA;YAC/E,IAAI,UAAU,IAAI,QAAQ,EAAE,CAAC;gBACzB,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAA;YACzC,CAAC;iBAAM,IAAI,QAAQ,EAAE,CAAC;gBAClB,IAAI,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAA;YAC9B,CAAC;QACL,CAAC;QACD,MAAM,CAAC,WAAW,CAAC,uBAAuB,EAAE,IAAI,CAAC,qBAAqB,CAAC,CAAA;QACvE,MAAM,CAAC,WAAW,CAAC,mBAAmB,EAAE,IAAI,CAAC,mBAAmB,CAAC,CAAA;QACjE,OAAO,GAAG,EAAE;YACR,MAAM,CAAC,cAAc,CAAC,uBAAuB,EAAE,IAAI,CAAC,qBAAqB,CAAC,CAAA;YAC1E,MAAM,CAAC,cAAc,CAAC,mBAAmB,EAAE,IAAI,CAAC,mBAAmB,CAAC,CAAA;QACxE,CAAC,CAAA;IACL,CAAC,CAAA;IAEO,mBAAmB,GAAG,CAAC,QAAgB,EAAE,EAAE;QAC/C,IAAI,QAAQ,KAAK,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;YAClC,MAAM,UAAU,GAAG,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,IAAI,CAAA;YAChF,MAAM,QAAQ,GAAG,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE,aAAa,EAAE,CAAC,SAAS,CAAA;YACvE,KAAK,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,yBAAyB,CAAC,CAAA;YACrD,KAAK,CAAC,SAAS,CAAC,UAAU,CAAC,EAAE,2BAA2B,CAAC,CAAA;YACzD,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAA;QACzC,CAAC;IACL,CAAC,CAAA;IAEO,qBAAqB,GAAG,CAAC,QAAgB,EAAE,UAAwB,EAAE,EAAE;QAC3E,IAAI,QAAQ,KAAK,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;YAClC,MAAM,CAAC,GAAG,CAAC,SAAS,EAAE,QAAQ,EAAE,UAAU,CAAC,CAAA;YAC3C,IAAI,CAAC,OAAO,CAAC,EAAE,UAAU,EAAE,CAAC,CAAA;QAChC,CAAC;IACL,CAAC,CAAA;IAEO,UAAU,CAAC,QAAgB,EAAE,UAA2B;QAC5D,IAAI,CAAC,OAAO,CAAC;YACT,WAAW,EAAE,IAAI;YACjB,QAAQ;YACR,UAAU,EAAE,UAAU,CAAC,mBAAmB,CAAC,UAAU;SACxD,CAAC,CAAA;IACN,CAAC;CACJ,CAAA;AA5DY,YAAY;IADxB,mBAAmB,CAAC,EAAE,SAAS,EAAE,cAAc,EAAE,CAAC;GACtC,YAAY,CA4DxB"}
+{"version":3,"file":"userMetadata.js","sourceRoot":"","sources":["../../../../src/sync-agent/user/models/userMetadata.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAA;AAC3C,OAAO,EAAE,wBAAwB,EAAE,MAAM,aAAa,CAAA;AAEtD,OAAO,EACH,kCAAkC,GAErC,MAAM,4CAA4C,CAAA;AACnD,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAA;AAE3D,6DAA6D;AAC7D,MAAM,MAAM,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAAA;AAE1C,MAAM,OAAO,YAAa,SAAQ,UAAmC;IAGrD;IAFZ,YACI,EAAU,EACF,eAAgC;QAExC,MAAM,QAAQ,GAAG,wBAAwB,CAAC,EAAE,CAAC,CAAA;QAC7C,KAAK,CAAC,kCAAkC,CAAC,QAAQ,CAAC,CAAC,CAAA;QAH3C,oBAAe,GAAf,eAAe,CAAiB;QAKxC,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC,CAAC,MAAM,EAAE,EAAE;YACzC,MAAM,KAAK,GAAG,MAAM,CAAC,WAAW,CAAC,mBAAmB,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CACjE,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,CAC3C,CAAA;YACD,OAAO,GAAG,EAAE;gBACR,KAAK,EAAE,CAAA;YACX,CAAC,CAAA;QACL,CAAC,CAAC,CAAA;IACN,CAAC;CACJ"}

package/dist/sync-agent/user/models/userSettings.d.ts

@@ -1,17 +1,14 @@
-import { Identifiable, Store } from '../../../store/store';
-import { PersistedObservable } from '../../../observable/persistedObservable';
+import { Identifiable } from '../../../store/store';
 import { RiverConnection } from '../../river-connection/riverConnection';
+import { UserSettingsStreamModel } from '../../../views/streams/userSettingsStreams';
+import { Observable } from '../../../observable/observable';
 export interface UserSettingsModel extends Identifiable {
     id: string;
     streamId: string;
     initialized: boolean;
 }
-export declare class UserSettings extends PersistedObservable<UserSettingsModel> {
+export declare class UserSettings extends Observable<UserSettingsStreamModel> {
     private riverConnection;
-    constructor(id: string, store: Store, riverConnection: RiverConnection);
-    protected onLoaded(): void;
-    private onClientStarted;
-    private onStreamInitialized;
-    private initialize;
+    constructor(id: string, riverConnection: RiverConnection);
 }
 //# sourceMappingURL=userSettings.d.ts.map

package/dist/sync-agent/user/models/userSettings.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"userSettings.d.ts","sourceRoot":"","sources":["../../../../src/sync-agent/user/models/userSettings.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAgB,KAAK,EAAE,MAAM,sBAAsB,CAAA;AACxE,OAAO,EAAE,mBAAmB,EAAuB,MAAM,yCAAyC,CAAA;AAClG,OAAO,EAAE,eAAe,EAAE,MAAM,wCAAwC,CAAA;AAQxE,MAAM,WAAW,iBAAkB,SAAQ,YAAY;IACnD,EAAE,EAAE,MAAM,CAAA;IACV,QAAQ,EAAE,MAAM,CAAA;IAChB,WAAW,EAAE,OAAO,CAAA;CACvB;AAED,qBACa,YAAa,SAAQ,mBAAmB,CAAC,iBAAiB,CAAC;IAIhE,OAAO,CAAC,eAAe;gBAFvB,EAAE,EAAE,MAAM,EACV,KAAK,EAAE,KAAK,EACJ,eAAe,EAAE,eAAe;cASzB,QAAQ;IAI3B,OAAO,CAAC,eAAe,CAUtB;IAED,OAAO,CAAC,mBAAmB,CAM1B;IAED,OAAO,CAAC,UAAU,CAEjB;CACJ"}
+{"version":3,"file":"userSettings.d.ts","sourceRoot":"","sources":["../../../../src/sync-agent/user/models/userSettings.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAA;AACnD,OAAO,EAAE,eAAe,EAAE,MAAM,wCAAwC,CAAA;AAExE,OAAO,EAEH,uBAAuB,EAC1B,MAAM,4CAA4C,CAAA;AACnD,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAA;AAK3D,MAAM,WAAW,iBAAkB,SAAQ,YAAY;IACnD,EAAE,EAAE,MAAM,CAAA;IACV,QAAQ,EAAE,MAAM,CAAA;IAChB,WAAW,EAAE,OAAO,CAAA;CACvB;AAED,qBAAa,YAAa,SAAQ,UAAU,CAAC,uBAAuB,CAAC;IAG7D,OAAO,CAAC,eAAe;gBADvB,EAAE,EAAE,MAAM,EACF,eAAe,EAAE,eAAe;CAc/C"}

package/dist/sync-agent/user/models/userSettings.js

@@ -1,48 +1,21 @@
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-import { check, dlogger } from '@towns-labs/utils';
-import { LoadPriority } from '../../../store/store';
-import { PersistedObservable, persistedObservable } from '../../../observable/persistedObservable';
+import { dlogger } from '@towns-labs/utils';
 import { makeUserSettingsStreamId } from '../../../id';
-import { isDefined } from '../../../check';
+import { DEFAULT_USER_SETTINGS_STREAM_MODEL, } from '../../../views/streams/userSettingsStreams';
+import { Observable } from '../../../observable/observable';
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
 const logger = dlogger('csb:userSettings');
-let UserSettings = class UserSettings extends PersistedObservable {
+export class UserSettings extends Observable {
     riverConnection;
-    constructor(id, store, riverConnection) {
-        super({ id, streamId: makeUserSettingsStreamId(id), initialized: false }, store, LoadPriority.high);
+    constructor(id, riverConnection) {
+        const streamId = makeUserSettingsStreamId(id);
+        super(DEFAULT_USER_SETTINGS_STREAM_MODEL(streamId));
         this.riverConnection = riverConnection;
+        this.riverConnection.registerView((client) => {
+            const unsub = client.streamsView.userSettingsStreams.subscribe((x) => this.setValue(x[streamId] ?? this.value));
+            return () => {
+                unsub();
+            };
+        });
     }
-    onLoaded() {
-        this.riverConnection.registerView(this.onClientStarted);
-    }
-    onClientStarted = (client) => {
-        logger.log('onClientStarted');
-        const streamView = client.stream(this.data.streamId)?.view;
-        if (streamView) {
-            this.initialize(streamView);
-        }
-        client.addListener('streamInitialized', this.onStreamInitialized);
-        return () => {
-            client.removeListener('streamInitialized', this.onStreamInitialized);
-        };
-    };
-    onStreamInitialized = (streamId) => {
-        if (streamId === this.data.streamId) {
-            const streamView = this.riverConnection.client?.stream(this.data.streamId)?.view;
-            check(isDefined(streamView), 'streamView is not defined');
-            this.initialize(streamView);
-        }
-    };
-    initialize = (_streamView) => {
-        this.setData({ initialized: true });
-    };
-};
-UserSettings = __decorate([
-    persistedObservable({ tableName: 'userSettings' })
-], UserSettings);
-export { UserSettings };
+}
 //# sourceMappingURL=userSettings.js.map

package/dist/sync-agent/user/models/userSettings.js.map

@@ -1 +1 @@
-{"version":3,"file":"userSettings.js","sourceRoot":"","sources":["../../../../src/sync-agent/user/models/userSettings.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAA;AAClD,OAAO,EAAgB,YAAY,EAAS,MAAM,sBAAsB,CAAA;AACxE,OAAO,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,MAAM,yCAAyC,CAAA;AAElG,OAAO,EAAE,wBAAwB,EAAE,MAAM,aAAa,CAAA;AAGtD,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAE1C,MAAM,MAAM,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAAA;AASnC,IAAM,YAAY,GAAlB,MAAM,YAAa,SAAQ,mBAAsC;IAIxD;IAHZ,YACI,EAAU,EACV,KAAY,EACJ,eAAgC;QAExC,KAAK,CACD,EAAE,EAAE,EAAE,QAAQ,EAAE,wBAAwB,CAAC,EAAE,CAAC,EAAE,WAAW,EAAE,KAAK,EAAE,EAClE,KAAK,EACL,YAAY,CAAC,IAAI,CACpB,CAAA;QANO,oBAAe,GAAf,eAAe,CAAiB;IAO5C,CAAC;IAEkB,QAAQ;QACvB,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC,IAAI,CAAC,eAAe,CAAC,CAAA;IAC3D,CAAC;IAEO,eAAe,GAAG,CAAC,MAAc,EAAE,EAAE;QACzC,MAAM,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAA;QAC7B,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,IAAI,CAAA;QAC1D,IAAI,UAAU,EAAE,CAAC;YACb,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,CAAA;QAC/B,CAAC;QACD,MAAM,CAAC,WAAW,CAAC,mBAAmB,EAAE,IAAI,CAAC,mBAAmB,CAAC,CAAA;QACjE,OAAO,GAAG,EAAE;YACR,MAAM,CAAC,cAAc,CAAC,mBAAmB,EAAE,IAAI,CAAC,mBAAmB,CAAC,CAAA;QACxE,CAAC,CAAA;IACL,CAAC,CAAA;IAEO,mBAAmB,GAAG,CAAC,QAAgB,EAAE,EAAE;QAC/C,IAAI,QAAQ,KAAK,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;YAClC,MAAM,UAAU,GAAG,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,IAAI,CAAA;YAChF,KAAK,CAAC,SAAS,CAAC,UAAU,CAAC,EAAE,2BAA2B,CAAC,CAAA;YACzD,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,CAAA;QAC/B,CAAC;IACL,CAAC,CAAA;IAEO,UAAU,GAAG,CAAC,WAA4B,EAAE,EAAE;QAClD,IAAI,CAAC,OAAO,CAAC,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,CAAA;IACvC,CAAC,CAAA;CACJ,CAAA;AAxCY,YAAY;IADxB,mBAAmB,CAAC,EAAE,SAAS,EAAE,cAAc,EAAE,CAAC;GACtC,YAAY,CAwCxB"}
+{"version":3,"file":"userSettings.js","sourceRoot":"","sources":["../../../../src/sync-agent/user/models/userSettings.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAA;AAG3C,OAAO,EAAE,wBAAwB,EAAE,MAAM,aAAa,CAAA;AACtD,OAAO,EACH,kCAAkC,GAErC,MAAM,4CAA4C,CAAA;AACnD,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAA;AAE3D,6DAA6D;AAC7D,MAAM,MAAM,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAAA;AAQ1C,MAAM,OAAO,YAAa,SAAQ,UAAmC;IAGrD;IAFZ,YACI,EAAU,EACF,eAAgC;QAExC,MAAM,QAAQ,GAAG,wBAAwB,CAAC,EAAE,CAAC,CAAA;QAC7C,KAAK,CAAC,kCAAkC,CAAC,QAAQ,CAAC,CAAC,CAAA;QAH3C,oBAAe,GAAf,eAAe,CAAiB;QAKxC,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC,CAAC,MAAM,EAAE,EAAE;YACzC,MAAM,KAAK,GAAG,MAAM,CAAC,WAAW,CAAC,mBAAmB,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CACjE,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,CAC3C,CAAA;YACD,OAAO,GAAG,EAAE;gBACR,KAAK,EAAE,CAAA;YACX,CAAC,CAAA;QACL,CAAC,CAAC,CAAA;IACN,CAAC;CACJ"}