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=437fae1b45600c5cb0bc700d690569c820b44b5e;hb=d18fccb1e77f6c835369675a69dc546825edf50c;hp=71cce531df287572f6e0c8a2a9d11feb3fde167d;hpb=8ff2efc7b8bc4e459a5c545bfc88daa3437d73e8;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 71cce531..437fae1b 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
@@ -1,5 +1,3 @@
-import { dirname, extname, join } from 'node:path'
-import { fileURLToPath } from 'node:url'
 import {
   ClusterWorker,
   DynamicThreadPool,
@@ -24,17 +22,35 @@ class WebSocketServerWorker extends ClusterWorker<
 ClusterWorkerData,
 ClusterWorkerResponse
 > {
+  private static wss: WebSocketServer
+  private static requestHandlerPool: DynamicThreadPool<
+  ThreadWorkerData<DataPayload>,
+  ThreadWorkerResponse<DataPayload>
+  >
+
   private static readonly startWebSocketServer = (
     workerData?: ClusterWorkerData
   ): ClusterWorkerResponse => {
-    const { port } = workerData as ClusterWorkerData
-    const wss = new WebSocketServer({ port }, () => {
+    const { port, workerFile, minWorkers, maxWorkers, ...poolOptions } =
+      workerData as ClusterWorkerData
+
+    WebSocketServerWorker.requestHandlerPool = new DynamicThreadPool<
+    ThreadWorkerData<DataPayload>,
+    ThreadWorkerResponse<DataPayload>
+    >(
+      minWorkers ?? 1,
+      maxWorkers ?? availableParallelism(),
+      workerFile,
+      poolOptions
+    )
+
+    WebSocketServerWorker.wss = new WebSocketServer({ port }, () => {
       console.info(
-        `⚡️[ws server]: WebSocket server is started on cluster worker at ws://localhost:${port}/`
+        `⚡️[ws server]: WebSocket server is started in cluster worker at ws://localhost:${port}/`
       )
     })
 
-    wss.on('connection', ws => {
+    WebSocketServerWorker.wss.on('connection', (ws) => {
       ws.on('error', console.error)
       ws.on('message', (message: RawData) => {
         const { type, data } = JSON.parse(
@@ -43,9 +59,9 @@ ClusterWorkerResponse
         ) as MessagePayload<DataPayload>
         switch (type) {
           case MessageType.echo:
-            this.requestHandlerPool
+            WebSocketServerWorker.requestHandlerPool
               .execute({ data }, 'echo')
-              .then(response => {
+              .then((response) => {
                 ws.send(
                   JSON.stringify({
                     type: MessageType.echo,
@@ -57,9 +73,9 @@ ClusterWorkerResponse
               .catch(emptyFunction)
             break
           case MessageType.factorial:
-            this.requestHandlerPool
+            WebSocketServerWorker.requestHandlerPool
               .execute({ data }, 'factorial')
-              .then(response => {
+              .then((response) => {
                 ws.send(
                   JSON.stringify({
                     type: MessageType.factorial,
@@ -75,35 +91,17 @@ ClusterWorkerResponse
     })
     return {
       status: true,
-      port: wss.options.port
+      port: WebSocketServerWorker.wss.options.port
     }
   }
 
-  private static readonly requestHandlerWorkerFile = join(
-    dirname(fileURLToPath(import.meta.url)),
-    `request-handler-worker${extname(fileURLToPath(import.meta.url))}`
-  )
-
-  private static readonly requestHandlerPool = new DynamicThreadPool<
-  ThreadWorkerData<DataPayload>,
-  ThreadWorkerResponse<DataPayload>
-  >(
-    1,
-    Math.round(availableParallelism() / 2),
-    WebSocketServerWorker.requestHandlerWorkerFile,
-    {
-      enableTasksQueue: true,
-      tasksQueueOptions: {
-        concurrency: 8
-      },
-      errorHandler: (e: Error) => {
-        console.error('Thread worker error:', e)
-      }
-    }
-  )
-
   public constructor () {
-    super(WebSocketServerWorker.startWebSocketServer)
+    super(WebSocketServerWorker.startWebSocketServer, {
+      killHandler: async () => {
+        await WebSocketServerWorker.requestHandlerPool.destroy()
+        WebSocketServerWorker.wss.close()
+      }
+    })
   }
 }