@jcbuisson/express-x 1.5.36 → 1.6.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jcbuisson/express-x",
-  "version": "1.5.36",
+  "version": "1.6.1",
   "description": "",
   "type": "module",
   "main": "src/index.mjs",

package/src/server.mjs

@@ -13,6 +13,7 @@ export function expressX(prisma, options = {}) {
    if (options.ws === undefined) options.ws = { ws_prefix: "expressx" }
 
    const services = {}
+   let appHooks = []
 
    const cnx2Socket = {}
 
@@ -48,6 +49,14 @@ export function expressX(prisma, options = {}) {
       }
    }
 
+   function getSocket(connectionId) {
+      return cnx2Socket[connectionId]
+   }
+
+   function setSocket(connectionId, socket) {
+      cnx2Socket[connectionId] = socket
+   }
+
 
    // logging function - a winston logger must be configured first
    app.log = (severity, message) => {
@@ -89,10 +98,11 @@ export function expressX(prisma, options = {}) {
             // if a hook or the method throws an error, it will be caught by `socket.on('client-request'` (ws)
             // or by express (http) and the client will get a rejected promise
 
-            // call 'before' hooks, modifying `context.args`
+            // call 'before' hooks, modifying `context`
+            const beforeAppHooks = appHooks?.before || []
             const beforeMethodHooks = service?.hooks?.before && service.hooks.before[methodName] || []
             const beforeAllHooks = service?.hooks?.before?.all || []
-            for (const hook of [...beforeMethodHooks, ...beforeAllHooks]) {
+            for (const hook of [...beforeAppHooks, ...beforeMethodHooks, ...beforeAllHooks]) {
                await hook(context)
             }
 
@@ -100,18 +110,18 @@ export function expressX(prisma, options = {}) {
             const result = await method(...context.args)
             // put result into context
             context.result = result
-   
-            // call 'after' hooks
+
+            // call 'after' hooks, modifying `context`
             const afterMethodHooks = service?.hooks?.after && service.hooks.after[methodName] || []
             const afterAllHooks = service?.hooks?.after?.all || []
-            for (const hook of [...afterMethodHooks, ...afterAllHooks]) {
+            const afterAppHooks = appHooks?.after || []
+            for (const hook of [...afterMethodHooks, ...afterAllHooks, ...afterAppHooks]) {
                await hook(context)
             }
 
-            // publish event
-            const publishFunc = service.publishCallback
-            if (publishFunc) {
-               const channelNames = await publishFunc(result, app)
+            // publish event (websocket transport)
+            if (options.ws && service.publishFunction) {
+               const channelNames = await service.publishFunction(result, app)
                app.log('verbose', `publish channels ${service.name} ${methodName} ${channelNames}`)
                const connections = await app.prisma.Connection.findMany({})
                for (const channelName of channelNames) {
@@ -124,12 +134,9 @@ export function expressX(prisma, options = {}) {
                   for (const connection of connectionList) {
                      const trimmedResult = result ? JSON.stringify(result).slice(0, 300) : ''
                      app.log('verbose', `emit to ${connection.id} ${service.name} ${methodName} ${trimmedResult}`)
-                     const socket = cnx2Socket[connection.id]
-                     console.log()
-                     if (!socket) {
-                        continue // SHOULD NOT HAPPEN
-                     }
-                     socket.emit('service-event', {
+                     const socket = getSocket(connection.id)
+                     // emit service event
+                     socket && socket.emit('service-event', {
                         name: service.name,
                         action: methodName,
                         result,
@@ -137,20 +144,20 @@ export function expressX(prisma, options = {}) {
                   }
                }
             }
-      
+            
             return context.result
          }
 
+         // TODO: NOT CLEAR AND PROBABLY USELESS
          // hooked version of method: `create`, etc., to be called from backend with no context
          service[methodName] = method
-
          // un-hooked version of method: `_create`, etc., to be called from backend with no context
          service['_' + methodName] = method
       }
 
       // attach pub/sub publish callback
       service.publish = async (func) => {
-         service.publishCallback = func
+         service.publishFunction = func
       },
 
       // attach hooks
@@ -174,6 +181,11 @@ export function expressX(prisma, options = {}) {
       callback(app)
    }
 
+   // set application hooks
+   function hooks(hooks) {
+      appHooks = hooks
+   }
+
    /*
     * add an HTTP REST endpoint at `path`, based on `service`
     */
@@ -310,7 +322,7 @@ export function expressX(prisma, options = {}) {
          const connection = await createConnection(clientIP)
          app.log('verbose', `Client connected ${connection.id} from IP ${clientIP}`)
 
-         cnx2Socket[connection.id] = socket
+         setSocket(connection.id, socket)
 
          // emit 'connection' event for app (expressjs extends EventEmitter)
          console.log('EMIT CONNECTION')
@@ -341,7 +353,7 @@ export function expressX(prisma, options = {}) {
             const fromConnection = await getConnection(from)
             if (!fromConnection) return
             await cloneConnection(to, fromConnection)
-            cnx2Socket[to] = socket
+            setSocket(to, socket)
             await deleteConnection(from)
             // send acknowledge to client
             io.emit('cnx-transfer-ack', to)
@@ -425,11 +437,12 @@ export function expressX(prisma, options = {}) {
    return Object.assign(app, {
       prisma,
       options,
-      cnx2Socket,
+      getSocket, setSocket,
       createDatabaseService,
       createService,
       service,
       configure,
+      hooks,
       addHttpRest,
       server,
       joinChannel,