Start Ydoc with the language server

app/gui2/shared/ast/ffiPolyglot.ts

@@ -1,7 +1,7 @@
 /**
  * @file This file is used as ffi {@link module:ffi} interface for building the polyglot ydoc server.
  * All the exported methods are provided by the ydoc server implementation.
- * The interface should be kept in sync with Rust ffi inteface {@link module:ffi}.
+ * The interface should be kept in sync with Rust ffi interface {@link module:ffi}.
  *
  * @module ffiPolyglot
  */

app/gui2/shared/languageServer.ts

@@ -124,7 +124,7 @@ export type TransportEvents = {
  * This client implements the [Language Server Protocol](https://github.com/enso-org/enso/blob/develop/docs/language-server/protocol-language-server.md)
  *
  * It also handles the initialization (and re-initialization on every reconnect); each method
- * repressenting a remote call (except the `initProtocolConnection` obviously) waits for
+ * representing a remote call (except the `initProtocolConnection` obviously) waits for
  * initialization before sending the request.
  */
 export class LanguageServer extends ObservableV2<Notifications & TransportEvents> {

app/gui2/src/stores/project/index.ts

@@ -53,12 +53,15 @@ function resolveLsUrl(config: GuiConfig): LsUrls {
   if (engine.rpcUrl != null && engine.dataUrl != null) {
     const dataUrl = engine.dataUrl
     const rpcUrl = engine.rpcUrl
-    let ydocUrl
-    if (engine.ydocUrl == null || engine.ydocUrl === '') {
+
+    let ydocUrl: URL
+    if (engine.ydocUrl == '') {
       ydocUrl = new URL(location.origin)
       ydocUrl.protocol = location.protocol.replace(/^http/, 'ws')
+    } else if (URL.canParse(engine.ydocUrl)) {
+      ydocUrl = new URL(engine.ydocUrl)
     } else {
-      ydocUrl = new URL(engine.rpcUrl)
+      ydocUrl = new URL(rpcUrl)
       ydocUrl.port = '1234'
     }
     ydocUrl.pathname = '/project'

app/gui2/vite.config.ts

@@ -2,8 +2,6 @@
 
 import vue from '@vitejs/plugin-vue'
 import { getDefines, readEnvironmentFromFile } from 'enso-common/src/appConfig'
-import { spawn, type ChildProcessWithoutNullStreams } from 'node:child_process'
-import { existsSync } from 'node:fs'
 import { fileURLToPath } from 'node:url'
 import postcssNesting from 'postcss-nesting'
 import tailwindcss from 'tailwindcss'
@@ -15,9 +13,7 @@ import { createGatewayServer } from './ydoc-server'
 const projectManagerUrl = 'ws://127.0.0.1:30535'
 
 const IS_CLOUD_BUILD = process.env.CLOUD_BUILD === 'true'
-const IS_POLYGLOT_YDOC_SERVER_DEBUG = process.env.POLYGLOT_YDOC_SERVER_DEBUG === 'true'
-const IS_POLYGLOT_YDOC_SERVER =
-  process.env.POLYGLOT_YDOC_SERVER === 'true' || IS_POLYGLOT_YDOC_SERVER_DEBUG
+const POLYGLOT_YDOC_SERVER = process.env.POLYGLOT_YDOC_SERVER
 
 await readEnvironmentFromFile()
 
@@ -62,7 +58,7 @@ export default defineConfig({
     ...getDefines(),
     IS_CLOUD_BUILD: JSON.stringify(IS_CLOUD_BUILD),
     PROJECT_MANAGER_URL: JSON.stringify(projectManagerUrl),
-    YDOC_SERVER_URL: IS_POLYGLOT_YDOC_SERVER ? JSON.stringify('defined') : undefined,
+    YDOC_SERVER_URL: JSON.stringify(POLYGLOT_YDOC_SERVER),
     RUNNING_VITEST: false,
     'import.meta.vitest': false,
     // Single hardcoded usage of `global` in aws-amplify.
@@ -98,48 +94,13 @@ export default defineConfig({
   },
 })
 
-let ydocServer: ChildProcessWithoutNullStreams | null
 function gatewayServer(): Plugin {
   return {
     name: 'gateway-server',
     configureServer(server) {
-      if (server.httpServer == null) return
+      if (POLYGLOT_YDOC_SERVER != undefined || server.httpServer == null) return
 
-      if (IS_POLYGLOT_YDOC_SERVER) {
-        const ydocServerJar = fileURLToPath(
-          new URL(
-            '../../lib/java/ydoc-server/target/ydoc-server-assembly-0.1.0-SNAPSHOT.jar',
-            import.meta.url,
-          ),
-        )
-        const runYdocServer = () => {
-          const args = []
-          if (IS_POLYGLOT_YDOC_SERVER_DEBUG) {
-            args.push('-DinspectPort=34567')
-          }
-          args.push('-jar', ydocServerJar)
-          ydocServer = spawn('java', args)
-          if (IS_POLYGLOT_YDOC_SERVER_DEBUG) {
-            ydocServer.stdout.on('data', (data) => console.log(`ydoc: ${data}`))
-          }
-          ydocServer.stderr.on('data', (data) => console.log(`ydoc: ${data}`))
-        }
-        if (!existsSync(ydocServerJar)) {
-          const cwd = fileURLToPath(new URL('../..', import.meta.url))
-          const sbt = spawn('sbt', ['ydoc-server/assembly'], { cwd })
-          sbt.stdout.on('data', (data) => console.log(`sbt: ${data}`))
-          sbt.on('exit', runYdocServer)
-        } else {
-          runYdocServer()
-        }
-      } else {
-        createGatewayServer(server.httpServer, undefined)
-      }
-    },
-    buildEnd() {
-      if (ydocServer == null) return
-
-      ydocServer.kill('SIGTERM')
+      createGatewayServer(server.httpServer, undefined)
     },
   }
 }

app/gui2/vite.ydoc-server-polyglot.config.ts

@@ -1,3 +1,4 @@
+import * as fs from 'node:fs'
 import { fileURLToPath } from 'node:url'
 import { defineConfig, type Plugin } from 'vite'
 import defaultConfig from './vite.config'
@@ -13,22 +14,16 @@ export default defineConfig({
   cacheDir,
   publicDir,
   envDir,
-  resolve: {
-    ...resolve,
-    alias: {
-      ...resolve?.alias,
-      // Use `ffiPolyglot` module as `ffi` interface during the build.
-      'shared/ast/ffi': fileURLToPath(new URL('./shared/ast/ffiPolyglot.ts', import.meta.url)),
-    },
-  },
+  resolve,
+  plugins: [usePolyglotFfi()],
   define: {
     ...defaultConfig.define,
     self: 'globalThis',
   },
   build: {
     minify: false, // For debugging
     emptyOutDir: true,
-    outDir: '../../lib/java/ydoc-server/target/classes/dist',
+    outDir: '../../lib/java/ydoc-server/target/ydoc-server-bundle',
     rollupOptions: {
       input: {
         ydocServer: fileURLToPath(new URL('ydoc-server/indexPolyglot.ts', import.meta.url)),
@@ -39,3 +34,23 @@ export default defineConfig({
     },
   },
 })
+
+/**
+ * Use `ffiPolyglot` module as `ffi` interface during the build.
+ */
+function usePolyglotFfi(): Plugin {
+  const ffiPolyglot = fileURLToPath(new URL('./shared/ast/ffiPolyglot.ts', import.meta.url))
+  const ffiBackup = fileURLToPath(new URL('./shared/ast/ffiBackup.ts', import.meta.url))
+  const ffi = fileURLToPath(new URL('./shared/ast/ffi.ts', import.meta.url))
+
+  return {
+    name: 'use-polyglot-ffi',
+    options: () => {
+      fs.renameSync(ffi, ffiBackup)
+      fs.copyFileSync(ffiPolyglot, ffi)
+    },
+    buildEnd: () => {
+      fs.renameSync(ffiBackup, ffi)
+    },
+  }
+}

app/gui2/ydoc-server/indexPolyglot.ts

@@ -11,9 +11,15 @@ declare global {
     onconnect: ((socket: any, url: any) => any) | null
     start(): void
   }
+
+  const YDOC_HOST: string | undefined
+  const YDOC_PORT: number | undefined
 }
 
-const wss = new WebSocketServer({ host: 'localhost', port: 1234 })
+const host = YDOC_HOST ?? 'localhost'
+const port = YDOC_PORT ?? 1234
+
+const wss = new WebSocketServer({ host, port })
 
 wss.onconnect = (socket, url) => {
   const doc = docName(url.pathname)