@jcbuisson/express-x 2.1.16 → 2.1.18

package/package.json

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

package/src/index.mjs

@@ -65,13 +65,13 @@ export function expressX(config) {
 
       app.log('verbose', `Client connected ${socket.id}`)
 
-      // // emit 'connection' event for app (expressjs extends EventEmitter)
-      // app.emit('connection', socket)
+      // emit 'connection' event for app (expressjs extends EventEmitter)
+      app.emit('connection', socket)
 
       socketConnectListeners.forEach(listener => listener(socket))
 
-      // // send 'connected' event to client
-      // socket.emit('connected', socket.id)
+      // send 'connected' event to client
+      socket.emit('connected', socket.id)
 
       socket.on('disconnecting', (reason) => {
          app.log('verbose', `Client disconnecting ${socket.id}, ${reason}`)
@@ -207,9 +207,9 @@ export function expressX(config) {
             if (service.publishFunction) {
                // collect channel names to socket is member of
                const channelNames = await service.publishFunction(context)
-               app.log('verbose', `publish channels ${name} ${methodName} ${channelNames}`)
                // send event on all these channels
                if (channelNames.length > 0) {
+                  app.log('verbose', `publish channels ${name} ${methodName} ${channelNames}`)
                   let sender = io.to(channelNames[0])
                   for (let i = 1; i < channelNames.length; i++) {
                      sender = sender.to(channelNames[i])
@@ -358,11 +358,13 @@ export const isNotExpired = async (context) => {
             context.socket.leave(room)
          }
          // send an event to the client (typical client handling: logout)
-         context.socket.emit('expired')
+         context.socket.emit('not-authenticated')
          // throw exception
          throw new EXError('not-authenticated', "Session expired")
       }
    } else {
+      // send an event to the client (typical client handling: logout)
+      context.socket.emit('not-authenticated')
       throw new EXError('not-authenticated', "No expiresAt in socket.data")
    }
 }
@@ -373,8 +375,16 @@ export const isNotExpired = async (context) => {
 export const isAuthenticated = async (context) => {
    // do nothing if it's not a client call from a ws connexion
    if (context.caller !== 'client') return
-   if (!context.socket?.data) throw new EXError('not-authenticated', 'no data in socket')
-   if (!context.socket.data?.user) throw new EXError('not-authenticated', 'no user in socket.data')
+   if (!context.socket?.data) {
+      // send an event to the client (typical client handling: logout)
+      context.socket.emit('not-authenticated')
+      throw new EXError('not-authenticated', 'no data in socket')
+   }
+   if (!context.socket.data?.user) {
+      // send an event to the client (typical client handling: logout)
+      context.socket.emit('not-authenticated')
+      throw new EXError('not-authenticated', 'no user in socket.data')
+   }
 }
 
 /*
@@ -383,6 +393,10 @@ export const isAuthenticated = async (context) => {
 export const extendExpiration = (duration) => async (context) => {
    const now = new Date()
    if (context.caller !== 'client') return
-   if (!context.socket?.data) throw new EXError('not-authenticated', 'no data in socket')
+   if (!context.socket?.data) {
+      // send an event to the client (typical client handling: logout)
+      context.socket.emit('not-authenticated')
+      throw new EXError('not-authenticated', 'no data in socket')
+   }
    context.socket.data.expiresAt = new Date(now.getTime() + duration)
 }