@jcbuisson/express-x-client 2.1.7 → 2.2.0

package/package.json

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

package/src/index.mjs

@@ -1,7 +1,7 @@
 
 function generateUID(length) {
    const characters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789'
-   let uid = '';
+   let uid = ''
 
    for (let i = 0; i < length; i++) {
      const randomIndex = Math.floor(Math.random() * characters.length)
@@ -17,49 +17,51 @@ export default function expressXClient(socket, options={}) {
    const waitingPromisesByUid = {}
    const action2service2handlers = {}
    const type2appHandler = {}
-   // const socketConnectionState = {}
-   let connectHandler = null
-   let connectErrorHandler = null
-   let disconnectHandler = null
+   let connectListeners = []
+   let disconnectListeners = []
+   let errorListeners = []
 
    socket.on("connect", async () => {
       console.log("socket connected", socket.id)
-      if (connectHandler) connectHandler(socket)
+      for (const func of connectListeners) {
+         func(socket)
+      }
    })
 
    socket.on("connect_error", async (err) => {
       console.log("socket connection error", socket.id)
-      if (connectErrorHandler) connectErrorHandler(socket, err)
+      for (const func of errorListeners) {
+         func(socket)
+      }
    })
 
    socket.on("disconnect", async () => {
-      if (disconnectHandler) disconnectHandler(socket)
+      console.log("socket disconnected", socket.id)
+      for (const func of disconnectListeners) {
+         func(socket)
+      }
    })
 
-   function onConnect(func) {
-      connectHandler = func
+   function addConnectListener(func) {
+      connectListeners.push(func)
    }
-
-   function onConnectError(func) {
-      connectErrorHandler = func
+   function removeConnectListener(func) {
+      connectListeners = connectListeners.filter(f !== func)
    }
 
-   function onDisconnect(func) {
-      disconnectHandler = func
+   function addDisconnectListener(func) {
+      disconnectListeners.push(func)
+   }
+   function removeDisonnectListener(func) {
+      disconnectListeners = disconnectListeners.filter(f !== func)
    }
 
-
-   // async function socketConnection() {
-   //    const promise = new Promise((resolve, reject) => {
-   //       socketConnectionState.resolve = resolve
-   //       socketConnectionState.reject = reject
-   //    })
-   //    return promise
-   // }
-
-   // function socketStatus() {
-   //    return socketConnectionState.status
-   // }
+   function addErrorListener(func) {
+      errorListeners.push(func)
+   }
+   function removeErrorListener(func) {
+      errorListeners = errorListeners.filter(f !== func)
+   }
 
    // on receiving response from service request
    socket.on('client-response', ({ uid, error, result }) => {
@@ -96,16 +98,18 @@ export default function expressXClient(socket, options={}) {
       })
       // send request to server through websocket
       if (options.debug) console.log('client-request', uid, name, action, args)
-      socket.emit('client-request', {
-         uid,
-         name,
-         action,
-         args,
-      })
+      if (serviceOptions.volatile) {
+         // event is not sent if connection is not active
+         socket.volatile.emit('client-request', { uid, name, action, args, })
+      } else {
+         // event is buffered if connection is not active (default)
+         socket.emit('client-request', { uid, name, action, args, })
+      }
       return promise
    }
 
-   function service(name, serviceOptions={ timeout: 20000 }) {
+   function service(name, serviceOptions={}) {
+      if (serviceOptions.timeout === undefined) serviceOptions.timeout = 20000
       const service = {
          // associate a handler to a pub/sub event for this service
          on: (action, handler) => {
@@ -146,9 +150,12 @@ export default function expressXClient(socket, options={}) {
    }
 
    return {
-      onConnect,
-      onConnectError,
-      onDisconnect,
+      addConnectListener,
+      removeConnectListener,
+      addDisconnectListener,
+      removeDisonnectListener,
+      addErrorListener,
+      removeErrorListener,
    
       service,
       on,