Stream method

Author: movsb

common.go

@@ -4,6 +4,8 @@ import (
 	"fmt"
 	"io"
 	"log"
+	"os"
+	"sync"
 
 	"tinygo.org/x/bluetooth"
 )
@@ -58,3 +60,28 @@ func splitWrite(w io.Writer, p []byte) (int, error) {
 var (
 	errConnClosed = fmt.Errorf(`tcp-over-bt: connection closed`)
 )
+
+func Stream(a, b io.ReadWriter) {
+	wg := sync.WaitGroup{}
+	wg.Add(2)
+
+	go func() {
+		defer wg.Done()
+		io.Copy(a, b)
+	}()
+
+	go func() {
+		defer wg.Done()
+		io.Copy(b, a)
+	}()
+
+	wg.Wait()
+}
+
+var Stdio io.ReadWriter = struct {
+	io.Reader
+	io.Writer
+}{
+	os.Stdin,
+	os.Stdout,
+}

device.go

@@ -4,7 +4,6 @@ package main
 
 import (
 	"bytes"
-	"io"
 	"log"
 	"net"
 	"sync"
@@ -168,19 +167,6 @@ func main() {
 			conn.Close()
 		}()
 
-		wg := sync.WaitGroup{}
-		wg.Add(2)
-
-		go func() {
-			defer wg.Done()
-			io.Copy(conn, d)
-		}()
-
-		go func() {
-			defer wg.Done()
-			io.Copy(d, conn)
-		}()
-
-		wg.Wait()
+		Stream(conn, d)
 	}
 }

host.go

@@ -5,7 +5,6 @@ package main
 import (
 	"bytes"
 	"fmt"
-	"io"
 	"log"
 	"os"
 	"sync"
@@ -125,9 +124,5 @@ func main() {
 	h.Connect(address)
 	fmt.Fprintln(os.Stderr, `Connected`)
 
-	go func() {
-		Must1(io.Copy(os.Stdout, h))
-	}()
-
-	Must1(io.Copy(h, os.Stdin))
+	Stream(h, Stdio)
 }