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=72ac2a1baef359eb635543a2e7ac68dcb080e832;hb=HEAD;hp=2418be61d0487e9ce43bda018e41a4b8f5117579;hpb=80ccdab6c5ce5e7e6305c15dd29257d0acc9e302;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 2418be61..72ac2a1b 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,11 +1,10 @@
-import { dirname, extname, join } from 'node:path'
-import { fileURLToPath } from 'node:url'
 import {
+  availableParallelism,
   ClusterWorker,
   DynamicThreadPool,
-  availableParallelism
 } from 'poolifier'
 import { type RawData, WebSocketServer } from 'ws'
+
 import {
   type ClusterWorkerData,
   type ClusterWorkerResponse,
@@ -13,28 +12,47 @@ import {
   type MessagePayload,
   MessageType,
   type ThreadWorkerData,
-  type ThreadWorkerResponse
+  type ThreadWorkerResponse,
 } from './types.js'
 
 const emptyFunction = (): void => {
-  /** Intentional */
+  /* Intentional */
 }
 
 class WebSocketServerWorker extends ClusterWorker<
-ClusterWorkerData,
-ClusterWorkerResponse
+  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 } =
+      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+      workerData!
+
+    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 in cluster worker at ws://localhost:${port}/`
+        `⚡️[ws server]: WebSocket server is started in cluster worker at ws://localhost:${port.toString()}/`
       )
     })
 
-    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,30 +61,34 @@ ClusterWorkerResponse
         ) as MessagePayload<DataPayload>
         switch (type) {
           case MessageType.echo:
-            this.requestHandlerPool
+            WebSocketServerWorker.requestHandlerPool
               .execute({ data }, 'echo')
               .then(response => {
                 ws.send(
                   JSON.stringify({
                     type: MessageType.echo,
-                    data: response.data
+                    data: response.data,
                   })
                 )
-                return null
+                return undefined
               })
               .catch(emptyFunction)
             break
           case MessageType.factorial:
-            this.requestHandlerPool
+            WebSocketServerWorker.requestHandlerPool
               .execute({ data }, 'factorial')
               .then(response => {
                 ws.send(
-                  JSON.stringify({
-                    type: MessageType.factorial,
-                    data: response.data
-                  })
+                  JSON.stringify(
+                    {
+                      type: MessageType.factorial,
+                      data: response.data,
+                    },
+                    (_, v: unknown) =>
+                      typeof v === 'bigint' ? v.toString() : v
+                  )
                 )
-                return null
+                return undefined
               })
               .catch(emptyFunction)
             break
@@ -75,35 +97,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()
+      },
+    })
   }
 }