DRAFT: yjs transport

Author: 4e6

app/ydoc-server-polyglot/build.mjs

@@ -10,6 +10,10 @@ const globals = {
     varName: 'zlib',
     type: 'cjs',
   },
+  'node:crypto': {
+    varName: 'crypto',
+    type: 'cjs',
+  },
 }
 
 const ctx = await esbuild.context({

app/ydoc-server/src/languageServerSession.ts

@@ -18,7 +18,7 @@ import type {
 } from 'ydoc-shared/languageServerTypes'
 import { assertNever } from 'ydoc-shared/util/assert'
 import { AbortScope, exponentialBackoff, printingCallbacks } from 'ydoc-shared/util/net'
-import { ReconnectingWebSocketTransport } from 'ydoc-shared/util/net/ReconnectingWSTransport'
+import { YjsTransport } from 'ydoc-shared/util/net/YjsTransport'
 import {
   DistributedProject,
   IdMap,
@@ -89,8 +89,10 @@ export class LanguageServerSession {
   /** Get a {@link LanguageServerSession} by its URL. */
   static get(url: string): LanguageServerSession {
     const session = map.setIfUndefined(LanguageServerSession.sessions, url, () => {
-      const ws = new ReconnectingWebSocketTransport(url)
-      const ls = new LanguageServer(crypto.randomUUID(), ws)
+      const doc = new Y.Doc()
+      const transport = new YjsTransport(doc, url)
+      transport.connect()
+      const ls = new LanguageServer(crypto.randomUUID(), transport)
       return new LanguageServerSession(ls, () => LanguageServerSession.sessions.delete(url))
     })
     session.retain()

app/ydoc-shared/src/languageServer.ts

@@ -26,7 +26,7 @@ import type {
   VisualizationConfiguration,
 } from './languageServerTypes'
 import { AbortScope, exponentialBackoff } from './util/net'
-import type { ReconnectingWebSocketTransport } from './util/net/ReconnectingWSTransport'
+import type { YjsTransport } from './util/net/YjsTransport'
 import type { Uuid } from './yjsModel'
 
 const debugLog = debug('ydoc-shared:languageServer')
@@ -148,7 +148,7 @@ export class LanguageServer extends ObservableV2<Notifications & TransportEvents
   /** Create a {@link LanguageServer}. */
   constructor(
     private clientID: Uuid,
-    private transport: ReconnectingWebSocketTransport,
+    private transport: YjsTransport,
   ) {
     super()
     this.initialized = this.scheduleInitializationAfterConnect()
@@ -224,7 +224,8 @@ export class LanguageServer extends ObservableV2<Notifications & TransportEvents
 
   /** Reconnect the underlying network transport. */
   reconnect() {
-    this.transport.reconnect()
+    this.transport.close()
+    this.transport.connect()
   }
 
   // The "magic bag of holding" generic that is only present in the return type is UNSOUND.