@jcbuisson/express-x-client 2.1.6 → 2.1.7

package/package.json

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

package/src/index.mjs

@@ -17,42 +17,50 @@ export default function expressXClient(socket, options={}) {
    const waitingPromisesByUid = {}
    const action2service2handlers = {}
    const type2appHandler = {}
-   const connectHandlers = []
-   const connectErrorHandlers = []
-   const disconnectHandlers = []
+   // const socketConnectionState = {}
+   let connectHandler = null
+   let connectErrorHandler = null
+   let disconnectHandler = null
 
    socket.on("connect", async () => {
       console.log("socket connected", socket.id)
-      for (const handler of connectHandlers) {
-         handler(socket)
-      }
+      if (connectHandler) connectHandler(socket)
    })
 
    socket.on("connect_error", async (err) => {
       console.log("socket connection error", socket.id)
-      for (const handler of connectErrorHandlers) {
-         handler(socket, err)
-      }
+      if (connectErrorHandler) connectErrorHandler(socket, err)
    })
 
    socket.on("disconnect", async () => {
-      for (const handler of disconnectHandlers) {
-         handler(socket)
-      }
+      if (disconnectHandler) disconnectHandler(socket)
    })
 
    function onConnect(func) {
-      connectHandlers.push(func)
+      connectHandler = func
    }
 
    function onConnectError(func) {
-      connectErrorHandlers.push(func)
+      connectErrorHandler = func
    }
 
    function onDisconnect(func) {
-      disconnectHandlers.push(func)
+      disconnectHandler = 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)
@@ -75,7 +83,7 @@ export default function expressXClient(socket, options={}) {
       if (handler) handler(result)
    })
    
-   async function serviceMethodRequest(name, action, options, ...args) {
+   async function serviceMethodRequest(name, action, serviceOptions, ...args) {
       // create a promise which will resolve or reject by an event 'client-response'
       const uid = generateUID(20)
       const promise = new Promise((resolve, reject) => {
@@ -84,7 +92,7 @@ export default function expressXClient(socket, options={}) {
          setTimeout(() => {
             delete waitingPromisesByUid[uid]
             reject(`Error: timeout on service '${name}', action '${action}', args: ${JSON.stringify(args)}`)
-         }, options.timeout)
+         }, serviceOptions.timeout)
       })
       // send request to server through websocket
       if (options.debug) console.log('client-request', uid, name, action, args)
@@ -97,7 +105,7 @@ export default function expressXClient(socket, options={}) {
       return promise
    }
 
-   function service(name, options={ timeout: 5000 }) {
+   function service(name, serviceOptions={ timeout: 20000 }) {
       const service = {
          // associate a handler to a pub/sub event for this service
          on: (action, handler) => {
@@ -111,7 +119,7 @@ export default function expressXClient(socket, options={}) {
          get(service, action) {
             if (!(action in service)) {
                // newly used property `action`: define it as a service method request function
-               service[action] = (...args) => serviceMethodRequest(name, action, options, ...args)
+               service[action] = (...args) => serviceMethodRequest(name, action, serviceOptions, ...args)
             }
             return service[action]
          }