Turn adsb-ws into a json repeater, rather than a protocol converter

sinks/adsb-ws/input.go

@@ -2,66 +2,17 @@ package main
 
 import (
 	"bufio"
-	"errors"
 	"log"
 	"os"
-
-	"github.com/adsb-tools/sinks/adsb-ws/proto"
 )
 
-func decodeVarint(r *bufio.Reader) (n uint64, err error) {
-	var value uint64
-	var shift uint16
-	for {
-		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()
+		line, err := r.ReadBytes('\n')
 		if err != nil {
-			log.Printf("error: %v", err)
-			break
+			log.Fatal("Input read error: ", err)
 		}
-		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
-		}
-		packet := new(adsb.Adsb)
-		err = packet.Unmarshal(buf)
-		if err != nil {
-			log.Printf("error: %v", err)
-			break
-		}
-		log.Println(packet)
+		h.broadcast <- line
 	}
-	os.Exit(1)
 }