@jcbuisson/express-x 1.5.14 → 1.5.16

package/package.json

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

package/src/server.mjs

@@ -3,8 +3,6 @@ import http from 'http'
 import { Server } from "socket.io"
 import express from 'express'
 
-import { getChannelConnections, addChannelToConnection, removeChannelFromConnection } from './channels.mjs'
-
 /*
  * Enhance `app` express application with services and real-time features
  */
@@ -19,15 +17,16 @@ export function expressX(prisma, options = {}) {
 
    const cnx2Socket = {}
 
-   function createConnection(clientIP) {
+   async function createConnection(clientIP) {
       const now = new Date();
       const expirationTime = new Date(now.getTime() + 15 * 60000)
-      return app.service('Connection').create({
+      const connection = await app.service('Connection').create({
          data: {
             clientIP,
             expirationTime,
          }
       })
+      return connection
    }
 
    function getConnection(id) {
@@ -38,8 +37,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,
          }
       })
    }
@@ -401,6 +402,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) },
-   })
-}