tlsd 2.6.1 → 2.6.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tlsd",
-  "version": "2.6.1",
+  "version": "2.6.3",
   "description": "A server for web app prototyping with HTTPS and Websockets",
   "main": "tlsd.js",
   "bin": {
@@ -20,7 +20,7 @@
     "g": "^2.0.1",
     "greenlock-express": "^4.0.3",
     "serve-static": "^1.15.0",
-    "sleepless": "^5.7.0",
+    "sleepless": "^5.13.0",
     "tlsd": "^2.4.1",
     "websocket": "^1.0.34"
   }

package/tlsd.js

@@ -1,9 +1,7 @@
 
 /*
-
 Copyright 2023 Sleepless Software Inc.
 All Rights Reserved
-
 */
 
 const { path, http, https, fs, crypto, tls, } = require( "allcore" );
@@ -12,8 +10,8 @@ const connect = require( "connect" );
 const websocket = require( "websocket" );
 const serveStatic = require( "serve-static" )
 
-const g = require( "g" );
-g( "sleepless" );
+require( "sleepless" ).globalize();
+
 const L = log5.mkLog( "TLSD: " );
 const { D, V, I, W, E } = L;
 
@@ -34,7 +32,6 @@ function usage() {
 	process.exit( 1 );
 }
 
-
 let seq = 0;
 const next_seq = function() {
 	seq += 1;
@@ -44,22 +41,22 @@ const next_seq = function() {
 
 // Handles incoming RPC msgs.
 // Tries to load the rpc handler module from root and if successful, passes the msg to it
-const rpc_handler = function( root, msg, _okay, _fail ) {
+const rpc_handler = function( root, msg, xport, _okay, _fail ) {
 
-	D( "----------->>> RPC "+o2j( msg, null, 2 ) );
+	D( "----------->>> "+xport+" "+o2j( msg, null, 2 ) );
 
 	const okay = data => {
-		D( "<<<=========== RPC OKAY "+o2j( data, null, 2 ) );
+		D( "<<<=========== "+xport+" OKAY "+o2j( data, null, 2 ) );
 		_okay( data );
 	};
 
 	const fail = error => {
-		D( "<<<*********** RPC ERROR "+o2j( error, null, 2 ) );
+		D( "<<<*********** "+xport+" ERROR "+o2j( error, null, 2 ) );
 		_fail( error );
 	};
 
 	const ouch = audit_error => {
-		//E( root + ": " + audit_error );
+		E( root + ": " + audit_error );
 		fail( "RPC error" );	// this is returned to browser
 	};
 
@@ -81,10 +78,10 @@ const rpc_handler = function( root, msg, _okay, _fail ) {
 // Glue function to call rpc handler module and then return response
 // via the websockets msg object
 const ws_msg_handler = function( root, msg ) {
-	rpc_handler( root, msg.msg, data => {
+	rpc_handler( root, msg.msg, "WS", data => {
 		msg.reply( data );
 	}, error => {
-		E( "This shouldn't happen." );
+		E( "This shouldn't happen: "+o2j(error,null,2) );
 	} );
 };
 
@@ -156,7 +153,7 @@ const basic_handler = function( root ) {
 		const fail = ( error, body ) => { done( error, body ); };
 
 		// Summon the rpc handler for the domain root.
-		rpc_handler( root, input, okay, fail );
+		rpc_handler( root, input, "REST", okay, fail );
 
 	} );
 
@@ -168,11 +165,19 @@ const basic_handler = function( root ) {
 	// Serve static files for domain
 	app.use( serveStatic( root + "/static" ) );
 
+	// finally, if serveStatic can't service the request,
+	// look for a 404/ dir and redirect to that if present
 	app.use( function( req, res, next ) {
-		res.writeHead( 302, {
-			"Location": "/404/",
-		});
-		res.end();
+		// I can't just return a redirect here because if the /404 doesn't exist,
+		// I will just go into a redirect loop, so I have to test to see if the
+		// dir exists, and then if so, redirect to it, otherwise, just return 404.
+		is_file( root + "/404", so => {
+			if( so )
+				res.writeHead( 302, { "Location": "/404/", });
+			else
+				res.writeHead( 404 );
+			res.end();
+		} );
 	} );
 
 	return app;
@@ -180,42 +185,35 @@ const basic_handler = function( root ) {
 }
 
 
-const rest_handler = function( root, req, res ) {
+// Handle REST calls (as opposed to websocket messages)
+const rest_handler = function( root, req, rsp ) {
 
 	I( req.headers[ "host" ] + ": " + req.method + " " + req.url );
 	D( "rest_handler root: " + root );
 
-	const ouch = ( log_msg, error ) => {
-		W( root + ": " + log_msg );
-		if( error ) {
+	const call = function( handler ) {
+		try {
+			handler( req, rsp );
+		} catch( error ) {
+			W( root + ": REST handler exception" );
 			E( error.stack );
+			try {
+				rsp.writeHead( 404 );
+				rsp.end();
+			} catch( err ) {}
 		}
-		try {
-			res.writeHead( 404 );
-			res.end();
-		} catch( err ) {}
-	};
+	}
 
+	// try loading custom handler first
 	try {
-
 		handler = require( root );
-		D( "Custom handler loaded from "+root );
-		try {
-			handler( req, res );
-		} catch( err ) {
-			ouch( "Custom handler exception", err );
-		}
-
+		D( "Using custom REST handler loaded from "+root );
+		call( handler );
 	} catch( err ) {
-
-		try {
-			const handler = basic_handler( root );
-			D( "Using basic handler" );
-			handler( req, res );
-		} catch( err ) {
-			ouch( "Basic handler exception", err );
-		}
-
+		// custom handler load attempt threw an exception
+		const handler = basic_handler( root );
+		D( "Using basic REST handler" );
+		call( handler );
 	}
 };
 
@@ -225,7 +223,7 @@ const ws_attach = function( httpServer, msg_handler ) {
 	const wsd = new websocket.server( { httpServer, autoAcceptConnections: false, } );
 
 	wsd.on( "request", function( req ) {
-		D( "WS: connection request from "+req.remoteAddress+" "+req.resource )
+		V( "WS: connection request from "+req.remoteAddress+" "+req.resource )
 	
 		const domain = req.httpRequest.headers[ "host" ];
 
@@ -238,7 +236,7 @@ const ws_attach = function( httpServer, msg_handler ) {
 			if( msg.msg_id === undefined ) {
 				msg.msg_id = "msg-id-" + next_seq();	// every message must have an id
 			}
-			D( name+" <-- WS --<< "+o2j( msg ) );
+			D( name+" <=== WS ===<< "+o2j( msg ) );
 			socket.send( o2j( msg ) ); 
 		};
 
@@ -254,7 +252,7 @@ const ws_attach = function( httpServer, msg_handler ) {
 
 		// incoming msgs from client come through here
 		socket.on( "message", function( x ) {
-			D( name+" >>-- WS --> "+x.utf8Data );
+			D( name+" >>--- WS ---> "+x.utf8Data );
 
 			const json = x.utf8Data;			// raw message is a utf8 string
 			const msg_in = j2o( json );