@jcbuisson/express-x-client 1.0.5 → 1.0.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jcbuisson/express-x-client",
-  "version": "1.0.5",
+  "version": "1.0.7",
   "description": "",
   "main": "src/index.js",
   "repository": {

package/src/index.js

@@ -3,33 +3,37 @@ import { v4 } from 'uuid'
 
 function expressxClient(socket) {
 
-   const waitingPromises = {}
+   const waitingPromisesByUid = {}
+   const timersByUid = {}
    const action2service2handlers = {}
+   let onConnectionCallback = null
+   let onDisconnectionCallback = null
+
+   const setConnectionCallback = (callback) => {
+      onConnectionCallback = callback
+   }
+
+   const setDisconnectionCallback = (callback) => {
+      onDisconnectionCallback = callback
+   }
 
    // on connection
    socket.on("connected", async (connectionId) => {
       console.log('connected', connectionId)
-
-      // TODO: configurable
-      const accessToken = window.sessionStorage.getItem('feathers-jwt')
-      if (accessToken) {
-         // disconnect/reconnect: reauthenticate
-         console.log('reauthenticate with', accessToken)
-         serviceMethodRequest('authenticate', 'reauthenticate', accessToken)
-      }
+      if (onConnectionCallback) onConnectionCallback(connectionId)
    })
 
    // on receiving response from service request
    socket.on('client-response', ({ uid, error, result }) => {
       console.log('client-response', uid, error, result)
-      if (!uid in waitingPromises) return // ???
-      const [resolve, reject] = waitingPromises[uid]
+      if (!waitingPromisesByUid[uid]) return // may not exist because of timeout
+      const [resolve, reject] = waitingPromisesByUid[uid]
       if (error) {
          reject(error)
       } else {
          resolve(result)
       }
-      delete waitingPromises[uid]
+      delete waitingPromisesByUid[uid]
    })
 
    // on receiving events from pub/sub
@@ -42,9 +46,16 @@ function expressxClient(socket) {
 
    async function serviceMethodRequest(name, action, ...args) {
       const uid = v4()
+      // create a promise which will resolve or reject by an event 'client-response'
       const promise = new Promise((resolve, reject) => {
-         waitingPromises[uid] = [resolve, reject]
+         waitingPromisesByUid[uid] = [resolve, reject]
+         // a 5s timeout may also reject the promise
+         setTimeout(() => {
+            delete waitingPromisesByUid[uid]
+            reject(`Error: timeout on service '${name}', action '${action}', args: ${args}`)
+         }, 5000)
       })
+      // send request to server through websocket
       socket.emit('client-request', {
          uid,
          name,
@@ -63,11 +74,11 @@ function expressxClient(socket) {
             serviceHandlers[name] = handler
          },
       }
-      // use a proxy to allow for any method name for a service
+      // use a Proxy to allow for any method name for a service
       const handler = {
          get(service, action) {
             if (!(action in service)) {
-               // newly used property: define it as the service method request function
+               // newly used property `action`: define it as a service method request function
                service[action] = (...args) => serviceMethodRequest(name, action, ...args)
             }
             return service[action]
@@ -76,14 +87,10 @@ function expressxClient(socket) {
       return new Proxy(service, handler)
    }
 
-   function logout() {
-      // TODO: configurable
-      window.sessionStorage.removeItem('feathers-jwt')
-   }
-
    return {
+      setConnectionCallback,
+      setDisconnectionCallback,
       service,
-      logout,
    }
 }