@jcbuisson/express-x-client 2.1.0 → 2.1.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jcbuisson/express-x-client",
-  "version": "2.1.0",
+  "version": "2.1.6",
   "type": "module",
   "description": "Client library for ExpressX framework",
   "main": "src/index.mjs",

package/src/index.mjs

@@ -17,58 +17,42 @@ export default function expressXClient(socket, options={}) {
    const waitingPromisesByUid = {}
    const action2service2handlers = {}
    const type2appHandler = {}
-   // const socketConnectionState = {}
-   let connectHandler = null
-   let connectErrorHandler = null
-   let disconnectHandler = null
+   const connectHandlers = []
+   const connectErrorHandlers = []
+   const disconnectHandlers = []
 
    socket.on("connect", async () => {
       console.log("socket connected", socket.id)
-      // if (socketConnectionState.resolve) {
-      //    socketConnectionState.resolve('ok')
-      //    socketConnectionState.status = 'connected'
-      // }
-      if (connectHandler) connectHandler(socket)
+      for (const handler of connectHandlers) {
+         handler(socket)
+      }
    })
 
-   socket.on("connect_error", async () => {
+   socket.on("connect_error", async (err) => {
       console.log("socket connection error", socket.id)
-      // if (socketConnectionState.reject) {
-      //    socketConnectionState.reject(err)
-      //    socketConnectionState.status = 'error'
-      // }
-      if (connectErrorHandler) connectErrorHandler(socket)
+      for (const handler of connectErrorHandlers) {
+         handler(socket, err)
+      }
    })
 
    socket.on("disconnect", async () => {
-      if (disconnectHandler) disconnectHandler(socket)
+      for (const handler of disconnectHandlers) {
+         handler(socket)
+      }
    })
 
    function onConnect(func) {
-      connectHandler = func
+      connectHandlers.push(func)
    }
 
    function onConnectError(func) {
-      connectErrorHandler = func
+      connectErrorHandlers.push(func)
    }
 
    function onDisconnect(func) {
-      disconnectHandler = func
+      disconnectHandlers.push(func)
    }
 
-
-   // async function socketConnection() {
-   //    const promise = new Promise((resolve, reject) => {
-   //       socketConnectionState.resolve = resolve
-   //       socketConnectionState.reject = reject
-   //    })
-   //    return promise
-   // }
-
-   // function socketStatus() {
-   //    return socketConnectionState.status
-   // }
-
    // on receiving response from service request
    socket.on('client-response', ({ uid, error, result }) => {
       if (options.debug) console.log('client-response', uid, error, result)
@@ -143,12 +127,14 @@ export default function expressXClient(socket, options={}) {
       if (options.debug) console.log('app-event', type, value)
       if (!type2appHandler[type]) type2appHandler[type] = {}
       const handler = type2appHandler[type]
+      console.log('handler', handler)
       if (handler) handler(value)
    })
 
    // add a handler for application-wide events
    function on(type, handler) {
       type2appHandler[type] = handler
+      console.log('type2appHandler[type]', type2appHandler[type])
    }
 
    return {
@@ -160,4 +146,3 @@ export default function expressXClient(socket, options={}) {
       on,
    }
 }
-