@jcbuisson/express-x 2.1.4 → 2.1.6

package/package.json

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

package/src/common-hooks.mjs

@@ -1,15 +1,19 @@
 
 import bcrypt from 'bcryptjs'
 
+import config from '#config'
 
+
+/*
+ * Add a timestamp property of name `field` with current time as value
+*/
 export const addTimestamp = (field) => async (context) => {
    context.result[field] = (new Date()).toISOString()
    return context
 }
 
 /*
- * Hash password of user record
- * To be used as an 'after' hook for users service methods
+ * Hash password of the property `field`
 */
 export const hashPassword = (passwordField) => async (context) => {
    const user = context.result
@@ -17,7 +21,6 @@ export const hashPassword = (passwordField) => async (context) => {
    return context
 }
 
-
 /*
  * Remove `field` from `context.result`
 */
@@ -34,9 +37,13 @@ export function protect(field) {
    }
 }
 
-/*
- * Throw an error for a client service method call when socket.data.expiresAt is missing or overdue
-*/
+class NotAuthenticatedError extends Error {
+   constructor(message) {
+      super(message)
+      this.code = 'not-authenticated'
+   }
+}
+
 export const isNotExpired = async (context) => {
    // do nothing if it's not a client call from a ws connexion
    if (!context.socket) return
@@ -45,12 +52,22 @@ export const isNotExpired = async (context) => {
       const expiresAtDate = new Date(expiresAt)
       const now = new Date()
       if (now > expiresAtDate) {
-         // expiration date is met: clear socket.data & throw exception
+         // expiration date is met
+         // clear socket.data
          context.socket.data = {}
-         throw new Error('session-expired')
+         // leave all rooms except socket#id
+         const rooms = new Set(context.socket.rooms)
+         for (const room of rooms) {
+            if (room === context.socket.id) continue
+            context.socket.leave(room)
+         }
+         // send an event to the client (typical client handling: logout)
+         context.socket.emit('expired')
+         // throw exception
+         throw new NotAuthenticatedError("Session expired")
       }
    } else {
-      throw new Error('session-expired')
+      throw new NotAuthenticatedError("No expiresAt in socket.data")
    }
 }
 
@@ -60,5 +77,13 @@ 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.socket) return
-   if (!context.socket.data.user) throw new Error('not-authenticated')
+   if (!context.socket.data.user) throw new NotAuthenticatedError('no user in socket.data')
 }
+
+/*
+ * Extend value of socket.data.expiresAt
+*/
+export const extendExpiration = async (context) => {
+   const now = new Date()
+   context.socket.data.expiresAt = new Date(now.getTime() + config.SESSION_EXPIRE_DELAY)
+}

package/src/server.mjs

@@ -8,7 +8,6 @@ import { Server } from "socket.io"
 export function expressX(config) {
 
    const services = {}
-   let appHooks = []
    const socketConnectListeners = []
    const socketDisconnectingListeners = []
    const socketDisconnectListeners = []
@@ -115,7 +114,7 @@ export function expressX(config) {
                         result,
                      })
                   } catch(err) {
-                     console.log('!!!!!!error', err)
+                     console.log('!!!!!!error', err.code, err.message)
                      app.log('verbose', err.stack)
                      socket.emit('client-response', {
                         uid,
@@ -180,10 +179,9 @@ export function expressX(config) {
             // and the client will get a rejected promise
 
             // call 'before' hooks, possibly modifying `context`
-            const beforeAppHooks = appHooks?.before || []
             const beforeMethodHooks = service?._hooks?.before && service._hooks.before[methodName] || []
             const beforeAllHooks = service?._hooks?.before?.all || []
-            for (const hook of [...beforeAppHooks, ...beforeMethodHooks, ...beforeAllHooks]) {
+            for (const hook of [...beforeAllHooks, ...beforeMethodHooks]) {
                await hook(context)
             }
 
@@ -195,8 +193,7 @@ export function expressX(config) {
             // call 'after' hooks, possibly modifying `context`
             const afterMethodHooks = service?._hooks?.after && service._hooks.after[methodName] || []
             const afterAllHooks = service?._hooks?.after?.all || []
-            const afterAppHooks = appHooks?.after || []
-            for (const hook of [...afterMethodHooks, ...afterAllHooks, ...afterAppHooks]) {
+            for (const hook of [...afterMethodHooks, ...afterAllHooks]) {
                await hook(context)
             }
 
@@ -255,11 +252,6 @@ export function expressX(config) {
       callback(app)
    }
 
-   // set application hooks
-   function hooks(hooks) {
-      appHooks = hooks
-   }
-
    // `app.service(name)` starts here!
    function service(name) {
       // get service from `services` cache
@@ -290,7 +282,6 @@ export function expressX(config) {
       createService,
       service,
       configure,
-      hooks,
       joinChannel,
       leaveChannel,
       sendAppEvent,