tlsd 2.2.2 → 2.4.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "tlsd",
-  "version": "2.2.2",
-  "description": "An server for web app prototyping with HTTPS and Websockets",
+  "version": "2.4.0",
+  "description": "A server for web app prototyping with HTTPS and Websockets",
   "main": "tlsd.js",
   "bin": {
     "tlsd": "tlsd"

package/scaffold/rpc/index.js

@@ -1,4 +1,13 @@
 
+/*
+	This is the back end script that handles message from the front end.
+	The "input" object is the exact same that was given to RPC()
+	on the front end.
+	Use okay() to return a normal response, or fail() to return an error.
+	These correspond to the same okay()/fail() functions given to RPC() on
+	the front end.
+*/
+
 module.exports = ( input, okay, fail ) => {
 
 	const action = input.action;

package/scaffold/static/index.html

@@ -6,9 +6,20 @@
 	<script src="/rpc/rpc.js"></script>
 
 	<script>
-		RPC.on_connect = evt => {
-			RPC( { action: "hello" }, console.log, alert );
-		};
+
+		/*
+		RPC is used to send msgs to the back end.
+		If you call RPC() directly, it will decide whether or not
+		to use Websocket or REST as transport based on size of object.
+		Otherwise, you can explicitly choose the transport by using
+		RPC.POST() or RPC.WS().
+		*/
+
+		RPC.on_connect = function( evt ) {
+			// RPC is ready to be used
+			RPC( { action: "hello" }, console.log, alert )
+		}
+
 	</script>
 
 </body>

package/server_static/rpc/rpc.js

@@ -190,21 +190,6 @@
 	};
 
 
-	ws_connect( msg => {
-		DBG( "Server says: " + msg ); // msg initiated by server 
-		const fn = RPC[ "onmessage" ];
-		if( typeof fn == "function" ) {
-			fn( msg );
-		}
-	}, ( evt, detail ) => {
-		DBG( "Event: " + evt );
-		const fn = RPC[ "on_" + evt ];
-		if( typeof fn == "function" ) {
-			fn( detail );
-		}
-	}, "/" );
-
-
 	const RPC_URL = "/rpc/";
 
 	const via_post = function( msg, okay = ()=>{}, fail = ()=>{} ) {
@@ -230,6 +215,14 @@
 		conn.send( { msg }, okay );
 	};
 
+	const connect = function( cb ) {
+		if( connected ) {
+			cb();
+		} else {
+			RPC.on_connect = cb;
+		}
+	};
+
 	const RPC = function( msg, okay = ()=>{}, fail = ()=>{} ) {
 		const json = o2j( msg );
 		if( json.length > 5000 ) {
@@ -241,9 +234,34 @@
 		}
 	};
 
+	RPC.connect = connect;
 	RPC.POST = via_post;
 	RPC.WS = via_ws;
 	RPC.debug = false;
+	RPC.connected = false;
+
+	ws_connect( msg => {
+		// 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;
+		}
+		if( evt === "disconnect" ) {
+			RPC.connected = false;
+		}
+		const fn = RPC[ "on_" + evt ];
+		if( typeof fn == "function" ) {
+			fn( detail );
+		}
+	}, "/" );
+
 
 	globalThis.RPC = RPC;