D11391.1768582923.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D11391.1768582923.diff
View Options

	diff --git a/keyserver/src/socket/tunnelbroker-socket.js b/keyserver/src/socket/tunnelbroker-socket.js
	--- a/keyserver/src/socket/tunnelbroker-socket.js
	+++ b/keyserver/src/socket/tunnelbroker-socket.js
	@@ -31,24 +31,28 @@

	class TunnelbrokerSocket {
	ws: WebSocket;
	- connected: boolean;
	- promises: Promises;
	+ connected: boolean = false;
	+ closed: boolean = false;
	+ promises: Promises = {};
	heartbeatTimeoutID: ?TimeoutID;
	oneTimeKeysPromise: ?Promise<void>;

	constructor(socketURL: string, initMessage: ConnectionInitializationMessage) {
	- this.connected = false;
	- this.promises = {};
	-
	const socket = new WebSocket(socketURL);

	socket.on('open', () => {
	- socket.send(JSON.stringify(initMessage));
	+ if (!this.closed) {
	+ socket.send(JSON.stringify(initMessage));
	+ }
	});

	socket.on('close', async () => {
	- this.stopHeartbeatTimeout();
	+ if (this.closed) {
	+ return;
	+ }
	+ this.closed = true;
	this.connected = false;
	+ this.stopHeartbeatTimeout();
	console.error('Connection to Tunnelbroker closed');
	});