@jcbuisson/express-x 1.7.4 → 1.7.6

package/package.json

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

package/src/server.mjs

@@ -6,11 +6,12 @@ import express from 'express'
 /*
  * Enhance `app` express application with services and real-time features
  */
-export function expressX(prisma, options = {}) {
+export function expressX(prisma, config) {
 
    const app = express()
 
-   if (options.ws === undefined) options.ws = { ws_prefix: "expressx" }
+   // websocket transport by default
+   if (config.WS_TRANSPORT == undefined) config.WS_TRANSPORT = true
 
    const services = {}
    let appHooks = []
@@ -45,7 +46,7 @@ export function expressX(prisma, options = {}) {
       try {
          await prisma.Connection.delete({ where: { id }})
       } catch(err) {
-         // it may be necessary in rare situations (not sure...)
+         // in case it would no longer exist
       }
    }
 
@@ -120,7 +121,7 @@ export function expressX(prisma, options = {}) {
             }
 
             // publish event (websocket transport)
-            if (options.ws && service.publishFunction) {
+            if (config.WS_TRANSPORT && 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({})
@@ -311,7 +312,7 @@ export function expressX(prisma, options = {}) {
    */
    const server = new http.Server(app)
 
-   if (options.ws) {
+   if (config.WS_TRANSPORT) {
       /*
       * Add websocket transport
       */
@@ -334,7 +335,7 @@ export function expressX(prisma, options = {}) {
          socket.on('disconnect', () => {
             app.log('verbose', `Client disconnected ${connection.id}`)
 
-            // remove connection record after 1mn (leaves time in case of connection transfer)
+            // remove connection record after expiration delay, if it still exists
             setTimeout(async () => {
                const connectionId = connection.id
                // check if connection still exists
@@ -343,7 +344,7 @@ export function expressX(prisma, options = {}) {
                   app.log('verbose', `Delete connection ${connectionId}`)
                   await deleteConnection(connectionId)
                }
-            }, 10 * 1000)
+            }, config.SESSION_EXPIRE_DELAY || 24*60*60000)
          })
 
          
@@ -455,7 +456,7 @@ export function expressX(prisma, options = {}) {
    // enhance `app` with objects and methods
    return Object.assign(app, {
       prisma,
-      options,
+      config,
       getSocket, setSocket,
       createDatabaseService,
       createService,