Skip to content

Commit 162a8a0

Browse files
committed
fix(implementations/js/server): let integrator spawn server instance
1 parent eb466ff commit 162a8a0

4 files changed

Lines changed: 3 additions & 32 deletions

File tree

implementations/js/client/src/main.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -397,5 +397,3 @@ export default class WscClientManager {
397397
return client;
398398
}
399399
}
400-
401-
clientManagerInstance = new WscClientManager();

implementations/js/server/src/peer.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,7 @@ export default class WscPeerManager {
188188
* @return {WscPeerManager} WscPeer instance
189189
*/
190190
static getInstance() {
191+
if (!peerManagerInstance) return new WscPeerManager();
191192
return peerManagerInstance;
192193
}
193194

implementations/js/server/src/server.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,5 +126,3 @@ export default class WSCServer {
126126
this.handleWscPacket(packet, peer);
127127
}
128128
}
129-
130-
wscServerInstance = new WSCServer();

implementations/js/server/src/signaling.js

Lines changed: 2 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ export default class SignalingServer {
5959
* @returns {SignalingServer} signaling server instance
6060
*/
6161
static getInstance() {
62+
if (!signalingInstance) signalingInstance = new SignalingServer();
6263
return signalingInstance;
6364
}
6465

@@ -75,7 +76,7 @@ export default class SignalingServer {
7576

7677
ws.onmessage = peer.handleSignaling.bind(peer);
7778
ws.onclose = () => this.handleClosure(peer.client.id);
78-
ws.onerror = this.handleError;
79+
ws.onerror = this.handleError.bind(this);
7980

8081
this.clients.set(peer.client.id, peer.client);
8182

@@ -87,31 +88,6 @@ export default class SignalingServer {
8788
}
8889
}
8990

90-
// async handleSignaling(msg, ws) {
91-
// const data = JSON.parse(msg);
92-
// const peer = WSCPeer.getInstance();
93-
94-
// try {
95-
// if (data.type === MSG_TYPE.OFFER) {
96-
// // Handle Offer (Offer received from browser)
97-
// logger.debug('Received offer from client');
98-
// await peer.handleOffer(data.offer, ws);
99-
// } else if (data.type === MSG_TYPE.ANSWER) {
100-
// // Handle Answer (Answer from browser)
101-
// logger.debug('Received answer from client');
102-
// await peer.handleAnswer(data.answer);
103-
// } else if (data.type === MSG_TYPE.ICE) {
104-
// // Handle ICE candidate
105-
// logger.debug('Received ICE candidate from client');
106-
// await peer.handleIceCandidate(data.candidate);
107-
// } else {
108-
// logger.debug('Unknown signaling message type:', data.type);
109-
// }
110-
// } catch (error) {
111-
// logger.error('Error handling message:', error);
112-
// }
113-
// }
114-
11591
/**
11692
* handle connection closure
11793
*
@@ -125,5 +101,3 @@ export default class SignalingServer {
125101
logger.debug('Signaling server error:', err);
126102
}
127103
}
128-
129-
signalingInstance = new SignalingServer();

0 commit comments

Comments
 (0)