Fix connect and add trayicon

Author: matteosuppo

connect_v1.go

@@ -29,40 +29,43 @@
 package main
 
 import (
-	"log"
+	"bytes"
+
+	"golang.org/x/net/context"
+
+	serial "go.bug.st/serial.v1"
 
 	"github.com/arduino/arduino-create-agent/app"
-	"github.com/arduino/arduino-create-agent/connect"
+	"github.com/codeclysm/cc"
 	"github.com/goadesign/goa"
 	"github.com/gorilla/websocket"
-	"golang.org/x/net/context"
 )
 
-type device struct {
-	input  chan []byte
-	output chan []byte
-	cancel func()
-}
+type conns map[*websocket.Conn]*cc.Stoppable
 
 // ConnectV1Controller implements the connect_v1 resource.
 type ConnectV1Controller struct {
 	*goa.Controller
-	devices map[string]device
+	sockets conns
 }
 
 // NewConnectV1Controller creates a connect_v1 controller.
 func NewConnectV1Controller(service *goa.Service) *ConnectV1Controller {
 	return &ConnectV1Controller{
 		Controller: service.NewController("ConnectV1Controller"),
-		devices:    make(map[string]device),
+		sockets:    make(conns),
 	}
 }
 
 // Websocket runs the websocket action.
 func (c *ConnectV1Controller) Websocket(ctx *app.WebsocketConnectV1Context) error {
-	cont, cancel := context.WithCancel(context.Background())
-	input, output, err := connect.Open(cont, ctx.Port, ctx.Baud)
+	// Open port
+	mode := &serial.Mode{
+		BaudRate: ctx.Baud,
+	}
+	port, err := serial.Open(ctx.Port, mode)
 	if err != nil {
+		goa.LogError(ctx, err.Error())
 		return ctx.BadRequest()
 	}
 
@@ -73,28 +76,74 @@ func (c *ConnectV1Controller) Websocket(ctx *app.WebsocketConnectV1Context) erro
 
 	conn, err := upgrader.Upgrade(ctx.ResponseWriter, ctx.Request, nil)
 	if err != nil {
+		goa.LogError(ctx, err.Error())
 		return ctx.BadRequest()
 	}
 
-	go func() {
-		for msg := range output {
-			log.Println(len(msg))
+	c.sockets[conn] = cc.Run(listen(ctx, conn, port))
 
-			conn.WriteMessage(websocket.TextMessage, msg)
-		}
+	<-c.sockets[conn].Stopped
+	delete(c.sockets, conn)
+
+	conn.Close()
+
+	return nil
+}
+
+// StopAll stops all websocket connections
+func (c *ConnectV1Controller) StopAll() {
+	for conn, stoppable := range c.sockets {
 		conn.Close()
-	}()
+		stoppable.Stop()
+		<-stoppable.Stopped
+	}
+}
 
-	for {
-		_, msg, err := conn.ReadMessage()
-		if err != nil {
-			break
-		}
+func listen(ctx context.Context, conn *websocket.Conn, port serial.Port) (reader, writer cc.StoppableFunc) {
+	reader = func(done chan struct{}) {
+	L:
+		for {
+			select {
+			case <-done:
+				break L
 
-		input <- msg
+			default:
+				msg := make([]byte, 1024)
+				n, err := port.Read(msg)
+				if err != nil {
+					goa.LogError(ctx, err.Error(), "when", "read from port")
+					break L
+				}
+				if n > 0 {
+					conn.WriteMessage(websocket.TextMessage, bytes.Trim(msg, "\x00"))
+				}
+			}
+		}
 	}
 
-	cancel()
+	writer = func(done chan struct{}) {
+	L:
+		for {
+			select {
+			case <-done:
+				break L
 
-	return nil
+			default:
+				_, msg, err := conn.ReadMessage()
+				if err != nil {
+					goa.LogError(ctx, err.Error(), "when", "read from websocket")
+					break L
+				}
+				_, err = port.Write(msg)
+				if err != nil {
+					goa.LogError(ctx, err.Error(), "when", "write on port")
+					break L
+				}
+			}
+		}
+		port.Close()
+		conn.Close()
+	}
+
+	return reader, writer
 }

main.go

@@ -31,17 +31,30 @@
 package main
 
 import (
+	"flag"
+	"log"
+	"os"
+	"os/exec"
+	"strings"
 	"time"
 
 	"golang.org/x/net/context"
 
 	"github.com/arduino/arduino-create-agent/app"
 	"github.com/arduino/arduino-create-agent/discovery"
+	"github.com/getlantern/systray"
 	"github.com/goadesign/goa"
 	"github.com/goadesign/goa/middleware"
+	"github.com/kardianos/osext"
 )
 
 func main() {
+	var (
+		hibernate = flag.Bool("hibernate", false, "start hibernated")
+	)
+
+	flag.Parse()
+
 	// Create service
 	service := goa.New("arduino-create-agent")
 
@@ -67,9 +80,50 @@ func main() {
 	public := NewPublicController(service)
 	app.MountPublicController(service, public)
 
+	// Mount systray
+	restart := restartFunc("", !*hibernate)
+	shutdown := func() {
+		os.Exit(0)
+	}
+	go setupSystray(*hibernate, "XXX", "YYY", restart, shutdown)
+
 	// Start service
 	if err := service.ListenAndServe(":9000"); err != nil {
 		service.LogError("startup", "err", err)
 	}
+}
 
+// RestartFunc launches itself before exiting. It works because we pass an option to tell it to wait for 5 seconds, which gives us time to exit and unbind from serial ports and TCP/IP
+// sockets like :8989
+func restartFunc(path string, hibernate bool) func() {
+	return func() {
+		// Quit systray
+		systray.Quit()
+
+		// figure out current path of executable so we know how to restart
+		// this process using osext
+		exePath, err := osext.Executable()
+		if err != nil {
+			log.Fatalf("Error getting exe path using osext lib. err: %v\n", err)
+		}
+
+		if path == "" {
+			log.Printf("exePath using osext: %v\n", exePath)
+		} else {
+			exePath = path
+		}
+		exePath = strings.Trim(exePath, "\n")
+		hiberString := ""
+		if hibernate {
+			hiberString = "-hibernate"
+		}
+
+		// Execute command
+		cmd := exec.Command(exePath, hiberString)
+		err = cmd.Start()
+		if err != nil {
+			log.Fatalf("Got err restarting spjs: %v\n", err)
+		}
+		os.Exit(0)
+	}
 }

pool/pool.go

@@ -0,0 +1 @@
+package pool

pool/pool_test.go

@@ -0,0 +1,21 @@
+package pool_test
+
+import (
+	"io"
+	"testing"
+)
+
+func TestReaderFail(t *testing.T) {
+	p := pool.New()
+
+	var rwc io.ReadWriteCloser
+
+	p.Write(rwc, []byte("msg"))
+
+	p.Read(rwc, func(n int, msg []byte) {
+
+	})
+
+	p.CloseAll()
+
+}

systray.go

@@ -29,21 +29,24 @@
 package main
 
 import (
+	"os"
 	"runtime"
 
 	"github.com/arduino/arduino-create-agent/icon"
 	"github.com/getlantern/systray"
 	"github.com/skratchdot/open-golang/open"
 )
 
-func setupSystray(hybernate bool, version, revision string, shutdown func()) {
+func setupSystray(hibernate bool, version, revision string, restart, shutdown func()) {
 	runtime.LockOSThread()
-	if !hybernate {
-		systray.Run(setupSystrayReal(version, revision, shutdown))
+	if !hibernate {
+		systray.Run(setupSystrayReal(version, revision, restart))
+	} else {
+		systray.Run(setupSysTrayHibernate(restart, shutdown))
 	}
 }
 
-func setupSystrayReal(version, revision string, shutdown func()) func() {
+func setupSystrayReal(version, revision string, restart func()) func() {
 	return func() {
 		systray.SetIcon(icon.GetIcon())
 		mURL := systray.AddMenuItem("Go to Arduino Create", "Arduino Create")
@@ -58,14 +61,36 @@ func setupSystrayReal(version, revision string, shutdown func()) func() {
 			for {
 				select {
 				case <-mPause.ClickedCh:
-					shutdown()
-				// TODO: Restart ?
+					systray.Quit()
+					restart()
 				case <-mDebug.ClickedCh:
-					open.Start("http://localhost:9000")
+					open.Start("http://localhost:9000/debug")
 				case <-mURL.ClickedCh:
 					open.Start("https://create.arduino.cc")
 				}
 			}
 		}()
 	}
 }
+
+func setupSysTrayHibernate(restart, shutdown func()) func() {
+	return func() {
+		systray.SetIcon(icon.GetIconHiber())
+		mOpen := systray.AddMenuItem("Open Plugin", "")
+		mQuit := systray.AddMenuItem("Kill Plugin", "")
+
+		// Listen for events
+		go func() {
+			for {
+				select {
+				case <-mOpen.ClickedCh:
+					systray.Quit()
+					restart()
+				case <-mQuit.ClickedCh:
+					systray.Quit()
+					os.Exit(0)
+				}
+			}
+		}()
+	}
+}

templates/debug.html

@@ -94,6 +94,11 @@ <h1>Arduino Create Agent - Debug</h1>
 	var formEl = document.getElementById('connect-form');
 	var codeEl = document.getElementById('connect-code');
 
+	if (ws) {
+		ws.onclose = function () {};
+		ws.close();
+	}
+
 	codeEl.textContent = '';
 	ws = new WebSocket("ws://localhost:9000/v1/connect?port=" + port + "&baud=" + baud);
 	ws.onopen = function () {