@jcbuisson/express-x 1.5.5 → 1.5.7

package/package.json

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

package/src/channels.mjs

@@ -0,0 +1,32 @@
+
+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) },
+   })
+}
+
+export async function resetConnectionChannels(connectionId) {
+   await app.service('Connection').update({
+      where: { id: connectionId },
+      data: { channelNames: '[]' },
+   })
+}

package/src/common-hooks.mjs

@@ -31,11 +31,12 @@ export function protect(field) {
 
 export async function isAuthenticated(context) {
    if (context.transport !== 'ws') return
-   // extract user from connection data
-   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}`)
+   // extract userId from connection data
+   const userId = await getConnectionDataItem(context, 'userId')
+   if (!userId) throw Error(`Not authenticated, userId ${userId}`)
+}
+
+export const isExpired = (delay) => async (context) => {
+   if (context.transport !== 'ws') return
+   // TODO
 }

package/src/context.mjs

@@ -5,6 +5,16 @@ export async function getConnectionIP(context) {
    return connection?.clientIP
 }
 
+export async function resetConnectionIP(context) {
+   const id = context.params.connectionId
+   await context.app.service('Connection')._update({
+      where: { id },
+      data: {
+         clientIP: ''
+      }
+   })
+}
+
 export async function getConnectionDataItem(context, key) {
    const id = context.params.connectionId
    const connection = await context.app.service('Connection')._findUnique({ where: { id }})
@@ -17,7 +27,7 @@ export async function setConnectionDataItem(context, key, value) {
    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({
+   await context.app.service('Connection')._update({
       where: { id },
       data: {
          data: JSON.stringify(data)

package/src/index.mjs

@@ -1,12 +1,17 @@
 
 import { expressX } from './server.mjs'
 import { hashPassword, protect, isAuthenticated } from './common-hooks.mjs'
-import { getConnectionIP, getConnectionDataItem, setConnectionDataItem, removeConnectionDataItem, resetConnectionData } from './context.mjs'
+import { getConnectionIP, resetConnectionIP, getConnectionDataItem, setConnectionDataItem, removeConnectionDataItem, resetConnectionData } from './context.mjs'
+import { resetConnectionChannels } from './channels.mjs'
 
 export {
    expressX,
 
    getConnectionIP,
+   resetConnectionIP,
+
+   resetConnectionChannels,
+
    getConnectionDataItem,
    setConnectionDataItem,
    removeConnectionDataItem,

package/src/server.mjs

@@ -3,6 +3,8 @@ 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
  */
@@ -43,30 +45,6 @@ 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) },
-      })
-   }
 
    // logging function - a winston logger must be configured first
    app.log = (severity, message) => {
@@ -402,7 +380,6 @@ export function expressX(prisma, options = {}) {
          app.log('verbose', `publish channels ${service.name} ${action} ${channelNames}`)
          for (const channelName of channelNames) {
             app.log('verbose', `service-event ${service.name} ${action} ${channelName}`)
-            // const connectionList = Object.values(app.connections).filter(cnx => cnx.channelNames.has(channelName))
             const connectionList = getChannelConnections(channelName)
             for (const connection of connectionList) {
                app.log('verbose', `emit to ${connection.id} ${service.name} ${action} ${result}`)