update host mp env file

host.d/config.d/mayhem-party.d/env.env

@@ -1,6 +1,6 @@
 export DEBUG=true
 export RAW_UDP=17070
-export BUTTON_PARSER_V01=true
+export BUTTON_V01=true
 export WRAP_REFRESH_ON_SIGUSR1=true
 export MAIN_INTERVAL_DURATION=5ms
 export OUTPUT_KEYBOARD=false

src/device/input/button/parser.go

@@ -6,14 +6,19 @@ import (
 	"os"
 )
 
+var (
+	FlagButtonV01 = os.Getenv("BUTTON_V01") == "true"
+)
+
 type Parser interface {
 	Read() []Button
 	Close()
+	CloseWrap() raw.Raw
 }
 
 func New(ctx context.Context, src raw.Raw) Parser {
-	if os.Getenv("BUTTON_PARSER_V01") == "true" {
-		return NewV01(src)
+	if FlagButtonV01 {
+		return NewV01(ctx, src)
 	}
 	return NewPlaintext(src)
 }

src/device/input/button/plaintext.go

@@ -5,6 +5,10 @@ import (
 	"os"
 )
 
+var (
+	FlagButtonPlaintextRelease = os.Getenv("BUTTON_PLAINTEXT_RELEASE")
+)
+
 type Plaintext struct {
 	src     raw.Raw
 	release byte
@@ -12,8 +16,8 @@ type Plaintext struct {
 
 func NewPlaintext(src raw.Raw) Plaintext {
 	releaseChar := byte('!')
-	if v := os.Getenv("BUTTON_PLAINTEXT_RELEASE"); v != "" {
-		releaseChar = byte(v[0])
+	if FlagButtonPlaintextRelease != "" {
+		releaseChar = byte(FlagButtonPlaintextRelease[0])
 	}
 	return Plaintext{
 		src:     src,
@@ -23,6 +27,8 @@ func NewPlaintext(src raw.Raw) Plaintext {
 
 func (p Plaintext) Close() { p.src.Close() }
 
+func (p Plaintext) CloseWrap() raw.Raw { return p.src }
+
 func (p Plaintext) Read() []Button {
 	b := p.src.Read()
 	buttons := make([]Button, 0, len(b))

src/device/input/button/v01.go

@@ -1,6 +1,7 @@
 package button
 
 import (
+	"context"
 	"encoding/json"
 	"io/ioutil"
 	"log"
@@ -11,10 +12,15 @@ import (
 	"gopkg.in/yaml.v2"
 )
 
-var debugging = os.Getenv("DEBUG") == "true"
+var (
+	FlagDebug           = os.Getenv("DEBUG") == "true"
+	FlagButtonV01Config = os.Getenv("BUTTON_V01_CONFIG")
+)
 
 type (
 	V01 struct {
+		ctx context.Context
+		can context.CancelFunc
 		src raw.Raw
 		cfg v01Cfg
 	}
@@ -36,17 +42,26 @@ type (
 	v01Transformation map[string]string
 )
 
-func NewV01(src raw.Raw) V01 {
+func NewV01(ctx context.Context, src raw.Raw) V01 {
 	var cfg v01Cfg
-	b, _ := ioutil.ReadFile(os.Getenv("BUTTON_PARSER_V01_CONFIG"))
+	b, _ := ioutil.ReadFile(FlagButtonV01Config)
 	yaml.Unmarshal(b, &cfg)
+	ctx, can := context.WithCancel(ctx)
 	return V01{
+		ctx: ctx,
+		can: can,
 		src: src,
 		cfg: cfg,
 	}
 }
 
+func (v01 V01) CloseWrap() raw.Raw {
+	v01.can()
+	return v01.src
+}
+
 func (v01 V01) Close() {
+	v01.can()
 	v01.src.Close()
 }
 
@@ -87,7 +102,7 @@ func (t v01Transformation) pipe(s string) string {
 }
 
 func (v01 V01) telemetry(msg v01Msg) {
-	if debugging {
+	if FlagDebug {
 		log.Printf("%s|%dms", msg.U, time.Now().UnixNano()/int64(time.Millisecond)-msg.T)
 	}
 }
@@ -100,7 +115,7 @@ func (msg v01Msg) buttons() []Button {
 	for i := range msg.N {
 		buttons[len(msg.Y)+i] = Button{Char: msg.N[i], Down: false}
 	}
-	if debugging {
+	if FlagDebug {
 		log.Printf("%+v", msg)
 	}
 	return buttons

src/device/input/button/v01_exported_test.go

@@ -1,6 +1,7 @@
 package button_test
 
 import (
+	"context"
 	"fmt"
 	"mayhem-party/src/device/input/button"
 	"os"
@@ -12,7 +13,7 @@ import (
 func TestV01(t *testing.T) {
 	src := constSrc(fmt.Sprintf(`{"T":%v,"U":"bel","Y":"abc","N":"cde"}`, time.Now().UnixNano()/int64(time.Millisecond)-50))
 	t.Logf("(%v) %s", len(src), src.Read())
-	v01 := button.NewV01(src)
+	v01 := button.NewV01(context.Background(), src)
 	got := v01.Read()
 	want := []button.Button{
 		{Down: true, Char: 'a'},
@@ -45,10 +46,10 @@ func TestV01WithCfg(t *testing.T) {
       - transformation:
           w: i
    `), os.ModePerm)
-	os.Setenv("BUTTON_PARSER_V01_CONFIG", p)
+	button.FlagButtonV01Config = p
 
 	t.Run("unknown user ignored", func(t *testing.T) {
-		v01 := button.NewV01(constSrc(`{"U":"qt","Y":"w"}`))
+		v01 := button.NewV01(context.Background(), constSrc(`{"U":"qt","Y":"w"}`))
 		got := v01.Read()
 		if len(got) != 0 {
 			t.Error(got)
@@ -56,7 +57,7 @@ func TestV01WithCfg(t *testing.T) {
 	})
 
 	t.Run("player2", func(t *testing.T) {
-		v01 := button.NewV01(constSrc(`{"U":"bel","Y":"w","N":"w"}`))
+		v01 := button.NewV01(context.Background(), constSrc(`{"U":"bel","Y":"w","N":"w"}`))
 		got := v01.Read()
 		if len(got) != 2 {
 			t.Error(got)

src/device/input/input_exported_test.go

@@ -3,6 +3,8 @@ package input_test
 import (
 	"context"
 	"mayhem-party/src/device/input"
+	"mayhem-party/src/device/input/raw"
+	"mayhem-party/src/device/input/wrap"
 	"os"
 	"path"
 	"testing"
@@ -30,11 +32,11 @@ func TestNewRemapped(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	os.Setenv("WRAP_REMAP_FILE", remap)
-	os.Setenv("RAW_RANDOM_WEIGHT_FILE", rand)
+	wrap.FlagRemapFile = remap
+	raw.FlagRawRandomWeightFile = rand
 	t.Cleanup(func() {
-		os.Unsetenv("WRAP_REMAP_FILE")
-		os.Unsetenv("RAW_RANDOM_WEIGHT_FILE")
+		wrap.FlagRemapFile = ""
+		raw.FlagRawRandomWeightFile = ""
 	})
 
 	r := input.New(context.Background())
@@ -50,9 +52,9 @@ func TestNewRemapped(t *testing.T) {
 }
 
 func TestNewBuffered(t *testing.T) {
-	os.Setenv("WRAP_BUFFERED", "true")
+	wrap.FlagBuffered = true
 	t.Cleanup(func() {
-		os.Unsetenv("WRAP_BUFFERED")
+		wrap.FlagBuffered = false
 	})
 
 	r := input.New(context.Background())
@@ -71,9 +73,9 @@ func TestNewRandomWeightFile(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	os.Setenv("RAW_RANDOM_WEIGHT_FILE", p)
+	raw.FlagRawRandomWeightFile = p
 	t.Cleanup(func() {
-		os.Unsetenv("RAW_RANDOM_WEIGHT_FILE")
+		raw.FlagRawRandomWeightFile = ""
 	})
 
 	r := input.New(context.Background())

src/device/input/raw/keyboard.go

@@ -50,7 +50,7 @@ func (kb Keyboard) Read() []byte {
 	if err != nil && err != io.EOF {
 		panic(err)
 	}
-	if os.Getenv("DEBUG") == "true" {
+	if FlagDebug {
 		log.Printf("raw.Keyboard.Read() %s", b[:n])
 	}
 	return b[:n]

src/device/input/raw/raw.go

@@ -6,21 +6,27 @@ import (
 	"strconv"
 )
 
+var (
+	FlagRawKeyboard         = os.Getenv("RAW_KEYBOARD") == "true"
+	FlagRawUDP              = os.Getenv("RAW_UDP")
+	FlagRawRandomWeightFile = os.Getenv("RAW_RANDOM_WEIGHT_FILE")
+)
+
 type Raw interface {
 	Read() []byte
 	Close()
 }
 
 func New(ctx context.Context) Raw {
-	if os.Getenv("RAW_KEYBOARD") == "true" {
+	if FlagRawKeyboard {
 		return NewKeyboard()
 	}
-	if port, _ := strconv.Atoi(os.Getenv("RAW_UDP")); port != 0 {
+	if port, _ := strconv.Atoi(FlagRawUDP); port != 0 {
 		return NewUDP(ctx, port)
 	}
 	generator := randomCharFromRange('a', 'g')
-	if p, ok := os.LookupEnv("RAW_RANDOM_WEIGHT_FILE"); ok && len(p) > 0 {
-		generator = randomCharFromWeightFile(p)
+	if FlagRawRandomWeightFile != "" {
+		generator = randomCharFromWeightFile(FlagRawRandomWeightFile)
 	}
 	return NewRandom(generator)
 }

src/device/input/raw/udp.go

@@ -8,6 +8,10 @@ import (
 	"strconv"
 )
 
+var (
+	FlagDebug = os.Getenv("DEBUG") == "true"
+)
+
 type UDP struct {
 	conn net.PacketConn
 	c    chan []byte
@@ -29,14 +33,13 @@ func NewUDP(ctx context.Context, port int) UDP {
 }
 
 func (udp UDP) listen() {
-	debugging := os.Getenv("DEBUG") == "true"
 	for udp.ctx.Err() == nil {
 		buff := make([]byte, 256)
 		n, _, err := udp.conn.ReadFrom(buff)
 		if err != nil && udp.ctx.Err() == nil {
 			panic(err)
 		}
-		if debugging {
+		if FlagDebug {
 			log.Printf("raw.UDP.Read() => %s", buff[:n])
 		}
 		select {

src/device/input/wrap/buffered.go

@@ -3,11 +3,16 @@ package wrap
 import (
 	"context"
 	"mayhem-party/src/device/input/button"
+	"mayhem-party/src/device/input/raw"
 	"os"
 	"sync"
 	"time"
 )
 
+var (
+	FlagBufferedStickyDuration = os.Getenv("WRAP_BUFFERED_STICKY_DURATION")
+)
+
 type Buffered struct {
 	ctx                context.Context
 	can                context.CancelFunc
@@ -21,7 +26,7 @@ type Buffered struct {
 func NewBuffered(ctx context.Context, input Wrap) *Buffered {
 	ctx, can := context.WithCancel(ctx)
 	expirationInterval := time.Millisecond * 125
-	if d, err := time.ParseDuration(os.Getenv("WRAP_BUFFERED_STICKY_DURATION")); err == nil {
+	if d, err := time.ParseDuration(FlagBufferedStickyDuration); err == nil {
 		expirationInterval = d
 	}
 	result := &Buffered{
@@ -57,6 +62,11 @@ func (b *Buffered) listen() {
 	}
 }
 
+func (b *Buffered) CloseWrap() raw.Raw {
+	b.can()
+	return b.input.CloseWrap()
+}
+
 func (b *Buffered) Close() {
 	b.input.Close()
 	b.can()

src/device/input/wrap/protocol.go

@@ -1,24 +0,0 @@
-package wrap
-
-import (
-	"mayhem-party/src/device/input/button"
-	"mayhem-party/src/device/input/raw"
-)
-
-type Protocol struct {
-	src raw.Raw
-}
-
-func NewProtocol(src raw.Raw) Protocol {
-	return Protocol{
-		src: src,
-	}
-}
-
-func (p Protocol) Close() {
-	p.src.Close()
-}
-
-func (p Protocol) Read() []button.Button {
-	panic(nil)
-}

src/device/input/wrap/refresh.go

@@ -4,8 +4,18 @@ import (
 	"context"
 	"log"
 	"mayhem-party/src/device/input/button"
+	"mayhem-party/src/device/input/raw"
 	"os"
 	"os/signal"
+	"syscall"
+)
+
+var (
+	chSigUsr1 = func() chan os.Signal {
+		c := make(chan os.Signal, 1)
+		signal.Notify(c, syscall.SIGUSR1)
+		return c
+	}()
 )
 
 type Refresh struct {
@@ -13,14 +23,12 @@ type Refresh struct {
 	input Wrap
 }
 
-func NewRefreshCh(sig os.Signal) <-chan os.Signal {
-	c := make(chan os.Signal, 1)
-	signal.Notify(c, sig)
-	return c
+func NewRefresh(ctx context.Context, newWrap func() Wrap) *Refresh {
+	return NewRefreshWith(ctx, newWrap, chSigUsr1)
 }
 
-func NewRefresh(newWrap func() Wrap, ch <-chan os.Signal) *Refresh {
-	ctx, can := context.WithCancel(context.Background())
+func NewRefreshWith(ctx context.Context, newWrap func() Wrap, ch <-chan os.Signal) *Refresh {
+	ctx, can := context.WithCancel(ctx)
 	result := &Refresh{
 		can:   can,
 		input: newWrap(),
@@ -33,6 +41,7 @@ func NewRefresh(newWrap func() Wrap, ch <-chan os.Signal) *Refresh {
 				return
 			case sig := <-ch:
 				log.Println("refreshing for", sig)
+				result.input.CloseWrap()
 				result.input = newWrap()
 			}
 		}
@@ -40,6 +49,11 @@ func NewRefresh(newWrap func() Wrap, ch <-chan os.Signal) *Refresh {
 	return result
 }
 
+func (r *Refresh) CloseWrap() raw.Raw {
+	r.can()
+	return r.input.CloseWrap()
+}
+
 func (r *Refresh) Read() []button.Button {
 	return r.input.Read()
 }

src/device/input/wrap/refresh_test.go

@@ -1,6 +1,8 @@
 package wrap
 
 import (
+	"context"
+	"mayhem-party/src/device/input/button"
 	"os"
 	"syscall"
 	"testing"
@@ -15,7 +17,7 @@ func TestRefresh(t *testing.T) {
 	}
 	ch := make(chan os.Signal, 1)
 	defer close(ch)
-	refresh := NewRefresh(generator, ch)
+	refresh := NewRefreshWith(context.Background(), generator, ch)
 	defer refresh.Close()
 
 	assertIts := func(t *testing.T, b byte) {
@@ -42,3 +44,51 @@ func TestRefresh(t *testing.T) {
 		assertIts(t, byte('c'))
 	})
 }
+
+func TestRefreshDoesntCloseSources(t *testing.T) {
+	src := &telemetrySrc{}
+	newParsers := 0
+	newParser := func() Wrap {
+		newParsers += 1
+		return button.NewPlaintext(src)
+	}
+	ctx, can := context.WithCancel(context.Background())
+	defer can()
+	refresh := NewRefresh(ctx, newParser)
+	if newParsers != 1 {
+		t.Error(newParsers)
+	}
+
+	for i := 0; i < 5; i++ {
+		refresh.Read()
+	}
+	if want := (telemetrySrc{reads: 5}); *src != want {
+		t.Errorf("%+v", *src)
+	} else if newParsers != 1 {
+		t.Error(newParsers)
+	}
+
+	for i := 0; i < 5; i++ {
+		chSigUsr1 <- syscall.SIGINT
+	}
+	time.Sleep(time.Millisecond * 250)
+	if want := (telemetrySrc{reads: 5}); *src != want {
+		t.Errorf("want %+v, got %+v", want, *src)
+	} else if newParsers != 6 {
+		t.Error(newParsers)
+	}
+}
+
+type telemetrySrc struct {
+	closes int
+	reads  int
+}
+
+func (src *telemetrySrc) Close() {
+	src.closes += 1
+}
+
+func (src *telemetrySrc) Read() []byte {
+	src.reads += 1
+	return []byte("foo")
+}

src/device/input/wrap/remap.go

@@ -2,6 +2,7 @@ package wrap
 
 import (
 	"mayhem-party/src/device/input/button"
+	"mayhem-party/src/device/input/raw"
 	"os"
 
 	"github.com/go-yaml/yaml"
@@ -38,6 +39,10 @@ func NewRemap(input Wrap, m map[byte]byte) Remap {
 	}
 }
 
+func (re Remap) CloseWrap() raw.Raw {
+	return re.input.CloseWrap()
+}
+
 func (re Remap) Close() {
 	re.input.Close()
 }

src/device/input/wrap/wrap.go

@@ -3,36 +3,42 @@ package wrap
 import (
 	"context"
 	"mayhem-party/src/device/input/button"
+	"mayhem-party/src/device/input/raw"
 	"os"
-	"syscall"
+)
+
+var (
+	FlagBuffered         = os.Getenv("WRAP_BUFFERED") == "true"
+	FlagRemapFile        = os.Getenv("WRAP_REMAP_FILE")
+	FlagRefreshOnSigUsr1 = os.Getenv("WRAP_REFRESH_ON_SIGUSR1") == "true"
 )
 
 type Wrap interface {
 	Read() []button.Button
 	Close()
+	CloseWrap() raw.Raw
 }
 
 func New(ctx context.Context, srcFunc func() button.Parser) Wrap {
 	maker := func() Wrap {
 		return srcFunc()
 	}
-	if os.Getenv("WRAP_BUFFERED") == "true" {
+	if FlagBuffered {
 		oldMaker := maker
 		maker = func() Wrap {
 			return NewBuffered(ctx, oldMaker())
 		}
 	}
-	if p := os.Getenv("WRAP_REMAP_FILE"); p != "" {
+	if FlagRemapFile != "" {
 		oldMaker := maker
 		maker = func() Wrap {
-			return NewRemapFromFile(oldMaker(), p)
+			return NewRemapFromFile(oldMaker(), FlagRemapFile)
 		}
 	}
-	if os.Getenv("WRAP_REFRESH_ON_SIGUSR1") != "" {
+	if FlagRefreshOnSigUsr1 {
 		oldMaker := maker
-		c := NewRefreshCh(syscall.SIGUSR1)
 		maker = func() Wrap {
-			return NewRefresh(oldMaker, c)
+			return NewRefresh(ctx, oldMaker)
 		}
 	}
 	return maker()

src/device/input/wrap/wrap_test.go

@@ -2,6 +2,7 @@ package wrap
 
 import (
 	"mayhem-party/src/device/input/button"
+	"mayhem-party/src/device/input/raw"
 	"testing"
 )
 
@@ -10,12 +11,12 @@ func TestWrap(t *testing.T) {
 	var _ Wrap = &Refresh{}
 	var _ Wrap = &Buffered{}
 	var _ Wrap = &Remap{}
-	var _ Wrap = Protocol{}
 }
 
 type dummyParser button.Button
 
-func (d dummyParser) Close() {}
+func (d dummyParser) CloseWrap() raw.Raw { return nil }
+func (d dummyParser) Close()             {}
 func (d dummyParser) Read() []button.Button {
 	return []button.Button{button.Button(d)}
 }

src/main.go

@@ -17,7 +17,7 @@ func Main(ctx context.Context) error {
 	defer reader.Close()
 
 	interval := time.Millisecond * 50
-	if intervalS, ok := os.LookupEnv("MAIN_INTERVAL_DURATION"); !ok {
+	if intervalS := os.Getenv("MAIN_INTERVAL_DURATION"); intervalS != "" {
 	} else if v, err := time.ParseDuration(intervalS); err != nil {
 		panic(err)
 	} else {

todo.yaml

@@ -1,4 +1,5 @@
 todo:
+- v01cfg includes messages to send per client and exposes http server for it
 - send clients messages to display
 - input.MayhemParty as a logical wrapper from mod10 but then gotta translate back
   to char for keyboard things somewhere; space delimited?
@@ -51,3 +52,5 @@ done:
   ts: Sat Mar 25 00:44:19 MDT 2023
 - todo: use button.V01Cfg; map keys triggered by user to player idx and their keys
   ts: Sat Mar 25 09:12:43 MDT 2023
+- todo: v01cfg includes messages to send per client and exposes tcp server for it
+  ts: Sat Mar 25 10:09:06 MDT 2023