X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=examples%2Ftypescript%2Fwebsocket-server-pool%2Fws-hybrid%2Fsrc%2Fwebsocket-server-worker.ts;h=46745d9657cc9f700fc3f9ad79789b8323bf0715;hb=2889bd70182e9e42c75d686ece3c288307e01d4f;hp=0a1cbdfd956b04265e277b13c5607dad6af5cc37;hpb=5daad283d56413b7287cca894637a35e51a1222c;p=poolifier.git

diff --git a/examples/typescript/websocket-server-pool/ws-hybrid/src/websocket-server-worker.ts b/examples/typescript/websocket-server-pool/ws-hybrid/src/websocket-server-worker.ts
index 0a1cbdfd..46745d96 100644
--- a/examples/typescript/websocket-server-pool/ws-hybrid/src/websocket-server-worker.ts
+++ b/examples/typescript/websocket-server-pool/ws-hybrid/src/websocket-server-worker.ts
@@ -15,7 +15,7 @@ import {
 } from './types.js'
 
 const emptyFunction = (): void => {
-  /** Intentional */
+  /* Intentional */
 }
 
 class WebSocketServerWorker extends ClusterWorker<
@@ -31,23 +31,26 @@ ClusterWorkerResponse
   private static readonly startWebSocketServer = (
     workerData?: ClusterWorkerData
   ): ClusterWorkerResponse => {
-    const { port } = workerData as ClusterWorkerData
-    WebSocketServerWorker.wss = new WebSocketServer({ port }, () => {
-      console.info(
-        `⚡️[ws server]: WebSocket server is started in cluster worker at ws://localhost:${port}/`
-      )
-    })
+    const { port, workerFile, minWorkers, maxWorkers, ...poolOptions } =
+      workerData as ClusterWorkerData
 
     WebSocketServerWorker.requestHandlerPool = new DynamicThreadPool<
     ThreadWorkerData<DataPayload>,
     ThreadWorkerResponse<DataPayload>
     >(
-      workerData?.minWorkers ?? 1,
-      workerData?.maxWorkers ?? availableParallelism(),
-      workerData?.workerFile as string
+      minWorkers ?? 1,
+      maxWorkers ?? availableParallelism(),
+      workerFile,
+      poolOptions
     )
 
-    WebSocketServerWorker.wss.on('connection', (ws) => {
+    WebSocketServerWorker.wss = new WebSocketServer({ port }, () => {
+      console.info(
+        `⚡️[ws server]: WebSocket server is started in cluster worker at ws://localhost:${port}/`
+      )
+    })
+
+    WebSocketServerWorker.wss.on('connection', ws => {
       ws.on('error', console.error)
       ws.on('message', (message: RawData) => {
         const { type, data } = JSON.parse(
@@ -58,28 +61,28 @@ ClusterWorkerResponse
           case MessageType.echo:
             WebSocketServerWorker.requestHandlerPool
               .execute({ data }, 'echo')
-              .then((response) => {
+              .then(response => {
                 ws.send(
                   JSON.stringify({
                     type: MessageType.echo,
                     data: response.data
                   })
                 )
-                return null
+                return undefined
               })
               .catch(emptyFunction)
             break
           case MessageType.factorial:
             WebSocketServerWorker.requestHandlerPool
               .execute({ data }, 'factorial')
-              .then((response) => {
+              .then(response => {
                 ws.send(
                   JSON.stringify({
                     type: MessageType.factorial,
                     data: response.data
                   })
                 )
-                return null
+                return undefined
               })
               .catch(emptyFunction)
             break
@@ -94,7 +97,8 @@ ClusterWorkerResponse
 
   public constructor () {
     super(WebSocketServerWorker.startWebSocketServer, {
-      killHandler: () => {
+      killHandler: async () => {
+        await WebSocketServerWorker.requestHandlerPool.destroy()
         WebSocketServerWorker.wss.close()
       }
     })