@polytric/openws-sdkgen 0.0.12 → 0.0.13

package/dist/templates/typescript/src/network.ts.ejs

@@ -23,7 +23,7 @@ export interface OpenWsEndpoint {
 }
 
 export type Unsubscribe = () => void
-export type TransportEvent = 'message' | 'error'
+export type TransportEvent = 'message' | 'error' | 'close'
 export type TransportHandler = (data: unknown) => void | Promise<void>
 
 export interface Transport {
@@ -101,6 +101,7 @@ export class WsTransport implements Transport {
     private readonly listeners: Record<TransportEvent, Set<TransportHandler>> = {
         message: new Set(),
         error: new Set(),
+        close: new Set(),
     }
 
     constructor(socket?: unknown) {
@@ -142,14 +143,11 @@ export class WsTransport implements Transport {
     close(): void {
         const socket = this.socket as { close?: () => void } | undefined
         socket?.close?.()
-        this.socketUnsubscribe?.()
-        this.socket = undefined
-        this.socketUnsubscribe = undefined
-        this.openPromise = undefined
+        this.clearSocket()
     }
 
     private bindSocket(socket: unknown): void {
-        this.socketUnsubscribe?.()
+        this.clearSocket()
         this.socket = socket
         this.openPromise = undefined
 
@@ -159,10 +157,29 @@ export class WsTransport implements Transport {
         const unsubscribeError = addSocketListener(socket, 'error', error => {
             void this.emit('error', error)
         })
+        const unsubscribeClose = addSocketListener(socket, 'close', event => {
+            void this.handleSocketClose(socket, event)
+        })
         this.socketUnsubscribe = () => {
             unsubscribeMessage()
             unsubscribeError()
+            unsubscribeClose()
+        }
+    }
+
+    private async handleSocketClose(socket: unknown, event: unknown): Promise<void> {
+        if (this.socket !== socket) {
+            return
         }
+        this.clearSocket()
+        await this.emit('close', event)
+    }
+
+    private clearSocket(): void {
+        this.socketUnsubscribe?.()
+        this.socket = undefined
+        this.socketUnsubscribe = undefined
+        this.openPromise = undefined
     }
 
     private async emit(event: TransportEvent, data: unknown): Promise<void> {
@@ -196,9 +213,14 @@ export class WsTransport implements Transport {
                 cleanup()
                 reject(error)
             })
+            const unsubscribeClose = addSocketListener(socket, 'close', event => {
+                cleanup()
+                reject(event instanceof Error ? event : new Error('WebSocket closed before opening'))
+            })
             cleanup = () => {
                 unsubscribeOpen()
                 unsubscribeError()
+                unsubscribeClose()
             }
         })
         await this.openPromise
@@ -243,7 +265,7 @@ function getReadyState(socket: unknown): number | undefined {
 
 function addSocketListener(
     socket: unknown,
-    event: 'open' | 'message' | 'error',
+    event: 'open' | 'message' | 'error' | 'close',
     handler: (...args: unknown[]) => void
 ): Unsubscribe {
     const target = socket as {
@@ -342,6 +364,7 @@ export class WsTransport {
     listeners = {
         message: new Set(),
         error: new Set(),
+        close: new Set(),
     }
 
     constructor(socket) {
@@ -382,14 +405,11 @@ export class WsTransport {
 
     close() {
         this.socket?.close?.()
-        this.socketUnsubscribe?.()
-        this.socket = undefined
-        this.socketUnsubscribe = undefined
-        this.openPromise = undefined
+        this.clearSocket()
     }
 
     bindSocket(socket) {
-        this.socketUnsubscribe?.()
+        this.clearSocket()
         this.socket = socket
         this.openPromise = undefined
 
@@ -399,10 +419,29 @@ export class WsTransport {
         const unsubscribeError = addSocketListener(socket, 'error', error => {
             void this.emit('error', error)
         })
+        const unsubscribeClose = addSocketListener(socket, 'close', event => {
+            void this.handleSocketClose(socket, event)
+        })
         this.socketUnsubscribe = () => {
             unsubscribeMessage()
             unsubscribeError()
+            unsubscribeClose()
+        }
+    }
+
+    async handleSocketClose(socket, event) {
+        if (this.socket !== socket) {
+            return
         }
+        this.clearSocket()
+        await this.emit('close', event)
+    }
+
+    clearSocket() {
+        this.socketUnsubscribe?.()
+        this.socket = undefined
+        this.socketUnsubscribe = undefined
+        this.openPromise = undefined
     }
 
     async emit(event, data) {
@@ -436,9 +475,14 @@ export class WsTransport {
                 cleanup()
                 reject(error)
             })
+            const unsubscribeClose = addSocketListener(socket, 'close', event => {
+                cleanup()
+                reject(event instanceof Error ? event : new Error('WebSocket closed before opening'))
+            })
             cleanup = () => {
                 unsubscribeOpen()
                 unsubscribeError()
+                unsubscribeClose()
             }
         })
         await this.openPromise

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@polytric/openws-sdkgen",
-  "version": "0.0.12",
+  "version": "0.0.13",
   "description": "OpenWS SDK generator CLI",
   "type": "module",
   "bin": {
@@ -59,6 +59,7 @@
     "test:javascript:node": "node dist/main.cjs --spec ./test/spec.json --out ./generated/javascript/node --project Example --network core --hostRole client --language javascript --environment node",
     "test:typescript:node": "node dist/main.cjs --spec ./test/spec.json --out ./generated/typescript/node --project Example --network core --hostRole client --language typescript --environment node",
     "test:typescript:server": "tsx ./test/typescript/server.ts",
-    "test:typescript:client": "tsx ./test/typescript/client.ts"
+    "test:typescript:client": "tsx ./test/typescript/client.ts",
+    "test:transport-close": "tsx ./test/typescript/transport-close.ts"
   }
 }