@jcbuisson/express-x 1.0.3 → 1.0.5

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@jcbuisson/express-x",
-  "version": "1.0.3",
+  "version": "1.0.5",
   "description": "",
-  "main": "src/expressX.js",
+  "main": "src/index.js",
   "repository": {
     "type": "git",
     "url": "git@gitlab.com:buisson31/express-x.git"
@@ -17,7 +17,6 @@
     "@prisma/client": "^4.10.1",
     "config": "^3.3.9",
     "express": "^4.18.2",
-    "jsonwebtoken": "^9.0.0",
     "socket.io": "^4.6.0"
   },
   "devDependencies": {

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

@@ -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
@@ -19,44 +18,39 @@ function expressX(app) {
    /*
     * create a service `name` based on Prisma table `entity`
     */
-   function createDatabaseService({ name, entity=name, client='prisma' }) {
-      return createService({
-         name,
-         entity,
-
-         methods: {
-            create: (data) => prisma[entity].create({
-               data,
-            }),
-
-            get: (id) => prisma[entity].findUnique({
-               where: {
-                  id,
-               },
-            }),
-
-            patch: (id, data) => prisma[entity].update({
-               where: {
-                  id,
-               },
-               data,
-            }),
-
-            remove: (id, data) => prisma[entity].delete({
-               where: {
-                  id,
-               },
-            }),
-
-            find: (options) => prisma[entity].findMany(options),
-         }
+   function createDatabaseService(name, { entity=name, client='prisma' }) {
+      return createService(name, {
+         create: (data) => prisma[entity].create({
+            data,
+         }),
+
+         get: (id) => prisma[entity].findUnique({
+            where: {
+               id,
+            },
+         }),
+
+         patch: (id, data) => prisma[entity].update({
+            where: {
+               id,
+            },
+            data,
+         }),
+
+         remove: (id, data) => prisma[entity].delete({
+            where: {
+               id,
+            },
+         }),
+
+         find: (options) => prisma[entity].findMany(options),
       })
    }
 
    /*
     * create a service `name` with given `methods`
     */
-   function createService({ name, methods }) {
+   function createService(name, methods) {
       const service = { name }
 
       for (const methodName in methods) {
@@ -64,7 +58,7 @@ function expressX(app) {
 
          // `context` is the context of execution (transport type, connection, app)
          // `args` is the list of arguments of the method
-         service[methodName] = async (context, ...args) => {
+         service['__' + methodName] = async (context, ...args) => {
             context.args = args
 
             // if a hook or the method throws an error, it will be caught by `socket.on('client-request'`
@@ -89,11 +83,11 @@ function expressX(app) {
             }
             return result
          }
-      }
 
-      // un-hooked versions of methods: `_create`, etc.
-      for (const methodName in methods) {
-         const method = methods[methodName]
+         // 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
       }
 
@@ -112,8 +106,9 @@ function expressX(app) {
       return service
    }
 
-   // get service from `services` cache
+   // `app.service(name)` starts here!
    function service(name) {
+      // get service from `services` cache
       if (name in services) return services[name]
       throw Error(`there is no service named '${name}'`)
    }
@@ -133,27 +128,27 @@ function expressX(app) {
       }
 
       app.post(path, async (req, res) => {
-         const value = await service.create(context, req.body)
+         const value = await service.__create(context, req.body)
          res.json(value)
       })
 
       app.get(path, async (req, res) => {
-         const values = await service.find(context, req.body)
+         const values = await service.__find(context, req.body)
          res.json(values)
       })
 
       app.get(`${path}/:id`, async (req, res) => {
-         const value = await service.get(context, parseInt(req.params.id))
+         const value = await service.__get(context, parseInt(req.params.id))
          res.json(value)
       })
 
       app.patch(`${path}/:id`, async (req, res) => {
-         const value = await service.patch(context, parseInt(req.params.id), req.body)
+         const value = await service.__patch(context, parseInt(req.params.id), req.body)
          res.json(value)
       })
 
       app.delete(`${path}/:id`, async (req, res) => {
-         const value = await service.remove(context, parseInt(req.params.id))
+         const value = await service.__remove(context, parseInt(req.params.id))
          res.json(value)
       })
    }
@@ -162,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')
@@ -195,36 +190,44 @@ function expressX(app) {
          if (name in services) {
             const service = services[name]
             try {
-               const serviceMethod = service[action]
-
-               const context = {
-                  app,
-                  transport: 'ws',
-                  connection,
-               }
-               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,
-                        })
+               const serviceMethod = service['__' + action]
+               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', {
@@ -264,4 +267,4 @@ function expressX(app) {
    return app
 }
 
-module.exports = expressX
+export default expressX