@polytric/openws-sdkgen 0.0.16 → 0.0.18

package/dist/templates/typescript/package.json.ejs

@@ -23,7 +23,7 @@
     },
     "files": ["dist"],
     "dependencies": {
-        "@polytric/openws": "^0.0.9"
+        "@polytric/openws": "^0.0.10"
     },
     "scripts": {
         "build": "tsup",

package/dist/templates/typescript/src/sdk/role.ts.ejs

@@ -57,11 +57,11 @@ export type <%= ctx.className %>ErrorHandler = (error: unknown) => void | Promis
 /**
  * Application callback for connection lifecycle events.
  */
-export type <%= ctx.className %>LifecycleHandler = (roleName: string) => void | Promise<void>
+export type <%= ctx.className %>LifecycleHandler = (roleName: string, peer: <%= ctx.className %>Peer) => void | Promise<void>
 /**
  * Application callback for connection lifecycle errors.
  */
-export type <%= ctx.className %>LifecycleErrorHandler = (roleName: string, error: Error) => void | Promise<void>
+export type <%= ctx.className %>LifecycleErrorHandler = (roleName: string, peer: <%= ctx.className %>Peer, error: Error) => void | Promise<void>
 
 type <%= ctx.className %>Connection = {
     roleName: string
@@ -132,14 +132,14 @@ export class <%= ctx.className %> {
 <% } -%>
 <% } -%>
 <% for (const remoteRole of ctx.remoteRoles) { -%>
-        this.binder.fromRoles[<%- JSON.stringify(remoteRole.roleName) %>].onOpen(async fromRole => {
-            await this.handleOpen(fromRole)
+        this.binder.fromRoles[<%- JSON.stringify(remoteRole.roleName) %>].onOpen(async (fromRole, peer) => {
+            await this.handleOpen(fromRole, peer as unknown as <%= ctx.className %>Peer)
         })
-        this.binder.fromRoles[<%- JSON.stringify(remoteRole.roleName) %>].onClose(async fromRole => {
-            await this.handleClose(fromRole)
+        this.binder.fromRoles[<%- JSON.stringify(remoteRole.roleName) %>].onClose(async (fromRole, peer) => {
+            await this.handleClose(fromRole, peer as unknown as <%= ctx.className %>Peer)
         })
-        this.binder.fromRoles[<%- JSON.stringify(remoteRole.roleName) %>].onError(async (fromRole, error) => {
-            await this.handleError(fromRole, error)
+        this.binder.fromRoles[<%- JSON.stringify(remoteRole.roleName) %>].onError(async (fromRole, peer, error) => {
+            await this.handleError(fromRole, peer as unknown as <%= ctx.className %>Peer, error)
         })
 <% } -%>
         if (canBindTransport(transport)) {
@@ -159,13 +159,21 @@ export class <%= ctx.className %> {
             case <%- JSON.stringify(remoteRole.roleName) %>: {
                 const remoteEndpoint = endpoint ?? (<%- remoteRole.endpoints.length > 0 ? JSON.stringify(remoteRole.endpoints[0]) : 'undefined' %> as OpenWsEndpoint | undefined)
                 await this.transport.connect?.(roleName, remoteEndpoint)
-                const session = this.runtime.newSession(this.sendEnvelope)
+                let connection: <%= ctx.className %>Connection | undefined
+                const session = this.runtime.newSession(this.sendEnvelope, async () => {
+                    if (!connection) {
+                        await session.close()
+                        return
+                    }
+                    await this.closeConnection(connection)
+                })
                 const <%= remoteRole.varName %>Peer = await session.open(<%- JSON.stringify(remoteRole.roleName) %>)
-                this.connections.add({
+                connection = {
                     roleName: <%- JSON.stringify(remoteRole.roleName) %>,
                     session,
                     peer: <%= remoteRole.varName %>Peer,
-                })
+                }
+                this.connections.add(connection)
                 this.<%= remoteRole.peerVarName %> = <%= remoteRole.varName %>Peer as unknown as <%= remoteRole.scopedPeerName %>
 <% for (const handler of ctx.handlers) { -%>
 <% const handlerDefaultPeer = handler.bindFromRoles.find(fromRole => ctx.remoteRoles.some(remoteRole => remoteRole.roleName === fromRole.roleName)) ?? ctx.remoteRoles[0] -%>
@@ -198,11 +206,11 @@ export class <%= ctx.className %> {
             await this.closeSessions(peer)
             return
         }
-        const connection = this.findConnectionByPeer(peer as PeerProto)
+        const connection = this.findConnectionByPeer(peer as unknown as PeerProto)
         if (!connection) {
             throw new Error('Peer is not connected')
         }
-        await this.closeConnection(connection)
+        await this.runtime.disconnect(connection.peer)
     }
 
     /**
@@ -279,9 +287,9 @@ export class <%= ctx.className %> {
     /**
      * Framework entrypoint for a peer session opening.
      */
-    async handleOpen(roleName: string): Promise<void> {
+    async handleOpen(roleName: string, peer: <%= ctx.className %>Peer): Promise<void> {
         for (const handler of this.openHandlers) {
-            await handler(roleName)
+            await handler(roleName, peer)
         }
     }
 
@@ -298,9 +306,9 @@ export class <%= ctx.className %> {
     /**
      * Framework entrypoint for a peer session closing.
      */
-    async handleClose(roleName: string): Promise<void> {
+    async handleClose(roleName: string, peer: <%= ctx.className %>Peer): Promise<void> {
         for (const handler of this.closeHandlers) {
-            await handler(roleName)
+            await handler(roleName, peer)
         }
     }
 
@@ -317,9 +325,9 @@ export class <%= ctx.className %> {
     /**
      * Framework entrypoint for a peer session error.
      */
-    async handleError(roleName: string, error: Error): Promise<void> {
+    async handleError(roleName: string, peer: <%= ctx.className %>Peer, error: Error): Promise<void> {
         for (const handler of this.lifecycleErrorHandlers) {
-            await handler(roleName, error)
+            await handler(roleName, peer, error)
         }
     }
 
@@ -494,14 +502,14 @@ export class <%= ctx.className %> {
 <% } -%>
 <% } -%>
 <% for (const remoteRole of ctx.remoteRoles) { -%>
-        this.binder.fromRoles[<%- JSON.stringify(remoteRole.roleName) %>].onOpen(async fromRole => {
-            await this.handleOpen(fromRole)
+        this.binder.fromRoles[<%- JSON.stringify(remoteRole.roleName) %>].onOpen(async (fromRole, peer) => {
+            await this.handleOpen(fromRole, peer)
         })
-        this.binder.fromRoles[<%- JSON.stringify(remoteRole.roleName) %>].onClose(async fromRole => {
-            await this.handleClose(fromRole)
+        this.binder.fromRoles[<%- JSON.stringify(remoteRole.roleName) %>].onClose(async (fromRole, peer) => {
+            await this.handleClose(fromRole, peer)
         })
-        this.binder.fromRoles[<%- JSON.stringify(remoteRole.roleName) %>].onError(async (fromRole, error) => {
-            await this.handleError(fromRole, error)
+        this.binder.fromRoles[<%- JSON.stringify(remoteRole.roleName) %>].onError(async (fromRole, peer, error) => {
+            await this.handleError(fromRole, peer, error)
         })
 <% } -%>
         if (canBindTransport(transport)) {
@@ -518,13 +526,21 @@ export class <%= ctx.className %> {
             case <%- JSON.stringify(remoteRole.roleName) %>: {
                 const remoteEndpoint = endpoint ?? <%- remoteRole.endpoints.length > 0 ? JSON.stringify(remoteRole.endpoints[0]) : 'undefined' %>
                 await this.transport.connect?.(roleName, remoteEndpoint)
-                const session = this.runtime.newSession(this.sendEnvelope)
+                let connection
+                const session = this.runtime.newSession(this.sendEnvelope, async () => {
+                    if (!connection) {
+                        await session.close()
+                        return
+                    }
+                    await this.#closeConnection(connection)
+                })
                 this.<%= remoteRole.peerVarName %> = await session.open(<%- JSON.stringify(remoteRole.roleName) %>)
-                this.#connections.add({
+                connection = {
                     roleName: <%- JSON.stringify(remoteRole.roleName) %>,
                     session,
                     peer: this.<%= remoteRole.peerVarName %>,
-                })
+                }
+                this.#connections.add(connection)
 <% for (const handler of ctx.handlers) { -%>
 <% const handlerDefaultPeer = handler.bindFromRoles.find(fromRole => ctx.remoteRoles.some(remoteRole => remoteRole.roleName === fromRole.roleName)) ?? ctx.remoteRoles[0] -%>
 <% if (handlerDefaultPeer?.roleName === remoteRole.roleName) { -%>
@@ -556,7 +572,7 @@ export class <%= ctx.className %> {
         if (!connection) {
             throw new Error('Peer is not connected')
         }
-        await this.#closeConnection(connection)
+        await this.runtime.disconnect(connection.peer)
     }
 
     /**
@@ -633,9 +649,9 @@ export class <%= ctx.className %> {
     /**
      * Framework entrypoint for a peer session opening.
      */
-    async handleOpen(roleName) {
+    async handleOpen(roleName, peer) {
         for (const handler of this.#openHandlers) {
-            await handler(roleName)
+            await handler(roleName, peer)
         }
     }
 
@@ -652,9 +668,9 @@ export class <%= ctx.className %> {
     /**
      * Framework entrypoint for a peer session closing.
      */
-    async handleClose(roleName) {
+    async handleClose(roleName, peer) {
         for (const handler of this.#closeHandlers) {
-            await handler(roleName)
+            await handler(roleName, peer)
         }
     }
 
@@ -671,9 +687,9 @@ export class <%= ctx.className %> {
     /**
      * Framework entrypoint for a peer session error.
      */
-    async handleError(roleName, error) {
+    async handleError(roleName, peer, error) {
         for (const handler of this.#lifecycleErrorHandlers) {
-            await handler(roleName, error)
+            await handler(roleName, peer, error)
         }
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@polytric/openws-sdkgen",
-  "version": "0.0.16",
+  "version": "0.0.18",
   "description": "OpenWS SDK generator CLI",
   "type": "module",
   "bin": {
@@ -50,7 +50,7 @@
     "tsx": "^4.21.0",
     "typescript": "^5.9.3",
     "ws": "^8.18.3",
-    "@polytric/openws": "^0.0.9"
+    "@polytric/openws": "^0.0.11"
   },
   "scripts": {
     "build": "tsup",