@jcbuisson/express-x-client 1.5.9 → 1.6.1

package/package.json

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

package/src/index.mjs

@@ -5,7 +5,9 @@ export default function expressXClient(socket, options={}) {
 
    const waitingPromisesByUid = {}
    const action2service2handlers = {}
+   const type2appHandlers = {}
    let onConnectionCallback = null
+   let onReconnectionCallback = null
    let onDisconnectionCallback = null
    let nodeCnxId
 
@@ -13,6 +15,10 @@ export default function expressXClient(socket, options={}) {
       onConnectionCallback = callback
    }
 
+   const setReconnectionCallback = (callback) => {
+      onReconnectionCallback = callback
+   }
+
    const setDisconnectionCallback = (callback) => {
       onDisconnectionCallback = callback
    }
@@ -58,9 +64,11 @@ export default function expressXClient(socket, options={}) {
       if (onConnectionCallback) onConnectionCallback(connectionId)
    })
 
-   socket.on("cnx-transfer-ack", async (connectionId) => {
-      if (options.debug) console.log('cnx-transfer-ack', connectionId)
-      _setCnxId(connectionId)
+   socket.on("cnx-transfer-ack", async (connection) => {
+      if (options.debug) console.log('cnx-transfer-ack', connection)
+      _setCnxId(connection.id)
+      // call user-defined reconnection callback
+      if (onReconnectionCallback) onReconnectionCallback(connection)
    })
 
 
@@ -103,7 +111,7 @@ export default function expressXClient(socket, options={}) {
       delete waitingPromisesByUid[uid]
    })
 
-   // on receiving events from pub/sub
+   // on receiving service 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] = {}
@@ -112,6 +120,14 @@ export default function expressXClient(socket, options={}) {
       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)
+   })
+
    function wait(ms) {
       return new Promise(resolve => setTimeout(resolve, ms));
    }
@@ -147,6 +163,12 @@ export default function expressXClient(socket, options={}) {
       return promise
    }
 
+   // define application events handlers
+   function on(type, handler) {
+      if (!type2appHandlers[type]) type2appHandlers[type] = {}
+      type2appHandlers[type] = handler
+   }
+
    function service(name) {
       const service = {
          // associate a handler to a pub/sub event for this service
@@ -171,8 +193,10 @@ export default function expressXClient(socket, options={}) {
 
    return {
       setConnectionCallback,
+      setReconnectionCallback,
       setDisconnectionCallback,
       service,
+      on,
    }
 }