@jcbuisson/express-x-client 2.0.0 → 2.0.2

package/package.json

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

package/src/index.mjs

@@ -13,10 +13,10 @@ function generateUID(length) {
 
 export default function expressXClient(socket, options={}) {
    if (options.debug === undefined) options.debug = false
-   if (options.timeout === undefined) options.timeout = 5000
 
    const waitingPromisesByUid = {}
    const action2service2handlers = {}
+   const type2appHandler = {}
    const socketConnectionState = {}
 
    socket.on("connect", async () => {
@@ -68,16 +68,8 @@ export default function expressXClient(socket, options={}) {
       const handler = serviceHandlers[name]
       if (handler) handler(result)
    })
-
-   // on receiving application events from pub/sub
-   socket.on('app-event', ({ type, value }) => {
-      if (options.debug) console.log('app-event', type, value)
-      if (!type2appHandlers[type]) type2appHandlers[type] = {}
-      const handler = type2appHandlers[type]
-      if (handler) handler(value)
-   })
    
-   async function serviceMethodRequest(name, action, ...args) {
+   async function serviceMethodRequest(name, action, options, ...args) {
       // create a promise which will resolve or reject by an event 'client-response'
       const uid = generateUID(20)
       const promise = new Promise((resolve, reject) => {
@@ -99,7 +91,7 @@ export default function expressXClient(socket, options={}) {
       return promise
    }
 
-   function service(name) {
+   function service(name, options={ timeout: 5000 }) {
       const service = {
          // associate a handler to a pub/sub event for this service
          on: (action, handler) => {
@@ -113,7 +105,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, ...args)
+               service[action] = (...args) => serviceMethodRequest(name, action, options, ...args)
             }
             return service[action]
          }
@@ -121,10 +113,26 @@ export default function expressXClient(socket, options={}) {
       return new Proxy(service, handler)
    }
 
+   ///////////////         APPLICATION-LEVEL EVENTS         /////////////////
+
+   // There is a need for events sent outside any service method call, for example on unsolicited-by-frontend backend state change
+   socket.on('app-event', ({ type, value }) => {
+      if (options.debug) console.log('app-event', type, value)
+      if (!type2appHandler[type]) type2appHandler[type] = {}
+      const handler = type2appHandler[type]
+      if (handler) handler(value)
+   })
+
+   // add application event handler
+   function on(type, handler) {
+      type2appHandler[type] = handler
+   }
+
    return {
       socketConnection,
       socketStatus,
       service,
+      on,
    }
 }