@jcbuisson/express-x 1.2.1 → 1.3.0

package/package.json

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

package/src/client.mjs

@@ -19,13 +19,13 @@ export function expressXClient(socket, options={}) {
 
    // on connection
    socket.on("connected", async (connectionId) => {
-      if (options.debug) console.log('connected', connectionId)
+      if (options.logger) options.logger.log('info', 'connected', connectionId)
       if (onConnectionCallback) onConnectionCallback(connectionId)
    })
 
    // on receiving response from service request
    socket.on('client-response', ({ uid, error, result }) => {
-      if (options.debug) console.log('client-response', uid, error, result)
+      if (options.logger) options.logger.log('info', 'client-response', uid, error, result)
       if (!waitingPromisesByUid[uid]) return // may not exist because a timeout removed it
       const [resolve, reject] = waitingPromisesByUid[uid]
       if (error) {

package/src/server.mjs

@@ -7,11 +7,10 @@ import { PrismaClient } from '@prisma/client'
 /*
  * Enhance `app` express application with services and real-time features
  */
-export function expressX(options={ debug: false }) {
+export function expressX(options = {}) {
 
    const app = express()
 
-   if (options.debug === undefined) options.debug = true
    if (options.ws === undefined) options.ws = { ws_prefix: "expressx" }
 
    const services = {}
@@ -38,7 +37,7 @@ export function expressX(options={ debug: false }) {
       service.prisma = prisma
       service.entity = prismaOptions.entity
       
-      if (options.debug) console.log(`created service '${name}' over table '${prismaOptions.entity}'`)
+      if (options.logger) options.logger.log('info', `created service '${name}' over table '${prismaOptions.entity}'`)
       return service
    }
 
@@ -69,7 +68,7 @@ export function expressX(options={ debug: false }) {
 
             // call method
             const result = await method(...context.args)
-            // if (options.debug) console.log('result', result)
+            // if (options.logger) options.logger.log('info', 'result', result)
 
             // call 'after' hooks
             const afterMethodHooks = service?.hooks?.after && service.hooks.after[methodName] || []
@@ -147,7 +146,7 @@ export function expressX(options={ debug: false }) {
 
 
       app.post(path, async (req, res) => {
-         if (options.debug) console.log("http request POST", req.url)
+         if (options.logger) options.logger.log('info', "http request POST", req.url)
          context.http.req = req
          try {
             const value = await service.__create(context, { data: req.body })
@@ -160,7 +159,7 @@ export function expressX(options={ debug: false }) {
       })
 
       app.get(path, async (req, res) => {
-         if (options.debug) console.log("http request GET", req.url)
+         if (options.logger) options.logger.log('info', "http request GET", req.url)
          context.http.req = req
          const query = { ...req.query }
          try {
@@ -196,7 +195,7 @@ export function expressX(options={ debug: false }) {
       })
 
       app.get(`${path}/:id`, async (req, res) => {
-         if (options.debug) console.log("http request GET", req.url)
+         if (options.logger) options.logger.log('info', "http request GET", req.url)
          context.http.req = req
          try {
             const value = await service.__findUnique(context, {
@@ -213,7 +212,7 @@ export function expressX(options={ debug: false }) {
       })
 
       app.patch(`${path}/:id`, async (req, res) => {
-         if (options.debug) console.log("http request PATCH", req.url)
+         if (options.logger) options.logger.log('info', "http request PATCH", req.url)
          context.http.req = req
          try {
             const value = await service.__update(context, {
@@ -231,7 +230,7 @@ export function expressX(options={ debug: false }) {
       })
 
       app.delete(`${path}/:id`, async (req, res) => {
-         if (options.debug) console.log("http request DELETE", req.url)
+         if (options.logger) options.logger.log('info', "http request DELETE", req.url)
          context.http.req = req
          try {
             const value = await service.__delete(context, {
@@ -247,7 +246,7 @@ export function expressX(options={ debug: false }) {
          }
       })
 
-      if (options.debug) console.log(`added HTTP endpoints for service '${service.name}' at path '${path}'`)
+      if (options.logger) options.logger.log('info', `added HTTP endpoints for service '${service.name}' at path '${path}'`)
    }
 
    /*
@@ -262,7 +261,7 @@ export function expressX(options={ debug: false }) {
       const io = new Server(server)
       
       io.on('connection', function(socket) {
-         if (options.debug) console.log('Client connected to the WebSocket')
+         if (options.logger) options.logger.log('info', 'Client connected to the WebSocket')
          const connection = {
             id: lastConnectionId++,
             socket,
@@ -270,7 +269,7 @@ export function expressX(options={ debug: false }) {
          }
          // store connection in cache 
          connections[connection.id] = connection
-         if (options.debug) console.log('active connections', Object.keys(connections))
+         if (options.logger) options.logger.log('info', 'active connections', Object.keys(connections))
 
          // emit 'connection' event for app (expressjs extends EventEmitter)
          app.emit('connection', connection)
@@ -279,7 +278,7 @@ export function expressX(options={ debug: false }) {
          socket.emit('connected', connection.id)
 
          socket.on('disconnect', () => {
-            if (options.debug) console.log('Client disconnected', connection.id)
+            if (options.logger) options.logger.log('info', 'Client disconnected', connection.id)
             delete connections[connection.id]
          })
 
@@ -289,7 +288,7 @@ export function expressX(options={ debug: false }) {
          * Emit in return a 'client-response' message
          */
          socket.on('client-request', async ({ uid, name, action, args }) => {
-            if (options.debug) console.log("client-request", uid, name, action, args)
+            if (options.logger) options.logger.log('info', "client-request", uid, name, action, args)
             if (name in services) {
                const service = services[name]
                try {
@@ -342,12 +341,12 @@ export function expressX(options={ debug: false }) {
       const publishFunc = service.publishCallback
       if (publishFunc) {
          const channelNames = await publishFunc(result, app)
-         if (options.debug) console.log('publish channels', service.name, action, channelNames)
+         if (options.logger) options.logger.log('info', 'publish channels', service.name, action, channelNames)
          for (const channelName of channelNames) {
-            if (options.debug) console.log('service-event', service.name, action, channelName)
+            if (options.logger) options.logger.log('info', 'service-event', service.name, action, channelName)
             const connectionList = Object.values(connections).filter(cnx => cnx.channelNames.has(channelName))
             for (const connection of connectionList) {
-               if (options.debug) console.log('emit to', connection.id, service.name, action, result)
+               if (options.logger) options.logger.log('info', 'emit to', connection.id, service.name, action, result)
                connection.socket.emit('service-event', {
                   name: service.name,
                   action,