tlsd 2.6.5 → 2.6.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tlsd",
-  "version": "2.6.5",
+  "version": "2.6.7",
   "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

@@ -57,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
 	};
 
@@ -82,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) );
 	} );
 };