@verdant-web/server 4.1.1 → 4.2.1

package/dist/esm/adapters/node/websocketHandler.js

@@ -11,8 +11,8 @@ export function createNodeWebsocketHandler(core) {
             const data = JSON.parse(message.toString());
             await microserver.handleMessage(key, info, data);
         });
-        ws.on('close', () => {
-            microserver.clientConnections.remove(key);
+        ws.on('close', async () => {
+            await microserver.clientConnections.remove(key);
             core.log('debug', 'Connection closed', { key, userId: info.userId });
         });
     });

package/dist/esm/adapters/node/websocketHandler.js.map

@@ -1 +1 @@
-{"version":3,"file":"websocketHandler.js","sourceRoot":"","sources":["../../../../src/adapters/node/websocketHandler.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"websocketHandler.js","sourceRoot":"","sources":["../../../../src/adapters/node/websocketHandler.ts"],"names":[],"mappings":"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"}

package/dist/esm/connections/ClientConnection.d.ts

@@ -1,26 +1,38 @@
-import { ServerMessage } from '@verdant-web/common';
+import { EventSubscriber, ServerMessage } from '@verdant-web/common';
 import { IncomingMessage, ServerResponse } from 'http';
 import { WebSocket as WSWebSocket } from 'ws';
 import { Logger } from '../logger.js';
 import { UserProfileLoader } from '../Profiles.js';
 import { TokenInfo } from '../TokenVerifier.js';
 import { MessageSender } from './MessageSender.js';
-import { Presence } from './Presence.js';
-export declare class ClientConnectionManager implements MessageSender {
+import { Presence, PresenceStorage } from './Presence.js';
+export type ClientConnectionsManagerEvents = {
+    replicaLost: (replicaId: string, connectionKey: string) => void;
+};
+export declare class ClientConnectionManager extends EventSubscriber<ClientConnectionsManagerEvents> implements MessageSender {
     private readonly connections;
+    private connectionToUser;
+    private userToConnections;
     readonly presence: Presence;
     private readonly log?;
-    constructor({ profiles, log, }: {
+    constructor({ profiles, presenceStorage, log, }: {
         profiles: UserProfileLoader<any>;
+        presenceStorage?: PresenceStorage;
         log?: Logger;
     });
+    private addMappings;
+    /**
+     * Removes back-mappings and, if all are deleted,
+     * also removes user presence.
+     */
+    private removeMappings;
     addSocket: (key: string, socket: WebSocket | WSWebSocket, info: TokenInfo, options?: {
         disableAutoRemoveOnClose?: boolean;
     }) => void;
     addRequest: (key: string, request: IncomingMessage, response: ServerResponse, info: TokenInfo) => () => void;
     addFetch: (key: string, req: Request, info: TokenInfo) => (() => Response);
-    remove: (key: string) => void;
-    respond: (key: string, message: ServerMessage) => void;
+    remove: (key: string) => Promise<void>;
+    respond: (key: string, message: ServerMessage) => boolean;
     /**
      * Broadcasts a message to all live-connected clients in a library.
      * This does not reach push/pull clients.

package/dist/esm/connections/ClientConnection.js

@@ -1,4 +1,4 @@
-import { authz } from '@verdant-web/common';
+import { authz, EventSubscriber } from '@verdant-web/common';
 import { Presence } from './Presence.js';
 class ClientConnection {
     constructor(key, info) {
@@ -96,31 +96,45 @@ class WebSocketClientConnection extends ClientConnection {
         };
     }
 }
-export class ClientConnectionManager {
-    constructor({ profiles, log, }) {
+export class ClientConnectionManager extends EventSubscriber {
+    constructor({ profiles, presenceStorage, log, }) {
+        super();
         this.connections = new Map();
+        this.connectionToUser = new Map();
+        this.userToConnections = new Map();
         this.addSocket = (key, socket, info, options) => {
             const connection = new WebSocketClientConnection(key, socket, info);
             this.connections.set(key, connection);
+            this.addMappings(info.userId, key);
             const unsubscribes = [];
-            if (!(options === null || options === void 0 ? void 0 : options.disableAutoRemoveOnClose)) {
-                unsubscribes.push(subscribeToSocketEvent(socket, 'close', () => {
-                    var _a;
-                    (_a = this.log) === null || _a === void 0 ? void 0 : _a.call(this, 'info', `Socket closed: ${key}`);
-                    this.connections.delete(key);
-                    this.presence.removeConnection(key);
-                    unsubscribes.forEach((u) => u());
-                }));
-            }
+            /**
+             * Listen for websocket close and remove connection and mappings.
+             * If not disabled, also broadcast presence offline for the final
+             * connection per user.
+             *
+             * This may be disabled for environments where a closed connection
+             * doesn't necessarily indicate offline - Cloudflare is like this
+             * since it "hibernates" sockets but keeps them connected to the
+             * client side.
+             */
+            unsubscribes.push(subscribeToSocketEvent(socket, 'close', async () => {
+                var _a;
+                (_a = this.log) === null || _a === void 0 ? void 0 : _a.call(this, 'info', `Socket closed: ${key}`);
+                if (!(options === null || options === void 0 ? void 0 : options.disableAutoRemoveOnClose)) {
+                    await this.remove(key);
+                }
+                unsubscribes.forEach((u) => u());
+            }));
             unsubscribes.push(subscribeToSocketEvent(socket, 'messsage', () => {
                 // sockets get a long keepalive for message activity
                 // since they have a reliable close event
-                this.presence.keepAlive(key, 60 * 1000);
+                this.presence.keepAlive(info.userId, 60 * 1000);
             }));
         };
         this.addRequest = (key, request, response, info) => {
             const connection = new RequestClientConnection(key, request, response, info);
             this.connections.set(key, connection);
+            this.addMappings(info.userId, key);
             return () => {
                 connection.end();
                 this.connections.delete(key);
@@ -129,23 +143,27 @@ export class ClientConnectionManager {
         this.addFetch = (key, req, info) => {
             const connection = new FetchClientConnection(key, req, info);
             this.connections.set(key, connection);
+            this.addMappings(info.userId, key);
             return () => {
                 connection.end();
                 this.connections.delete(key);
                 return connection.res;
             };
         };
-        this.remove = (key) => {
+        this.remove = async (key) => {
             this.connections.delete(key);
-            this.presence.removeConnection(key);
+            await this.removeMappings(key);
         };
         this.respond = (key, message) => {
+            var _a;
             const connection = this.connections.get(key);
             if (connection) {
                 connection.respond(message);
+                return true;
             }
             else {
-                throw new Error(`No connection found for key ${key}`);
+                (_a = this.log) === null || _a === void 0 ? void 0 : _a.call(this, 'warn', `Could not respond: no connection found for key: ${key}`);
+                return false;
             }
         };
         /**
@@ -167,8 +185,35 @@ export class ClientConnectionManager {
             }
             this.connections.clear();
         };
-        this.presence = new Presence(profiles);
+        this.presence = new Presence(profiles, presenceStorage);
         this.log = log;
     }
+    addMappings(userId, connectionKey) {
+        this.connectionToUser.set(connectionKey, userId);
+        if (!this.userToConnections.has(userId)) {
+            this.userToConnections.set(userId, new Set());
+        }
+        this.userToConnections.get(userId).add(connectionKey);
+    }
+    /**
+     * Removes back-mappings and, if all are deleted,
+     * also removes user presence.
+     */
+    removeMappings(connectionKey, autoRemoveOnEmpty = true) {
+        const userId = this.connectionToUser.get(connectionKey);
+        if (userId) {
+            this.connectionToUser.delete(connectionKey);
+            const connections = this.userToConnections.get(userId);
+            if (connections) {
+                connections.delete(connectionKey);
+                if (connections.size === 0) {
+                    this.userToConnections.delete(userId);
+                    if (autoRemoveOnEmpty) {
+                        return this.presence.remove(userId);
+                    }
+                }
+            }
+        }
+    }
 }
 //# sourceMappingURL=ClientConnection.js.map

package/dist/esm/connections/ClientConnection.js.map

@@ -1 +1 @@
-{"version":3,"file":"ClientConnection.js","sourceRoot":"","sources":["../../../src/connections/ClientConnection.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ClientConnection.js","sourceRoot":"","sources":["../../../src/connections/ClientConnection.ts"],"names":[],"mappings":"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"}

package/dist/esm/connections/Presence.d.ts

@@ -1,23 +1,40 @@
 import { EventSubscriber, UserInfo, UserInfoUpdate } from '@verdant-web/common';
 import { UserProfiles } from '../Profiles.js';
 export type PresenceEvents = {
-    lost: (connectionKey: string, userId: string) => void;
+    lost: (userId: string) => void;
 };
+export type PresenceStorageItem = UserInfo<any, any> & {
+    expiresAt: number;
+};
+export interface PresenceStorage {
+    set: (userId: string, userInfo: UserInfoUpdate, profile: any, expiresAt: number) => Promise<UserInfo<any, any>>;
+    setExpiresAt: (userId: string, expiresAt: number) => Promise<void>;
+    get: (userId: string, time: number) => Promise<UserInfo<any, any> | undefined>;
+    remove: (userId: string) => Promise<void>;
+    all: () => Promise<Record<string, UserInfo<any, any>>>;
+    clear: () => Promise<void>;
+}
+export declare class PresenceMemoryStorage implements PresenceStorage {
+    private presences;
+    set: (userId: string, userInfo: UserInfoUpdate, profile: any, expiresAt: number) => Promise<PresenceStorageItem>;
+    setExpiresAt: (userId: string, expiresAt: number) => Promise<void>;
+    get: (userId: string, time: number) => Promise<PresenceStorageItem | undefined>;
+    remove: (userId: string) => Promise<void>;
+    all: () => Promise<Record<string, PresenceStorageItem>>;
+    clear: () => Promise<void>;
+}
 /**
- * Stores client presence in-memory for connected
+ * Stores client presence for connected
  * clients
  */
 export declare class Presence extends EventSubscriber<PresenceEvents> {
     readonly profiles: UserProfiles<any>;
-    private presences;
-    private connectionToUser;
-    private userToConnection;
-    private keepalives;
-    constructor(profiles: UserProfiles<any>);
-    set: (connectionKey: string, userId: string, userInfo: UserInfoUpdate) => Promise<UserInfo<any, any>>;
-    keepAlive: (connectionKey: string, duration?: number) => void;
-    get: (userId: string) => UserInfo<any, any>;
-    removeConnection: (connectionKey: string) => void;
-    all: () => Record<string, UserInfo<any, any>>;
+    readonly storage: PresenceStorage;
+    constructor(profiles: UserProfiles<any>, storage?: PresenceStorage);
+    set: (userId: string, userInfo: UserInfoUpdate) => Promise<UserInfo<any, any>>;
+    keepAlive: (userId: string, duration?: number) => void;
+    get: (userId: string) => Promise<UserInfo<any, any> | undefined>;
+    remove: (userId: string) => Promise<void>;
+    all: () => Promise<Record<string, UserInfo<any, any>>>;
     clear: () => void;
 }

package/dist/esm/connections/Presence.js

@@ -1,64 +1,74 @@
 import { EventSubscriber, initialInternalPresence, } from '@verdant-web/common';
-/**
- * Stores client presence in-memory for connected
- * clients
- */
-export class Presence extends EventSubscriber {
-    constructor(profiles) {
-        super();
-        this.profiles = profiles;
+const DEFAULT_EXPIRATION_TIME = 60 * 1000;
+export class PresenceMemoryStorage {
+    constructor() {
         this.presences = {};
-        this.connectionToUser = {};
-        this.userToConnection = {};
-        this.keepalives = new Map();
-        this.set = async (connectionKey, userId, userInfo) => {
+        this.set = async (userId, userInfo, profile, expiresAt) => {
             if (!this.presences[userId]) {
-                this.presences[userId] = Object.assign(Object.assign({}, userInfo), { profile: await this.profiles.get(userId), internal: userInfo.internal || initialInternalPresence });
+                this.presences[userId] = Object.assign(Object.assign({}, userInfo), { expiresAt,
+                    profile, internal: userInfo.internal || initialInternalPresence });
             }
             else {
                 Object.assign(this.presences[userId], userInfo);
             }
-            this.connectionToUser[connectionKey] = userId;
-            this.userToConnection[userId] =
-                this.userToConnection[userId] || new Set();
-            this.userToConnection[userId].add(connectionKey);
-            this.keepAlive(connectionKey);
             return this.presences[userId];
         };
-        this.keepAlive = (connectionKey, duration = 60 * 1000) => {
-            const existing = this.keepalives.get(connectionKey);
-            if (existing) {
-                clearTimeout(existing);
+        this.setExpiresAt = async (userId, expiresAt) => {
+            const presence = this.presences[userId];
+            if (presence) {
+                presence.expiresAt = expiresAt;
             }
-            this.keepalives.set(connectionKey, setTimeout(() => {
-                this.removeConnection(connectionKey);
-                this.keepalives.delete(connectionKey);
-            }, duration));
         };
-        this.get = (userId) => {
-            return this.presences[userId];
+        this.get = async (userId, time) => {
+            const value = this.presences[userId];
+            if (value && value.expiresAt > time) {
+                return value;
+            }
+            return undefined;
         };
-        this.removeConnection = (connectionKey) => {
-            const userId = this.connectionToUser[connectionKey];
-            if (!userId)
-                return;
-            this.userToConnection[userId].delete(connectionKey);
-            if (this.userToConnection[userId].size === 0) {
-                delete this.presences[userId];
-                this.emit('lost', connectionKey, userId);
-                // memory cleanup
-                if (Object.keys(this.presences).length === 0) {
-                    this.clear();
-                }
+        this.remove = async (userId) => {
+            delete this.presences[userId];
+            if (Object.keys(this.presences).length === 0) {
+                this.clear();
             }
         };
-        this.all = () => {
+        this.all = async () => {
             return this.presences;
         };
-        this.clear = () => {
+        this.clear = async () => {
             this.presences = {};
-            this.connectionToUser = {};
-            this.userToConnection = {};
+        };
+    }
+}
+/**
+ * Stores client presence for connected
+ * clients
+ */
+export class Presence extends EventSubscriber {
+    constructor(profiles, storage = new PresenceMemoryStorage()) {
+        super();
+        this.profiles = profiles;
+        this.storage = storage;
+        this.set = async (userId, userInfo) => {
+            const value = await this.storage.set(userId, userInfo, await this.profiles.get(userId), Date.now() + DEFAULT_EXPIRATION_TIME);
+            return value;
+        };
+        this.keepAlive = (userId, duration = DEFAULT_EXPIRATION_TIME) => {
+            const time = Date.now() + duration;
+            this.storage.setExpiresAt(userId, time);
+        };
+        this.get = (userId) => {
+            return this.storage.get(userId, Date.now());
+        };
+        this.remove = async (userId) => {
+            await this.storage.remove(userId);
+            this.emit('lost', userId);
+        };
+        this.all = () => {
+            return this.storage.all();
+        };
+        this.clear = () => {
+            this.storage.clear();
         };
     }
 }

package/dist/esm/connections/Presence.js.map

@@ -1 +1 @@
-{"version":3,"file":"Presence.js","sourceRoot":"","sources":["../../../src/connections/Presence.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Presence.js","sourceRoot":"","sources":["../../../src/connections/Presence.ts"],"names":[],"mappings":"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"}

package/dist/esm/internals.d.ts

@@ -2,6 +2,7 @@ export { errorHandler } from './adapters/node/errorHandler.js';
 export { createHttpRouter as createHonoRouter } from './adapters/node/httpRouter.js';
 export { tokenMiddleware } from './adapters/node/tokenMiddleware.js';
 export { ClientConnectionManager } from './connections/ClientConnection.js';
+export type * from './connections/Presence.js';
 export { FileStorageLibraryDelegate } from './files/FileStorage.js';
 export type * from './libraries/generic.js';
 export { Library, type LibraryEvents } from './libraries/Library.js';

package/dist/esm/internals.js.map

@@ -1 +1 @@
-{"version":3,"file":"internals.js","sourceRoot":"","sources":["../../src/internals.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAC/D,OAAO,EAAE,gBAAgB,IAAI,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AACrF,OAAO,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAC;AACrE,OAAO,EAAE,uBAAuB,EAAE,MAAM,mCAAmC,CAAC;AAC5E,OAAO,EAAE,0BAA0B,EAAE,MAAM,wBAAwB,CAAC;AAEpE,OAAO,EAAE,OAAO,EAAsB,MAAM,wBAAwB,CAAC;AAErE,OAAO,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAClD,OAAO,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;AAChE,OAAO,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAC;AACnE,OAAO,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AAExE,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC"}
+{"version":3,"file":"internals.js","sourceRoot":"","sources":["../../src/internals.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAC/D,OAAO,EAAE,gBAAgB,IAAI,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AACrF,OAAO,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAC;AACrE,OAAO,EAAE,uBAAuB,EAAE,MAAM,mCAAmC,CAAC;AAE5E,OAAO,EAAE,0BAA0B,EAAE,MAAM,wBAAwB,CAAC;AAEpE,OAAO,EAAE,OAAO,EAAsB,MAAM,wBAAwB,CAAC;AAErE,OAAO,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAClD,OAAO,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;AAChE,OAAO,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAC;AACnE,OAAO,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AAExE,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC"}

package/dist/esm/libraries/Library.d.ts

@@ -1,7 +1,6 @@
 import { ClientMessage, DocumentBaseline, EventSubscriber, Operation } from '@verdant-web/common';
-import { MessageSender } from '../connections/MessageSender.js';
-import { Presence } from '../connections/Presence.js';
 import { FileInfo, FileStorageLibraryDelegate } from '../files/FileStorage.js';
+import { ClientConnectionManager } from '../internals.js';
 import { Logger } from '../logger.js';
 import { Storage } from '../storage/Storage.js';
 import { TokenInfo } from '../TokenVerifier.js';
@@ -18,22 +17,22 @@ export interface LibraryFileInfo {
 }
 export declare class Library {
     private storage;
-    private sender;
     private disableRebasing;
     private fileStorage;
     private events;
     readonly id: string;
-    private presence;
+    private clientConnections;
+    private get presence();
+    private get sender();
     private log;
-    constructor({ storage, sender, log, disableRebasing, fileStorage, events, id, presence, }: {
+    constructor({ storage, log, disableRebasing, fileStorage, events, id, clientConnections, }: {
         storage: Storage;
-        sender: MessageSender;
         log?: Logger;
         disableRebasing?: boolean;
         fileStorage?: FileStorageLibraryDelegate;
         events?: EventSubscriber<LibraryEvents>;
         id: string;
-        presence: Presence;
+        clientConnections: ClientConnectionManager;
     });
     private validateReplicaAccess;
     private hasWriteAccess;

package/dist/esm/libraries/Library.js

@@ -1,6 +1,12 @@
 import { applyOperations, isFileRef, isObjectRef, ReplicaType, rewriteAuthzOriginator, } from '@verdant-web/common';
 export class Library {
-    constructor({ storage, sender, log = () => { }, disableRebasing, fileStorage, events, id, presence, }) {
+    get presence() {
+        return this.clientConnections.presence;
+    }
+    get sender() {
+        return this.clientConnections;
+    }
+    constructor({ storage, log = () => { }, disableRebasing, fileStorage, events, id, clientConnections, }) {
         this.validateReplicaAccess = async (replicaId, clientKey, info) => {
             const replica = await this.storage.replicas.get(replicaId);
             if (replica && replica.clientId !== info.userId) {
@@ -229,7 +235,12 @@ export class Library {
                 ? this.createAckNonce(serverOrderToAck)
                 : undefined;
             // respond to client
-            this.log('info', 'Sending sync response with', ops.length, 'operations and', baselines.length, 'baselines', 'to client key', clientKey);
+            const peerPresence = await this.presence.all();
+            this.log('info', 'Sending sync response with', {
+                ops: ops.length,
+                baselines: baselines.length,
+                peers: Object.keys(peerPresence),
+            }, 'to client key', clientKey);
             // mutating baselines/operations to remove extra data -
             // mutating just to save on allocations here.
             try {
@@ -238,7 +249,7 @@ export class Library {
                     operations: this.removeOperationExtras(ops),
                     baselines: this.removeBaselineExtras(baselines),
                     globalAckTimestamp: (_b = (await this.storage.replicas.getGlobalAck())) !== null && _b !== void 0 ? _b : undefined,
-                    peerPresence: this.presence.all(),
+                    peerPresence,
                     // only request the client to overwrite local data if a reset is requested
                     // and there is data to overwrite it. otherwise the client may still
                     // send its own history to us.
@@ -278,7 +289,7 @@ export class Library {
             }
         };
         this.handleDisconnecting = async (_message, clientKey, _info) => {
-            this.presence.removeConnection(clientKey);
+            await this.clientConnections.remove(clientKey);
         };
         this.updateHighwater = async (replicaId, timestamp, info, ignoreClientKeys = []) => {
             await this.storage.replicas.updateAcknowledgedLogicalTime(replicaId, timestamp);
@@ -317,7 +328,7 @@ export class Library {
             // for global ack, to determine consensus, also allow
             // for all actively connected replicas to ack regardless of their
             // type.
-            const activeReplicaIds = Object.values(this.presence.all()).map((p) => p.replicaId);
+            const activeReplicaIds = Object.values(await this.presence.all()).map((p) => p.replicaId);
             const globalAck = await this.storage.replicas.getGlobalAck(activeReplicaIds);
             const globalServerOrder = await this.storage.replicas.getEarliestAckedServerOrder();
             if (!globalAck) {
@@ -367,7 +378,7 @@ export class Library {
             });
         };
         this.handlePresenceUpdate = async (message, clientKey, info) => {
-            const updated = await this.presence.set(clientKey, info.userId, {
+            const updated = await this.presence.set(info.userId, {
                 presence: message.presence,
                 internal: message.internal,
                 replicaId: message.replicaId,
@@ -381,14 +392,13 @@ export class Library {
             // mirror back to the replica which sent it so it has profile
             []);
         };
-        this.onPresenceLost = async (replicaId, userId) => {
-            this.log('info', 'User disconnected from all replicas:', userId, 'replica:', replicaId);
+        this.onPresenceLost = async (userId) => {
+            this.log('info', 'User disconnected from all replicas:', userId);
             this.sender.broadcast({
                 type: 'presence-offline',
-                replicaId,
                 userId,
             });
-            if (Object.keys(this.presence.all()).length === 0) {
+            if (Object.keys(await this.presence.all()).length === 0) {
                 this.log('info', `All users have disconnected`);
                 // could happen - if the server is shutting down manually
                 if (!this.storage.open) {
@@ -441,7 +451,7 @@ export class Library {
             }
         };
         this.getPresence = () => {
-            return Promise.resolve(this.presence.all());
+            return this.presence.all();
         };
         this.getInfo = async () => {
             var _a;
@@ -576,12 +586,11 @@ export class Library {
         };
         this.id = id;
         this.storage = storage;
-        this.sender = sender;
         this.log = log;
         this.disableRebasing = !!disableRebasing;
         this.fileStorage = fileStorage;
         this.events = events;
-        this.presence = presence;
+        this.clientConnections = clientConnections;
         this.presence.subscribe('lost', this.onPresenceLost);
     }
 }