More input parsing

sinks/adsb-ws/Makefile

@@ -1,7 +1,7 @@
 all: adsb-ws
 
 proto/adsb.pb.go: ../../proto/adsb.proto
-	protoc --gofast_out=. --proto_path=../.. ../../proto/adsb.proto
+	protoc --gogoslick_out=. --proto_path=../.. $<
 
 adsb-ws: *.go proto/adsb.pb.go
 	go build

sinks/adsb-ws/input.go

@@ -1,18 +1,59 @@
 package main
 
 import (
+	"bufio"
+	"errors"
 	"log"
 	"os"
 )
 
-func readInput() {
+func decodeVarint(r *bufio.Reader) (n uint64, err error) {
+	var value uint64
+	var shift uint16
 	for {
-		b1 := make([]byte, 256)
-		n, err := os.Stdin.Read(b1)
+		c, err := r.ReadByte()
+		if err != nil {
+			return 0, err
+		}
+		value |= (uint64(c) & 0x7f) << shift
+		if c & 0x80 == 0 {
+			return value, nil
+		}
+		shift += 7
+		if shift > 21 {
+			return 0, errors.New("invalid varint")
+		}
+	}
+}
+
+func readInput() {
+	r := bufio.NewReader(os.Stdin)
+	for {
+		c, err := r.ReadByte()
 		if err != nil {
 			log.Printf("error: %v", err)
 			break
 		}
-		log.Println(n, b1)
+		if c != 0x0a {
+			log.Printf("invalid message type: %v", c)
+			break
 		}
+		msglen, err := decodeVarint(r)
+		if err != nil {
+			log.Printf("error: %v", err)
+			break
+		}
+		buf := make([]byte, msglen)
+		n, err := r.Read(buf)
+		if err != nil {
+			log.Printf("error: %v", err)
+			break
+		}
+		if uint64(n) != msglen {
+			log.Printf("short read")
+			break
+		}
+		log.Println(buf)
+	}
+	os.Exit(1)
 }

sinks/adsb-ws/main.go

@@ -9,6 +9,7 @@ import (
 var addr = flag.String("addr", ":8080", "http service address")
 
 func main() {
+	log.SetFlags(0)
 	flag.Parse()
 	go readInput()
 	http.HandleFunc("/stream", serveStream)