tlsd 2.16.1 → 2.16.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tlsd",
-  "version": "2.16.1",
+  "version": "2.16.3",
   "description": "A server for web app prototyping with HTTPS and Websockets",
   "main": "tlsd.js",
   "bin": {

package/rpc_static/rpc/rpc.js

@@ -95,7 +95,7 @@
 
 		const waiting = new WaitList()
 
-		const send = function(m, cb, fail) {
+		const send = async function(m, cb, fail) {
 			if(m.msg_id === undefined) {
 				m.msg_id = "CMID-" + next_seq(); // every message must have an id
 			}
@@ -105,8 +105,24 @@
 				waiting.ins( { msg: m, cb, fail }, m.msg_id );
 			}
 
-			DBG(">>--->", m );
-			socket.send( o2j( m ) );
+			const MAX_WAIT_TIME = 10000; // 10 seconds
+			const startTime = Date.now();
+			while(socket.readyState !== WebSocket.OPEN) {
+				if(Date.now() - startTime >= MAX_WAIT_TIME) {
+					if(fail) fail("WebSocket connection timeout after " + MAX_WAIT_TIME + "ms");
+					return;
+				}
+				DBG("Waiting for socket to be open", socket.readyState, MAX_WAIT_TIME - (Date.now() - startTime));
+				await new Promise(resolve => setTimeout(resolve, 200));
+			}
+
+			try {
+				DBG(">>--->", m, socket.readyState );
+				socket.send( o2j( m ) );
+			} catch(error) {
+				DBG("Send error:", error);
+				if(fail) fail(error);
+			}
 		}
 
 		var loc = document.location