fix(rpc): issue with ESM

deepkit · Oct 3, 2023 · c7d87c5 · c7d87c5
1 parent 7a1027a
commit c7d87c5
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git a/packages/rpc-tcp/src/client.ts b/packages/rpc-tcp/src/client.ts
@@ -1,4 +1,4 @@
-import { ParsedHost, parseHost } from '@deepkit/core';
+import { parseHost } from '@deepkit/core';
 import { ClientTransportAdapter, TransportConnectionHooks } from '@deepkit/rpc';
 import { connect } from 'net';
 

diff --git a/packages/rpc-tcp/src/server.ts b/packages/rpc-tcp/src/server.ts
@@ -2,6 +2,9 @@ import { asyncOperation, ParsedHost, parseHost } from '@deepkit/core';
 import { RpcKernel } from '@deepkit/rpc';
 import { existsSync, unlinkSync } from 'fs';
 import { createServer, Server, Socket } from 'net';
+import type { ServerOptions as WebSocketServerOptions } from 'ws';
+import { WebSocketServer } from 'ws';
+import { IncomingMessage } from 'http';
 
 /**
  * Uses the node `net` module to create a server. Supports unix sockets.
@@ -74,12 +77,8 @@ export class RpcTcpServer {
     }
 }
 
-import * as ws from 'ws';
-import type { ServerOptions as WebSocketServerOptions } from 'ws';
-import { IncomingMessage } from 'http';
-
 export class RpcWebSocketServer {
-    protected server?: ws.Server;
+    protected server?: WebSocketServer;
     protected host: ParsedHost;
 
     constructor(
@@ -98,7 +97,7 @@ export class RpcWebSocketServer {
 
     start(options: WebSocketServerOptions): void {
         const defaultOptions = { host: this.host.host, port: this.host.port };
-        this.server = new ws.Server({ ...defaultOptions, ...options });
+        this.server = new WebSocketServer({ ...defaultOptions, ...options });
 
         this.server.on('connection', (ws, req: IncomingMessage) => {
             const connection = this.kernel?.createConnection({

diff --git a/packages/rpc/src/client/client-websocket.ts b/packages/rpc/src/client/client-websocket.ts
@@ -54,17 +54,19 @@ export function createRpcWebSocketClientProvider(baseUrl: string = typeof locati
     };
 }
 
-declare var require: (module: string) => any;
+let webSocketConstructor: typeof WebSocket | undefined = undefined;
 
 export class RpcWebSocketClientAdapter implements ClientTransportAdapter {
     constructor(public url: string) {
     }
 
     public async connect(connection: TransportConnectionHooks) {
         const wsPackage = 'ws';
-        const webSocketConstructor = 'undefined' === typeof WebSocket && 'undefined' !== typeof require ? require(wsPackage) : WebSocket;
+        if (!webSocketConstructor) {
+            webSocketConstructor = 'undefined' === typeof WebSocket ? (await import(wsPackage)).WebSocket : WebSocket;
+        }
 
-        const socket = new webSocketConstructor(this.url);
+        const socket = new webSocketConstructor!(this.url);
         socket.binaryType = 'arraybuffer';
 
         socket.onmessage = (event: MessageEvent) => {