wip

assets/index.html

@@ -12,11 +12,12 @@
   <script src="xterm-addon-attach.js"></script>
   <script src="xterm-addon-fit.js"></script>
   <script src="xterm-addon-web-links.js"></script>
-  <script src="main.js"></script>
 
+  <script src="main.js"></script>
 
   <link rel="stylesheet" href="xterm.css" />
   <link rel="stylesheet" href="main.css" />
+
   <title>Websocket Terminal</title>
 </head>
 
@@ -50,9 +51,6 @@
     ].join('\n\r');
 
     term.writeln(str);
-  term.writeln(str);
-  term.writeln(str);
-  
   </script>
 </body>
 

assets/main.css

@@ -14,12 +14,15 @@
 .xterm-viewport.xterm-viewport {
     scrollbar-width: thin;
 }
+
 .xterm-viewport::-webkit-scrollbar {
     width: 10px;
 }
+
 .xterm-viewport::-webkit-scrollbar-track {
     opacity: 0;
 }
+
 .xterm-viewport::-webkit-scrollbar-thumb {
     min-height: 20px;
     background-color: #ffffff20;

assets/main.js

@@ -1,5 +1,6 @@
 function createTerminal() {
   // vscode-snazzy https://github.com/Tyriar/vscode-snazzy
+  // copied from xterm.js website
   var baseTheme = {
     foreground: '#eff0eb',
     background: '#282a36',
@@ -23,16 +24,17 @@ function createTerminal() {
   };
 
   const term = new Terminal({
-    fontFamily:`'Fira Code', monospace`,
-    fontSize:12,
-    theme:baseTheme,
+    fontFamily: `'Fira Code', monospace`,
+    fontSize: 12,
+    theme: baseTheme,
+    convertEol: true,
   });
 
   term.open(document.getElementById('terminal_view'));
   term.resize(120, 36);
 
   const weblinksAddon = new WebLinksAddon.WebLinksAddon();
-  term.loadAddon(weblinksAddon)
+  term.loadAddon(weblinksAddon);
 
   // fit the xterm viewpoint to parent element
   const fitAddon = new FitAddon.FitAddon();
@@ -40,10 +42,9 @@ function createTerminal() {
   fitAddon.fit();
 
   // create the websocket and connect to the server
-  const ws_uri = "ws://" + window.location.host + "/ws"
-  const socket = new WebSocket(ws_uri)
-  console.log("Attempting to connect to" + ws_uri);
-  const attachAddon = new AttachAddon.AttachAddon(socket)
+  const ws_uri = "ws://" + window.location.host + "/ws";
+  const socket = new WebSocket(ws_uri);
+  const attachAddon = new AttachAddon.AttachAddon(socket);
   term.loadAddon(attachAddon);
 
   return term;

main.go

@@ -2,9 +2,10 @@ package main
 
 import (
 	"fmt"
-	"strings"
 	"net/http"
 	"net/url"
+	"strings"
+
 	"github.com/gin-gonic/gin"
 	"github.com/gorilla/websocket"
 )
@@ -12,11 +13,11 @@ import (
 var host *string = nil
 
 var upgrader = websocket.Upgrader{
-	ReadBufferSize : 4096,
+	ReadBufferSize:  4096,
 	WriteBufferSize: 4096,
 	CheckOrigin: func(r *http.Request) bool {
 		org := r.Header.Get("Origin")
-		h,err := url.Parse(org)
+		h, err := url.Parse(org)
 
 		if err != nil {
 			return false
@@ -32,9 +33,9 @@ var upgrader = websocket.Upgrader{
 
 // handle websockets
 func wsHandler(w http.ResponseWriter, r *http.Request) {
-	conn, err := upgrader.Upgrade(w,r, nil)
+	conn, err := upgrader.Upgrade(w, r, nil)
 
-	if err!= nil {
+	if err != nil {
 		fmt.Println(err)
 		return
 	}
@@ -44,12 +45,12 @@ func wsHandler(w http.ResponseWriter, r *http.Request) {
 	for {
 		msgType, p, err := conn.ReadMessage()
 
-		if err!= nil {
+		if err != nil {
 			fmt.Println(err)
 			return
 		}
 
-		if err := conn.WriteMessage(msgType, p); err!= nil {
+		if err := conn.WriteMessage(msgType, p); err != nil {
 			fmt.Println(err)
 			return
 		}
@@ -57,7 +58,7 @@ func wsHandler(w http.ResponseWriter, r *http.Request) {
 }
 
 // return files
-func fileHandler (c *gin.Context, fname string) {
+func fileHandler(c *gin.Context, fname string) {
 	// if the URL has no fname, c.Param returns "/"
 	if fname == "/" {
 		fname = "/index.html"
@@ -76,13 +77,13 @@ func fileHandler (c *gin.Context, fname string) {
 	}
 }
 
-func main () {
+func main() {
 	rt := gin.Default()
 
 	rt.SetTrustedProxies(nil)
 	rt.LoadHTMLGlob("assets/*.html")
 
-	rt.GET("/*fname", func(c *gin.Context){
+	rt.GET("/*fname", func(c *gin.Context) {
 		fname := c.Param("fname")
 
 		// ws is a special case to create a new websocket