From 8edd6e8c841bb4c161e06799aa50a2931457bf25 Mon Sep 17 00:00:00 2001
From: David Botton <david@botton.com>
Date: Fri, 19 Mar 2021 06:18:46 -0400
Subject: [PATCH] update boot.js remove old code and add to test to use static
 version

---
 source/clog-connection.lisp |  8 -------
 static-files/js/boot.js     | 48 ++++++++++++++++---------------------
 test/test-clog.lisp         |  2 +-
 3 files changed, 22 insertions(+), 36 deletions(-)

diff --git a/source/clog-connection.lisp b/source/clog-connection.lisp
index e935f4b..e4b0fe4 100644
--- a/source/clog-connection.lisp
+++ b/source/clog-connection.lisp
@@ -51,7 +51,6 @@ script."
   (debug-mode        function)
   (set-html-on-close function))
 
-
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Implemetation - clog-connection
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -470,7 +469,6 @@ the browser contents in case of connection loss."
   "Returns a compiled version of current version of boot.js (private)"
 "var ws;
 var adr;
-var params={};
 var clog={};
 var pingerid;
 
@@ -551,12 +549,6 @@ $( document ).ready(function() {
     clog['document']=window.document;
     clog['location']=window.location;
     
-    s = s.split('+').join(' ');
-    
-    while (tokens = r.exec(s)) {
-        params[decodeURIComponent(tokens[1])] = decodeURIComponent(tokens[2]);
-    }
-    
     if (location.protocol == 'https:') {
         adr = 'wss://' + location.hostname;
     } else {
diff --git a/static-files/js/boot.js b/static-files/js/boot.js
index bf636dd..0512b14 100644
--- a/static-files/js/boot.js
+++ b/static-files/js/boot.js
@@ -1,6 +1,6 @@
+/*static version*/
 var ws;
 var adr;
-var params={};
 var clog={};
 var pingerid;
 
@@ -10,7 +10,7 @@ if (typeof clog_debug == 'undefined') {
 
 function Ping_ws() {
     if (ws.readyState == 1) {
-        ws.send ("0");
+        ws.send ('0');
     }
 }
 
@@ -22,7 +22,7 @@ function Shutdown_ws(event) {
 	ws = null;
     }
     clearInterval (pingerid);
-    if (clog['html_on_close'] != "") {
+    if (clog['html_on_close'] != '') {
         $(document.body).html(clog['html_on_close']);
     }
 }
@@ -31,7 +31,7 @@ function Setup_ws() {
     ws.onmessage = function (event) {
         try {
             if (clog_debug == true) {
-		console.log ("eval data = " + event.data);
+		console.log ('eval data = ' + event.data);
             }
             eval (event.data);
         } catch (e) {
@@ -40,29 +40,29 @@ function Setup_ws() {
     }
     
     ws.onerror = function (event) {
-        console.log ("onerror: reconnect");
+        console.log ('onerror: reconnect');
         ws = null;
-        ws = new WebSocket (adr  + "?r=" + clog['connection_id']);
+        ws = new WebSocket (adr  + '?r=' + clog['connection_id']);
         ws.onopen = function (event) {
-            console.log ("onerror: reconnect successful");
+            console.log ('onerror: reconnect successful');
             Setup_ws();
         }
         ws.onclose = function (event) {
-            console.log ("onerror: reconnect failure");
+            console.log ('onerror: reconnect failure');
             Shutdown_ws(event);
         }
     }
     
     ws.onclose = function (event) {
-        console.log ("onclose: reconnect");
+        console.log ('onclose: reconnect');
         ws = null;
-        ws = new WebSocket (adr  + "?r=" + clog['connection_id']);
+        ws = new WebSocket (adr  + '?r=' + clog['connection_id']);
         ws.onopen = function (event) {
-            console.log ("onclose: reconnect successful");
+            console.log ('onclose: reconnect successful');
             Setup_ws();
         }
         ws.onclose = function (event) {
-            console.log ("onclose: reconnect failure");
+            console.log ('onclose: reconnect failure');
             Shutdown_ws(event);
         }
     }
@@ -81,36 +81,30 @@ $( document ).ready(function() {
     clog['document']=window.document;
     clog['location']=window.location;
     
-    s = s.split("+").join(" ");
-    
-    while (tokens = r.exec(s)) {
-        params[decodeURIComponent(tokens[1])] = decodeURIComponent(tokens[2]);
-    }
-    
-    if (location.protocol == "https:") {
-        adr = "wss://" + location.hostname;
+    if (location.protocol == 'https:') {
+        adr = 'wss://' + location.hostname;
     } else {
-        adr = "ws://" + location.hostname;
+        adr = 'ws://' + location.hostname;
     }
     
-    if (location.port != "") { adr = adr + ":" + location.port; }
-    adr = adr + "/clog";
+    if (location.port != '') { adr = adr + ':' + location.port; }
+    adr = adr + '/clog';
     
     try {
-        console.log ("connecting to " + adr);
+        console.log ('connecting to ' + adr);
         ws = new WebSocket (adr);
     } catch (e) {
-        console.log ("trying again, connecting to " + adr);
+        console.log ('trying again, connecting to ' + adr);
         ws = new WebSocket (adr);
     }
     
     if (ws != null) {
         ws.onopen = function (event) {
-            console.log ("connection successful");
+            console.log ('connection successful');
             Setup_ws();
         }
         pingerid = setInterval (function () {Ping_ws ();}, 10000);
     } else {
-        document.writeln ("If you are seeing this your browser or your connection to the internet is blocking websockets.");
+        document.writeln ('If you are seeing this your browser or your connection to the internet is blocking websockets.');
     }
 });
diff --git a/test/test-clog.lisp b/test/test-clog.lisp
index 7a8d0c2..0aed4ac 100644
--- a/test/test-clog.lisp
+++ b/test/test-clog.lisp
@@ -83,6 +83,6 @@
 
 (defun test ()
   (print "Init connection")
-  (initialize #'on-new-window :boot-file "/debug.html")
+  (initialize #'on-new-window :boot-file "/debug.html" :static-boot-js t)
   (print "Open browser")
   (open-browser))