From 74075c2919f8226e321da704a55d4eea5ed4f448 Mon Sep 17 00:00:00 2001 From: Janis Hutz Date: Sun, 28 Sep 2025 16:01:39 +0200 Subject: [PATCH] Finish up refactor --- backend/src/app.ts | 5 +++++ backend/src/sse.ts | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/backend/src/app.ts b/backend/src/app.ts index f8a7200..0e55f83 100644 --- a/backend/src/app.ts +++ b/backend/src/app.ts @@ -19,6 +19,8 @@ const isFossVersion = false; import storeSDK from '@janishutz/store-sdk'; import sdk from '@janishutz/login-sdk-server'; +import sse from './sse'; +import socket from './socket'; // const isFossVersion = true; // @@ -98,6 +100,9 @@ const run = () => { */ const socketData: SocketData = {}; + sse.useSSE( app, socketData, corsOpts, sdk.getSessionID, sdk.getSignedIn ); + socket.useWebSocket( httpServer, socketData ); + /* GENERAL ROUTES diff --git a/backend/src/sse.ts b/backend/src/sse.ts index ddb5510..4de6b9c 100644 --- a/backend/src/sse.ts +++ b/backend/src/sse.ts @@ -9,6 +9,8 @@ const useSSE = ( app: express.Application, socketData: SocketData, corsOpts: cors.CorsOptions, + getSessionID: ( request: express.Request ) => string, + getSignedIn: ( request: express.Request ) => boolean ) => { /* ROUTES FOR SERVER SENT EVENTS VERSION @@ -51,9 +53,9 @@ const useSSE = ( 'type': 'basics', 'data': socketData[ String( request.query.room ) ] } ) }\n\n` ); - const sid = sdk.getSessionID( request ); + const sid = getSessionID( request ); - if ( sdk.getSignedIn( request ) ) { + if ( getSignedIn( request ) ) { importantClients[ sid ] = { 'response': response, 'room': String( request.query.room )