@jcbuisson/express-x 1.5.32 → 1.5.34

package/package.json

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

package/src/server.mjs

@@ -9,7 +9,6 @@ import express from 'express'
 export function expressX(prisma, options = {}) {
 
    const app = express()
-   // app.set('prisma', prisma)
 
    if (options.ws === undefined) options.ws = { ws_prefix: "expressx" }
 
@@ -108,6 +107,38 @@ export function expressX(prisma, options = {}) {
             for (const hook of [...afterMethodHooks, ...afterAllHooks]) {
                await hook(context)
             }
+
+            // publish event
+            const publishFunc = service.publishCallback
+            if (publishFunc) {
+               const channelNames = await publishFunc(result, app)
+               app.log('verbose', `publish channels ${service.name} ${methodName} ${channelNames}`)
+               const connections = await app.prisma.Connection.findMany({})
+               console.log('connections', connections)
+               for (const channelName of channelNames) {
+                  app.log('verbose', `service-event ${service.name} ${methodName} ${channelName}`)
+                  const connectionList = connections.filter(connection => {
+                     const channelNames = JSON.parse(connection.channelNames)
+                     return channelNames.includes(channelName)
+                  })
+            
+                  for (const connection of connectionList) {
+                     const trimmedResult = 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', {
+                        name: service.name,
+                        action: methodName,
+                        result,
+                     })
+                  }
+               }
+            }
+      
             return context.result
          }
 
@@ -170,7 +201,6 @@ export function expressX(prisma, options = {}) {
          context.params.req = req
          try {
             const value = await service.__create(context, { data: req.body })
-            publish(service, 'create', value)
             res.json(value)
          } catch(err) {
             app.log('error', err)
@@ -206,7 +236,6 @@ export function expressX(prisma, options = {}) {
             const values = await service.__findMany(context, {
                where: query,
             })
-            publish(service, 'findMany', values)
             res.json(values)
          } catch(err) {
             app.log('error', err)
@@ -223,7 +252,6 @@ export function expressX(prisma, options = {}) {
                   id: parseInt(req.params.id)
                }
             })
-            publish(service, 'findUnique', value)
             res.json(value)
          } catch(err) {
             app.log('error', err)
@@ -241,7 +269,6 @@ export function expressX(prisma, options = {}) {
                },
                data: req.body,
             })
-            publish(service, 'update', value)
             res.json(value)
          } catch(err) {
             app.log('error', err)
@@ -258,7 +285,6 @@ export function expressX(prisma, options = {}) {
                   id: parseInt(req.params.id)
                }
             })
-            publish(service, 'delete', value)
             res.json(value)
          } catch(err) {
             app.log('error', err)
@@ -288,6 +314,7 @@ export function expressX(prisma, options = {}) {
          cnx2Socket[connection.id] = socket
 
          // emit 'connection' event for app (expressjs extends EventEmitter)
+         console.log('EMIT CONNECTION')
          app.emit('connection', connection)
 
          // send 'connected' event to client
@@ -346,8 +373,6 @@ export function expressX(prisma, options = {}) {
                            uid,
                            result,
                         })
-                        // pub/sub: send event on associated channels
-                        publish(service, action, result)
                      } catch(err) {
                         app.log('error', err.toString())
                         io.emit('client-response', {
@@ -376,42 +401,9 @@ export function expressX(prisma, options = {}) {
          })
       })      
    }
-
-   // publish event on associated channels
-   async function publish(service, action, result) {
-      const publishFunc = service.publishCallback
-      if (publishFunc) {
-         const channelNames = await publishFunc(result, app)
-         app.log('verbose', `publish channels ${service.name} ${action} ${channelNames}`)
-         for (const channelName of channelNames) {
-            app.log('verbose', `service-event ${service.name} ${action} ${channelName}`)
-            const connectionList = await getChannelConnections(channelName)
-            for (const connection of connectionList) {
-               const trimmedResult = JSON.stringify(result).slice(0, 300)
-               app.log('verbose', `emit to ${connection.id} ${service.name} ${action} ${trimmedResult}`)
-               const socket = cnx2Socket[connection.id]
-               if (!socket) {
-                  continue // SHOULD NOT HAPPEN
-               }
-               socket.emit('service-event', {
-                  name: service.name,
-                  action,
-                  result,
-               })
-            }
-         }
-      }
-   }
-
-   async function getChannelConnections(channelName) {
-      const connections = await app.prisma.Connection.findMany({})
-      return connections.filter(connection => {
-         const channelNames = JSON.parse(connection.channelNames)
-         return channelNames.includes(channelName)
-      })
-   }
    
-   async function addChannelToConnection(connection, channelName) {
+   async function joinChannel(channelName, connection) {
+      app.log('verbose', `Joining channel ${channelName} ${connection.id}`)
       const channelNames = JSON.parse(connection.channelNames)
       if (!channelNames.includes(channelName)) channelNames.push(channelName)
       await app.prisma.Connection.update({
@@ -419,22 +411,15 @@ export function expressX(prisma, options = {}) {
          data: { channelNames: JSON.stringify(channelNames) },
       })
    }
-   
-   async function removeChannelFromConnection(connection, channelName) {
+
+   async function leaveChannel(channelName, connection) {
+      app.log('verbose', `Leaving channel ${channelName} ${connection.id}`)
       const channelNames = JSON.parse(connection.channelNames).filter(name => name !== channelName)
       await app.prisma.Connection.update({
          where: { id },
          data: { channelNames: JSON.stringify(channelNames) },
       })
    }
-   
-   function joinChannel(channelName, connection) {
-      addChannelToConnection(connection, channelName)
-   }
-
-   function leaveChannel(channelName, connection) {
-      removeChannelFromConnection(connection, channelName)
-   }
 
 
    // enhance `app` with objects and methods