tlsd 2.6.3 → 2.6.6

package/package.json

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

package/server_static/rpc/rpc.js

@@ -98,7 +98,7 @@
 
 		const waiting = new WaitList()
 
-		const send = function(m, cb) {
+		const send = function(m, cb, fail) {
 			DBG( "send: " + o2j( m ) );
 			if(m.msg_id === undefined) {
 				m.msg_id = "CMID-" + next_seq(); // every message must have an id
@@ -106,7 +106,7 @@
 
 			// put msg into waiting list if caller is expecting a reply
 			if(cb) {
-				waiting.ins( { msg: m, cb: cb }, m.msg_id );
+				waiting.ins( { msg: m, cb, fail }, m.msg_id );
 			}
 
 			DBG(">>---> server "+o2j( m ));
@@ -162,6 +162,24 @@
 				return;
 			}
 
+			if( typeof msg_in.error !== "undefined" ) {
+				// error response to a client initiated msg
+				var x = waiting.rem( msg_in.msg_id ); 
+				if( ! x ) {
+					cb_ctrl( "warning", "invalid reply", msg_in.msg_id );
+					return;
+				}
+
+				// route response to associated error call back
+				var m = x.msg
+				var fail = x.fail;
+				if( fail ) {
+					fail(msg_in.error);
+				}
+
+                return
+            }
+
 			if( typeof msg_in.response !== "undefined" ) {
 				// response to a client initiated msg
 
@@ -209,7 +227,7 @@
 	};
 
 	const via_ws = function( msg, okay = ()=>{}, fail = ()=>{} ) {
-		conn.send( { msg }, okay );
+		conn.send( { msg }, okay, fail );
 	};
 
 	const connect = function( cb ) {

package/tlsd.js

@@ -43,6 +43,7 @@ const next_seq = function() {
 // Tries to load the rpc handler module from root and if successful, passes the msg to it
 const rpc_handler = function( root, msg, xport, _okay, _fail ) {
 
+	V( "RPC " + o2j( msg ).abbr( 70 ) );
 	D( "----------->>> "+xport+" "+o2j( msg, null, 2 ) );
 
 	const okay = data => {
@@ -56,7 +57,7 @@ const rpc_handler = function( root, msg, xport, _okay, _fail ) {
 	};
 
 	const ouch = audit_error => {
-		E( root + ": " + audit_error );
+		E( root + ": " + o2j(audit_error) );
 		fail( "RPC error" );	// this is returned to browser
 	};
 
@@ -65,11 +66,11 @@ const rpc_handler = function( root, msg, xport, _okay, _fail ) {
 		try {
 			mod( msg, okay, ouch );
 		} catch( err ) {
-			E( err );
+			E( (err instanceof Error ) ? err.stack : err );
 			ouch( "RPC handler exception" );
 		}
 	} catch( err ) {
-		E( err );
+        E( (err instanceof Error ) ? err.stack : err );
 		ouch( "Error loading RPC handler" );
 	}
 };
@@ -81,7 +82,8 @@ const ws_msg_handler = function( root, msg ) {
 	rpc_handler( root, msg.msg, "WS", data => {
 		msg.reply( data );
 	}, error => {
-		E( "This shouldn't happen: "+o2j(error,null,2) );
+		msg.error( { error } );
+		E( "Should this happen? "+o2j(error,null,2) );
 	} );
 };
 
@@ -290,7 +292,6 @@ const ws_attach = function( httpServer, msg_handler ) {
 
 // -----------------------
 
-
 const argv = process.argv;
 
 if( argv.length == 2 ) {
@@ -309,7 +310,8 @@ if( argv.length == 2 ) {
 			packageRoot: __dirname,
 			maintainerEmail: MAINTAINER_EMAIL,
 			configDir: "./greenlock.d",
-			cluster: true
+			cluster: false,
+			//notify
 		} ).ready( glx => {
 
 			var httpd = glx.httpsServer();