tlsd 2.11.2 → 2.12.1

package/package.json

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

package/tlsd.js

@@ -44,7 +44,11 @@ function next_seq() {
 
 // Handles incoming RPC msgs.
 // Tries to load the rpc handler module from root and if successful, passes the msg to it
-function rpc_handler( root, msg, xport, _okay, _fail ) {
+// transport = 
+//      { type: "WS", connection: { ... } }
+//      { type: "GET", connection: { req, res } }
+//      { type: "POST", connection: { req, res } }
+function rpc_handler( root, msg, transport, _okay, _fail ) {
 
 	let ll = toInt( msg.log_level );
     if( ll > 0 ) {
@@ -60,15 +64,15 @@ function rpc_handler( root, msg, xport, _okay, _fail ) {
 	}
 
 	V( "RPC " + o2j( msg ).abbr( 70 ) );
-	D( "----------->>> "+xport+" "+o2j( msg, null, 2 ) );
+	D( "----------->>> "+transport.type+" "+o2j( msg, null, 2 ) );
 
 	const okay = data => {
-		D( "<<<=========== "+xport+" OKAY "+o2j( data, null, 2 ) );
+		D( "<<<=========== "+transport.type+" OKAY "+o2j( data, null, 2 ) );
 		_okay( data );
 	};
 
 	const fail = error => {
-		D( "<<<*********** "+xport+" ERROR "+o2j( error, null, 2 ) );
+		D( "<<<*********** "+transport.type+" ERROR "+o2j( error, null, 2 ) );
 		_fail( error );
 	};
 
@@ -78,9 +82,9 @@ function rpc_handler( root, msg, xport, _okay, _fail ) {
 	};
 
 	try {
-		const mod = require( root + "/rpc" );
+		const mod = require( root + "/rpc/index.cjs" );
 		try {
-			mod( msg, okay, ouch );
+			mod( msg, okay, ouch, transport );
 		} catch( err ) {
 			E( (err instanceof Error ) ? err.stack : err );
 			ouch( "RPC handler exception" );
@@ -94,8 +98,8 @@ function rpc_handler( root, msg, xport, _okay, _fail ) {
 
 // Glue function to call rpc handler module and then return response
 // via the websockets msg object
-function ws_msg_handler( root, msg ) {
-	rpc_handler( root, msg.msg, "WS", data => {
+function ws_msg_handler( root, msg, connection ) {
+	rpc_handler( root, msg.msg, { type: "WS", connection }, data => {
 		msg.reply( data );
 	}, error => {
 		msg.error( { error } );
@@ -161,7 +165,7 @@ function rpc_post( root ) {
         const fail = ( error, body ) => { done( error, body ); };
 
         // Summon the rpc handler for the domain root.
-        rpc_handler( root, input, "REST", okay, fail );
+        rpc_handler( root, input, { type: method, connection: { req, res, } } , okay, fail );
     };
 }
 
@@ -252,7 +256,7 @@ function rest_handler( root, req, rsp ) {
 
 
 // tracked websocket connections
-const ws_connections = {};
+//const ws_connections = {};
 
 
 // Associate a websocket message handler (msg_handler) to a webserver instance (server)
@@ -270,7 +274,7 @@ function ws_attach( server, msg_handler ) {
 		const name = "ws-conn-"+next_seq();       // XXX just use the websocket id
 
 		// send msg to connected client
-		const send = function( msg , cb ) {
+		const send = function( msg, cb ) {
 			if( msg.msg_id === undefined ) {
 				msg.msg_id = "msg-id-" + next_seq();	// every message must have an id
 			}
@@ -286,7 +290,7 @@ function ws_attach( server, msg_handler ) {
 
 		socket.on("close", function() {
 			D( "WS: disconnect" );
-            delete ws_connections[ name ];  // remove from tracked connections
+            //delete ws_connections[ name ];  // remove from tracked connections
 		});
 
 		// incoming msgs from client come through here
@@ -318,7 +322,7 @@ function ws_attach( server, msg_handler ) {
 
 		D( "WS: connected: "+name );
 
-        ws_connections[ name ] = conn;      // add to tracked connections
+        //ws_connections[ name ] = conn;      // add to tracked connections
 
 	} );
 
@@ -354,9 +358,9 @@ if( argv.length == 2 ) {
 
 			var server = glx.httpsServer();
 
-			ws_attach( server, ( msg, conn, domain ) => {
+			ws_attach( server, ( msg, connection, domain ) => {
 				const root = path.resolve( DOMAINS_ROOT + "/" + domain );
-				ws_msg_handler( root, msg );
+				ws_msg_handler( root, msg, connection );
             } );
 
 			glx.serveApp( ( req, res ) => {
@@ -392,8 +396,8 @@ if( argv.length == 5 ) {
 			rest_handler( SITE_ROOT, req, res );
 		} );
 
-        ws_attach( server, ( msg, conn, domain ) => {
-            ws_msg_handler( SITE_ROOT, msg );
+        ws_attach( server, ( msg, connection, domain ) => {
+            ws_msg_handler( SITE_ROOT, msg, connection );
         } );
 
 		server.listen( toInt( PORT ), () => {