tlsd 2.9.0 → 2.10.0

package/package.json

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

package/rpc_static/rpc/rpc.js

@@ -118,8 +118,9 @@
 		var socket = new WebSocket( ( loc.protocol == "http:" ? "ws:" : "wss:" ) + "//" + loc.host + path )
 
 		socket.onerror = function( evt ) {
-			DBG( "error:", evt.data );
-			cb_ctrl( "error", evt.data );
+            evt.preventDefault();
+			DBG( "error:", evt );
+			cb_ctrl( "error", evt );
 		}
 
 		socket.onclose = function() {

package/scaffold/static/index.html

@@ -9,6 +9,8 @@
         document.write( Date() );
     </script>
 
+    <div id=connect_status>?</div>
+
 	<script src="/rpc/rpc.js"></script>
 
 	<script>
@@ -32,9 +34,17 @@
 
 		RPC.on_connect = function( evt ) {
 			// RPC is ready to be used
-			RPC( { action: "hello" }, console.log, alert )
+			RPC( { action: "hello" }, msg => {
+                document.getElementById( "connect_status" ).innerText = msg;
+            } );
 		}
 
+		RPC.on_disconnect = function( evt ) {
+            // The websocket connection ws lost for some reason
+            // The RPC code will reconnect automatically
+            document.getElementById( "connect_status" ).innerText = "[ DISCONNECTED ]";
+        }
+
 	</script>
 
 </body>

package/scaffold/static/local.sass

@@ -9,3 +9,7 @@ h1
   a
     font-style: italic
 
+#connect_status
+    margin: 2em 0
+    font-size: 200%
+    font-size: 100%

package/scaffold/static/local.sass.css

@@ -9,4 +9,10 @@ h1 {
 }
 h1 a {
   font-style: italic;
+}
+
+#connect_status {
+  margin: 2em 0;
+  font-size: 200%;
+  font-size: 100%;
 }

package/tlsd.js

@@ -43,6 +43,17 @@ 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 ) {
 
+	let ll = toInt( msg.log_level );
+    if( ll > 0 ) {
+	    D( "Setting log level to "+ll );
+		log_level = ll;
+		L( log_level );
+        setTimeout( () => { 
+            ll = process.env.VERBOSITY;
+            D( "Reverting log level to "+ll );
+        }, 15 * 1000 );
+	}
+
 	V( "RPC " + o2j( msg ).abbr( 70 ) );
 	D( "----------->>> "+xport+" "+o2j( msg, null, 2 ) );
 
@@ -306,8 +317,8 @@ const ws_attach = function( httpServer, msg_handler ) {
 
 
 
+/*
 const build_sass = function( path ) {
-    //D( "_________ auto_build sass " + path );
     const sass = require( "sass" );
     const result = sass.compile( path );
     fs.writeFileSync( path + ".css", result.css, "utf8" );
@@ -321,7 +332,6 @@ const auto_builders = [
 const auto_build = function( paths ) {
 
     for( let path of paths ) {
-//        D( "___ path? " + path );
         for( const bldr of auto_builders ) {
             if( bldr[ 0 ].test( path ) ) {
                 bldr[ 1 ]( path );
@@ -381,6 +391,7 @@ const enable_fs_watch = function( root ) {
     } );
 
 };
+*/
 
 
 // -----------------------
@@ -455,7 +466,7 @@ if( argv.length == 5 ) {
 			} );
 
             // enable the file system watch, which handles hot-reload and auto-build
-            enable_fs_watch( SITE_ROOT );
+            // enable_fs_watch( SITE_ROOT );
 
 			I( "Listening on " + PORT + " & serving from " + SITE_ROOT );