From fbef076ebc77e71db76d8ca09ffc40ecfe88efe7 Mon Sep 17 00:00:00 2001
From: iliajie <gpg@ilia.engineer>
Date: Thu, 27 Oct 2022 20:29:39 +0300
Subject: [PATCH 1/4] Fix not to expose active `socket` to a global scope

---
 xterm/index.cgi | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/xterm/index.cgi b/xterm/index.cgi
index 807994792..90ba5ff32 100644
--- a/xterm/index.cgi
+++ b/xterm/index.cgi
@@ -177,14 +177,18 @@ sleep(1);
 my $url = "wss://".$ENV{'HTTP_HOST'}.$wspath;
 my $term_script = <<EOF;
 
-var term = new Terminal($termjs_opts{'Options'}),
-    termcont = document.getElementById('terminal'),
-    socket = new WebSocket('$url', 'binary'),
-    attachAddon = new AttachAddon.AttachAddon(socket);
-termcont.focus();
-term.loadAddon(attachAddon);
-term.open(termcont);
-term.focus();
+(function() {
+	var socket = new WebSocket('$url', 'binary');
+	socket.onopen = function() {
+		var term = new Terminal($termjs_opts{'Options'}),
+		    termcont = document.getElementById('terminal'),
+		    attachAddon = new AttachAddon.AttachAddon(this);
+		term.loadAddon(attachAddon);
+		term.open(termcont);
+		term.focus();
+	};
+})();
+
 EOF
 
 # Return inline script data depending on type

From 2574e2012f39113887d1d71957332e25be88b34b Mon Sep 17 00:00:00 2001
From: iliajie <gpg@ilia.engineer>
Date: Thu, 27 Oct 2022 20:32:39 +0300
Subject: [PATCH 2/4] Fix to always clear screen as sometimes command-prompt is
 eaten up

---
 xterm/index.cgi | 1 +
 1 file changed, 1 insertion(+)

diff --git a/xterm/index.cgi b/xterm/index.cgi
index 90ba5ff32..e73e50b6e 100644
--- a/xterm/index.cgi
+++ b/xterm/index.cgi
@@ -186,6 +186,7 @@ my $term_script = <<EOF;
 		term.loadAddon(attachAddon);
 		term.open(termcont);
 		term.focus();
+		socket.send('clear\\r');
 	};
 })();
 

From 72cce4349b9d70c73eb855f1a56c7a14454f8196 Mon Sep 17 00:00:00 2001
From: iliajie <gpg@ilia.engineer>
Date: Thu, 27 Oct 2022 20:43:03 +0300
Subject: [PATCH 3/4] Add error handling

---
 xterm/index.cgi | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/xterm/index.cgi b/xterm/index.cgi
index e73e50b6e..aee5f28cd 100644
--- a/xterm/index.cgi
+++ b/xterm/index.cgi
@@ -178,16 +178,19 @@ my $url = "wss://".$ENV{'HTTP_HOST'}.$wspath;
 my $term_script = <<EOF;
 
 (function() {
-	var socket = new WebSocket('$url', 'binary');
+	var socket = new WebSocket('$url', 'binary'),
+	    termcont = document.getElementById('terminal');
 	socket.onopen = function() {
 		var term = new Terminal($termjs_opts{'Options'}),
-		    termcont = document.getElementById('terminal'),
 		    attachAddon = new AttachAddon.AttachAddon(this);
 		term.loadAddon(attachAddon);
 		term.open(termcont);
 		term.focus();
 		socket.send('clear\\r');
 	};
+	socket.onerror = function() {
+		termcont.innerHTML = '<tt style="color: \#ff0000">Error: Cannot connect to the socket $url</tt>';
+	};
 })();
 
 EOF

From 5204bd1a1b73e6ba1d4e0caf2bc2092680bfc2e1 Mon Sep 17 00:00:00 2001
From: iliajie <gpg@ilia.engineer>
Date: Thu, 27 Oct 2022 21:49:08 +0300
Subject: [PATCH 4/4] Add to support `onclose` event handler (for connection
 lost)

---
 xterm/index.cgi | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/xterm/index.cgi b/xterm/index.cgi
index aee5f28cd..e7e09ef96 100644
--- a/xterm/index.cgi
+++ b/xterm/index.cgi
@@ -179,7 +179,9 @@ my $term_script = <<EOF;
 
 (function() {
 	var socket = new WebSocket('$url', 'binary'),
-	    termcont = document.getElementById('terminal');
+	    termcont = document.getElementById('terminal'),
+	    err_conn_cannot = 'Cannot connect to the socket $url',
+	    err_conn_lost = 'Connection to the socket $url lost';
 	socket.onopen = function() {
 		var term = new Terminal($termjs_opts{'Options'}),
 		    attachAddon = new AttachAddon.AttachAddon(this);
@@ -189,7 +191,12 @@ my $term_script = <<EOF;
 		socket.send('clear\\r');
 	};
 	socket.onerror = function() {
-		termcont.innerHTML = '<tt style="color: \#ff0000">Error: Cannot connect to the socket $url</tt>';
+		termcont.innerHTML = '<tt style="color: \#ff0000">Error: ' +
+			err_conn_cannot + '</tt>';
+	};
+	socket.onclose = function() {
+		termcont.innerHTML = '<tt style="color: \#ff0000">Error: ' +
+			err_conn_lost + '</tt>';
 	};
 })();