tlsd 2.4.1 → 2.6.0

package/proxy/zzz/was-nm/sleepless/test.js

@@ -0,0 +1,146 @@
+
+var l = console.log
+require("./sleepless.js")
+
+o = { a:[1,2,3], t:true, f:false, o:{key:'val'}, pi:3.1415, n:null };
+j = JSON.stringify(o);
+
+throwIf( typeof nop !== "function" );
+
+throwIf( o2j(o) !== j );
+throwIf( o2j(j2o(j)) !== j );
+
+throwIf( toInt(3) !== 3 );
+throwIf( toInt(3.0) !== 3 );
+throwIf( toInt("3") !== 3 );
+throwIf( toInt("1,234") !== 1234 );
+throwIf( toInt("1,234.56") !== 1234 );
+throwIf( toInt("-1,234.56") !== -1234 );
+throwIf( toInt(-1234.56) !== -1234 );
+
+throwIf( toFlt(3) !== 3 );
+throwIf( toFlt(3.0) !== 3 );
+throwIf( toFlt("3") !== 3 );
+throwIf( toFlt("1,234") !== 1234 );
+throwIf( toFlt("1,234.56") !== 1234.56 );
+throwIf( toFlt("-1,234.56") !== -1234.56 );
+throwIf( toFlt(-1234.56) !== -1234.56 );
+
+throwIf( c2b("10") !== 0.1 );
+throwIf( c2b("12345") !== 123.45 );
+throwIf( c2b(12345) !== 123.45 );
+throwIf( c2b(1) !== 0.01 );
+throwIf( b2c("100") !== 10000 );
+throwIf( b2c("1.23") !== 123 );
+throwIf( b2c("1,234.56") !== 123456 );
+throwIf( b2c("1,234.5") !== 123450 );
+throwIf( b2c("1,234") !== 123400 );
+throwIf( b2c("0.01") !== 1 );
+throwIf( b2c("0.01") !== 1 );
+
+throwIf( numFmt(0) !== "0" );
+throwIf( numFmt(0, 1) !== "0.0" );
+throwIf( numFmt(0, 4) !== "0.0000" );
+throwIf( numFmt(1, 4) !== "1.0000" );
+throwIf( numFmt(1.1, 3) !== "1.100" );
+throwIf( numFmt(-1.1, 3) !== "-1.100" );
+throwIf( numFmt(-1.104, 2) !== "-1.10" );
+throwIf( numFmt(1.105, 2) !== "1.11" );
+throwIf( numFmt(-1.105, 2) !== "-1.10" );
+throwIf( numFmt(1234) !== "1,234" );
+throwIf( numFmt(123456) !== "123,456" );
+throwIf( numFmt(1234567) !== "1,234,567" );
+throwIf( numFmt(1234, 1) !== "1,234.0" );
+throwIf( numFmt(1234, 3) !== "1,234.000" );
+throwIf( numFmt(1234, 3, ".", "") !== "1234.000" );
+throwIf( numFmt(-0.0001, 4, ":") !== "-0:0001" );
+throwIf( numFmt(1234, 3, ":", "!") !== "1!234:000" );
+
+throwIf( byteSize(123) !== "123 B" );
+throwIf( byteSize(1234) !== "1.2 KB" );
+throwIf( byteSize(1234567) !== "1.2 MB" );
+throwIf( byteSize(1234567890) !== "1.1 GB" );
+throwIf( byteSize(1234567890123) !== "1.1 TB" );
+
+throwIf( toMoney("0.01") !== "0.01" );
+throwIf( toMoney("31415.015") !== "31,415.02" );
+throwIf( toMoney("31415.01") !== "31,415.01" );
+throwIf( toMoney("31415.99") !== "31,415.99" );
+throwIf( toMoney(0.01) !== "0.01");
+throwIf( toMoney(31415.015) !== "31,415.02");
+throwIf( toMoney(31415.01) !== "31,415.01" );
+throwIf( toMoney(31415.99) !== "31,415.99" );
+throwIf( toMoney(-0.01) !== "-0.01" );
+throwIf( toMoney(-31415.016) !== "-31,415.02" );
+throwIf( toMoney(-31415.01) !== "-31,415.01" );
+throwIf( toMoney(-31415.99) !== "-31,415.99" );
+throwIf( toMoney("1,000.00") !== "1,000.00" );
+
+throwIf( toPct(1) !== "100", toPct(1) );
+throwIf( toPct(1.013, 0) !== "101" );
+throwIf( toPct(1.016, 0) !== "102" );
+throwIf( toPct(0.01, 0) !== "1" );
+throwIf( toPct(2.3, 3) !== "230.000" );
+throwIf( toPct(-314.15, 2) !== "-31,415.00" );
+
+throwIf( my2ts("") !== 0 );
+throwIf( my2ts("2014-01-02 12:13:14") !== 1388693594 );
+throwIf( my2ts(ts2my(1388693594)) !== 1388693594 );
+
+throwIf( dt2ts() !== 0 );
+throwIf( ts2us(1384565221) !== "11/15/2013 17:27:01" );
+throwIf( ts2us_md(1384565221) !== "11/15" );
+throwIf( ts2us_mdy(1384565221) !== "11/15/2013" );
+throwIf( ts2us_mdy2(1384565221) !== "11/15/13" );
+throwIf( ts2us_hm(1384565221) !== "17:27" );
+throwIf( ts2us_mdyhm(1384565221) !== "11/15/2013 17:27" );
+throwIf( ts2us_mdy2hm(1384565221) !== "11/15/13 17:27" );
+throwIf( ts2us_dMy(1384565221) !== "15-Nov-2013" );
+
+throwIf( !( us2dt("11/15/2013 17:27:01") instanceof Date) );
+throwIf( dt2ts( us2dt("11/15/2013 17:27:01") ) !== 1384565221 );
+
+throwIf( "foO".lcase() !== "foo" );
+throwIf( "foO".ucase() !== "FOO" );
+throwIf( "foO".ucfirst() !== "FoO" );
+throwIf( "foo baR".ucwords() !== "Foo BaR" );
+throwIf( "foo bar baz".abbr(7) !== "foo ..." );
+throwIf( "foo".abbr(7) != "foo" );		// XXX why doesn't this work with !== ?
+throwIf( " \tfoo bar \n".trim() !== "foo bar" );
+
+throwIf( "Foo Bar".toId() !== "foo_bar" );
+throwIf( "Foo_Bar".toId() !== "foo_bar" );
+throwIf( " Foo_Bar ! ".toId() !== "foo_bar" );
+throwIf( "foo_bar".toLabel() !== "Foo Bar" );
+throwIf( "foo_bar".toLabel() !== "Foo Bar" );
+throwIf( "foo_bar!".toLabel() !== "Foo Bar!" );
+
+getFile("test.js", "utf8", function(err, data) {
+	throwIf( err, err );
+	throwIf( getFile("test.js").toString() !== data.toString() );
+});
+
+throwIf( sha1("I have a lovely bunch of coconuts.") !== "9fd0f467384256f02560d0694316b6d9bdfe7c68");
+throwIf( sha256("I have a lovely bunch of coconuts.") !== "1a983ac204ea2bc92d8871d53111e021483c12a3e1ccb8ec59b0d62f3167cb13");
+
+throwIf( "I,\nhave a lovely bunch of coconuts.".looksLike("i have", "coconuts") !== true)
+
+throwIf( "joe@sleepless.com".is_email() !== true );
+throwIf( "a@b.cd".is_email() !== true );
+throwIf( "aaaaaaaaaaaaaaaaaaaa-_12.aaaa@bbbbbb.cccccccc.dddddddddddddddd".is_email() !== true );
+throwIf( "joe.sleepless.com".is_email() !== false );
+
+Thing = function() {
+	this.name = "Mr. Thing";
+}
+
+t = new EE(Thing);
+t.on("foo", function(n) {
+	throwIf(n != "Mr. Thing");
+})
+t.emit("foo", t.name);
+
+if(isBrowser) {
+}
+
+

package/server_static/rpc/rpc.js

@@ -196,13 +196,10 @@
 		let xhr = new XMLHttpRequest();
 		xhr.onload = function() {
 			let r = j2o( xhr.responseText );
-			if( ! r ) {
+			if( r === null && xhr.responseText !== "null" ) {
 				return fail( "Error parsing response from server." );
 			}
-			if( r.error ) {
-				return fail( r.error );
-			}
-			okay( r.data, xhr );
+			okay( r, xhr );
 		};
 		xhr.onerror = fail;
 		xhr.open( "POST", RPC_URL );

package/test.html

@@ -0,0 +1,4 @@
+<html>
+<head>
+#include head.html
+</head>

package/tlsd

@@ -95,13 +95,22 @@ if [ "$cmd" = "init" ] ; then
 
 fi
 
+if [ "$cmd" = "domain" ] ; then
+	domain="$2"
+	if cd "$home" ; then
+		npx greenlock add --subject "$domain" --altnames "$domain"
+		exit 0
+	else
+		exit 1
+	fi
+fi
 
 if [ "$cmd" = "version" ] || [ "$cmd" = "-v" ] ; then
 	node "$home/tlsd.js" -v
-	exit 0;
+	exit 0
 fi
 
 
-echo "Usage: tlsd init|run|version ..."
+echo "Usage: tlsd init|run|domain|version ..."
 exit 1
 

package/tlsd.js

@@ -46,34 +46,34 @@ 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, _okay, _fail ) {
 
-	D( "----------->>> RPC "+o2j( msg, null, 2 ));
+	D( "----------->>> RPC "+o2j( msg, null, 2 ) );
 
 	const okay = data => {
-		D( "<<<=========== RPC OKAY "+o2j(data, null, 2 ));
+		D( "<<<=========== RPC OKAY "+o2j( data, null, 2 ) );
 		_okay( data );
 	};
+
 	const fail = error => {
-		D( "<<<===******** RPC FAIL "+o2j(error, null, 2 ));
+		D( "<<<*********** RPC ERROR "+o2j( error, null, 2 ) );
 		_fail( error );
 	};
 
-	const ouch = ( log_msg, error ) => {
-		W( root + ": " + log_msg );
-		if( error ) {
-			E( error.stack );
-		}
-		fail( "RPC error" );
+	const ouch = audit_error => {
+		//E( root + ": " + audit_error );
+		fail( "RPC error" );	// this is returned to browser
 	};
 
 	try {
 		const mod = require( root + "/rpc" );
 		try {
-			mod( msg, okay, fail );
+			mod( msg, okay, ouch );
 		} catch( err ) {
-			ouch( "RPC handler exception", err );
+			E( err );
+			ouch( "RPC handler exception" );
 		}
 	} catch( err ) {
-		ouch( "Error loading RPC handler", err );
+		E( err );
+		ouch( "Error loading RPC handler" );
 	}
 };
 
@@ -82,9 +82,9 @@ const rpc_handler = function( root, msg, _okay, _fail ) {
 // via the websockets msg object
 const ws_msg_handler = function( root, msg ) {
 	rpc_handler( root, msg.msg, data => {
-		msg.reply( { data } );
+		msg.reply( data );
 	}, error => {
-		msg.reply( { error } );
+		E( "This shouldn't happen." );
 	} );
 };
 
@@ -168,6 +168,8 @@ const basic_handler = function( root ) {
 	// Serve static files for domain
 	app.use( serveStatic( root + "/static" ) );
 
+	app.use( serveStatic( root + "/static/404" ) );
+
 	return app;
 
 }

package/foo/rpc/index.js

@@ -1,13 +0,0 @@
-
-module.exports = ( input, okay, fail ) => {
-
-	const action = input.action;
-
-	if( action == "hello" ) {
-		return okay( "welcome" );
-	}
-
-	fail( "Invalid action: "+action );
-
-};
-

package/foo/static/index.html

@@ -1,15 +0,0 @@
-<html>
-<body>
-	
-	<h1> Hello </h1>
-
-	<script src="/rpc/rpc.js"></script>
-
-	<script>
-		RPC.on_connect = evt => {
-			RPC( { action: "hello" }, console.log, alert );
-		};
-	</script>
-
-</body>
-</html>