@jcbuisson/express-x 2.1.12 → 2.1.13

package/package.json

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

package/src/common-hooks.mjs

@@ -1,6 +1,8 @@
 
 import bcrypt from 'bcryptjs'
 
+import { EXError } from './server.mjs'
+
 /*
  * Add a timestamp property of name `field` with current time as value
 */
@@ -34,13 +36,6 @@ export function protect(field) {
    }
 }
 
-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
@@ -61,10 +56,10 @@ export const isNotExpired = async (context) => {
          // send an event to the client (typical client handling: logout)
          context.socket.emit('expired')
          // throw exception
-         throw new NotAuthenticatedError("Session expired")
+         throw new EXError('not-authenticated', "Session expired")
       }
    } else {
-      throw new NotAuthenticatedError("No expiresAt in socket.data")
+      throw new EXError('not-authenticated', "No expiresAt in socket.data")
    }
 }
 
@@ -74,7 +69,7 @@ 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 NotAuthenticatedError('no user in socket.data')
+   if (!context.socket.data.user) throw new EXError('not-authenticated', 'no user in socket.data')
 }
 
 /*
@@ -83,4 +78,4 @@ export const isAuthenticated = async (context) => {
 export const extendExpiration = (duration) => async (context) => {
    const now = new Date()
    context.socket.data.expiresAt = new Date(now.getTime() + duration)
-}
+}

package/src/server.mjs

@@ -5,6 +5,13 @@ import { Server } from "socket.io"
 
 // UTILISER L'ACKNOWLEDGEMENT : https://socket.io/docs/v4/#acknowledgements
 
+export default class EXError extends Error {
+   constructor(code, message) {
+      super(message)
+      this.code = code
+   }
+}
+
 export function expressX(config) {
 
    const services = {}
@@ -162,7 +169,7 @@ export function expressX(config) {
    /*
     * create a service `name` with given `methods`
     */
-   function createService(serviceName, methods) {
+   function createService(name, methods) {
       const service = {}
 
       for (const methodName in methods) {
@@ -201,7 +208,7 @@ 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 ${serviceName} ${methodName} ${channelNames}`)
+               app.log('verbose', `publish channels ${name} ${methodName} ${channelNames}`)
                // send event on all these channels
                if (channelNames.length > 0) {
                   let sender = io.to(channelNames[0])
@@ -209,7 +216,7 @@ export function expressX(config) {
                      sender = sender.to(channelNames[i])
                   }
                   sender.emit('service-event', {
-                     name: serviceName,
+                     name,
                      action: methodName,
                      result,
                   })
@@ -224,7 +231,7 @@ export function expressX(config) {
             const context = {
                app,
                caller: 'server',
-               serviceName,
+               serviceName: service._name,
                methodName,
                args,
             }
@@ -244,7 +251,7 @@ export function expressX(config) {
       }
 
       // cache service in `services`
-      services[serviceName] = service
+      services[name] = service
       return service
    }