tlsd 2.12.0 → 2.12.2

package/package.json

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

package/tlsd.js

@@ -44,10 +44,10 @@ function next_seq() {
 
 // Handles incoming RPC msgs.
 // Tries to load the rpc handler module from root and if successful, passes the msg to it
-// xport: 
-//      { type: "WS", transport: { ... } }
-//      { type: "GET", transport: { req, res } }
-//      { type: "POST", transport: { req, res } }
+// 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 );
@@ -82,16 +82,36 @@ function rpc_handler( root, msg, transport, _okay, _fail ) {
 	};
 
 	try {
-		const mod = require( root + "/rpc" );
+        // try loading explicit common js module 
+		const path = root + "/rpc/index.cjs";
+		V( "path=" + path );
+		const mod = require( path );
 		try {
 			mod( msg, okay, ouch, transport );
 		} catch( err ) {
-			E( (err instanceof Error ) ? err.stack : err );
-			ouch( "RPC handler exception" );
+            E( (err instanceof Error ) ? err.stack : err );
+            ouch( "RPC handler exception" );
 		}
+
 	} catch( err ) {
-        E( (err instanceof Error ) ? err.stack : err );
-		ouch( "Error loading RPC handler" );
+
+        // try loading it the old way using the dir
+        try {
+			const path = root + "/rpc";
+			V( "path=" + path );
+			const mod = require( path );
+			try {
+				mod( msg, okay, ouch, transport );
+			} catch( err ) {
+				E( (err instanceof Error ) ? err.stack : err );
+				ouch( "RPC handler exception" );
+			}
+
+        } catch( err ) {
+			E( (err instanceof Error ) ? err.stack : err );
+			ouch( "Error loading RPC handler" );
+        }
+
 	}
 };
 
@@ -99,7 +119,7 @@ function rpc_handler( root, msg, transport, _okay, _fail ) {
 // Glue function to call rpc handler module and then return response
 // via the websockets msg object
 function ws_msg_handler( root, msg, connection ) {
-	rpc_handler( root, msg.msg, { type: "WS", transport: connection }, data => {
+	rpc_handler( root, msg.msg, { type: "WS", connection }, data => {
 		msg.reply( data );
 	}, error => {
 		msg.error( { error } );
@@ -165,7 +185,7 @@ function rpc_post( root ) {
         const fail = ( error, body ) => { done( error, body ); };
 
         // Summon the rpc handler for the domain root.
-        rpc_handler( root, input, { type, method, transport: { req, res, } } , okay, fail );
+        rpc_handler( root, input, { type: method, connection: { req, res, } } , okay, fail );
     };
 }
 
@@ -274,7 +294,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
 			}
@@ -396,8 +416,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 ), () => {