Merge pull request #83 from CodinGame/force-close-connection

Force close connection on shutdown

Author: CGNonofr

src/createLanguageClient.ts

@@ -125,7 +125,25 @@ async function createLanguageClient (
     return undefined
   }
 
-  const client = new MonacoLanguageClient({
+  // Hack to force close the connection when the language client stops
+  // Even if the `shutdown` request failed
+  class _MonacoLanguageClient extends MonacoLanguageClient {
+    override async stop (timeout: number): Promise<void> {
+      // eslint-disable-next-line dot-notation
+      const connection = this['_connection']
+      try {
+        await super.stop(timeout)
+      } finally {
+        try {
+          connection.dispose()
+        } catch (err) {
+          // ignore
+        }
+      }
+    }
+  }
+
+  const client = new _MonacoLanguageClient({
     id: `${id}-languageclient`,
     name: `CodinGame ${id} Language Client`,
     clientOptions: {

src/infrastructure.ts

@@ -51,11 +51,18 @@ export interface Infrastructure {
   getInitializationOptions? (): LSPAny
 }
 
+class CloseOnDisposeWebSocketMessageReader extends WebSocketMessageReader {
+  override dispose () {
+    super.dispose()
+    this.socket.dispose()
+  }
+}
+
 async function openWebsocketConnection (url: URL | string): Promise<MessageTransports> {
   const webSocket = new WebSocket(url)
   const socket: IWebSocket = toSocket(webSocket)
 
-  const reader = new WebSocketMessageReader(socket)
+  const reader = new CloseOnDisposeWebSocketMessageReader(socket)
   const writer = new WebSocketMessageWriter(socket)
 
   await new Promise((resolve, reject) => {