ppfun/pixelplanet
13
Fork 18
Code Issues 24 Pull Requests Releases 2 Activity

another websocket message change

Browse Source
This commit is contained in:
HF 2022-07-02 13:47:20 +02:00
parent eee3d6a7ec
commit bb89d6e55b
1 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/socket/SocketClient.js
View File

@ -68,12 +68,17 @@ class SocketClient extends EventEmitter {
} }
if (now - 23000 > this.timeLastSent) { if (now - 23000 > this.timeLastSent) {
// make sure we send something at least all 25s // make sure we send something at least all 25s
this.sendWhenReady(Ping.dehydrate()); this.send(Ping.dehydrate());
} }
} }
} }
sendWhenReady(msg) { sendWhenReady(msg) {
/*
* if websocket is closed, store messages and send
* them later, once connection is established again.
* Do NOT use this method for things that wouldn't be useful after reconnect
*/
this.timeLastSent = Date.now(); this.timeLastSent = Date.now();
if (this.readyState === WebSocket.OPEN) { if (this.readyState === WebSocket.OPEN) {
this.ws.send(msg); this.ws.send(msg);
@ -83,6 +88,12 @@ class SocketClient extends EventEmitter {
} }
} }
send(msg) {
if (this.readyState === WebSocket.OPEN) {
this.ws.send(msg);
}
}
processMsgQueue() { processMsgQueue() {
while (this.msgQueue.length > 0) { while (this.msgQueue.length > 0) {
this.sendWhenReady(this.msgQueue.shift()); this.sendWhenReady(this.msgQueue.shift());
@ -97,11 +108,11 @@ class SocketClient extends EventEmitter {
this.emit('open', {}); this.emit('open', {});
if (this.canvasId !== null) { if (this.canvasId !== null) {
this.ws.send(RegisterCanvas.dehydrate(this.canvasId)); this.send(RegisterCanvas.dehydrate(this.canvasId));
} }
this.processMsgQueue();
console.log(`Register ${chunks.length} chunks`); console.log(`Register ${chunks.length} chunks`);
this.ws.send(RegisterMultipleChunks.dehydrate(chunks)); this.send(RegisterMultipleChunks.dehydrate(chunks));
this.processMsgQueue();
} }
setCanvas(canvasId) { setCanvas(canvasId) {
@ -115,7 +126,7 @@ class SocketClient extends EventEmitter {
console.log('Notify websocket server that we changed canvas'); console.log('Notify websocket server that we changed canvas');
this.canvasId = canvasId; this.canvasId = canvasId;
chunks.length = 0; chunks.length = 0;
this.sendWhenReady(RegisterCanvas.dehydrate(this.canvasId)); this.send(RegisterCanvas.dehydrate(this.canvasId));
} }
registerChunk(cell) { registerChunk(cell) {
@ -124,7 +135,7 @@ class SocketClient extends EventEmitter {
chunks.push(chunkid); chunks.push(chunkid);
const buffer = RegisterChunk.dehydrate(chunkid); const buffer = RegisterChunk.dehydrate(chunkid);
if (this.readyState === WebSocket.OPEN) { if (this.readyState === WebSocket.OPEN) {
this.ws.send(buffer); this.send(buffer);
} }
} }
@ -133,7 +144,7 @@ class SocketClient extends EventEmitter {
const chunkid = (i << 8) | j; const chunkid = (i << 8) | j;
const buffer = DeRegisterChunk.dehydrate(chunkid); const buffer = DeRegisterChunk.dehydrate(chunkid);
if (this.readyState === WebSocket.OPEN) { if (this.readyState === WebSocket.OPEN) {
this.ws.send(buffer); this.send(buffer);
} }
const pos = chunks.indexOf(chunkid); const pos = chunks.indexOf(chunkid);
if (~pos) chunks.splice(pos, 1); if (~pos) chunks.splice(pos, 1);