fix: handle send errs correctly

src/server/create-server.ts

@@ -9,6 +9,7 @@ import { logger as LOGGER } from 'src/utils'
 import { createBgpListener } from 'src/utils/bgp-listener'
 import { getEnvVariable } from 'src/utils/env'
 import { SelectedServiceSignatureType } from 'src/utils/signatures'
+import { promisifySend } from 'src/utils/ws'
 import type { Duplex } from 'stream'
 import { WebSocket, WebSocketServer } from 'ws'
 
@@ -90,6 +91,7 @@ async function handleNewClient(
 	req: IncomingMessage,
 	bgpListener: BGPListener | undefined
 ) {
+	promisifySend(ws)
 	const client = await AttestorServerSocket.acceptConnection(
 		ws,
 		{ req, bgpListener, logger: LOGGER }

src/types/client.ts

@@ -185,6 +185,10 @@ interface WebSocketWithServerSocket {
 	 * Our RPC socket instance
 	 */
 	serverSocket?: IAttestorServerSocket
+	/**
+	 * Just promisified send
+	 */
+	sendPromise?: (data: Uint8Array) => Promise<void>
 }
 
 declare module 'ws' {

src/utils/socket-base.ts

@@ -75,9 +75,11 @@ export class AttestorSocket implements IAttestorSocket {
 		const msg = packRpcMessages(...msgs)
 		const bytes = RPCMessages.encode(msg).finish()
 
-		await this.socket.send(bytes, err => {
-			this.logger.debug({ err }, 'error sending message')
-		})
+		if('sendPromise' in this.socket && this.socket.sendPromise) {
+			await this.socket.sendPromise(bytes)
+		} else {
+			this.socket.send(bytes)
+		}
 
 		return msg
 	}

src/utils/ws.ts

@@ -1,5 +1,6 @@
 import { MAX_PAYLOAD_SIZE } from 'src/config'
 import { detectEnvironment } from 'src/utils/env'
+import type { WebSocket as WSWebSocket } from 'ws'
 
 /**
  * Default WebSocket implementation, uses `ws` package
@@ -9,8 +10,35 @@ import { detectEnvironment } from 'src/utils/env'
 export function makeWebSocket(url: string) {
 	if(detectEnvironment() === 'node') {
 		const ws = require('ws') as typeof import('ws')
-		return new ws.WebSocket(url, { maxPayload: MAX_PAYLOAD_SIZE })
+		return promisifySend(
+			new ws.WebSocket(url, { maxPayload: MAX_PAYLOAD_SIZE })
+		)
 	}
 
 	return new WebSocket(url)
+}
+
+/**
+ * Adds the "sendPromise" fn to the given WebSocket instance,
+ * if not already present.
+ */
+export function promisifySend(ws: WSWebSocket) {
+	if(ws.sendPromise) {
+		return ws
+	}
+
+	ws.sendPromise = (data) => (
+		new Promise((resolve, reject) => {
+			ws.send(data, err => {
+				if(err) {
+					reject(err)
+					return
+				}
+
+				resolve()
+			})
+		})
+	)
+
+	return ws
 }