tlsd 2.3.0 → 2.4.1

package/package.json

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

package/server_static/rpc/rpc.js

@@ -6,13 +6,13 @@
 	// Send msg via Websocket if it's less than around 5K stringified, otherwise use POST
 	RPC( msg_object, okay, fail );
 
-	RPC.on_connect = () => {
+	RPC.connect( function() {
 		RPC( { action: "Hello, I'm a client" }, rsp => {
 			console.log( rsp )	// "Welcome client, I'm a server"
 		}, error => {
 			alert( error )
 		} );
-	};
+	} );
 
 	RPC.debug = true;	// enable on console debug output
 
@@ -215,6 +215,14 @@
 		conn.send( { msg }, okay );
 	};
 
+	const connect = function( cb ) {
+		if( RPC.connected ) {
+			cb();
+		} else {
+			RPC.on_connect = cb;
+		}
+	};
+
 	const RPC = function( msg, okay = ()=>{}, fail = ()=>{} ) {
 		const json = o2j( msg );
 		if( json.length > 5000 ) {
@@ -226,18 +234,21 @@
 		}
 	};
 
+	RPC.connect = connect;
 	RPC.POST = via_post;
 	RPC.WS = via_ws;
 	RPC.debug = false;
 	RPC.connected = false;
 
 	ws_connect( msg => {
-		DBG( "Server says: " + msg ); // msg initiated by server 
+		// msg initiated by server 
+		DBG( "Server says: " + msg );
 		const fn = RPC[ "onmessage" ];
 		if( typeof fn == "function" ) {
 			fn( msg );
 		}
 	}, ( evt, detail ) => {
+		// event occurred
 		DBG( "Event: " + evt );
 		if( evt === "connect" ) {
 			RPC.connected = true;

package/server_static/rpc/test.html

@@ -5,7 +5,7 @@
 
 	<script>
 		RPC.debug = true;
-		RPC.on_connect = evt => {
+		RPC.connect( function() {
 			RPC( { action: "ping" }, console.log, alert );
-		};
+		} );
 	</script>