From 0cfd10a8290f4732956adc655e32ba736d37b499 Mon Sep 17 00:00:00 2001
From: Quentin Perez <qperez@ocs.online.net>
Date: Wed, 21 Oct 2015 17:27:16 +0200
Subject: [PATCH] Use gotty-client instead of termjs-cli

---
 README.md          |  1 +
 pkg/utils/utils.go | 35 ++++++++---------------------------
 2 files changed, 9 insertions(+), 27 deletions(-)

diff --git a/README.md b/README.md
index f93e26b9a2..5552cd0422 100644
--- a/README.md
+++ b/README.md
@@ -1132,6 +1132,7 @@ $ scw inspect myserver | jq '.[0].public_ip.address'
 
 ### master (unreleased)
 
+* Use `gotty-client` instead of `termjs-cli`
 * Fix: bad detection of server already started when starting a server ([#224](https://github.com/scaleway/scaleway-cli/pull/224)) - [@arianvp](https://github.com/arianvp)
 * Added _cs ([#180](https://github.com/scaleway/scaleway-cli/issues/180))
 * Report **quotas** in `scw info` ([#130](https://github.com/scaleway/scaleway-cli/issues/130))
diff --git a/pkg/utils/utils.go b/pkg/utils/utils.go
index 6964969c72..6b2bf76ddc 100644
--- a/pkg/utils/utils.go
+++ b/pkg/utils/utils.go
@@ -21,6 +21,8 @@ import (
 	"strings"
 	"time"
 
+	"github.com/Sirupsen/logrus"
+	"github.com/moul/gotty-client"
 	"github.com/scaleway/scaleway-cli/pkg/sshcommand"
 	log "github.com/scaleway/scaleway-cli/vendor/github.com/Sirupsen/logrus"
 )
@@ -179,38 +181,17 @@ func RemoveDuplicates(elements []string) []string {
 	return result
 }
 
-const termjsBin string = "termjs-cli"
-
-// AttachToSerial tries to connect to server serial using 'term.js-cli' and fallback with a help message
+// AttachToSerial tries to connect to server serial using 'gotty-client' and fallback with a help message
 func AttachToSerial(serverID string, apiToken string, attachStdin bool) error {
-	termjsURL := fmt.Sprintf("https://tty.cloud.online.net?server_id=%s&type=serial&auth_token=%s", serverID, apiToken)
+	URL := fmt.Sprintf("https://tty.scaleway.com/v2/?arg=%s&arg=%s", apiToken, serverID)
 
-	args := []string{}
-	if !attachStdin {
-		args = append(args, "--no-stdin")
-	}
-	args = append(args, termjsURL)
-	log.Debugf("Executing: %s %v", termjsBin, args)
-	// FIXME: check if termjs-cli is installed
-	spawn := exec.Command(termjsBin, args...)
-	spawn.Stdout = os.Stdout
-	spawn.Stdin = os.Stdin
-	spawn.Stderr = os.Stderr
-	err := spawn.Run()
+	logrus.Debug("Connection to ", URL)
+	gottycli, err := gottyclient.NewClient(URL)
 	if err != nil {
-		log.Warnf(`
-You need to install '%s' from https://github.com/moul/term.js-cli
-
-    npm install -g term.js-cli
-
-However, you can access your serial using a web browser:
-
-    %s
-
-`, termjsBin, termjsURL)
 		return err
 	}
-	return nil
+	fmt.Println("You are connected, type 'Ctrl+q' to quit.")
+	return gottycli.Loop()
 }
 
 func SSHGetFingerprint(key string) (string, error) {