@jcbuisson/express-x 1.5.2 → 1.5.4

package/package.json

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

package/src/common-hooks.mjs

@@ -2,6 +2,8 @@
 import config from 'config'
 import bcrypt from 'bcryptjs'
 
+import { getConnectionDataItem } from './context.mjs'
+
 
 // hash password of user record
 // name of the password field is found in `config.authentication.local.passwordField` (default: 'password')
@@ -30,9 +32,10 @@ export function protect(field) {
 export async function isAuthenticated(context) {
    if (context.transport !== 'ws') return
    // extract user from connection data
-   const id = context.params.connectionId
-   const connection = await context.app.service('Connection')._findUnique({ where: { id }})
-   const data = JSON.parse(connection.data)
-   const user = data.user
+   const user = await getConnectionDataItem(context, 'user')
+   // const id = context.params.connectionId
+   // const connection = await context.app.service('Connection')._findUnique({ where: { id }})
+   // const data = JSON.parse(connection.data)
+   // const user = data.user
    if (!user) throw Error(`AuthCode hook: not authenticated ${id}`)
 }

package/src/context.mjs

@@ -0,0 +1,39 @@
+
+export async function getConnectionIP(context) {
+   const id = context.params.connectionId
+   const connection = await context.app.service('Connection')._findUnique({ where: { id }})
+   return connection?.clientIP
+}
+
+export async function getConnectionDataItem(context, key) {
+   const id = context.params.connectionId
+   const connection = await context.app.service('Connection')._findUnique({ where: { id }})
+   const data = JSON.parse(connection.data)
+   return data[key]
+}
+
+export async function setConnectionDataItem(context, key, value) {
+   const id = context.params.connectionId
+   const connection = await context.app.service('Connection')._findUnique({ where: { id }})
+   const data = JSON.parse(connection.data)
+   data[key] = value
+   await context.app.service('Connection').update({
+      where: { id },
+      data: {
+         data: JSON.stringify(data)
+      }
+   })
+}
+
+export async function removeConnectionDataItem(context, key) {
+   const id = context.params.connectionId
+   const connection = await context.app.service('Connection')._findUnique({ where: { id }})
+   const data = JSON.parse(connection.data)
+   delete data[key]
+   await context.app.service('Connection').update({
+      where: { id },
+      data: {
+         data: JSON.stringify(data)
+      }
+   })
+}

package/src/index.mjs

@@ -1,10 +1,16 @@
 
 import { expressX } from './server.mjs'
 import { hashPassword, protect, isAuthenticated } from './common-hooks.mjs'
+import { getConnectionIP, getConnectionDataItem, setConnectionDataItem, removeConnectionDataItem } from './context.mjs'
 
 export {
    expressX,
 
+   getConnectionIP,
+   getConnectionDataItem,
+   setConnectionDataItem,
+   removeConnectionDataItem,
+
    hashPassword,
    protect,
    isAuthenticated,

package/src/server.mjs

@@ -17,23 +17,15 @@ export function expressX(prisma, options = {}) {
 
    const cnx2Socket = {}
 
-   function createConnection() {
-      return app.service('Connection').create({})
-   }
-
-   async function deleteConnection(id) {
-      try {
-         await app.service('Connection')._delete({ where: { id }})
-      } catch(err) {
-         console.log('111')
-      }
+   function createConnection(clientIP) {
+      return app.service('Connection').create({ data: { clientIP }})
    }
 
    function getConnection(id) {
       return app.service('Connection').findUnique({ where: { id }})
    }
 
-   async function copyConnection(id, connection) {
+   async function cloneConnection(id, connection) {
       await app.service('Connection').update({
          where: { id },
          data: {
@@ -43,6 +35,14 @@ export function expressX(prisma, options = {}) {
       })
    }
 
+   async function deleteConnection(id) {
+      try {
+         await app.service('Connection')._delete({ where: { id }})
+      } catch(err) {
+         // it may be necessary in rare situations (not sure...)
+      }
+   }
+
    async function getChannelConnections(channelName) {
       const connections = await app.service('Connection').findMany({})
       return connections.filter(connection => {
@@ -68,14 +68,6 @@ export function expressX(prisma, options = {}) {
       })
    }
 
-   app.printCnx = async (label) => {
-      console.log(label)
-      const connections = await app.service('Connection').findMany({})
-      for (const connection of connections) {
-         console.log(`CNX ${connection.id}, data ${JSON.stringify(connection.data)}`)
-      }
-   }
-
    // logging function - a winston logger must be configured first
    app.log = (severity, message) => {
       const logger = app.get('logger')
@@ -307,8 +299,9 @@ export function expressX(prisma, options = {}) {
       const io = new Server(server)
       
       io.on('connection', async function(socket) {
-         const connection = await createConnection()
-         app.log('verbose', `Client connected ${connection.id}`)
+         const clientIP = socket.request?.connection?.remoteAddress || 'unknown'
+         const connection = await createConnection(clientIP)
+         app.log('verbose', `Client connected ${connection.id} from IP ${clientIP}`)
 
          cnx2Socket[connection.id] = socket
 
@@ -322,9 +315,14 @@ export function expressX(prisma, options = {}) {
             app.log('verbose', `Client disconnected ${connection.id}`)
 
             // remove connection record after 1mn (leaves time in case of connection transfer)
-            setTimeout(() => {
-               app.log('verbose', `Delete connection ${connection.id}`)
-               deleteConnection(connection.id)
+            setTimeout(async () => {
+               const connectionId = connection.id
+               // check if connection still exists
+               const cnx = await getConnection(connectionId)
+               if (cnx) {
+                  app.log('verbose', `Delete connection ${connectionId}`)
+                  await deleteConnection(connectionId)
+               }
             }, 10 * 1000)
          })
 
@@ -334,10 +332,9 @@ export function expressX(prisma, options = {}) {
             app.log('verbose', `cnx-transfer from ${from} to ${to}`)
             const fromConnection = await getConnection(from)
             if (!fromConnection) return
-            await copyConnection(to, fromConnection)
+            await cloneConnection(to, fromConnection)
             cnx2Socket[to] = socket
             await deleteConnection(from)
-            app.printCnx('AFTER TRANSFER')
             // send acknowledge to client
             io.emit('cnx-transfer-ack', to)
          })
@@ -428,6 +425,7 @@ export function expressX(prisma, options = {}) {
       removeChannelFromConnection(connection, channelName)
    }
 
+
    // enhance `app` with objects and methods
    return Object.assign(app, {
       options,