@jcbuisson/express-x 1.0.4 → 1.0.6

package/package.json

@@ -1,8 +1,9 @@
 {
   "name": "@jcbuisson/express-x",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "description": "",
-  "main": "src/index.js",
+  "type": "module",
+  "main": "src/index.mjs",
   "repository": {
     "type": "git",
     "url": "git@gitlab.com:buisson31/express-x.git"

package/src/{index.js → index.mjs}

@@ -1,8 +1,7 @@
 
-const http = require('http')
-const socketio = require('socket.io')
-
-const { PrismaClient } = require('@prisma/client')
+import http from 'http'
+import { Server } from "socket.io"
+import { PrismaClient } from '@prisma/client'
 
 /*
  * Enhance `app` express application with Feathers-like services
@@ -158,7 +157,7 @@ function expressX(app) {
     * Add websocket transport for services
     */
    const server = new http.Server(app)
-   const io = new socketio.Server(server)
+   const io = new Server(server)
    
    io.on('connection', function(socket) {
       console.log('Client connected to the WebSocket')
@@ -192,37 +191,43 @@ function expressX(app) {
             const service = services[name]
             try {
                const serviceMethod = service['__' + action]
-
-               const context = {
-                  app,
-                  transport: 'ws',
-                  connection,
-                  name,
-                  action,
-               }
-               const result = await serviceMethod(context, ...args)
-
-               io.emit('client-response', {
-                  uid,
-                  result,
-               })
-               // pub/sub: send event on associated channels
-               const publishFunc = service.publishCallback
-               if (publishFunc) {
-                  const channelNames = await publishFunc(result, app)
-                  console.log('publish channels', name, action, channelNames)
-                  for (const channelName of channelNames) {
-                     console.log('service-event', name, action, channelName)
-                     const connectionList = Object.values(connections).filter(cnx => cnx.channelNames.has(channelName))
-                     for (const connection of connectionList) {
-                        console.log('emit to', connection.id)
-                        connection.socket.emit('service-event', {
-                           name,
-                           action,
-                           result,
-                        })
+               if (serviceMethod) {
+                  const context = {
+                     app,
+                     transport: 'ws',
+                     connection,
+                     name,
+                     action,
+                  }
+                  const result = await serviceMethod(context, ...args)
+
+                  io.emit('client-response', {
+                     uid,
+                     result,
+                  })
+                  // pub/sub: send event on associated channels
+                  const publishFunc = service.publishCallback
+                  if (publishFunc) {
+                     const channelNames = await publishFunc(result, app)
+                     console.log('publish channels', name, action, channelNames)
+                     for (const channelName of channelNames) {
+                        console.log('service-event', name, action, channelName)
+                        const connectionList = Object.values(connections).filter(cnx => cnx.channelNames.has(channelName))
+                        for (const connection of connectionList) {
+                           console.log('emit to', connection.id)
+                           connection.socket.emit('service-event', {
+                              name,
+                              action,
+                              result,
+                           })
+                        }
                      }
                   }
+               } else {
+                  io.emit('client-response', {
+                     uid,
+                     error: `there is no method named '${action}' for service '${name}'`,
+                  })
                }
             } catch(error) {
                io.emit('client-response', {
@@ -262,4 +267,4 @@ function expressX(app) {
    return app
 }
 
-module.exports = expressX
+export default expressX