@jcbuisson/express-x-client 1.5.7 → 1.5.9

package/package.json

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

package/src/index.mjs

@@ -1,17 +1,7 @@
-
-function generateUID(length) {
-   const characters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789'
-   let uid = '';
-
-   for (let i = 0; i < length; i++) {
-     const randomIndex = Math.floor(Math.random() * characters.length)
-     uid += characters.charAt(randomIndex)
-   }
-   return uid
-}
  
 export default function expressXClient(socket, options={}) {
    if (options.debug === undefined) options.debug = false
+   if (options.timeout === undefined) options.timeout = 5000
 
    const waitingPromisesByUid = {}
    const action2service2handlers = {}
@@ -115,6 +105,7 @@ export default function expressXClient(socket, options={}) {
 
    // on receiving events from pub/sub
    socket.on('service-event', ({ name, action, result }) => {
+      if (options.debug) console.log('service-event', name, action, result)
       if (!action2service2handlers[action]) action2service2handlers[action] = {}
       const serviceHandlers = action2service2handlers[action]
       const handler = serviceHandlers[name]
@@ -139,11 +130,11 @@ export default function expressXClient(socket, options={}) {
       const uid = generateUID(20)
       const promise = new Promise((resolve, reject) => {
          waitingPromisesByUid[uid] = [resolve, reject]
-         // a 5s timeout may also reject the promise
+         // a timeout may also reject the promise
          setTimeout(() => {
             delete waitingPromisesByUid[uid]
             reject(`Error: timeout on service '${name}', action '${action}', args: ${JSON.stringify(args)}`)
-         }, 5000)
+         }, options.timeout)
       })
       // send request to server through websocket
       if (options.debug) console.log('client-request', uid, name, action, args)
@@ -184,3 +175,15 @@ export default function expressXClient(socket, options={}) {
       service,
    }
 }
+
+
+function generateUID(length) {
+   const characters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789'
+   let uid = '';
+
+   for (let i = 0; i < length; i++) {
+     const randomIndex = Math.floor(Math.random() * characters.length)
+     uid += characters.charAt(randomIndex)
+   }
+   return uid
+}