@verdant-web/store 3.9.0-next.2 → 3.10.0

package/src/sync/PushPullSync.ts

@@ -204,9 +204,7 @@ export class PushPullSync
 		// will include the client's own presence info and fill in missing profile
 		// data on the first request. otherwise it would have to wait for the second.
 		this.sendRequest([
-			await this.meta.messageCreator.createPresenceUpdate(
-				this.presence.self.presence,
-			),
+			await this.meta.messageCreator.createPresenceUpdate(this.presence.self),
 			await this.meta.messageCreator.createSyncStep1(),
 		]);
 	};

package/src/sync/Sync.ts

@@ -8,6 +8,7 @@ import {
 	rewriteAuthzOriginator,
 	ServerMessage,
 	VerdantError,
+	VerdantInternalPresence,
 } from '@verdant-web/common';
 import { Metadata } from '../metadata/Metadata.js';
 import { HANDLE_MESSAGE, PresenceManager } from './PresenceManager.js';
@@ -299,12 +300,13 @@ export class ServerSync<Presence = any, Profile = any>
 
 		if (automaticTransportSelection && this.canDoRealtime) {
 			// automatically shift between transport modes depending
-			// on whether any peers are present
+			// on whether any peers are present (matching view if
+			// applicable)
 			const decideIfUpgrade = () => {
 				if (switchoverTimeout) {
 					clearTimeout(switchoverTimeout);
 				}
-				const hasPeers = Object.keys(this.presence.peers).length > 0;
+				const hasPeers = this.presence.getViewPeers().length > 0;
 				const shouldUpgrade =
 					hasPeers ||
 					(automaticTransportSelection !== 'peers-only' &&
@@ -314,7 +316,7 @@ export class ServerSync<Presence = any, Profile = any>
 				} else if (!shouldUpgrade && this.mode === 'realtime') {
 					// wait 1 second then switch to pull mode if still empty
 					switchoverTimeout = setTimeout(() => {
-						if (Object.keys(this.presence.peers).length === 0) {
+						if (this.presence.getViewPeers().length === 0) {
 							this.setMode('pull');
 						}
 					}, 1000);
@@ -422,8 +424,11 @@ export class ServerSync<Presence = any, Profile = any>
 	private handleOnlineChange = (online: boolean) => {
 		this.emit('onlineChange', online);
 	};
-	private handlePresenceUpdate = async (presence: any) => {
-		this.send(await this.meta.messageCreator.createPresenceUpdate(presence));
+	private handlePresenceUpdate = async (data: {
+		presence?: Presence;
+		internal?: VerdantInternalPresence;
+	}) => {
+		this.send(await this.meta.messageCreator.createPresenceUpdate(data));
 	};
 
 	setMode = (transport: SyncTransportMode) => {

package/src/sync/WebSocketSync.ts

@@ -94,9 +94,7 @@ export class WebSocketSync
 			this.hasStartedSync = true;
 			this.synced = false;
 			this.send(
-				await this.meta.messageCreator.createPresenceUpdate(
-					this.presence.self.presence,
-				),
+				await this.meta.messageCreator.createPresenceUpdate(this.presence.self),
 			);
 			this.send(await this.meta.messageCreator.createSyncStep1());
 			this.heartbeat.start();