@jcbuisson/express-x-client 1.0.2 → 1.0.4

package/package.json

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

package/src/express-x-client.js

@@ -1,10 +1,7 @@
 
-import { io } from 'socket.io-client'
 import { v4 } from 'uuid'
 
-function expressxClient() {
-
-   const socket = io()
+function expressxClient(socket) {
 
    const waitingPromises = {}
    const action2service2handlers = {}
@@ -12,11 +9,13 @@ function expressxClient() {
    // on connection
    socket.on("connected", async (connectionId) => {
       console.log('connected', connectionId)
-      const token = window.sessionStorage.getItem('feathers-jwt')
-      if (token) {
+
+      // TODO: configurable
+      const accessToken = window.sessionStorage.getItem('feathers-jwt')
+      if (accessToken) {
          // disconnect/reconnect: reauthenticate
-         console.log('reauthenticate with', token)
-         serviceMethodRequest('authenticate', 'patch', [token])
+         console.log('reauthenticate with', accessToken)
+         serviceMethodRequest('authenticate', 'reauthenticate', accessToken)
       }
    })
 
@@ -41,7 +40,7 @@ function expressxClient() {
       if (handler) handler(result)
    })
 
-   async function serviceMethodRequest(name, action, argList) {
+   async function serviceMethodRequest(name, action, ...args) {
       const uid = v4()
       const promise = new Promise((resolve, reject) => {
          waitingPromises[uid] = [resolve, reject]
@@ -50,33 +49,41 @@ function expressxClient() {
          uid,
          name,
          action,
-         argList,
+         args,
       })
       return promise
    }
 
    function service(name) {
-      return {
-         create: (data) => serviceMethodRequest(name, 'create', [data]),
-         get: (id) => serviceMethodRequest(name, 'create', [id]),
-         patch: (id, data) => serviceMethodRequest(name, 'create', [id, data]),
-         update: (id, data) => serviceMethodRequest(name, 'update', [id, data]),
-         remove: (id) => serviceMethodRequest(name, 'remove', [id]),
-         find: (data) => serviceMethodRequest(name, 'find', [data]),
-
+      const service = {
          // associate a handler to a pub/sub event for this service
          on: (action, handler) => {
             if (!action2service2handlers[action]) action2service2handlers[action] = {}
             const serviceHandlers = action2service2handlers[action]
             serviceHandlers[name] = handler
-            console.log('action2service2handlers', action2service2handlers)
          },
       }
+      // 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
+               service[action] = (...args) => serviceMethodRequest(name, action, ...args)
+            }
+            return service[action]
+         }
+      }
+      return new Proxy(service, handler)
+   }
+
+   function logout() {
+      // TODO: configurable
+      window.sessionStorage.removeItem('feathers-jwt')
    }
 
    return {
       service,
-      socket,
+      logout,
    }
 }