@jcbuisson/express-x 1.5.13 → 1.5.15

package/package.json

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

package/src/common-hooks.mjs

@@ -33,7 +33,7 @@ export async function isAuthenticated(context) {
    if (context.transport !== 'ws') return
    // extract userId from connection data
    const userId = await getConnectionDataItem(context, 'userId')
-   if (!userId) throw Error(`Not authenticated, userId ${userId}`)
+   if (!userId) throw Error(`Not authenticated`)
 }
 
 export const isExpired = (delay) => async (context) => {

package/src/server.mjs

@@ -19,8 +19,16 @@ export function expressX(prisma, options = {}) {
 
    const cnx2Socket = {}
 
-   function createConnection(clientIP) {
-      return app.service('Connection').create({ data: { clientIP }})
+   async function createConnection(clientIP) {
+      const now = new Date();
+      const expirationTime = new Date(now.getTime() + 15 * 60000)
+      const connection = await app.service('Connection').create({
+         data: {
+            clientIP,
+            expirationTime,
+         }
+      })
+      return connection
    }
 
    function getConnection(id) {
@@ -31,8 +39,10 @@ export function expressX(prisma, options = {}) {
       await app.service('Connection').update({
          where: { id },
          data: {
+            clientIP: connection.clientIP,
             channelNames: connection.channelNames,
             data: connection.data,
+            expirationTime: connection.expirationTime,
          }
       })
    }
@@ -394,6 +404,31 @@ export function expressX(prisma, options = {}) {
       }
    }
 
+   async function getChannelConnections(channelName) {
+      const connections = await app.service('Connection').findMany({})
+      return connections.filter(connection => {
+         const channelNames = JSON.parse(connection.channelNames)
+         return channelNames.includes(channelName)
+      })
+   }
+   
+   async function addChannelToConnection(connection, channelName) {
+      const channelNames = JSON.parse(connection.channelNames)
+      if (!channelNames.includes(channelName)) channelNames.push(channelName)
+      await app.service('Connection').update({
+         where: { id: connection.id },
+         data: { channelNames: JSON.stringify(channelNames) },
+      })
+   }
+   
+   async function removeChannelFromConnection(connection, channelName) {
+      const channelNames = JSON.parse(connection.channelNames).filter(name => name !== channelName)
+      await app.service('Connection').update({
+         where: { id },
+         data: { channelNames: JSON.stringify(channelNames) },
+      })
+   }
+   
    function joinChannel(channelName, connection) {
       addChannelToConnection(connection, channelName)
    }

package/src/channels.mjs

@@ -1,25 +0,0 @@
-
-export async function getChannelConnections(channelName) {
-   const connections = await app.service('Connection').findMany({})
-   return connections.filter(connection => {
-      const channelNames = JSON.parse(connection.channelNames)
-      return channelNames.includes(channelName)
-   })
-}
-
-export async function addChannelToConnection(connection, channelName) {
-   const channelNames = JSON.parse(connection.channelNames)
-   if (!channelNames.includes(channelName)) channelNames.push(channelName)
-   await app.service('Connection').update({
-      where: { id: connection.id },
-      data: { channelNames: JSON.stringify(channelNames) },
-   })
-}
-
-export async function removeChannelFromConnection(connection, channelName) {
-   const channelNames = JSON.parse(connection.channelNames).filter(name => name !== channelName)
-   await app.service('Connection').update({
-      where: { id },
-      data: { channelNames: JSON.stringify(channelNames) },
-   })
-}