@jcbuisson/express-x 1.5.26 → 1.5.28

package/package.json

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

package/src/common-hooks.mjs

@@ -2,7 +2,7 @@
 import config from 'config'
 import bcrypt from 'bcryptjs'
 
-import { getConnectionDataItem } from './context.mjs'
+import { getConnectionDataItem, resetConnection } from './context.mjs'
 
 
 // hash password of user record
@@ -36,9 +36,15 @@ export async function isAuthenticated(context) {
    if (!userId) throw Error(`Not authenticated`)
 }
 
-export const isNotExpired = (delay) => async (context) => {
+export const isNotExpired = async (context) => {
    if (context.transport !== 'ws') return
-   const expireAt = await getConnectionDataItem(context, 'expireAt')
+   const expireAtISO = await getConnectionDataItem(context, 'expireAt')
+   const expireAt = new Date(expireAtISO)
    const now = new Date()
-   if (expireAt > now) throw new Error('session expired')
+   if (expireAt > now) {
+      // clear connection data
+      await resetConnection(context)
+      // throw exception
+      throw new Error('session expired')
+   }
 }

package/src/context.mjs

@@ -10,7 +10,6 @@ export async function resetConnection(context) {
    await context.app.prisma.Connection.update({
       where: { id },
       data: {
-         clientIP: '',
          data: '{}',
          channelNames: '[]',
       }

package/src/server.mjs

@@ -384,10 +384,10 @@ export function expressX(prisma, options = {}) {
          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 = getChannelConnections(channelName)
+            const connectionList = await getChannelConnections(channelName)
             for (const connection of connectionList) {
                app.log('verbose', `emit to ${connection.id} ${service.name} ${action} ${result}`)
-               const socket = cnx2Socket(connection.id)
+               const socket = cnx2Socket[connection.id]
                socket.emit('service-event', {
                   name: service.name,
                   action,