|
@@ -7,7 +7,7 @@ import { v4 as uuidv4 } from 'uuid'
|
|
|
import { ConnectedSocketClient, ConnectedSocketServer } from '../transport/websocket';
|
|
|
import ConsoleLogger from './log.utils';
|
|
|
import path from 'path';
|
|
|
-import { ConnectionState, GeneralEvent, TransportMessage } from '../interface/interface';
|
|
|
+import { ClientObject, ConnectionState, GeneralEvent, TransportMessage } from '../interface/interface';
|
|
|
import { addClientToDB, checkIfClientExists, checkOwnClientInfo, writeFile } from './general.utils';
|
|
|
const console: ConsoleLogger = new ConsoleLogger(`SocketUtils`, ['transport'])
|
|
|
|
|
@@ -81,7 +81,7 @@ export function handleClientSocketConnection(transportServiceId: string, socket:
|
|
|
})
|
|
|
})
|
|
|
} else {
|
|
|
- socket.emit('profile', {
|
|
|
+ socket.emit('profile', {
|
|
|
name: 'New Client',
|
|
|
data: null
|
|
|
})
|
|
@@ -125,17 +125,14 @@ export function handleClientSocketConnection(transportServiceId: string, socket:
|
|
|
transport: 'Websocket',
|
|
|
transportServiceId: transportServiceId
|
|
|
}
|
|
|
- writeFile(data.message as ConnectedSocketServer, (data.message as ConnectedSocketServer).clientId).then(() => {
|
|
|
+ writeFile(data.message as ConnectedSocketServer, receiverProfileInfo.clientId).then(() => {
|
|
|
// broadcast event to allow transmission manager to instantiate transmission components
|
|
|
eventNotification.next({
|
|
|
id: uuidv4(),
|
|
|
type: 'Transport Event',
|
|
|
event: `New Server`,
|
|
|
date: new Date(),
|
|
|
- data: {
|
|
|
- clientId: (data.message as ConnectedSocketServer).clientId,
|
|
|
- message: `New Websocket Channel ${(data.message as ConnectedSocketServer).clientId} established.`
|
|
|
- },
|
|
|
+ data: receiverProfileInfo,
|
|
|
transport: 'Websocket'
|
|
|
})
|
|
|
// broadcast event to allow retransmission to relase buffered messages
|
|
@@ -144,10 +141,7 @@ export function handleClientSocketConnection(transportServiceId: string, socket:
|
|
|
type: 'Transport Event',
|
|
|
event: `Server Connected`,
|
|
|
date: new Date(),
|
|
|
- data: {
|
|
|
- clientId: (data.message as ConnectedSocketServer).clientId,
|
|
|
- message: `Server ${(data.message as ConnectedSocketServer).clientId} connected and ready to go.`
|
|
|
- },
|
|
|
+ data: receiverProfileInfo,
|
|
|
transport: 'Websocket'
|
|
|
})
|
|
|
}).catch((error) => { }) // do nothing at the moment.
|
|
@@ -169,10 +163,7 @@ export function handleClientSocketConnection(transportServiceId: string, socket:
|
|
|
type: `Transport Event`,
|
|
|
event: 'Server Connected',
|
|
|
date: new Date(),
|
|
|
- data: {
|
|
|
- clientId: (data.message as ConnectedSocketServer).clientId,
|
|
|
- message: `Existing Websocket Channel ${(data.message as ConnectedSocketServer).clientId} re-established.`
|
|
|
- },
|
|
|
+ data: clientObj,
|
|
|
transport: 'Websocket'
|
|
|
})
|
|
|
}
|