@jcbuisson/express-x-client 2.0.1 → 2.1.0

package/package.json

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

package/src/index.mjs

@@ -16,36 +16,59 @@ export default function expressXClient(socket, options={}) {
 
    const waitingPromisesByUid = {}
    const action2service2handlers = {}
-   const socketConnectionState = {}
+   const type2appHandler = {}
+   // const socketConnectionState = {}
+   let connectHandler = null
+   let connectErrorHandler = null
+   let disconnectHandler = null
 
    socket.on("connect", async () => {
       console.log("socket connected", socket.id)
-      if (socketConnectionState.resolve) {
-         socketConnectionState.resolve('ok')
-         socketConnectionState.status = 'connected'
-      }
+      // if (socketConnectionState.resolve) {
+      //    socketConnectionState.resolve('ok')
+      //    socketConnectionState.status = 'connected'
+      // }
+      if (connectHandler) connectHandler(socket)
    })
 
-   socket.on("error", async () => {
+   socket.on("connect_error", async () => {
       console.log("socket connection error", socket.id)
-      if (socketConnectionState.reject) {
-         socketConnectionState.reject(err)
-         socketConnectionState.status = 'error'
-      }
+      // if (socketConnectionState.reject) {
+      //    socketConnectionState.reject(err)
+      //    socketConnectionState.status = 'error'
+      // }
+      if (connectErrorHandler) connectErrorHandler(socket)
    })
 
-   async function socketConnection() {
-      const promise = new Promise((resolve, reject) => {
-         socketConnectionState.resolve = resolve
-         socketConnectionState.reject = reject
-      })
-      return promise
+   socket.on("disconnect", async () => {
+      if (disconnectHandler) disconnectHandler(socket)
+   })
+
+   function onConnect(func) {
+      connectHandler = func
    }
 
-   function socketStatus() {
-      return socketConnectionState.status
+   function onConnectError(func) {
+      connectErrorHandler = func
    }
 
+   function onDisconnect(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)
@@ -67,14 +90,6 @@ 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, options, ...args) {
       // create a promise which will resolve or reject by an event 'client-response'
@@ -120,10 +135,29 @@ export default function expressXClient(socket, options={}) {
       return new Proxy(service, handler)
    }
 
+   ///////////////         APPLICATION-LEVEL EVENTS         /////////////////
+
+   // There is a need for application-wide events sent outside any service method call, for example when backend state changes
+   // without front-end interactions
+   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 a handler for application-wide events
+   function on(type, handler) {
+      type2appHandler[type] = handler
+   }
+
    return {
-      socketConnection,
-      socketStatus,
+      onConnect,
+      onConnectError,
+      onDisconnect,
+   
       service,
+      on,
    }
 }