@tldraw/sync-core 4.6.0-next.5a871ec02ff3 → 4.6.0-next.6594d48ace27

package/src/lib/TLSyncClient.test.ts

@@ -30,13 +30,10 @@ const protocolVersion = getTlsyncProtocolVersion()
 type TestRecord = TLRecord
 
 // Mock socket implementation for testing
-class MockSocket
-	implements
-		TLPersistentClientSocket<
-			TLSocketClientSentEvent<TestRecord>,
-			TLSocketServerSentEvent<TestRecord>
-		>
-{
+class MockSocket implements TLPersistentClientSocket<
+	TLSocketClientSentEvent<TestRecord>,
+	TLSocketServerSentEvent<TestRecord>
+> {
 	connectionStatus: 'online' | 'offline' | 'error' = 'offline'
 	private messageListeners: Array<(msg: TLSocketServerSentEvent<TestRecord>) => void> = []
 	private statusListeners: Array<(event: TLSocketStatusChangeEvent) => void> = []

package/src/lib/TLSyncClient.ts

@@ -826,6 +826,9 @@ export class TLSyncClient<R extends UnknownRecord, S extends Store<R> = Store<R>
 		this.disposables.forEach((dispose) => dispose())
 		this.sendUnsentChanges.cancel?.()
 		this.scheduleRebase.cancel?.()
+		if (typeof window !== 'undefined' && (window as any).tlsync === this) {
+			delete (window as any).tlsync
+		}
 	}
 
 	private lastPushedPresenceState: R | null = null
@@ -903,7 +906,7 @@ export class TLSyncClient<R extends UnknownRecord, S extends Store<R> = Store<R>
 		}
 	}
 
-	// eslint-disable-next-line local/prefer-class-methods
+	// eslint-disable-next-line tldraw/prefer-class-methods
 	private rebase = () => {
 		// need to make sure that our speculative changes are in sync with the actual store instance before
 		// proceeding, to avoid inconsistency bugs.

package/src/lib/TLSyncRoom.ts

@@ -910,7 +910,15 @@ export class TLSyncRoom<R extends UnknownRecord, SessionMeta> {
 				sessionSchema,
 				requiresDownMigrations,
 				{
-					puts: Object.fromEntries([...this.presenceStore.values()].map((p) => [p.id, p])),
+					// Exclude the connecting session's own presence — it will push fresh
+					// data immediately after connecting. Sending the stale record back
+					// would leave an orphaned presence in the client's local store (the
+					// server never echoes a session's own updates back to it).
+					puts: Object.fromEntries(
+						[...this.presenceStore.values()]
+							.filter((p) => p.id !== session.presenceId)
+							.map((p) => [p.id, p])
+					),
 					deletes: [],
 				}
 			)

package/src/lib/protocol.ts

@@ -69,8 +69,10 @@ export const TLIncompatibilityReason = {
  * @internal
  * @deprecated replaced by websocket .close status/reason
  */
+/* eslint-disable @typescript-eslint/no-deprecated */
 export type TLIncompatibilityReason =
 	(typeof TLIncompatibilityReason)[keyof typeof TLIncompatibilityReason]
+/* eslint-enable @typescript-eslint/no-deprecated */
 
 /**
  * Union type representing all possible message types that can be sent from server to client.

package/src/test/RandomSource.ts

@@ -19,7 +19,7 @@ export class RandomSource {
 	}
 
 	randomAction<Result>(
-		// eslint-disable-next-line @typescript-eslint/method-signature-style
+		// eslint-disable-next-line tldraw/method-signature-style
 		choices: Array<(() => Result) | { weight: number; do: () => any }>,
 		randomWeights?: boolean
 	): Result {

package/src/test/SQLiteSyncStorage.test.ts

@@ -1,3 +1,4 @@
+import { DatabaseSync } from 'node:sqlite'
 import {
 	BaseRecord,
 	createMigrationSequence,
@@ -13,7 +14,6 @@ import {
 	TLRecord,
 } from '@tldraw/tlschema'
 import { IndexKey, ZERO_INDEX_KEY } from '@tldraw/utils'
-import { DatabaseSync } from 'node:sqlite'
 import { vi } from 'vitest'
 import { MAX_TOMBSTONES, TOMBSTONE_PRUNE_BUFFER_SIZE } from '../lib/InMemorySyncStorage'
 import { NodeSqliteWrapper } from '../lib/NodeSqliteWrapper'

package/src/test/TLSocketRoom.test.ts

@@ -1344,12 +1344,10 @@ describe('TLSocketRoom.updateStore', () => {
 			document.name = 'My lovely document'
 			store.put(document)
 		})
-		expect(
-			(
-				storage.getSnapshot().documents.find((r) => r.state.id === 'document:document')
-					?.state as any
-			).name
-		).toBe('My lovely document')
+		const docRecord = storage
+			.getSnapshot()
+			.documents.find((r) => r.state.id === 'document:document') as any
+		expect(docRecord.state.name).toBe('My lovely document')
 		expect(clock).toBeLessThan(storage.getClock())
 	})
 
@@ -1359,12 +1357,10 @@ describe('TLSocketRoom.updateStore', () => {
 			const document = store.get('document:document') as TLDocument
 			document.name = 'My lovely document'
 		})
-		expect(
-			(
-				storage.getSnapshot().documents.find((r) => r.state.id === 'document:document')
-					?.state as any
-			).name
-		).toBe('')
+		const docRecord = storage
+			.getSnapshot()
+			.documents.find((r) => r.state.id === 'document:document') as any
+		expect(docRecord.state.name).toBe('')
 		expect(clock).toBe(storage.getClock())
 	})
 

package/src/test/TLSyncRoom.test.ts

@@ -16,13 +16,13 @@ import {
 import { IndexKey, ZERO_INDEX_KEY, mockUniqueId, sortById } from '@tldraw/utils'
 import { vi } from 'vitest'
 import { InMemorySyncStorage } from '../lib/InMemorySyncStorage'
-import { RoomSnapshot, TLRoomSocket, TLSyncRoom } from '../lib/TLSyncRoom'
 import {
 	TLConnectRequest,
 	TLPushRequest,
 	TLSocketServerSentEvent,
 	getTlsyncProtocolVersion,
 } from '../lib/protocol'
+import { RoomSnapshot, TLRoomSocket, TLSyncRoom } from '../lib/TLSyncRoom'
 
 const schema = createTLSchema()
 const compareById = (a: { id: string }, b: { id: string }) => a.id.localeCompare(b.id)

package/src/test/TestSocketPair.ts

@@ -1,5 +1,6 @@
 import { UnknownRecord } from '@tldraw/store'
 import { structuredClone } from '@tldraw/utils'
+import { TLSocketClientSentEvent, TLSocketServerSentEvent } from '../lib/protocol'
 import {
 	TLPersistentClientSocket,
 	TLSocketStatusListener,
@@ -7,7 +8,6 @@ import {
 	TLSyncErrorCloseEventReason,
 } from '../lib/TLSyncClient'
 import { TLRoomSocket } from '../lib/TLSyncRoom'
-import { TLSocketClientSentEvent, TLSocketServerSentEvent } from '../lib/protocol'
 import { TestServer } from './TestServer'
 
 export class TestSocketPair<R extends UnknownRecord> {
@@ -97,7 +97,7 @@ export class TestSocketPair<R extends UnknownRecord> {
 		onStatusChange: null as null | TLSocketStatusListener,
 	}
 
-	// eslint-disable-next-line no-restricted-syntax
+	// eslint-disable-next-line tldraw/no-setter-getter
 	get isConnected() {
 		return this.clientSocket.connectionStatus === 'online'
 	}

package/src/test/syncFuzz.test.ts

@@ -2,10 +2,12 @@ import {
 	Editor,
 	TLRecord,
 	TLStore,
+	UserRecordType,
 	computed,
 	createPresenceStateDerivation,
 	createTLSchema,
 	createTLStore,
+	createUserId,
 	isRecordsDiffEmpty,
 	mockUniqueId,
 	uniqueId,
@@ -83,12 +85,13 @@ class FuzzTestInstance extends RandomSource {
 				this.editor = new FuzzEditor(this.id, this.seed, this.store)
 			},
 			presence: createPresenceStateDerivation(
-				computed('', () => ({
-					id: this.id,
-					name: 'test',
-					color: 'red',
-					locale: 'en',
-				}))
+				computed('', () =>
+					UserRecordType.create({
+						id: createUserId(this.id),
+						name: 'test',
+						color: 'red',
+					})
+				)
 			)(this.store),
 		})
 
@@ -287,6 +290,10 @@ test('seed 5279266392988747 - undo/redo page integrity regression', () => {
 	runTest(5279266392988747)
 })
 
+test('seed 8090628137862085 - duplicate index key regression', () => {
+	runTest(8090628137862085)
+})
+
 for (let i = 0; i < NUM_TESTS; i++) {
 	const seed = Math.floor(Math.random() * Number.MAX_SAFE_INTEGER)
 	test(`seed ${seed}`, () => {

package/src/test/upgradeDowngrade.test.ts

@@ -11,10 +11,10 @@ import {
 	createRecordType,
 } from '@tldraw/store'
 import { vi, type Mock } from 'vitest'
-import { TLSyncClient, TLSyncErrorCloseEventReason } from '../lib/TLSyncClient'
-import { RoomSnapshot, TLRoomSocket } from '../lib/TLSyncRoom'
 import { RecordOpType, ValueOpType } from '../lib/diff'
 import { TLSocketServerSentEvent, getTlsyncProtocolVersion } from '../lib/protocol'
+import { TLSyncClient, TLSyncErrorCloseEventReason } from '../lib/TLSyncClient'
+import { RoomSnapshot, TLRoomSocket } from '../lib/TLSyncRoom'
 import { TestServer } from './TestServer'
 import { TestSocketPair } from './TestSocketPair'
 

package/src/test/validation.test.ts

@@ -1,8 +1,8 @@
 import { computed } from '@tldraw/state'
 import { RecordId, Store, StoreSchema, UnknownRecord, createRecordType } from '@tldraw/store'
 import { vi } from 'vitest'
-import { TLSyncClient, TLSyncErrorCloseEventReason } from '../lib/TLSyncClient'
 import { RecordOpType } from '../lib/diff'
+import { TLSyncClient, TLSyncErrorCloseEventReason } from '../lib/TLSyncClient'
 import { TestServer } from './TestServer'
 import { TestSocketPair } from './TestSocketPair'