rework update and quit button

Author: facchinm

hub.go

@@ -114,6 +114,11 @@ func checkCmd(m []byte) {
 
 	sl := strings.ToLower(strings.Trim(s, "\n"))
 
+	if *hibernate == true {
+		//do nothing
+		return
+	}
+
 	if strings.HasPrefix(sl, "open") {
 
 		// check if user wants to open this port as a secondary port
@@ -211,7 +216,7 @@ func checkCmd(m []byte) {
 	} else if strings.HasPrefix(sl, "broadcast") {
 		go broadcast(s)
 	} else if strings.HasPrefix(sl, "restart") {
-		restart()
+		restart("")
 	} else if strings.HasPrefix(sl, "exit") {
 		exit()
 	} else if strings.HasPrefix(sl, "memstats") {
@@ -292,7 +297,7 @@ func exit() {
 
 }
 
-func restart() {
+func restart(path string) {
 	// relaunch ourself and exit
 	// the relaunch works because we pass a cmdline in
 	// that has serial-port-json-server only initialize 5 seconds later
@@ -320,22 +325,35 @@ func restart() {
 	// using osext
 	exePath, err3 := osext.Executable()
 	if err3 != nil {
-		fmt.Printf("Error getting exe path using osext lib. err: %v\n", err3)
+		log.Printf("Error getting exe path using osext lib. err: %v\n", err3)
 	}
-	fmt.Printf("exePath using osext: %v\n", exePath)
 
+	if path == "" {
+		log.Printf("exePath using osext: %v\n", exePath)
+	} else {
+		exePath = path
+	}
 	// figure out garbageCollection flag
 	//isGcFlag := "false"
 
 	var cmd *exec.Cmd
+
 	/*if *isGC {
 		//isGcFlag = "true"
 		cmd = exec.Command(exePath, "-ls", "-addr", *addr, "-regex", *regExpFilter, "-gc")
 	} else {
 		cmd = exec.Command(exePath, "-ls", "-addr", *addr, "-regex", *regExpFilter)
 
 	}*/
-	cmd = exec.Command(exePath, "-ls", "-addr", *addr, "-regex", *regExpFilter, "-gc", *gcType)
+
+	hiberString := ""
+	if *hibernate == true {
+		hiberString = "-hibernate"
+	}
+
+	cmd = exec.Command(exePath, "-ls", "-addr", *addr, "-regex", *regExpFilter, "-gc", *gcType, hiberString)
+
+	fmt.Println(cmd)
 
 	//cmd := exec.Command("./serial-port-json-server", "ls")
 	err := cmd.Start()

main.go

@@ -15,7 +15,6 @@ import (
 	//"github.com/sanderhahn/gozip"
 	"github.com/gin-gonic/gin"
 	"github.com/itsjamie/gin-cors"
-	"github.com/kardianos/service"
 	"github.com/vharitonsky/iniflags"
 	"runtime/debug"
 	"text/template"
@@ -27,6 +26,7 @@ var (
 	git_revision         = "xxxxxxxx"
 	embedded_autoupdate  = true
 	embedded_autoextract = false
+	hibernate            = flag.Bool("hibernate", false, "start hibernated")
 	addr                 = flag.String("addr", ":8989", "http service address")
 	addrSSL              = flag.String("addrSSL", ":8990", "https service address")
 	//assets       = flag.String("assets", defaultAssetPath(), "path to assets")
@@ -94,56 +94,9 @@ func launchSelfLater() {
 	log.Println("Done waiting 5 secs. Now launching...")
 }
 
-var logger service.Logger
-
-type program struct{}
-
-func (p *program) Start(s service.Service) error {
-	// Start should not block. Do the actual work async.
-	go p.run()
-	return nil
-}
-func (p *program) run() {
-	startDaemon()
-}
-func (p *program) Stop(s service.Service) error {
-	// Stop should not block. Return with a few seconds.
-	<-time.After(time.Second * 13)
-	return nil
-}
-
 func main() {
-	svcConfig := &service.Config{
-		Name:        "ArduinoCreateAgent",
-		DisplayName: "Arduino Create Agent",
-		Description: "A bridge that allows Arduino Create to operate on the boards connected to the computer",
-	}
 
-	prg := &program{}
-	s, err := service.New(prg, svcConfig)
-	if err != nil {
-		log.Fatal(err)
-	}
-	if len(os.Args) > 1 {
-		err = service.Control(s, os.Args[1])
-		if err != nil {
-			log.Fatal(err)
-		}
-		return
-	}
-
-	logger, err = s.Logger(nil)
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	err = s.Run()
-	if err != nil {
-		logger.Error(err)
-	}
-}
-
-func startDaemon() {
+	flag.Parse()
 	go func() {
 
 		// autoextract self
@@ -153,18 +106,22 @@ func startDaemon() {
 		if embedded_autoextract {
 			// save the config.ini (if it exists)
 			if _, err := os.Stat(dest + "/" + *configIni); os.IsNotExist(err) {
-				fmt.Println("First run, unzipping self")
+				log.Println("First run, unzipping self")
 				err := Unzip(src, dest)
-				fmt.Println("Self extraction, err:", err)
+				log.Println("Self extraction, err:", err)
 			}
 
 			if _, err := os.Stat(dest + "/" + *configIni); os.IsNotExist(err) {
 				flag.Parse()
-				fmt.Println("No config.ini at", *configIni)
+				log.Println("No config.ini at", *configIni)
 			} else {
+				flag.Parse()
 				flag.Set("config", dest+"/"+*configIni)
 				iniflags.Parse()
 			}
+		} else {
+			flag.Set("config", dest+"/"+*configIni)
+			iniflags.Parse()
 		}
 
 		//log.SetFormatter(&log.JSONFormatter{})
@@ -316,18 +273,23 @@ const homeTemplateHtml = `<!DOCTYPE html>
     var socket;
     var msg = $("#msg");
     var log = document.getElementById('log');
+    var pause = document.getElementById('myCheck');
     var messages = [];
+    var only_log = true;
 
     function appendLog(msg) {
-    	messages.push(msg);
-    	if (messages.length > 100) {
-    		messages.shift();
-    	}
-    	var doScroll = log.scrollTop == log.scrollHeight - log.clientHeight;
-    	log.innerHTML = messages.join("<br>");
-        if (doScroll) {
-            log.scrollTop = log.scrollHeight - log.clientHeight;
-        }
+
+		if (!pause.checked && (only_log == false || (!(msg.indexOf("{") == 0) && only_log == true))) {
+			messages.push(msg);
+			if (messages.length > 100) {
+				messages.shift();
+			}
+			var doScroll = log.scrollTop == log.scrollHeight - log.clientHeight;
+			log.innerHTML = messages.join("<br>");
+			if (doScroll) {
+				log.scrollTop = log.scrollHeight - log.clientHeight;
+			}
+		}
     }
 
     $("#form").submit(function() {
@@ -338,6 +300,8 @@ const homeTemplateHtml = `<!DOCTYPE html>
             return false;
         }
         socket.emit("command", msg.val());
+        if (msg.val().indexOf("log on") != -1) {only_log = true;}
+        if (msg.val().indexOf("log off") != -1) {only_log = false;}
         msg.val("");
         return false
     });

serial.go

@@ -90,18 +90,17 @@ type SpPortList struct {
 }
 
 type SpPortItem struct {
-	Name                      string
-	Friendly                  string
-	SerialNumber              string
-	DeviceClass               string
-	IsOpen                    bool
-	IsPrimary                 bool
-	RelatedNames              []string
-	Baud                      int
-	BufferAlgorithm           string
-	AvailableBufferAlgorithms []string
-	Ver                       float32
-	NetworkPort               bool
+	Name            string
+	Friendly        string
+	SerialNumber    string
+	DeviceClass     string
+	IsOpen          bool
+	IsPrimary       bool
+	RelatedNames    []string
+	Baud            int
+	BufferAlgorithm string
+	Ver             string
+	NetworkPort     bool
 }
 
 // SerialPorts contains the ports attached to the machine
@@ -513,21 +512,20 @@ func spListDual(network bool) {
 			DtrOn                     bool
 			BufferAlgorithm           string
 			AvailableBufferAlgorithms []string
-			Ver                       float32
+			Ver                       string
 		*/
 		spl.Ports[ctr] = SpPortItem{
-			Name:                      item.Name,
-			Friendly:                  item.FriendlyName,
-			SerialNumber:              item.SerialNumber,
-			DeviceClass:               item.DeviceClass,
-			IsOpen:                    false,
-			IsPrimary:                 false,
-			RelatedNames:              item.RelatedNames,
-			Baud:                      0,
-			BufferAlgorithm:           "",
-			AvailableBufferAlgorithms: availableBufferAlgorithms,
-			Ver:         versionFloat,
-			NetworkPort: item.NetworkPort,
+			Name:            item.Name,
+			Friendly:        item.FriendlyName,
+			SerialNumber:    item.SerialNumber,
+			DeviceClass:     item.DeviceClass,
+			IsOpen:          false,
+			IsPrimary:       false,
+			RelatedNames:    item.RelatedNames,
+			Baud:            0,
+			BufferAlgorithm: "",
+			Ver:             version,
+			NetworkPort:     item.NetworkPort,
 		}
 
 		// figure out if port is open

serialport.go

@@ -341,35 +341,10 @@ func spHandlerOpen(portname string, baud int, buftype string, isSecondary bool)
 	// we can go up to 256,000 lines of gcode in the buffer
 	p := &serport{sendBuffered: make(chan Cmd, 256000), done: make(chan bool), sendNoBuf: make(chan Cmd), portConf: conf, portIo: sp, BufferType: buftype, IsPrimary: isPrimary, IsSecondary: isSecondary}
 
-	// if user asked for a buffer watcher, i.e. tinyg/grbl then attach here
-	if buftype == "tinyg" {
-
-		bw := &BufferflowTinyg{Name: "tinyg", parent_serport: p}
-		bw.Init()
-		bw.Port = portname
-		p.bufferwatcher = bw
-	} else if buftype == "dummypause" {
-
-		// this is a dummy pause type bufferflow object
-		// to test artificially a delay on the serial port write
-		// it just pauses 3 seconds on each serial port write
-		bw := &BufferflowDummypause{}
-		bw.Init()
-		bw.Port = portname
-		p.bufferwatcher = bw
-	} else if buftype == "grbl" {
-		// grbl bufferflow
-		// store port as parent_serport for use in intializing a status query loop for '?'
-		bw := &BufferflowGrbl{Name: "grbl", parent_serport: p}
-		bw.Init()
-		bw.Port = portname
-		p.bufferwatcher = bw
-	} else {
-		bw := &BufferflowDefault{}
-		bw.Init()
-		bw.Port = portname
-		p.bufferwatcher = bw
-	}
+	bw := &BufferflowDefault{}
+	bw.Init()
+	bw.Port = portname
+	p.bufferwatcher = bw
 
 	sh.register <- p
 	defer func() { sh.unregister <- p }()
@@ -383,35 +358,6 @@ func spHandlerOpen(portname string, baud int, buftype string, isSecondary bool)
 	//<-p.done
 }
 
-func spHandlerCloseExperimental(p *serport) {
-	h.broadcastSys <- []byte("Pre-closing serial port " + p.portConf.Name)
-	p.isClosing = true
-	//close the port
-
-	p.bufferwatcher.Close()
-	p.portIo.Close()
-	h.broadcastSys <- []byte("Bufferwatcher closed")
-	p.portIo.Close()
-	//elicit response from hardware to close out p.reader()
-	//_, _ = p.portIo.Write([]byte("?"))
-	//p.portIo.Read(nil)
-
-	//close(p.portIo)
-	h.broadcastSys <- []byte("portIo closed")
-	close(p.sendBuffered)
-	h.broadcastSys <- []byte("p.sendBuffered closed")
-	close(p.sendNoBuf)
-	h.broadcastSys <- []byte("p.sendNoBuf closed")
-
-	//p.done <- true
-
-	// unregister myself
-	// we already have a deferred unregister in place from when
-	// we opened. the only thing holding up that thread is the p.reader()
-	// so if we close the reader we should get an exit
-	h.broadcastSys <- []byte("Closing serial port " + p.portConf.Name)
-}
-
 func spHandlerClose(p *serport) {
 	// p.isClosing = true
 	p.done <- true