Merge pull request #158 from jwetzell/module-context-handling

rework context handling throughout router and modules

.github/workflows/release-showbridge.yaml

@@ -4,13 +4,45 @@ on:
   push:
     tags:
       - "v*"
+  workflow_dispatch:
 
 permissions:
   contents: write
 
 jobs:
-  goreleaser:
+  setup_release:
     runs-on: ubuntu-latest
+    outputs:
+      version: ${{ steps.set_version.outputs.version }}
+      short_commit: ${{ steps.set_commit.outputs.short_commit }}
+    steps:
+      - name: checkout
+        uses: actions/checkout@v6
+        with:
+          fetch-depth: 0
+      - name: set environment variables
+        run: echo "SHOWBRIDGE_VERSION=${GITHUB_REF_NAME}" >> $GITHUB_ENV
+      - name: clean tag
+        if: startsWith(github.ref, 'refs/tags/v')
+        run: echo "SHOWBRIDGE_VERSION=${SHOWBRIDGE_VERSION#v}" >> $GITHUB_ENV
+      - name: set version
+        id: set_version
+        run: echo "version=${SHOWBRIDGE_VERSION}" >> $GITHUB_OUTPUT
+      - name: set commit
+        id: set_commit
+        run: echo "short_commit=${GITHUB_SHA::7}" >> $GITHUB_OUTPUT
+      - name: create release
+        uses: softprops/action-gh-release@v3
+        if: github.ref_type == 'tag' && github.event_name != 'workflow_dispatch' && startsWith(github.ref, 'refs/tags/v')
+        with:
+          draft: true
+          generate_release_notes: true
+  linux_amd64:
+    runs-on: ubuntu-24.04
+    needs: setup_release
+    env:
+      SHOWBRIDGE_VERSION: ${{ needs.setup_release.outputs.version }}
+      SHORT_COMMIT: ${{ needs.setup_release.outputs.short_commit }}
     steps:
       - name: checkout
         uses: actions/checkout@v6
@@ -20,18 +52,166 @@ jobs:
         uses: actions/setup-go@v6
         with:
           go-version-file: "go.mod"
-      - name: release
-        uses: goreleaser/goreleaser-action@v7
+      - name: install alsa lib
+        run: sudo apt-get install -y libasound2-dev
+      - name: build
+        run: |
+          CGO_ENABLED=1 go build -o showbridge -ldflags="-s -w -X main.version=${SHOWBRIDGE_VERSION}-${SHORT_COMMIT}" ./cmd/showbridge
+          tar -czf showbridge_${SHOWBRIDGE_VERSION}_linux-amd64.tar.gz showbridge
+      - name: upload linux artifacts
+        uses: actions/upload-artifact@v7
+        if: github.event_name == 'workflow_dispatch'
         with:
-          workdir: cmd/showbridge
-          distribution: goreleaser
-          version: "v2.13.0"
-          args: release --clean
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          name: showbridge-linux-amd64
+          path: |
+            showbridge_*.tar.gz
+      - name: upload artifacts to release
+        uses: softprops/action-gh-release@v3
+        if: github.ref_type == 'tag' && github.event_name != 'workflow_dispatch' && startsWith(github.ref, 'refs/tags/v')
+        with:
+          draft: true
+          files: showbridge_*.tar.gz
+  linux_arm64:
+    runs-on: ubuntu-24.04-arm
+    needs: setup_release
+    env:
+      SHOWBRIDGE_VERSION: ${{ needs.setup_release.outputs.version }}
+      SHORT_COMMIT: ${{ needs.setup_release.outputs.short_commit }}
+    steps:
+      - name: checkout
+        uses: actions/checkout@v6
+        with:
+          fetch-depth: 0
+      - name: setup go
+        uses: actions/setup-go@v6
+        with:
+          go-version-file: "go.mod"
+      - name: install alsa lib
+        run: sudo apt-get install -y libasound2-dev
+      - name: build
+        run: |
+          CGO_ENABLED=1 go build -o showbridge -ldflags="-s -w -X main.version=${SHOWBRIDGE_VERSION}-${SHORT_COMMIT}" ./cmd/showbridge
+          tar -czf showbridge_${SHOWBRIDGE_VERSION}_linux-arm64.tar.gz showbridge
+      - name: upload linux artifacts
+        uses: actions/upload-artifact@v7
+        if: github.event_name == 'workflow_dispatch'
+        with:
+          name: showbridge-linux-arm64
+          path: |
+            showbridge_*.tar.gz
+      - name: upload artifacts to release
+        uses: softprops/action-gh-release@v3
+        if: github.ref_type == 'tag' && github.event_name != 'workflow_dispatch' && startsWith(github.ref, 'refs/tags/v')
+        with:
+          draft: true
+          files: showbridge_*.tar.gz
+  windows:
+    runs-on: ubuntu-latest
+    needs: setup_release
+    env:
+      SHOWBRIDGE_VERSION: ${{ needs.setup_release.outputs.version }}
+      SHORT_COMMIT: ${{ needs.setup_release.outputs.short_commit }}
+    steps:
+      - name: checkout
+        uses: actions/checkout@v6
+        with:
+          fetch-depth: 0
+      - name: setup go
+        uses: actions/setup-go@v6
+        with:
+          go-version-file: "go.mod"
+      - name: setup zig
+        uses: mlugg/setup-zig@v2
+        with:
+          version: 0.16.0
+      - name: build amd64
+        run: |
+          CGO_ENABLED=1 GOOS=windows GOARCH=amd64 CC="zig cc -target x86_64-windows-gnu" CXX="zig c++ -target x86_64-windows-gnu" go build -o showbridge.exe -ldflags="-s -w -X main.version=${SHOWBRIDGE_VERSION}-${SHORT_COMMIT}" ./cmd/showbridge
+          zip showbridge_${SHOWBRIDGE_VERSION}_windows-amd64.zip showbridge.exe
+      - name: build arm64
+        run: |
+          CGO_ENABLED=1 GOOS=windows GOARCH=arm64 CC="zig cc -target aarch64-windows-gnu" CXX="zig c++ -target aarch64-windows-gnu" go build -o showbridge.exe -ldflags="-s -w -X main.version=${SHOWBRIDGE_VERSION}-${SHORT_COMMIT}" ./cmd/showbridge
+          zip showbridge_${SHOWBRIDGE_VERSION}_windows-arm64.zip showbridge.exe
+      - name: upload windows artifacts
+        uses: actions/upload-artifact@v7
+        if: github.event_name == 'workflow_dispatch'
+        with:
+          name: showbridge-windows
+          path: |
+            showbridge_*.zip
+      - name: upload artifacts to release
+        uses: softprops/action-gh-release@v3
+        if: github.ref_type == 'tag' && github.event_name != 'workflow_dispatch' && startsWith(github.ref, 'refs/tags/v')
+        with:
+          draft: true
+          files: showbridge_*.zip
+  macos_arm64:
+    runs-on: macos-26
+    needs: setup_release
+    env:
+      SHOWBRIDGE_VERSION: ${{ needs.setup_release.outputs.version }}
+      SHORT_COMMIT: ${{ needs.setup_release.outputs.short_commit }}
+    steps:
+      - name: checkout
+        uses: actions/checkout@v6
+        with:
+          fetch-depth: 0
+      - name: setup go
+        uses: actions/setup-go@v6
+        with:
+          go-version-file: "go.mod"
+      - name: build
+        run: |
+          CGO_ENABLED=1 GOOS=darwin GOARCH=arm64 go build -o showbridge -ldflags="-s -w -X main.version=${SHOWBRIDGE_VERSION}-${SHORT_COMMIT}" ./cmd/showbridge
+          tar -czf showbridge_${SHOWBRIDGE_VERSION}_macOS-arm64.tar.gz showbridge
+      - name: upload macos artifacts
+        uses: actions/upload-artifact@v7
+        if: github.event_name == 'workflow_dispatch'
+        with:
+          name: showbridge-macos-arm64
+          path: |
+            showbridge_*.tar.gz
+      - name: upload artifacts to release
+        uses: softprops/action-gh-release@v3
+        if: github.ref_type == 'tag' && github.event_name != 'workflow_dispatch' && startsWith(github.ref, 'refs/tags/v')
+        with:
+          draft: true
+          files: showbridge_*.tar.gz
+  macos_amd64:
+    runs-on: macos-26-intel
+    needs: setup_release
+    env:
+      SHOWBRIDGE_VERSION: ${{ needs.setup_release.outputs.version }}
+      SHORT_COMMIT: ${{ needs.setup_release.outputs.short_commit }}
+    steps:
+      - name: checkout
+        uses: actions/checkout@v6
+        with:
+          fetch-depth: 0
+      - name: setup go
+        uses: actions/setup-go@v6
+        with:
+          go-version-file: "go.mod"
+      - name: build
+        run: |
+          CGO_ENABLED=1 GOOS=darwin GOARCH=amd64 go build -o showbridge -ldflags="-s -w -X main.version=${SHOWBRIDGE_VERSION}-${SHORT_COMMIT}" ./cmd/showbridge
+          tar -czf showbridge_${SHOWBRIDGE_VERSION}_macOS-amd64.tar.gz showbridge
+      - name: upload macos artifacts
+        uses: actions/upload-artifact@v7
+        if: github.event_name == 'workflow_dispatch'
+        with:
+          name: showbridge-macos-amd64
+          path: |
+            showbridge_*.tar.gz
+      - name: upload artifacts to release
+        uses: softprops/action-gh-release@v3
+        if: github.ref_type == 'tag' && github.event_name != 'workflow_dispatch' && startsWith(github.ref, 'refs/tags/v')
+        with:
+          draft: true
+          files: showbridge_*.tar.gz
   docker:
     runs-on: ubuntu-latest
-    needs: goreleaser
+    needs: linux_amd64
     steps:
       - name: Check out repository
         uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
@@ -56,7 +236,8 @@ jobs:
             jwetzell/showbridge
 
       - name: Build and push
-        uses: docker/build-push-action@d08e5c354a6adb9ed34480a06d141179aa583294 # v7.0.0
+        uses: docker/build-push-action@bcafcacb16a39f128d818304e6c9c0c18556b85f # v7.1.0
+        if: github.ref_type == 'tag'
         with:
           push: true
           context: ./

Dockerfile

@@ -1,6 +1,6 @@
-ARG GO_VERSION=1.26.2
+ARG GO_VERSION=1.26.3
 FROM golang:${GO_VERSION}-alpine AS build
-RUN apk --no-cache add ca-certificates tzdata
+RUN apk --no-cache add ca-certificates tzdata git
 WORKDIR /build
 COPY go.mod go.sum ./
 RUN go mod download

cmd/showbridge/.gitignore

@@ -1,2 +0,0 @@
-# Added by goreleaser init:
-dist/

cmd/showbridge/.goreleaser.yaml

@@ -1,33 +0,0 @@
-version: 2
-project_name: showbridge
-before:
-  hooks:
-    - go mod tidy
-
-builds:
-  - env:
-      - CGO_ENABLED=0
-    goos:
-      - linux
-      - windows
-      - darwin
-    goarch:
-      - "amd64"
-      - "arm64"
-    ldflags:
-      - "-s -w -X main.version={{.RawVersion}}-{{.ShortCommit}}"
-
-archives:
-  - formats: [tar.gz]
-    name_template: "{{ .ProjectName }}_{{ .Version }}_{{ .Os }}-{{ .Arch }}"
-    format_overrides:
-      - goos: windows
-        formats: [zip]
-
-changelog:
-  sort: asc
-  use: github-native
-
-release:
-  draft: true
-  replace_existing_draft: true

cmd/showbridge/main.go

@@ -14,8 +14,6 @@ import (
 
 	"github.com/jwetzell/showbridge-go"
 	"github.com/jwetzell/showbridge-go/internal/config"
-	"github.com/jwetzell/showbridge-go/internal/module"
-	"github.com/jwetzell/showbridge-go/internal/route"
 	"github.com/jwetzell/showbridge-go/internal/schema"
 	"github.com/urfave/cli/v3"
 	"go.opentelemetry.io/otel"
@@ -92,12 +90,11 @@ func main() {
 }
 
 type showbridgeApp struct {
-	ctx          context.Context
-	configPath   string
-	logger       *slog.Logger
-	router       *showbridge.Router
-	routerRunner *sync.WaitGroup
-	routerMutex  sync.Mutex
+	ctx         context.Context
+	configPath  string
+	logger      *slog.Logger
+	router      *showbridge.Router
+	routerMutex sync.Mutex
 }
 
 func readConfig(configPath string) (config.Config, error) {
@@ -129,6 +126,9 @@ func readConfig(configPath string) (config.Config, error) {
 	}
 
 	validatedConfigBytes, err := json.Marshal(yamlMap)
+	if err != nil {
+		return config.Config{}, err
+	}
 
 	err = json.Unmarshal(validatedConfigBytes, &cfg)
 	if err != nil {
@@ -144,7 +144,7 @@ func writeConfig(configPath string, newConfig config.Config) error {
 		return err
 	}
 
-	err = os.WriteFile(configPath, configBytes, 0644)
+	err = os.WriteFile(configPath, configBytes, 0600)
 	if err != nil {
 		return err
 	}
@@ -158,7 +158,7 @@ func run(ctx context.Context, c *cli.Command) error {
 		return errors.New("config path cannot be empty")
 	}
 
-	logLevel := slog.LevelInfo
+	var logLevel slog.Level
 
 	logLevelFromFlag := c.String("log-level")
 
@@ -210,10 +210,9 @@ func run(ctx context.Context, c *cli.Command) error {
 	}
 
 	showbridgeApp := &showbridgeApp{
-		ctx:          ctx,
-		configPath:   configPath,
-		logger:       slog.Default().With("component", "cmd"),
-		routerRunner: &sync.WaitGroup{},
+		ctx:        ctx,
+		configPath: configPath,
+		logger:     slog.Default().With("component", "cmd"),
 	}
 
 	config, err := readConfig(showbridgeApp.configPath)
@@ -235,9 +234,7 @@ func run(ctx context.Context, c *cli.Command) error {
 	showbridgeApp.routerMutex.Lock()
 	showbridgeApp.router = router
 
-	showbridgeApp.routerRunner.Go(func() {
-		router.Start(context.Background())
-	})
+	router.Start(context.Background())
 	showbridgeApp.routerMutex.Unlock()
 
 	go showbridgeApp.handleChannels()
@@ -245,8 +242,6 @@ func run(ctx context.Context, c *cli.Command) error {
 	<-showbridgeApp.ctx.Done()
 	showbridgeApp.logger.Debug("shutting down router")
 	showbridgeApp.router.Stop()
-	showbridgeApp.logger.Debug("waiting for router to exit")
-	showbridgeApp.routerRunner.Wait()
 	return nil
 }
 
@@ -262,7 +257,12 @@ func (app *showbridgeApp) handleChannels() {
 				app.routerMutex.Unlock()
 				continue
 			}
-			moduleErrors, routeErrors := app.router.UpdateConfig(config)
+			moduleErrors, routeErrors, err := app.router.UpdateConfig(config, false)
+			if err != nil {
+				app.logger.Error("failed to update router config", "error", err)
+				app.routerMutex.Unlock()
+				continue
+			}
 			app.logConfigErrors(moduleErrors, routeErrors)
 			app.logger.Info("configuration reloaded successfully")
 			app.routerMutex.Unlock()
@@ -280,7 +280,7 @@ func (app *showbridgeApp) handleChannels() {
 	}
 }
 
-func (app *showbridgeApp) logConfigErrors(moduleErrors []module.ModuleError, routeErrors []route.RouteError) {
+func (app *showbridgeApp) logConfigErrors(moduleErrors []config.ModuleError, routeErrors []config.RouteError) {
 	for _, moduleError := range moduleErrors {
 		app.logger.Error("problem initializing module", "index", moduleError.Index, "error", moduleError.Error)
 	}

config.go

@@ -0,0 +1,85 @@
+package showbridge
+
+import (
+	"errors"
+	"reflect"
+
+	"github.com/jwetzell/showbridge-go/internal/common"
+	"github.com/jwetzell/showbridge-go/internal/config"
+	"github.com/jwetzell/showbridge-go/internal/route"
+)
+
+func (r *Router) GetRunningConfig() config.Config {
+	r.runningConfigMu.RLock()
+	defer r.runningConfigMu.RUnlock()
+	return r.runningConfig
+}
+
+func (r *Router) UpdateConfig(newConfig config.Config, triggerChangeChan bool) ([]config.ModuleError, []config.RouteError, error) {
+	if !r.runningConfigMu.TryLock() {
+		return nil, nil, errors.New("config update in progress")
+	}
+	defer r.runningConfigMu.Unlock()
+	oldConfig := r.runningConfig
+	r.logger.Debug("received config update", "oldConfig", oldConfig, "newConfig", newConfig)
+
+	if !reflect.DeepEqual(oldConfig.Api, newConfig.Api) {
+		r.logger.Info("applying new API config")
+		r.apiServer.Stop()
+		r.apiServer.Start(newConfig.Api)
+		r.runningConfig.Api = newConfig.Api
+	}
+
+	// TODO(jwetzell): handle config update errors better
+	for _, moduleInstance := range r.ModuleInstances {
+		moduleInstance.Stop()
+	}
+	r.logger.Debug("waiting for modules to exit")
+	r.moduleWait.Wait()
+
+	r.ModuleInstances = make(map[string]common.Module)
+	r.RouteInstances = []*route.Route{}
+
+	var moduleErrors []config.ModuleError
+
+	for moduleIndex, moduleDecl := range newConfig.Modules {
+
+		err := r.addModule(moduleDecl)
+		if err != nil {
+			if moduleErrors == nil {
+				moduleErrors = []config.ModuleError{}
+			}
+			moduleErrors = append(moduleErrors, config.ModuleError{
+				Index:  moduleIndex,
+				Config: moduleDecl,
+				Error:  err.Error(),
+			})
+			continue
+		}
+
+	}
+
+	var routeErrors []config.RouteError
+	for routeIndex, routeDecl := range newConfig.Routes {
+		err := r.addRoute(routeDecl)
+		if err != nil {
+			if routeErrors == nil {
+				routeErrors = []config.RouteError{}
+			}
+			routeErrors = append(routeErrors, config.RouteError{
+				Index:  routeIndex,
+				Config: routeDecl,
+				Error:  err.Error(),
+			})
+			continue
+		}
+	}
+	r.runningConfig = newConfig
+	r.startModules()
+
+	if triggerChangeChan {
+		r.ConfigChange <- newConfig
+	}
+
+	return moduleErrors, routeErrors, nil
+}

config.smoke.yaml

@@ -0,0 +1,85 @@
+api:
+  enabled: true
+  port: 8080
+modules:
+  - id: sqlite
+    type: db.sqlite
+    params:
+      dsn: ":memory:"
+  - id: httpin
+    type: http.server
+    params:
+      port: 3000
+  - id: tcpout
+    type: net.tcp.client
+    params:
+      host: "localhost"
+      port: 9000
+      framing: "RAW"
+  - id: tcpin
+    type: net.tcp.server
+    params:
+      port: 9000
+      framing: "RAW"
+  - id: ticker
+    type: time.interval
+    params:
+      duration: 1000
+  - id: udpout
+    type: net.udp.client
+    params:
+      host: "localhost"
+      port: 9001
+  - id: udpin
+    type: net.udp.server
+    params:
+      port: 9001
+  - id: wsecho
+    type: websocket.client
+    params:
+      url: "wss://echo.websocket.org"
+routes:
+  - input: ticker
+    processors:
+      - type: string.create
+        params:
+          template: "hello"
+      - type: router.output
+        params:
+          module: wsecho
+      - type: string.encode
+      - type: router.output
+        params:
+          module: tcpout
+      - type: router.output
+        params:
+          module: udpout
+  - input: ticker
+    processors:
+      - type: http.request.do
+        params:
+          url: "http://localhost:3000/echo"
+          method: "GET"
+      - type: debug.log
+  - input: tcpin
+    processors:
+      - type: string.decode
+      - type: debug.log
+  - input: httpin
+    processors:
+      - type: debug.log
+  - input: udpin
+    processors:
+      - type: string.decode
+      - type: debug.log
+  - input: wsecho
+    processors:
+      - type: debug.log
+  - input: ticker
+    processors:
+      - type: db.query
+        params:
+          module: "sqlite"
+          query: "SELECT 1;"
+      - type: debug.log
+  

events.go

@@ -1,64 +1,53 @@
 package showbridge
 
 import (
-	"encoding/json"
+	"time"
 
-	"github.com/gorilla/websocket"
+	"github.com/jwetzell/showbridge-go/internal/common"
 )
 
-type Event struct {
-	Type  string `json:"type"`
-	Data  any    `json:"data,omitempty"`
-	Error string `json:"error,omitempty"`
-}
-
-func (e Event) toJSON() ([]byte, error) {
-	return json.Marshal(e)
-}
-
-func (r *Router) handleEvent(event Event, sender *websocket.Conn) {
+func (r *Router) HandleEvent(event common.Event, sender common.EventDestination) {
 	switch event.Type {
 	case "ping":
-		r.unicastEvent(Event{Type: "pong"}, sender)
+		r.unicastEvent(common.Event{Type: "pong", Data: map[string]any{
+			"timestamp": time.Now().UnixMilli(),
+		}}, sender)
 	default:
 		r.logger.Warn("unknown event type", "eventType", event.Type)
 	}
 }
 
-func (r *Router) unicastEvent(event Event, conn *websocket.Conn) {
-	eventJSON, err := event.toJSON()
-	if err != nil {
-		r.logger.Error("failed to marshal event to JSON", "error", err)
-		return
-	}
-	err = conn.WriteMessage(websocket.TextMessage, eventJSON)
-	if err != nil {
-		r.logger.Error("failed to write message to websocket connection", "error", err)
+func (r *Router) AddEventDestination(dest common.EventDestination) {
+	r.eventDestinationsMu.Lock()
+	defer r.eventDestinationsMu.Unlock()
+	r.eventDestinations = append(r.eventDestinations, dest)
+}
+
+func (r *Router) RemoveEventDestination(dest common.EventDestination) {
+	r.eventDestinationsMu.Lock()
+	defer r.eventDestinationsMu.Unlock()
+	for i, d := range r.eventDestinations {
+		if d.Is(dest) {
+			r.eventDestinations = append(r.eventDestinations[:i], r.eventDestinations[i+1:]...)
+			break
+		}
 	}
 }
 
-func (r *Router) broadcastEvent(event Event, excluded ...*websocket.Conn) {
-	eventJSON, err := event.toJSON()
+func (r *Router) unicastEvent(event common.Event, dest common.EventDestination) {
+	err := dest.Send(event)
 	if err != nil {
-		r.logger.Error("failed to marshal event to JSON", "error", err)
-		return
+		r.logger.Error("failed to send event", "error", err)
 	}
-	r.wsConnsMu.Lock()
-	defer r.wsConnsMu.Unlock()
-	for _, conn := range r.wsConns {
-		exclude := false
-		for _, excludedConn := range excluded {
-			if conn == excludedConn {
-				exclude = true
-				break
-			}
-		}
-		if exclude {
-			continue
-		}
-		err := conn.WriteMessage(websocket.TextMessage, eventJSON)
+}
+
+func (r *Router) broadcastEvent(event common.Event) {
+	r.eventDestinationsMu.Lock()
+	defer r.eventDestinationsMu.Unlock()
+	for _, dest := range r.eventDestinations {
+		err := dest.Send(event)
 		if err != nil {
-			r.logger.Error("failed to write message to websocket connection", "error", err)
+			r.logger.Error("failed to send event", "error", err)
 		}
 	}
 }

go.mod

@@ -1,42 +1,41 @@
 module github.com/jwetzell/showbridge-go
 
-go 1.26.2
+go 1.26.3
 
 require (
 	github.com/eclipse/paho.mqtt.golang v1.5.1
 	github.com/emiago/diago v0.28.0
-	github.com/emiago/sipgo v1.3.0
+	github.com/emiago/sipgo v1.3.1
 	github.com/expr-lang/expr v1.17.8
 	github.com/extism/go-sdk v1.7.1
-	github.com/google/jsonschema-go v0.4.2
+	github.com/google/jsonschema-go v0.4.3
 	github.com/gorilla/websocket v1.5.3
-	github.com/jwetzell/artnet-go v0.2.1
-	github.com/jwetzell/free-d-go v0.1.0
-	github.com/jwetzell/osc-go v0.2.0
+	github.com/jwetzell/artnet-go v0.2.2
+	github.com/jwetzell/free-d-go v0.1.1
+	github.com/jwetzell/osc-go v0.3.0
 	github.com/jwetzell/psn-go v0.3.0
-	github.com/nats-io/nats-server/v2 v2.12.6
-	github.com/nats-io/nats.go v1.50.0
-	github.com/redis/go-redis/v9 v9.18.0
-	github.com/urfave/cli/v3 v3.8.0
+	github.com/nats-io/nats-server/v2 v2.14.0
+	github.com/nats-io/nats.go v1.52.0
+	github.com/redis/go-redis/v9 v9.19.0
+	github.com/urfave/cli/v3 v3.9.0
 	gitlab.com/gomidi/midi/v2 v2.3.23
 	go.bug.st/serial v1.6.4
 	go.opentelemetry.io/otel v1.43.0
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.43.0
 	go.opentelemetry.io/otel/sdk v1.43.0
 	go.opentelemetry.io/otel/trace v1.43.0
-	modernc.org/quickjs v0.17.2
-	modernc.org/sqlite v1.48.2
+	modernc.org/quickjs v0.18.1
+	modernc.org/sqlite v1.50.1
 	sigs.k8s.io/yaml v1.6.0
 )
 
 require (
-	github.com/antithesishq/antithesis-sdk-go v0.6.0-default-no-op // indirect
+	github.com/antithesishq/antithesis-sdk-go v0.7.0 // indirect
 	github.com/cenkalti/backoff/v5 v5.0.3 // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
-	github.com/creack/goselect v0.1.2 // indirect
-	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
+	github.com/creack/goselect v0.1.3 // indirect
 	github.com/dustin/go-humanize v1.0.1 // indirect
-	github.com/dylibso/observe-sdk/go v0.0.0-20240819160327-2d926c5d788a // indirect
+	github.com/dylibso/observe-sdk/go v0.0.0-20240828172851-9145d8ad07e1 // indirect
 	github.com/emiago/dtls/v3 v3.0.0-20260122183559-8b8d23e359c0 // indirect
 	github.com/go-audio/riff v1.0.0 // indirect
 	github.com/go-logr/logr v1.4.3 // indirect
@@ -48,11 +47,11 @@ require (
 	github.com/google/go-tpm v0.9.8 // indirect
 	github.com/google/uuid v1.6.0 // indirect
 	github.com/grpc-ecosystem/grpc-gateway/v2 v2.28.0 // indirect
-	github.com/ianlancetaylor/demangle v0.0.0-20240805132620-81f5be970eca // indirect
+	github.com/ianlancetaylor/demangle v0.0.0-20260505044615-1ff4bf46051f // indirect
 	github.com/icholy/digest v1.1.0 // indirect
-	github.com/klauspost/compress v1.18.5 // indirect
-	github.com/mattn/go-isatty v0.0.20 // indirect
-	github.com/minio/highwayhash v1.0.4-0.20251030100505-070ab1a87a76 // indirect
+	github.com/klauspost/compress v1.18.6 // indirect
+	github.com/mattn/go-isatty v0.0.22 // indirect
+	github.com/minio/highwayhash v1.0.4 // indirect
 	github.com/nats-io/jwt/v2 v2.8.1 // indirect
 	github.com/nats-io/nkeys v0.4.15 // indirect
 	github.com/nats-io/nuid v1.0.1 // indirect
@@ -60,13 +59,12 @@ require (
 	github.com/pion/logging v0.2.4 // indirect
 	github.com/pion/randutil v0.1.0 // indirect
 	github.com/pion/rtcp v1.2.16 // indirect
-	github.com/pion/rtp v1.8.26 // indirect
-	github.com/pion/srtp/v3 v3.0.9 // indirect
-	github.com/pion/transport/v3 v3.1.1 // indirect
+	github.com/pion/rtp v1.10.2 // indirect
+	github.com/pion/srtp/v3 v3.0.10 // indirect
 	github.com/pion/transport/v4 v4.0.1 // indirect
 	github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
 	github.com/tetratelabs/wabin v0.0.0-20230304001439-f6f874872834 // indirect
-	github.com/tetratelabs/wazero v1.9.0 // indirect
+	github.com/tetratelabs/wazero v1.11.0 // indirect
 	github.com/zaf/g711 v1.4.0 // indirect
 	go.opentelemetry.io/auto/sdk v1.2.1 // indirect
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.43.0 // indirect
@@ -74,19 +72,19 @@ require (
 	go.opentelemetry.io/proto/otlp v1.10.0 // indirect
 	go.uber.org/atomic v1.11.0 // indirect
 	go.yaml.in/yaml/v2 v2.4.2 // indirect
-	golang.org/x/crypto v0.49.0 // indirect
-	golang.org/x/net v0.52.0 // indirect
+	golang.org/x/crypto v0.51.0 // indirect
+	golang.org/x/net v0.54.0 // indirect
 	golang.org/x/sync v0.20.0 // indirect
-	golang.org/x/sys v0.42.0 // indirect
-	golang.org/x/text v0.35.0 // indirect
+	golang.org/x/sys v0.44.0 // indirect
+	golang.org/x/text v0.37.0 // indirect
 	golang.org/x/time v0.15.0 // indirect
 	google.golang.org/genproto/googleapis/api v0.0.0-20260401024825-9d38bb4040a9 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20260401024825-9d38bb4040a9 // indirect
 	google.golang.org/grpc v1.80.0 // indirect
 	google.golang.org/protobuf v1.36.11 // indirect
 	gopkg.in/hraban/opus.v2 v2.0.0-20230925203106-0188a62cb302 // indirect
-	modernc.org/libc v1.70.0 // indirect
-	modernc.org/libquickjs v0.12.4 // indirect
+	modernc.org/libc v1.72.3 // indirect
+	modernc.org/libquickjs v0.12.7 // indirect
 	modernc.org/mathutil v1.7.1 // indirect
 	modernc.org/memory v1.11.0 // indirect
 )

go.sum

@@ -1,5 +1,5 @@
-github.com/antithesishq/antithesis-sdk-go v0.6.0-default-no-op h1:kpBdlEPbRvff0mDD1gk7o9BhI16b9p5yYAXRlidpqJE=
-github.com/antithesishq/antithesis-sdk-go v0.6.0-default-no-op/go.mod h1:IUpT2DPAKh6i/YhSbt6Gl3v2yvUZjmKncl7U91fup7E=
+github.com/antithesishq/antithesis-sdk-go v0.7.0 h1:uWDG8BqLD1lI2ps38WDz2vXflrTX2+vLX0SvZtztJtE=
+github.com/antithesishq/antithesis-sdk-go v0.7.0/go.mod h1:FQyySiasQQM8735Ddel3MRojmy4dA1IqCeyJ5jmPMbI=
 github.com/bsm/ginkgo/v2 v2.12.0 h1:Ny8MWAHyOepLGlLKYmXG4IEkioBysk6GpaRTLC8zwWs=
 github.com/bsm/ginkgo/v2 v2.12.0/go.mod h1:SwYbGRRDovPVboqFv0tPTcG1sN61LM1Z4ARdbAV9g4c=
 github.com/bsm/gomega v1.27.10 h1:yeMWxP2pV2fG3FgAODIY8EiRE3dy0aeFYt4l7wh6yKA=
@@ -8,24 +8,22 @@ github.com/cenkalti/backoff/v5 v5.0.3 h1:ZN+IMa753KfX5hd8vVaMixjnqRZ3y8CuJKRKj1x
 github.com/cenkalti/backoff/v5 v5.0.3/go.mod h1:rkhZdG3JZukswDf7f0cwqPNk4K0sa+F97BxZthm/crw=
 github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
 github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
-github.com/creack/goselect v0.1.2 h1:2DNy14+JPjRBgPzAd1thbQp4BSIihxcBf0IXhQXDRa0=
-github.com/creack/goselect v0.1.2/go.mod h1:a/NhLweNvqIYMuxcMOuWY516Cimucms3DglDzQP3hKY=
+github.com/creack/goselect v0.1.3 h1:MaGNMclRo7P2Jl21hBpR1Cn33ITSbKP6E49RtfblLKc=
+github.com/creack/goselect v0.1.3/go.mod h1:a/NhLweNvqIYMuxcMOuWY516Cimucms3DglDzQP3hKY=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78=
-github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc=
 github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
 github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
-github.com/dylibso/observe-sdk/go v0.0.0-20240819160327-2d926c5d788a h1:UwSIFv5g5lIvbGgtf3tVwC7Ky9rmMFBp0RMs+6f6YqE=
-github.com/dylibso/observe-sdk/go v0.0.0-20240819160327-2d926c5d788a/go.mod h1:C8DzXehI4zAbrdlbtOByKX6pfivJTBiV9Jjqv56Yd9Q=
+github.com/dylibso/observe-sdk/go v0.0.0-20240828172851-9145d8ad07e1 h1:idfl8M8rPW93NehFw5H1qqH8yG158t5POr+LX9avbJY=
+github.com/dylibso/observe-sdk/go v0.0.0-20240828172851-9145d8ad07e1/go.mod h1:C8DzXehI4zAbrdlbtOByKX6pfivJTBiV9Jjqv56Yd9Q=
 github.com/eclipse/paho.mqtt.golang v1.5.1 h1:/VSOv3oDLlpqR2Epjn1Q7b2bSTplJIeV2ISgCl2W7nE=
 github.com/eclipse/paho.mqtt.golang v1.5.1/go.mod h1:1/yJCneuyOoCOzKSsOTUc0AJfpsItBGWvYpBLimhArU=
 github.com/emiago/diago v0.28.0 h1:VCiimhFYLoBTsxH6WrufLSt6tKWG8Fv7LfCkZHqct2E=
 github.com/emiago/diago v0.28.0/go.mod h1:eQT6j9co9PMQ/25aUiM2jpvwxxWFXLWi2w5R3lZNmKg=
 github.com/emiago/dtls/v3 v3.0.0-20260122183559-8b8d23e359c0 h1:o4LxpUnZ1zxiQ+Qjc9kLwXcjz31NGAHmnZ7xoJto3VM=
 github.com/emiago/dtls/v3 v3.0.0-20260122183559-8b8d23e359c0/go.mod h1:ydcZ977eS1I6uOWodzMuw30BwvNAzT9su/xcNYSJqjA=
-github.com/emiago/sipgo v1.3.0 h1:efxQln1wJqcIU9+N+4eTKNtTZ7YsRsg8yc+0XYqyuQU=
-github.com/emiago/sipgo v1.3.0/go.mod h1:DuwAxBZhKMqIzQFPGZb1MVAGU6Wuxj64oTOhd5dx/FY=
+github.com/emiago/sipgo v1.3.1 h1:JwcmYJtCmcjuLwB2ZxtupYilNQgwXN/JIcxp+CDq16A=
+github.com/emiago/sipgo v1.3.1/go.mod h1:DuwAxBZhKMqIzQFPGZb1MVAGU6Wuxj64oTOhd5dx/FY=
 github.com/expr-lang/expr v1.17.8 h1:W1loDTT+0PQf5YteHSTpju2qfUfNoBt4yw9+wOEU9VM=
 github.com/expr-lang/expr v1.17.8/go.mod h1:8/vRC7+7HBzESEqt5kKpYXxrxkr31SaO8r40VO/1IT4=
 github.com/extism/go-sdk v1.7.1 h1:lWJos6uY+tRFdlIHR+SJjwFDApY7OypS/2nMhiVQ9Sw=
@@ -51,8 +49,8 @@ github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
 github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
 github.com/google/go-tpm v0.9.8 h1:slArAR9Ft+1ybZu0lBwpSmpwhRXaa85hWtMinMyRAWo=
 github.com/google/go-tpm v0.9.8/go.mod h1:h9jEsEECg7gtLis0upRBQU+GhYVH6jMjrFxI8u6bVUY=
-github.com/google/jsonschema-go v0.4.2 h1:tmrUohrwoLZZS/P3x7ex0WAVknEkBZM46iALbcqoRA8=
-github.com/google/jsonschema-go v0.4.2/go.mod h1:r5quNTdLOYEz95Ru18zA0ydNbBuYoo9tgaYcxEYhJVE=
+github.com/google/jsonschema-go v0.4.3 h1:/DBOLZTfDow7pe2GmaJNhltueGTtDKICi8V8p+DQPd0=
+github.com/google/jsonschema-go v0.4.3/go.mod h1:r5quNTdLOYEz95Ru18zA0ydNbBuYoo9tgaYcxEYhJVE=
 github.com/google/pprof v0.0.0-20250317173921-a4b03ec1a45e h1:ijClszYn+mADRFY17kjQEVQ1XRhq2/JR1M3sGqeJoxs=
 github.com/google/pprof v0.0.0-20250317173921-a4b03ec1a45e/go.mod h1:boTsfXsheKC2y+lKOCMpSfarhxDeIzfZG1jqGcPl3cA=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
@@ -63,36 +61,36 @@ github.com/grpc-ecosystem/grpc-gateway/v2 v2.28.0 h1:HWRh5R2+9EifMyIHV7ZV+MIZqgz
 github.com/grpc-ecosystem/grpc-gateway/v2 v2.28.0/go.mod h1:JfhWUomR1baixubs02l85lZYYOm7LV6om4ceouMv45c=
 github.com/hashicorp/golang-lru/v2 v2.0.7 h1:a+bsQ5rvGLjzHuww6tVxozPZFVghXaHOwFs4luLUK2k=
 github.com/hashicorp/golang-lru/v2 v2.0.7/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM=
-github.com/ianlancetaylor/demangle v0.0.0-20240805132620-81f5be970eca h1:T54Ema1DU8ngI+aef9ZhAhNGQhcRTrWxVeG07F+c/Rw=
-github.com/ianlancetaylor/demangle v0.0.0-20240805132620-81f5be970eca/go.mod h1:gx7rwoVhcfuVKG5uya9Hs3Sxj7EIvldVofAWIUtGouw=
+github.com/ianlancetaylor/demangle v0.0.0-20260505044615-1ff4bf46051f h1:NW3E2QSchEk63/fjeEvWOa2cE02FSv9ox//VE/N4c8g=
+github.com/ianlancetaylor/demangle v0.0.0-20260505044615-1ff4bf46051f/go.mod h1:gx7rwoVhcfuVKG5uya9Hs3Sxj7EIvldVofAWIUtGouw=
 github.com/icholy/digest v1.1.0 h1:HfGg9Irj7i+IX1o1QAmPfIBNu/Q5A5Tu3n/MED9k9H4=
 github.com/icholy/digest v1.1.0/go.mod h1:QNrsSGQ5v7v9cReDI0+eyjsXGUoRSUZQHeQ5C4XLa0Y=
-github.com/jwetzell/artnet-go v0.2.1 h1:iYTKWcwYrF5kBkYfkw2UbWvoueeA23iKEn7fR27mWZE=
-github.com/jwetzell/artnet-go v0.2.1/go.mod h1:gli97Z32a0kMkZ6taoTiK7/lqHcF/dhiGjGJdx/PxqA=
-github.com/jwetzell/free-d-go v0.1.0 h1:xHt6dvyit98X+OC3jVzV0aLidxbyzi3vI9QiYkteEtA=
-github.com/jwetzell/free-d-go v0.1.0/go.mod h1:KmrkooRARRaxJTBSPvwt/6IMAIaHH1R8bSA8cwbbELw=
-github.com/jwetzell/osc-go v0.2.0 h1:4as+BYCeZhEddFczGveP5yZZxvY728Uavz+ZSLZfOII=
-github.com/jwetzell/osc-go v0.2.0/go.mod h1:D3ZIXYB12bt4S35lKFUqgCFbF1Y+9Ld0sOhHA9mGZZM=
+github.com/jwetzell/artnet-go v0.2.2 h1:vaXSmRrSlEdETPZ/gvw6aAmVqzQm0i+gfAwyIQkVsB0=
+github.com/jwetzell/artnet-go v0.2.2/go.mod h1:gli97Z32a0kMkZ6taoTiK7/lqHcF/dhiGjGJdx/PxqA=
+github.com/jwetzell/free-d-go v0.1.1 h1:pzY2c4qRxKFBZ2jO3z512ysvUI0BUmgd4mSlWPiFVRM=
+github.com/jwetzell/free-d-go v0.1.1/go.mod h1:KmrkooRARRaxJTBSPvwt/6IMAIaHH1R8bSA8cwbbELw=
+github.com/jwetzell/osc-go v0.3.0 h1:z75TxuQSEmdcmZ56OAepkDa3m88SdZh//3m4nBb/XZI=
+github.com/jwetzell/osc-go v0.3.0/go.mod h1:kCs329JxY6Qjga08tRQ/Gl0PqhgQzLIMpOhm6uszvIc=
 github.com/jwetzell/psn-go v0.3.0 h1:WVpCEmExYE8a+I5hQak5jNJJp2x35VdGX/VuMUKPmhY=
 github.com/jwetzell/psn-go v0.3.0/go.mod h1:bcEAeti4sQM375buujb3mIfmUstD4Aby18gq3ENb6+o=
-github.com/klauspost/compress v1.18.5 h1:/h1gH5Ce+VWNLSWqPzOVn6XBO+vJbCNGvjoaGBFW2IE=
-github.com/klauspost/compress v1.18.5/go.mod h1:cwPg85FWrGar70rWktvGQj8/hthj3wpl0PGDogxkrSQ=
-github.com/klauspost/cpuid/v2 v2.0.9 h1:lgaqFMSdTdQYdZ04uHyN2d/eKdOMyi2YLSvlQIBFYa4=
-github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
+github.com/klauspost/compress v1.18.6 h1:2jupLlAwFm95+YDR+NwD2MEfFO9d4z4Prjl1XXDjuao=
+github.com/klauspost/compress v1.18.6/go.mod h1:cwPg85FWrGar70rWktvGQj8/hthj3wpl0PGDogxkrSQ=
+github.com/klauspost/cpuid/v2 v2.2.10 h1:tBs3QSyvjDyFTq3uoc/9xFpCuOsJQFNPiAhYdw2skhE=
+github.com/klauspost/cpuid/v2 v2.2.10/go.mod h1:hqwkgyIinND0mEev00jJYCxPNVRVXFQeu1XKlok6oO0=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
 github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
-github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
-github.com/minio/highwayhash v1.0.4-0.20251030100505-070ab1a87a76 h1:KGuD/pM2JpL9FAYvBrnBBeENKZNh6eNtjqytV6TYjnk=
-github.com/minio/highwayhash v1.0.4-0.20251030100505-070ab1a87a76/go.mod h1:GGYsuwP/fPD6Y9hMiXuapVvlIUEhFhMTh0rxU3ik1LQ=
+github.com/mattn/go-isatty v0.0.22 h1:j8l17JJ9i6VGPUFUYoTUKPSgKe/83EYU2zBC7YNKMw4=
+github.com/mattn/go-isatty v0.0.22/go.mod h1:ZXfXG4SQHsB/w3ZeOYbR0PrPwLy+n6xiMrJlRFqopa4=
+github.com/minio/highwayhash v1.0.4 h1:asJizugGgchQod2ja9NJlGOWq4s7KsAWr5XUc9Clgl4=
+github.com/minio/highwayhash v1.0.4/go.mod h1:GGYsuwP/fPD6Y9hMiXuapVvlIUEhFhMTh0rxU3ik1LQ=
 github.com/nats-io/jwt/v2 v2.8.1 h1:V0xpGuD/N8Mi+fQNDynXohVvp7ZztevW5io8CUWlPmU=
 github.com/nats-io/jwt/v2 v2.8.1/go.mod h1:nWnOEEiVMiKHQpnAy4eXlizVEtSfzacZ1Q43LIRavZg=
-github.com/nats-io/nats-server/v2 v2.12.6 h1:Egbx9Vl7Ch8wTtpXPGqbehkZ+IncKqShUxvrt1+Enc8=
-github.com/nats-io/nats-server/v2 v2.12.6/go.mod h1:4HPlrvtmSO3yd7KcElDNMx9kv5EBJBnJJzQPptXlheo=
-github.com/nats-io/nats.go v1.50.0 h1:5zAeQrTvyrKrWLJ0fu02W3br8ym57qf7csDzgLOpcds=
-github.com/nats-io/nats.go v1.50.0/go.mod h1:26HypzazeOkyO3/mqd1zZd53STJN0EjCYF9Uy2ZOBno=
+github.com/nats-io/nats-server/v2 v2.14.0 h1:+8q0HrDFotwLLcGH/legOEOnowunhK+aZ4GYBIWpQlM=
+github.com/nats-io/nats-server/v2 v2.14.0/go.mod h1:ImVUUDvfClJbb6cuJQRc1VmgDCXKM5ds0OoiG9MVOKo=
+github.com/nats-io/nats.go v1.52.0 h1:n3avV4VBsCgsdwh71TppsTwtv+QdPs7ntSKM8qJLGsc=
+github.com/nats-io/nats.go v1.52.0/go.mod h1:26HypzazeOkyO3/mqd1zZd53STJN0EjCYF9Uy2ZOBno=
 github.com/nats-io/nkeys v0.4.15 h1:JACV5jRVO9V856KOapQ7x+EY8Jo3qw1vJt/9Jpwzkk4=
 github.com/nats-io/nkeys v0.4.15/go.mod h1:CpMchTXC9fxA5zrMo4KpySxNjiDVvr8ANOSZdiNfUrs=
 github.com/nats-io/nuid v1.0.1 h1:5iA8DT8V7q8WK2EScv2padNa/rTESc1KdnPw4TC2paw=
@@ -105,18 +103,16 @@ github.com/pion/randutil v0.1.0 h1:CFG1UdESneORglEsnimhUjf33Rwjubwj6xfiOXBa3mA=
 github.com/pion/randutil v0.1.0/go.mod h1:XcJrSMMbbMRhASFVOlj/5hQial/Y8oH/HVo7TBZq+j8=
 github.com/pion/rtcp v1.2.16 h1:fk1B1dNW4hsI78XUCljZJlC4kZOPk67mNRuQ0fcEkSo=
 github.com/pion/rtcp v1.2.16/go.mod h1:/as7VKfYbs5NIb4h6muQ35kQF/J0ZVNz2Z3xKoCBYOo=
-github.com/pion/rtp v1.8.26 h1:VB+ESQFQhBXFytD+Gk8cxB6dXeVf2WQzg4aORvAvAAc=
-github.com/pion/rtp v1.8.26/go.mod h1:rF5nS1GqbR7H/TCpKwylzeq6yDM+MM6k+On5EgeThEM=
-github.com/pion/srtp/v3 v3.0.9 h1:lRGF4G61xxj+m/YluB3ZnBpiALSri2lTzba0kGZMrQY=
-github.com/pion/srtp/v3 v3.0.9/go.mod h1:E+AuWd7Ug2Fp5u38MKnhduvpVkveXJX6J4Lq4rxUYt8=
-github.com/pion/transport/v3 v3.1.1 h1:Tr684+fnnKlhPceU+ICdrw6KKkTms+5qHMgw6bIkYOM=
-github.com/pion/transport/v3 v3.1.1/go.mod h1:+c2eewC5WJQHiAA46fkMMzoYZSuGzA/7E2FPrOYHctQ=
+github.com/pion/rtp v1.10.2 h1:l+f6tTDcAH6xwepaAoW791ddhuYsJlqRATOzirO04Mo=
+github.com/pion/rtp v1.10.2/go.mod h1:Au8fc6cEByy8RLTwKTQTEeQqDB/SJDxwL4mZuxYA5Pk=
+github.com/pion/srtp/v3 v3.0.10 h1:tFirkpBb3XccP5VEXLi50GqXhv5SKPxqrdlhDCJlZrQ=
+github.com/pion/srtp/v3 v3.0.10/go.mod h1:3mOTIB0cq9qlbn59V4ozvv9ClW/BSEbRp4cY0VtaR7M=
 github.com/pion/transport/v4 v4.0.1 h1:sdROELU6BZ63Ab7FrOLn13M6YdJLY20wldXW2Cu2k8o=
 github.com/pion/transport/v4 v4.0.1/go.mod h1:nEuEA4AD5lPdcIegQDpVLgNoDGreqM/YqmEx3ovP4jM=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/redis/go-redis/v9 v9.18.0 h1:pMkxYPkEbMPwRdenAzUNyFNrDgHx9U+DrBabWNfSRQs=
-github.com/redis/go-redis/v9 v9.18.0/go.mod h1:k3ufPphLU5YXwNTUcCRXGxUoF1fqxnhFQmscfkCoDA0=
+github.com/redis/go-redis/v9 v9.19.0 h1:XPVaaPSnG6RhYf7p+rmSa9zZfeVAnWsH5h3lxthOm/k=
+github.com/redis/go-redis/v9 v9.19.0/go.mod h1:v/M13XI1PVCDcm01VtPFOADfZtHf8YW3baQf57KlIkA=
 github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE=
 github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
 github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ=
@@ -125,14 +121,14 @@ github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu
 github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
 github.com/tetratelabs/wabin v0.0.0-20230304001439-f6f874872834 h1:ZF+QBjOI+tILZjBaFj3HgFonKXUcwgJ4djLb6i42S3Q=
 github.com/tetratelabs/wabin v0.0.0-20230304001439-f6f874872834/go.mod h1:m9ymHTgNSEjuxvw8E7WWe4Pl4hZQHXONY8wE6dMLaRk=
-github.com/tetratelabs/wazero v1.9.0 h1:IcZ56OuxrtaEz8UYNRHBrUa9bYeX9oVY93KspZZBf/I=
-github.com/tetratelabs/wazero v1.9.0/go.mod h1:TSbcXCfFP0L2FGkRPxHphadXPjo1T6W+CseNNY7EkjM=
-github.com/urfave/cli/v3 v3.8.0 h1:XqKPrm0q4P0q5JpoclYoCAv0/MIvH/jZ2umzuf8pNTI=
-github.com/urfave/cli/v3 v3.8.0/go.mod h1:ysVLtOEmg2tOy6PknnYVhDoouyC/6N42TMeoMzskhso=
+github.com/tetratelabs/wazero v1.11.0 h1:+gKemEuKCTevU4d7ZTzlsvgd1uaToIDtlQlmNbwqYhA=
+github.com/tetratelabs/wazero v1.11.0/go.mod h1:eV28rsN8Q+xwjogd7f4/Pp4xFxO7uOGbLcD/LzB1wiU=
+github.com/urfave/cli/v3 v3.9.0 h1:AV9lIiPv3ukYnxunaCUsHnEozptYmDN2F0+yWqLMn/c=
+github.com/urfave/cli/v3 v3.9.0/go.mod h1:ysVLtOEmg2tOy6PknnYVhDoouyC/6N42TMeoMzskhso=
 github.com/zaf/g711 v1.4.0 h1:XZYkjjiAg9QTBnHqEg37m2I9q3IIDv5JRYXs2N8ma7c=
 github.com/zaf/g711 v1.4.0/go.mod h1:eCDXt3dSp/kYYAoooba7ukD/Q75jvAaS4WOMr0l1Roo=
-github.com/zeebo/xxh3 v1.0.2 h1:xZmwmqxHZA8AI603jOQ0tMqmBr9lPeFwGg6d+xy9DC0=
-github.com/zeebo/xxh3 v1.0.2/go.mod h1:5NWz9Sef7zIDm2JHfFlcQvNekmcEl9ekUZQQKCYaDcA=
+github.com/zeebo/xxh3 v1.1.0 h1:s7DLGDK45Dyfg7++yxI0khrfwq9661w9EN78eP/UZVs=
+github.com/zeebo/xxh3 v1.1.0/go.mod h1:IisAie1LELR4xhVinxWS5+zf1lA4p0MW4T+w+W07F5s=
 gitlab.com/gomidi/midi/v2 v2.3.23 h1:P8NxV4EzV9c+BjpwTeB+G/qa+Xdq/UTazS2fKxY0O0g=
 gitlab.com/gomidi/midi/v2 v2.3.23/go.mod h1:jDpP4O4skYi+7iVwt6Zyp18bd2M4hkjtMuw2cmgKgfw=
 go.bug.st/serial v1.6.4 h1:7FmqNPgVp3pu2Jz5PoPtbZ9jJO5gnEnZIvnI1lzve8A=
@@ -163,24 +159,24 @@ go.yaml.in/yaml/v2 v2.4.2 h1:DzmwEr2rDGHl7lsFgAHxmNz/1NlQ7xLIrlN2h5d1eGI=
 go.yaml.in/yaml/v2 v2.4.2/go.mod h1:081UH+NErpNdqlCXm3TtEran0rJZGxAYx9hb/ELlsPU=
 go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc=
 go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg=
-golang.org/x/crypto v0.49.0 h1:+Ng2ULVvLHnJ/ZFEq4KdcDd/cfjrrjjNSXNzxg0Y4U4=
-golang.org/x/crypto v0.49.0/go.mod h1:ErX4dUh2UM+CFYiXZRTcMpEcN8b/1gxEuv3nODoYtCA=
-golang.org/x/mod v0.33.0 h1:tHFzIWbBifEmbwtGz65eaWyGiGZatSrT9prnU8DbVL8=
-golang.org/x/mod v0.33.0/go.mod h1:swjeQEj+6r7fODbD2cqrnje9PnziFuw4bmLbBZFrQ5w=
-golang.org/x/net v0.52.0 h1:He/TN1l0e4mmR3QqHMT2Xab3Aj3L9qjbhRm78/6jrW0=
-golang.org/x/net v0.52.0/go.mod h1:R1MAz7uMZxVMualyPXb+VaqGSa3LIaUqk0eEt3w36Sw=
+golang.org/x/crypto v0.51.0 h1:IBPXwPfKxY7cWQZ38ZCIRPI50YLeevDLlLnyC5wRGTI=
+golang.org/x/crypto v0.51.0/go.mod h1:8AdwkbraGNABw2kOX6YFPs3WM22XqI4EXEd8g+x7Oc8=
+golang.org/x/mod v0.35.0 h1:Ww1D637e6Pg+Zb2KrWfHQUnH2dQRLBQyAtpr/haaJeM=
+golang.org/x/mod v0.35.0/go.mod h1:+GwiRhIInF8wPm+4AoT6L0FA1QWAad3OMdTRx4tFYlU=
+golang.org/x/net v0.54.0 h1:2zJIZAxAHV/OHCDTCOHAYehQzLfSXuf/5SoL/Dv6w/w=
+golang.org/x/net v0.54.0/go.mod h1:Sj4oj8jK6XmHpBZU/zWHw3BV3abl4Kvi+Ut7cQcY+cQ=
 golang.org/x/sync v0.20.0 h1:e0PTpb7pjO8GAtTs2dQ6jYa5BWYlMuX047Dco/pItO4=
 golang.org/x/sync v0.20.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.42.0 h1:omrd2nAlyT5ESRdCLYdm3+fMfNFE/+Rf4bDIQImRJeo=
-golang.org/x/sys v0.42.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
-golang.org/x/text v0.35.0 h1:JOVx6vVDFokkpaq1AEptVzLTpDe9KGpj5tR4/X+ybL8=
-golang.org/x/text v0.35.0/go.mod h1:khi/HExzZJ2pGnjenulevKNX1W67CUy0AsXcNubPGCA=
+golang.org/x/sys v0.44.0 h1:ildZl3J4uzeKP07r2F++Op7E9B29JRUy+a27EibtBTQ=
+golang.org/x/sys v0.44.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
+golang.org/x/text v0.37.0 h1:Cqjiwd9eSg8e0QAkyCaQTNHFIIzWtidPahFWR83rTrc=
+golang.org/x/text v0.37.0/go.mod h1:a5sjxXGs9hsn/AJVwuElvCAo9v8QYLzvavO5z2PiM38=
 golang.org/x/time v0.15.0 h1:bbrp8t3bGUeFOx08pvsMYRTCVSMk89u4tKbNOZbp88U=
 golang.org/x/time v0.15.0/go.mod h1:Y4YMaQmXwGQZoFaVFk4YpCt4FLQMYKZe9oeV/f4MSno=
-golang.org/x/tools v0.42.0 h1:uNgphsn75Tdz5Ji2q36v/nsFSfR/9BRFvqhGBaJGd5k=
-golang.org/x/tools v0.42.0/go.mod h1:Ma6lCIwGZvHK6XtgbswSoWroEkhugApmsXyrUmBhfr0=
+golang.org/x/tools v0.44.0 h1:UP4ajHPIcuMjT1GqzDWRlalUEoY+uzoZKnhOjbIPD2c=
+golang.org/x/tools v0.44.0/go.mod h1:KA0AfVErSdxRZIsOVipbv3rQhVXTnlU6UhKxHd1seDI=
 gonum.org/v1/gonum v0.17.0 h1:VbpOemQlsSMrYmn7T2OUvQ4dqxQXU+ouZFQsZOx50z4=
 gonum.org/v1/gonum v0.17.0/go.mod h1:El3tOrEuMpv2UdMrbNlKEh9vd86bmQ6vqIcDwxEOc1E=
 google.golang.org/genproto/googleapis/api v0.0.0-20260401024825-9d38bb4040a9 h1:VPWxll4HlMw1Vs/qXtN7BvhZqsS9cdAittCNvVENElA=
@@ -200,10 +196,10 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gotest.tools/v3 v3.5.2 h1:7koQfIKdy+I8UTetycgUqXWSDwpgv193Ka+qRsmBY8Q=
 gotest.tools/v3 v3.5.2/go.mod h1:LtdLGcnqToBH83WByAAi/wiwSFCArdFIUV/xxN4pcjA=
-modernc.org/cc/v4 v4.27.1 h1:9W30zRlYrefrDV2JE2O8VDtJ1yPGownxciz5rrbQZis=
-modernc.org/cc/v4 v4.27.1/go.mod h1:uVtb5OGqUKpoLWhqwNQo/8LwvoiEBLvZXIQ/SmO6mL0=
-modernc.org/ccgo/v4 v4.32.0 h1:hjG66bI/kqIPX1b2yT6fr/jt+QedtP2fqojG2VrFuVw=
-modernc.org/ccgo/v4 v4.32.0/go.mod h1:6F08EBCx5uQc38kMGl+0Nm0oWczoo1c7cgpzEry7Uc0=
+modernc.org/cc/v4 v4.28.2 h1:3tQ0lf2ADtoby2EtSP+J7IE2SHwEJdP8ioR59wx7XpY=
+modernc.org/cc/v4 v4.28.2/go.mod h1:OnovgIhbbMXMu1aISnJ0wvVD1KnW+cAUJkIrAWh+kVI=
+modernc.org/ccgo/v4 v4.34.0 h1:yRLPFZieg532OT4rp4JFNIVcquwalMX26G95WQDqwCQ=
+modernc.org/ccgo/v4 v4.34.0/go.mod h1:AS5WYMyBakQ+fhsHhtP8mWB82KTGPkNNJDGfGQCe0/A=
 modernc.org/fileutil v1.4.0 h1:j6ZzNTftVS054gi281TyLjHPp6CPHr2KCxEXjEbD6SM=
 modernc.org/fileutil v1.4.0/go.mod h1:EqdKFDxiByqxLk8ozOxObDSfcVOv/54xDs/DUHdvCUU=
 modernc.org/gc/v2 v2.6.5 h1:nyqdV8q46KvTpZlsw66kWqwXRHdjIlJOhG6kxiV/9xI=
@@ -212,22 +208,22 @@ modernc.org/gc/v3 v3.1.2 h1:ZtDCnhonXSZexk/AYsegNRV1lJGgaNZJuKjJSWKyEqo=
 modernc.org/gc/v3 v3.1.2/go.mod h1:HFK/6AGESC7Ex+EZJhJ2Gni6cTaYpSMmU/cT9RmlfYY=
 modernc.org/goabi0 v0.2.0 h1:HvEowk7LxcPd0eq6mVOAEMai46V+i7Jrj13t4AzuNks=
 modernc.org/goabi0 v0.2.0/go.mod h1:CEFRnnJhKvWT1c1JTI3Avm+tgOWbkOu5oPA8eH8LnMI=
-modernc.org/libc v1.70.0 h1:U58NawXqXbgpZ/dcdS9kMshu08aiA6b7gusEusqzNkw=
-modernc.org/libc v1.70.0/go.mod h1:OVmxFGP1CI/Z4L3E0Q3Mf1PDE0BucwMkcXjjLntvHJo=
-modernc.org/libquickjs v0.12.4 h1:WQ2XP6pAscvtHKPEVuHTf8NiAl5nMomKgIL6790r7AQ=
-modernc.org/libquickjs v0.12.4/go.mod h1:MqdjijqGUwLw+r86+YbFLLj7vKZhVHEKRs8XOsnM/n8=
+modernc.org/libc v1.72.3 h1:ZnDF4tXn4NBXFutMMQC4vtbTFSXhhKzR73fv0beZEAU=
+modernc.org/libc v1.72.3/go.mod h1:dn0dZNnnn1clLyvRxLxYExxiKRZIRENOfqQ8XEeg4Qs=
+modernc.org/libquickjs v0.12.7 h1:jSU4+KWDnA6ILat9SAy5zMBSU3Cxtco1NzSJ7DZgCKc=
+modernc.org/libquickjs v0.12.7/go.mod h1:ajFW8dWHtF8ggFWGbU2BBEM6FI0vemVWrd8nEHAPZpE=
 modernc.org/mathutil v1.7.1 h1:GCZVGXdaN8gTqB1Mf/usp1Y/hSqgI2vAGGP4jZMCxOU=
 modernc.org/mathutil v1.7.1/go.mod h1:4p5IwJITfppl0G4sUEDtCr4DthTaT47/N3aT6MhfgJg=
 modernc.org/memory v1.11.0 h1:o4QC8aMQzmcwCK3t3Ux/ZHmwFPzE6hf2Y5LbkRs+hbI=
 modernc.org/memory v1.11.0/go.mod h1:/JP4VbVC+K5sU2wZi9bHoq2MAkCnrt2r98UGeSK7Mjw=
-modernc.org/opt v0.1.4 h1:2kNGMRiUjrp4LcaPuLY2PzUfqM/w9N23quVwhKt5Qm8=
-modernc.org/opt v0.1.4/go.mod h1:03fq9lsNfvkYSfxrfUhZCWPk1lm4cq4N+Bh//bEtgns=
-modernc.org/quickjs v0.17.2 h1:LrhCQ763clXttVFFYdfnwAATM4JFv/vPKee/tLsFFIE=
-modernc.org/quickjs v0.17.2/go.mod h1:h8zcP/sP8AZkDvtMXwIoUV/g5pWTPqivz0PLU070URQ=
+modernc.org/opt v0.2.0 h1:tGyef5ApycA7FSEOMraay9SaTk5zmbx7Tu+cJs4QKZg=
+modernc.org/opt v0.2.0/go.mod h1:03fq9lsNfvkYSfxrfUhZCWPk1lm4cq4N+Bh//bEtgns=
+modernc.org/quickjs v0.18.1 h1:exrw1Bp1smLUVXiZ4M9yfUP24EeU1C2wCKD1IHN2JFk=
+modernc.org/quickjs v0.18.1/go.mod h1:wMyqS7/VurEMUms6XwVQoX7UhJakAr9EMc8aPSL5Xjc=
 modernc.org/sortutil v1.2.1 h1:+xyoGf15mM3NMlPDnFqrteY07klSFxLElE2PVuWIJ7w=
 modernc.org/sortutil v1.2.1/go.mod h1:7ZI3a3REbai7gzCLcotuw9AC4VZVpYMjDzETGsSMqJE=
-modernc.org/sqlite v1.48.2 h1:5CnW4uP8joZtA0LedVqLbZV5GD7F/0x91AXeSyjoh5c=
-modernc.org/sqlite v1.48.2/go.mod h1:hWjRO6Tj/5Ik8ieqxQybiEOUXy0NJFNp2tpvVpKlvig=
+modernc.org/sqlite v1.50.1 h1:l+cQvn0sd0zJJtfygGHuQJ5AjlrwXmWPw4KP3ZMwr9w=
+modernc.org/sqlite v1.50.1/go.mod h1:tcNzv5p84E0skkmJn038y+hWJbLQXQqEnQfeh5r2JLM=
 modernc.org/strutil v1.2.1 h1:UneZBkQA+DX2Rp35KcM69cSsNES9ly8mQWD71HKlOA0=
 modernc.org/strutil v1.2.1/go.mod h1:EHkiggD70koQxjVdSBM3JKM7k6L0FbGE5eymy9i3B9A=
 modernc.org/token v1.1.0 h1:Xl7Ap9dKaEs5kLoOQeQmPWevfnk/DM5qcLcYlA8ys6Y=

internal/api/api.go

@@ -1,4 +1,4 @@
-package showbridge
+package api
 
 import (
 	"context"
@@ -6,60 +6,84 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
+	"log/slog"
 	"net/http"
+	"sync"
 	"time"
 
+	"github.com/jwetzell/showbridge-go/internal/common"
 	"github.com/jwetzell/showbridge-go/internal/config"
-	"github.com/jwetzell/showbridge-go/internal/module"
-	"github.com/jwetzell/showbridge-go/internal/route"
 	"github.com/jwetzell/showbridge-go/internal/schema"
 )
 
-func (r *Router) startAPIServer(config config.ApiConfig) {
-	if !config.Enabled {
-		r.logger.Warn("API not enabled")
+type ApiServer struct {
+	config             config.ApiConfig
+	serverMu           sync.Mutex
+	server             *http.Server
+	logger             *slog.Logger
+	configurableRouter config.Configurable
+	eventRouter        common.EventRouter
+}
+
+func NewApiServer(configurableRouter config.Configurable, eventRouter common.EventRouter) *ApiServer {
+	return &ApiServer{
+		configurableRouter: configurableRouter,
+		eventRouter:        eventRouter,
+		logger:             slog.Default().With("component", "api"),
+	}
+}
+
+func (as *ApiServer) Start(config config.ApiConfig) {
+	as.config = config
+	if !as.config.Enabled {
+		as.logger.Warn("not enabled")
 		return
 	}
-	r.logger.Debug("starting API server", "port", config.Port)
+	as.logger.Debug("starting", "port", as.config.Port)
 	mux := http.NewServeMux()
-	mux.HandleFunc("/ws", r.handleWebsocket)
-	mux.HandleFunc("/health", r.handleHealthHTTP)
-	mux.HandleFunc("/api/v1/config", r.handleConfigHTTP)
+	mux.HandleFunc("/ws", as.handleWebsocket)
+	mux.HandleFunc("/health", as.handleHealthHTTP)
+	mux.HandleFunc("/api/v1/config", as.handleConfigHTTP)
 	mux.HandleFunc("/schema/config.schema.json", handleConfigSchema)
 	mux.HandleFunc("/schema/routes.schema.json", handleRoutesSchema)
 	mux.HandleFunc("/schema/modules.schema.json", handleModulesSchema)
 	mux.HandleFunc("/schema/processors.schema.json", handleProcessorsSchema)
 
-	r.apiServerMu.Lock()
-	defer r.apiServerMu.Unlock()
-	r.apiServer = &http.Server{
-		Addr:    fmt.Sprintf(":%d", config.Port),
-		Handler: mux,
+	as.serverMu.Lock()
+	defer as.serverMu.Unlock()
+	as.server = &http.Server{
+		Addr:              fmt.Sprintf(":%d", as.config.Port),
+		ReadHeaderTimeout: 5 * time.Second,
+		Handler:           mux,
 	}
 
 	go func() {
-		r.apiServer.ListenAndServe()
-		r.apiServerShutdown()
+		err := as.server.ListenAndServe()
+		if err != nil && err != http.ErrServerClosed {
+			as.logger.Error("server error", "error", err)
+		}
 	}()
 }
 
-func (r *Router) stopAPIServer() {
-	if r.apiServer == nil {
+func (as *ApiServer) Stop() {
+	if as.server == nil {
 		return
 	}
-	r.logger.Debug("stopping API server")
-	r.apiServerMu.Lock()
-	defer r.apiServerMu.Unlock()
-	if r.apiServer != nil {
+	as.serverMu.Lock()
+	defer as.serverMu.Unlock()
+	if as.server != nil {
 		apiShutdownCtx, apiShutdownCancel := context.WithTimeout(context.Background(), 5*time.Second)
-		r.apiServerShutdown = apiShutdownCancel
-		r.apiServer.Shutdown(apiShutdownCtx)
-		<-apiShutdownCtx.Done()
-		r.apiServer = nil
+		defer apiShutdownCancel()
+		err := as.server.Shutdown(apiShutdownCtx)
+		if err != nil {
+			as.logger.Error("error shutting down server", "error", err)
+		}
+		as.server = nil
 	}
+	as.logger.Debug("done")
 }
 
-func (r *Router) handleHealthHTTP(w http.ResponseWriter, req *http.Request) {
+func (as *ApiServer) handleHealthHTTP(w http.ResponseWriter, req *http.Request) {
 	switch req.Method {
 	case http.MethodGet:
 		w.Header().Set("Access-Control-Allow-Origin", "*")
@@ -75,11 +99,11 @@ func (r *Router) handleHealthHTTP(w http.ResponseWriter, req *http.Request) {
 	}
 }
 
-func (r *Router) handleConfigHTTP(w http.ResponseWriter, req *http.Request) {
+func (as *ApiServer) handleConfigHTTP(w http.ResponseWriter, req *http.Request) {
 
 	switch req.Method {
 	case http.MethodGet:
-		configJSON, err := json.Marshal(r.runningConfig)
+		configJSON, err := json.Marshal(as.configurableRouter.GetRunningConfig())
 		if err != nil {
 			http.Error(w, "Internal server error", http.StatusInternalServerError)
 			return
@@ -89,10 +113,6 @@ func (r *Router) handleConfigHTTP(w http.ResponseWriter, req *http.Request) {
 		w.Header().Set("Content-Type", "application/json")
 		w.Write(configJSON)
 	case http.MethodPut:
-		if r.updatingConfig {
-			http.Error(w, "Config update in progress.", http.StatusConflict)
-			return
-		}
 		//TODO(jwetzell): again way too much marshaling
 		cfgBytes, err := io.ReadAll(req.Body)
 		if err != nil {
@@ -132,11 +152,15 @@ func (r *Router) handleConfigHTTP(w http.ResponseWriter, req *http.Request) {
 			http.Error(w, "Bad request", http.StatusBadRequest)
 			return
 		}
-		moduleErrors, routeErrors := r.UpdateConfig(newConfig)
+		moduleErrors, routeErrors, err := as.configurableRouter.UpdateConfig(newConfig, true)
+		if err != nil {
+			http.Error(w, err.Error(), http.StatusConflict)
+			return
+		}
 		if len(moduleErrors) > 0 || len(routeErrors) > 0 {
 			errorResponse := struct {
-				ModuleErrors []module.ModuleError `json:"moduleErrors,omitempty"`
-				RouteErrors  []route.RouteError   `json:"routeErrors,omitempty"`
+				ModuleErrors []config.ModuleError `json:"moduleErrors,omitempty"`
+				RouteErrors  []config.RouteError  `json:"routeErrors,omitempty"`
 			}{
 				ModuleErrors: moduleErrors,
 				RouteErrors:  routeErrors,
@@ -154,7 +178,6 @@ func (r *Router) handleConfigHTTP(w http.ResponseWriter, req *http.Request) {
 		}
 		w.Header().Set("Access-Control-Allow-Origin", "*")
 		w.WriteHeader(http.StatusOK)
-		r.ConfigChange <- newConfig
 	case http.MethodOptions:
 		w.Header().Set("Access-Control-Allow-Origin", "*")
 		w.Header().Set("Access-Control-Allow-Methods", "GET, PUT, OPTIONS")

internal/api/websocket.go

@@ -0,0 +1,82 @@
+package api
+
+import (
+	"encoding/json"
+	"net/http"
+
+	"github.com/gorilla/websocket"
+	"github.com/jwetzell/showbridge-go/internal/common"
+)
+
+var upgrader = websocket.Upgrader{
+	CheckOrigin: func(r *http.Request) bool {
+		return true
+	},
+}
+
+type WebsocketEventDestination struct {
+	conn *websocket.Conn
+}
+
+func (d WebsocketEventDestination) Send(event common.Event) error {
+	eventJSON, err := event.ToJSON()
+	if err != nil {
+		return err
+	}
+	return d.conn.WriteMessage(websocket.TextMessage, eventJSON)
+}
+
+func (d WebsocketEventDestination) Is(dest common.EventDestination) bool {
+	other, ok := dest.(WebsocketEventDestination)
+	if !ok {
+		return false
+	}
+	return d.conn == other.conn
+}
+
+func (as *ApiServer) handleWebsocket(w http.ResponseWriter, req *http.Request) {
+	conn, err := upgrader.Upgrade(w, req, nil)
+	if err != nil {
+		as.logger.Error("websocket upgrade error", "error", err)
+		return
+	}
+	defer conn.Close()
+
+	eventDestination := WebsocketEventDestination{conn: conn}
+
+	as.eventRouter.AddEventDestination(eventDestination)
+READ_LOOP:
+	for {
+		messageType, message, err := conn.ReadMessage()
+		if err != nil {
+			_, ok := err.(*websocket.CloseError)
+			if ok {
+				break READ_LOOP
+			}
+		}
+
+		switch messageType {
+		case websocket.TextMessage, websocket.BinaryMessage:
+			event := common.Event{}
+			err = json.Unmarshal(message, &event)
+			if err != nil {
+				as.logger.Error("websocket message unmarshal error", "error", err)
+				continue
+			}
+			as.eventRouter.HandleEvent(event, WebsocketEventDestination{conn: conn})
+		case websocket.CloseMessage:
+			break READ_LOOP
+		case websocket.PingMessage:
+			err = conn.WriteMessage(websocket.PongMessage, nil)
+			if err != nil {
+				as.logger.Error("websocket pong error", "error", err)
+			}
+		default:
+			as.logger.Warn("unsupported websocket message type", "type", messageType)
+			continue
+		}
+
+	}
+	//NOTE(jwetzell): remove ws connection
+	as.eventRouter.RemoveEventDestination(eventDestination)
+}

internal/common/common.go

@@ -81,11 +81,19 @@ func GetAnyAsByte(value any) (byte, bool) {
 }
 
 func GetAnyAsByteSlice(value any) ([]byte, bool) {
+	// already a []byte
+	byteSlice, ok := value.([]byte)
+	if ok {
+		return byteSlice, true
+	}
+
+	// check for a slice
 	v := reflect.ValueOf(value)
 	if v.Kind() != reflect.Slice {
 		return nil, false
 	}
 
+	// try to convert each element to a byte
 	result := make([]byte, v.Len())
 	for i := 0; i < v.Len(); i++ {
 		elem := v.Index(i).Interface()
@@ -99,6 +107,14 @@ func GetAnyAsByteSlice(value any) ([]byte, bool) {
 }
 
 func GetAnyAsIntSlice(value any) ([]int, bool) {
+
+	// already a []byte
+	intSlice, ok := value.([]int)
+	if ok {
+		return intSlice, true
+	}
+
+	// check for a slice
 	v := reflect.ValueOf(value)
 	if v.Kind() != reflect.Slice {
 		return nil, false

internal/common/context.go

@@ -1,8 +0,0 @@
-package common
-
-type contextKey string
-
-const RouterContextKey contextKey = contextKey("router")
-const SourceContextKey contextKey = contextKey("source")
-const ModulesContextKey contextKey = contextKey("modules")
-const SenderContextKey contextKey = contextKey("sender")

internal/common/events.go

@@ -0,0 +1,26 @@
+package common
+
+import (
+	"encoding/json"
+)
+
+type Event struct {
+	Type  string `json:"type"`
+	Data  any    `json:"data,omitempty"`
+	Error string `json:"error,omitempty"`
+}
+
+func (e Event) ToJSON() ([]byte, error) {
+	return json.Marshal(e)
+}
+
+type EventDestination interface {
+	Send(event Event) error
+	Is(dest EventDestination) bool
+}
+
+type EventRouter interface {
+	HandleEvent(event Event, source EventDestination)
+	AddEventDestination(dest EventDestination)
+	RemoveEventDestination(dest EventDestination)
+}

internal/common/module.go

@@ -8,7 +8,7 @@ import (
 type Module interface {
 	Id() string
 	Type() string
-	Start(context.Context) error
+	Start(context.Context, RouteIO) error
 	Stop()
 }
 
@@ -22,5 +22,5 @@ type KeyValueModule interface {
 }
 
 type DatabaseModule interface {
-	Database() *sql.DB
+	Database() (*sql.DB, error)
 }

internal/common/payload.go

@@ -1,40 +1,9 @@
 package common
 
-import (
-	"context"
-)
-
 type WrappedPayload struct {
 	Payload any
+	Router  RouteIO
 	Modules map[string]Module
-	Sender  any
 	Source  string
 	End     bool
 }
-
-func GetWrappedPayload(ctx context.Context, payload any) WrappedPayload {
-	wrappedPayload := WrappedPayload{
-		Payload: payload,
-		End:     false,
-	}
-	modules := ctx.Value(ModulesContextKey)
-	if modules != nil {
-		moduleMap, ok := modules.(map[string]Module)
-		if ok {
-			wrappedPayload.Modules = moduleMap
-		} else {
-			wrappedPayload.Modules = make(map[string]Module)
-		}
-	}
-
-	sender := ctx.Value(SenderContextKey)
-	if sender != nil {
-		wrappedPayload.Sender = sender
-	}
-
-	source := ctx.Value(SourceContextKey)
-	if source != nil {
-		wrappedPayload.Source = source.(string)
-	}
-	return wrappedPayload
-}

internal/common/payload_test.go

@@ -1,82 +0,0 @@
-package common_test
-
-import (
-	"context"
-	"reflect"
-	"testing"
-
-	"github.com/jwetzell/showbridge-go/internal/common"
-	"github.com/jwetzell/showbridge-go/internal/test"
-)
-
-func TestGoodGetWrappedPayload(t *testing.T) {
-	testCases := []struct {
-		name     string
-		ctx      context.Context
-		payload  any
-		expected common.WrappedPayload
-	}{
-		{
-			name:    "basic",
-			ctx:     t.Context(),
-			payload: "test",
-			expected: common.WrappedPayload{
-				Payload: "test",
-			},
-		},
-		{
-			name:    "with modules in context",
-			ctx:     test.GetContextWithModules(t.Context(), map[string]common.Module{}),
-			payload: "test",
-			expected: common.WrappedPayload{
-				Payload: "test",
-				Modules: map[string]common.Module{},
-			},
-		},
-		{
-			name:    "with sender in context",
-			ctx:     test.GetContextWithSender(t.Context(), "sender"),
-			payload: "test",
-			expected: common.WrappedPayload{
-				Payload: "test",
-				Sender:  "sender",
-			},
-		},
-		{
-			name:    "with source in context",
-			ctx:     test.GetContextWithSource(t.Context(), "source"),
-			payload: "test",
-			expected: common.WrappedPayload{
-				Payload: "test",
-				Source:  "source",
-			},
-		},
-		{
-			name: "with all fields in context",
-			ctx: test.GetContextWithSource(
-				test.GetContextWithSender(
-					test.GetContextWithModules(t.Context(), map[string]common.Module{}),
-					"sender",
-				),
-				"source",
-			),
-			payload: "test",
-			expected: common.WrappedPayload{
-				Payload: "test",
-				Modules: map[string]common.Module{},
-				Sender:  "sender",
-				Source:  "source",
-			},
-		},
-	}
-	for _, testCase := range testCases {
-		t.Run(testCase.name, func(t *testing.T) {
-			wrappedPayload := common.GetWrappedPayload(testCase.ctx, testCase.payload)
-
-			if !reflect.DeepEqual(wrappedPayload, testCase.expected) {
-				t.Fatalf("GetWrappedPayload expected got %+v,  expected %+v", wrappedPayload, testCase.expected)
-			}
-		})
-	}
-
-}

internal/common/routing.go

@@ -1,6 +1,8 @@
 package common
 
-import "context"
+import (
+	"context"
+)
 
 type RouteIO interface {
 	HandleInput(ctx context.Context, sourceId string, payload any) (bool, []RouteIOError)

internal/config/config.go

@@ -5,3 +5,8 @@ type Config struct {
 	Modules []ModuleConfig `json:"modules"`
 	Routes  []RouteConfig  `json:"routes"`
 }
+
+type Configurable interface {
+	UpdateConfig(newConfig Config, triggerChangeChannel bool) ([]ModuleError, []RouteError, error)
+	GetRunningConfig() Config
+}

internal/config/module.go

@@ -5,3 +5,9 @@ type ModuleConfig struct {
 	Type   string `json:"type"`
 	Params Params `json:"params,omitempty"`
 }
+
+type ModuleError struct {
+	Index  int          `json:"index"`
+	Config ModuleConfig `json:"config"`
+	Error  string       `json:"error"`
+}

internal/config/route.go

@@ -4,3 +4,9 @@ type RouteConfig struct {
 	Input      string            `json:"input"`
 	Processors []ProcessorConfig `json:"processors"`
 }
+
+type RouteError struct {
+	Index  int         `json:"index"`
+	Config RouteConfig `json:"config"`
+	Error  string      `json:"error"`
+}

internal/framer/slip.go

@@ -25,9 +25,10 @@ func (sf *SlipFramer) Decode(data []byte) [][]byte {
 		}
 
 		if escapeNext {
-			if packetByte == ESC_END {
+			switch packetByte {
+			case ESC_END:
 				sf.buffer = append(sf.buffer, END)
-			} else if packetByte == ESC_ESC {
+			case ESC_ESC:
 				sf.buffer = append(sf.buffer, ESC)
 			}
 			escapeNext = false

internal/module/db-sqlite.go

@@ -3,9 +3,9 @@ package module
 import (
 	"context"
 	"database/sql"
-	"errors"
 	"fmt"
 	"log/slog"
+	"sync"
 
 	"github.com/google/jsonschema-go/jsonschema"
 	"github.com/jwetzell/showbridge-go/internal/common"
@@ -21,6 +21,8 @@ type DbSqlite struct {
 	router common.RouteIO
 	db     *sql.DB
 	logger *slog.Logger
+	dbMu   sync.Mutex
+	cancel context.CancelFunc
 }
 
 func init() {
@@ -32,7 +34,7 @@ func init() {
 			Properties: map[string]*jsonschema.Schema{
 				"dsn": {
 					Type:      "string",
-					MinLength: jsonschema.Ptr(1),
+					MinLength: new(1),
 				},
 			},
 			Required:             []string{"dsn"},
@@ -59,32 +61,43 @@ func (t *DbSqlite) Type() string {
 	return t.config.Type
 }
 
-func (t *DbSqlite) Start(ctx context.Context) error {
+func (t *DbSqlite) Start(ctx context.Context, router common.RouteIO) error {
 	t.logger.Debug("running")
-	router, ok := ctx.Value(common.RouterContextKey).(common.RouteIO)
-
-	if !ok {
-		return errors.New("db.sqlite unable to get router from context")
-	}
 	t.router = router
-	t.ctx = ctx
+	moduleContext, cancel := context.WithCancel(ctx)
+	t.ctx = moduleContext
+	t.cancel = cancel
 
 	db, err := sql.Open("sqlite", t.Dsn)
 	if err != nil {
 		return fmt.Errorf("db.sqlite error opening database: %w", err)
 	}
+	t.dbMu.Lock()
 	t.db = db
-	defer t.db.Close()
-	<-ctx.Done()
+	t.dbMu.Unlock()
+	<-t.ctx.Done()
 	return nil
 }
 
 func (t *DbSqlite) Stop() {
+	if t.cancel != nil {
+		t.cancel()
+	}
+	t.dbMu.Lock()
+	defer t.dbMu.Unlock()
 	if t.db != nil {
 		t.db.Close()
+		t.db = nil
 	}
+	t.logger.Debug("done")
 }
 
-func (t *DbSqlite) Database() *sql.DB {
-	return t.db
+// TODO(jwetzell): get a database module layout that doesn't require handing the DB over
+func (t *DbSqlite) Database() (*sql.DB, error) {
+	t.dbMu.Lock()
+	defer t.dbMu.Unlock()
+	if t.db == nil {
+		return nil, fmt.Errorf("database not initialized")
+	}
+	return t.db, nil
 }

internal/module/http-server.go

@@ -6,8 +6,9 @@ import (
 	"errors"
 	"fmt"
 	"log/slog"
-	"net"
 	"net/http"
+	"sync"
+	"time"
 
 	"github.com/google/jsonschema-go/jsonschema"
 	"github.com/jwetzell/showbridge-go/internal/common"
@@ -16,12 +17,14 @@ import (
 )
 
 type HTTPServer struct {
-	config config.ModuleConfig
-	Port   uint16
-	ctx    context.Context
-	router common.RouteIO
-	logger *slog.Logger
-	cancel context.CancelFunc
+	config   config.ModuleConfig
+	Port     uint16
+	ctx      context.Context
+	router   common.RouteIO
+	logger   *slog.Logger
+	cancel   context.CancelFunc
+	server   *http.Server
+	serverMu sync.Mutex
 }
 
 type ResponseIOError struct {
@@ -99,10 +102,6 @@ func (hs *HTTPServer) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	}
 	if hs.router != nil {
 		inputContext := context.WithValue(hs.ctx, httpServerContextKey("responseWriter"), &responseWriter)
-		senderAddr, err := net.ResolveTCPAddr("tcp", r.RemoteAddr)
-		if err == nil {
-			inputContext = context.WithValue(inputContext, common.SenderContextKey, senderAddr)
-		}
 		aRouteFound, routingErrors := hs.router.HandleInput(inputContext, hs.Id(), r)
 		if !responseWriter.done {
 			if aRouteFound {
@@ -160,27 +159,22 @@ func (hs *HTTPServer) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	}
 }
 
-func (hs *HTTPServer) Start(ctx context.Context) error {
+func (hs *HTTPServer) Start(ctx context.Context, router common.RouteIO) error {
 	hs.logger.Debug("running")
-	router, ok := ctx.Value(common.RouterContextKey).(common.RouteIO)
-
-	if !ok {
-		return errors.New("http.server unable to get router from context")
-	}
 	hs.router = router
 	moduleContext, cancel := context.WithCancel(ctx)
 	hs.ctx = moduleContext
 	hs.cancel = cancel
 
 	httpServer := &http.Server{
-		Addr:    fmt.Sprintf(":%d", hs.Port),
-		Handler: hs,
+		Addr:              fmt.Sprintf(":%d", hs.Port),
+		ReadHeaderTimeout: 5 * time.Second,
+		Handler:           hs,
 	}
 
-	go func() {
-		<-hs.ctx.Done()
-		httpServer.Close()
-	}()
+	hs.serverMu.Lock()
+	hs.server = httpServer
+	hs.serverMu.Unlock()
 
 	err := httpServer.ListenAndServe()
 	// TODO(jwetzell): handle server closed error differently
@@ -191,7 +185,6 @@ func (hs *HTTPServer) Start(ctx context.Context) error {
 	}
 
 	<-hs.ctx.Done()
-	hs.logger.Debug("done")
 	return nil
 }
 
@@ -218,5 +211,17 @@ func (hs *HTTPServer) Output(ctx context.Context, payload any) error {
 }
 
 func (hs *HTTPServer) Stop() {
-	hs.cancel()
+	if hs.cancel != nil {
+		hs.cancel()
+	}
+	hs.serverMu.Lock()
+	defer hs.serverMu.Unlock()
+	if hs.server != nil {
+		shutdownCtx, shutdownCancel := context.WithTimeout(context.Background(), 5*time.Second)
+		hs.server.Shutdown(shutdownCtx)
+		shutdownCancel()
+		<-shutdownCtx.Done()
+		hs.server = nil
+	}
+	hs.logger.Debug("done")
 }

internal/module/midi-input.go

@@ -4,7 +4,6 @@ package module
 
 import (
 	"context"
-	"errors"
 	"fmt"
 	"log/slog"
 
@@ -16,13 +15,13 @@ import (
 )
 
 type MIDIInput struct {
-	config   config.ModuleConfig
-	ctx      context.Context
-	router   common.RouteIO
-	Port     string
-	SendFunc func(midi.Message) error
-	logger   *slog.Logger
-	cancel   context.CancelFunc
+	config config.ModuleConfig
+	ctx    context.Context
+	router common.RouteIO
+	Port   string
+	logger *slog.Logger
+	cancel context.CancelFunc
+	stop   func()
 }
 
 func init() {
@@ -60,14 +59,8 @@ func (mi *MIDIInput) Type() string {
 	return mi.config.Type
 }
 
-func (mi *MIDIInput) Start(ctx context.Context) error {
+func (mi *MIDIInput) Start(ctx context.Context, router common.RouteIO) error {
 	mi.logger.Debug("running")
-	defer midi.CloseDriver()
-	router, ok := ctx.Value(common.RouterContextKey).(common.RouteIO)
-
-	if !ok {
-		return errors.New("midi.input unable to get router from context")
-	}
 	mi.router = router
 	moduleContext, cancel := context.WithCancel(ctx)
 	mi.ctx = moduleContext
@@ -87,14 +80,20 @@ func (mi *MIDIInput) Start(ctx context.Context) error {
 	if err != nil {
 		return err
 	}
-
-	defer stop()
+	mi.stop = stop
 
 	<-mi.ctx.Done()
-	mi.logger.Debug("done")
 	return nil
 }
 
 func (mi *MIDIInput) Stop() {
-	mi.cancel()
+	if mi.cancel != nil {
+		mi.cancel()
+	}
+	if mi.stop != nil {
+		mi.stop()
+		mi.stop = nil
+	}
+	midi.CloseDriver()
+	mi.logger.Debug("done")
 }

internal/module/midi-output.go

@@ -7,6 +7,7 @@ import (
 	"errors"
 	"fmt"
 	"log/slog"
+	"sync"
 
 	"github.com/google/jsonschema-go/jsonschema"
 	"github.com/jwetzell/showbridge-go/internal/common"
@@ -16,13 +17,14 @@ import (
 )
 
 type MIDIOutput struct {
-	config   config.ModuleConfig
-	ctx      context.Context
-	router   common.RouteIO
-	Port     string
-	SendFunc func(midi.Message) error
-	logger   *slog.Logger
-	cancel   context.CancelFunc
+	config     config.ModuleConfig
+	ctx        context.Context
+	router     common.RouteIO
+	Port       string
+	sendFunc   func(midi.Message) error
+	logger     *slog.Logger
+	cancel     context.CancelFunc
+	sendFuncMu sync.Mutex
 }
 
 func init() {
@@ -61,14 +63,8 @@ func (mo *MIDIOutput) Type() string {
 	return mo.config.Type
 }
 
-func (mo *MIDIOutput) Start(ctx context.Context) error {
+func (mo *MIDIOutput) Start(ctx context.Context, router common.RouteIO) error {
 	mo.logger.Debug("running")
-	defer midi.CloseDriver()
-	router, ok := ctx.Value(common.RouterContextKey).(common.RouteIO)
-
-	if !ok {
-		return errors.New("midi.output unable to get router from context")
-	}
 	mo.router = router
 	moduleContext, cancel := context.WithCancel(ctx)
 	mo.ctx = moduleContext
@@ -85,15 +81,18 @@ func (mo *MIDIOutput) Start(ctx context.Context) error {
 		return err
 	}
 
-	mo.SendFunc = send
+	mo.sendFuncMu.Lock()
+	mo.sendFunc = send
+	mo.sendFuncMu.Unlock()
 
 	<-mo.ctx.Done()
-	mo.logger.Debug("done")
 	return nil
 }
 
 func (mo *MIDIOutput) Output(ctx context.Context, payload any) error {
-	if mo.SendFunc == nil {
+	mo.sendFuncMu.Lock()
+	defer mo.sendFuncMu.Unlock()
+	if mo.sendFunc == nil {
 		return errors.New("midi.output output is not setup")
 	}
 
@@ -103,9 +102,13 @@ func (mo *MIDIOutput) Output(ctx context.Context, payload any) error {
 		return errors.New("midi.output can only output midi.Message")
 	}
 
-	return mo.SendFunc(payloadMessage)
+	return mo.sendFunc(payloadMessage)
 }
 
 func (mo *MIDIOutput) Stop() {
-	mo.cancel()
+	if mo.cancel != nil {
+		mo.cancel()
+	}
+	midi.CloseDriver()
+	mo.logger.Debug("done")
 }

internal/module/module.go

@@ -10,12 +10,6 @@ import (
 	"github.com/jwetzell/showbridge-go/internal/config"
 )
 
-type ModuleError struct {
-	Index  int                 `json:"index"`
-	Config config.ModuleConfig `json:"config"`
-	Error  string              `json:"error"`
-}
-
 type ModuleRegistration struct {
 	Type         string             `json:"type"`
 	Title        string             `json:"title,omitempty"`

internal/module/mqtt-client.go

@@ -5,6 +5,7 @@ import (
 	"errors"
 	"fmt"
 	"log/slog"
+	"sync"
 
 	mqtt "github.com/eclipse/paho.mqtt.golang"
 	"github.com/google/jsonschema-go/jsonschema"
@@ -22,6 +23,7 @@ type MQTTClient struct {
 	client   mqtt.Client
 	logger   *slog.Logger
 	cancel   context.CancelFunc
+	clientMu sync.Mutex
 }
 
 func init() {
@@ -80,13 +82,8 @@ func (mc *MQTTClient) Type() string {
 	return mc.config.Type
 }
 
-func (mc *MQTTClient) Start(ctx context.Context) error {
+func (mc *MQTTClient) Start(ctx context.Context, router common.RouteIO) error {
 	mc.logger.Debug("running")
-	router, ok := ctx.Value(common.RouterContextKey).(common.RouteIO)
-
-	if !ok {
-		return errors.New("mqtt.client unable to get router from context")
-	}
 	mc.router = router
 	moduleContext, cancel := context.WithCancel(ctx)
 	mc.ctx = moduleContext
@@ -105,8 +102,8 @@ func (mc *MQTTClient) Start(ctx context.Context) error {
 		token.Wait()
 	}
 
+	mc.clientMu.Lock()
 	mc.client = mqtt.NewClient(opts)
-	defer mc.client.Disconnect(250)
 
 	token := mc.client.Connect()
 
@@ -115,9 +112,9 @@ func (mc *MQTTClient) Start(ctx context.Context) error {
 	if err != nil {
 		return err
 	}
+	mc.clientMu.Unlock()
 
 	<-mc.ctx.Done()
-	mc.logger.Debug("done")
 	return nil
 }
 
@@ -144,5 +141,14 @@ func (mc *MQTTClient) Output(ctx context.Context, payload any) error {
 }
 
 func (mc *MQTTClient) Stop() {
-	mc.cancel()
+	if mc.cancel != nil {
+		mc.cancel()
+	}
+	mc.clientMu.Lock()
+	defer mc.clientMu.Unlock()
+	if mc.client != nil {
+		mc.client.Disconnect(250)
+		mc.client = nil
+	}
+	mc.logger.Debug("done")
 }

internal/module/nats-client.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"errors"
 	"log/slog"
+	"sync"
 
 	"github.com/google/jsonschema-go/jsonschema"
 	"github.com/jwetzell/showbridge-go/internal/common"
@@ -13,14 +14,17 @@ import (
 )
 
 type NATSClient struct {
-	config  config.ModuleConfig
-	ctx     context.Context
-	router  common.RouteIO
-	URL     string
-	Subject string
-	client  *nats.Conn
-	logger  *slog.Logger
-	cancel  context.CancelFunc
+	config   config.ModuleConfig
+	ctx      context.Context
+	router   common.RouteIO
+	URL      string
+	Subject  string
+	client   *nats.Conn
+	logger   *slog.Logger
+	cancel   context.CancelFunc
+	sub      *nats.Subscription
+	subMu    sync.Mutex
+	clientMu sync.Mutex
 }
 
 func init() {
@@ -68,14 +72,8 @@ func (nc *NATSClient) Type() string {
 	return nc.config.Type
 }
 
-func (nc *NATSClient) Start(ctx context.Context) error {
+func (nc *NATSClient) Start(ctx context.Context, router common.RouteIO) error {
 	nc.logger.Debug("running")
-	router, ok := ctx.Value(common.RouterContextKey).(common.RouteIO)
-
-	if !ok {
-		return errors.New("nats.client unable to get router from context")
-	}
-
 	nc.router = router
 	moduleContext, cancel := context.WithCancel(ctx)
 	nc.ctx = moduleContext
@@ -87,10 +85,9 @@ func (nc *NATSClient) Start(ctx context.Context) error {
 		return err
 	}
 
+	nc.clientMu.Lock()
 	nc.client = client
-
-	defer client.Drain()
-	defer client.Close()
+	nc.clientMu.Unlock()
 
 	sub, err := nc.client.Subscribe(nc.Subject, func(msg *nats.Msg) {
 		if nc.router != nil {
@@ -101,11 +98,11 @@ func (nc *NATSClient) Start(ctx context.Context) error {
 	if err != nil {
 		return err
 	}
-
-	defer sub.Unsubscribe()
+	nc.subMu.Lock()
+	nc.sub = sub
+	nc.subMu.Unlock()
 
 	<-nc.ctx.Done()
-	nc.logger.Debug("done")
 	return nil
 }
 
@@ -117,6 +114,9 @@ func (nc *NATSClient) Output(ctx context.Context, payload any) error {
 		return errors.New("nats.client is only able to output NATSMessage")
 	}
 
+	nc.clientMu.Lock()
+	defer nc.clientMu.Unlock()
+
 	if nc.client == nil {
 		return errors.New("nats.client client is not setup")
 	}
@@ -131,5 +131,23 @@ func (nc *NATSClient) Output(ctx context.Context, payload any) error {
 }
 
 func (nc *NATSClient) Stop() {
-	nc.cancel()
+	if nc.cancel != nil {
+		nc.cancel()
+	}
+	nc.subMu.Lock()
+	defer nc.subMu.Unlock()
+	if nc.sub != nil {
+		nc.sub.Unsubscribe()
+		nc.sub = nil
+	}
+
+	nc.clientMu.Lock()
+	defer nc.clientMu.Unlock()
+	if nc.client != nil {
+		nc.client.Drain()
+		// TODO(jwetzell): setup closed callback to get when client is fully closed
+		nc.client.Close()
+		nc.client = nil
+	}
+	nc.logger.Debug("done")
 }

internal/module/nats-server.go

@@ -7,6 +7,7 @@ import (
 	"fmt"
 	"log/slog"
 	"net"
+	"sync"
 	"time"
 
 	"github.com/google/jsonschema-go/jsonschema"
@@ -16,14 +17,15 @@ import (
 )
 
 type NATSServer struct {
-	config config.ModuleConfig
-	ctx    context.Context
-	Ip     string
-	Port   int
-	router common.RouteIO
-	server *server.Server
-	logger *slog.Logger
-	cancel context.CancelFunc
+	config   config.ModuleConfig
+	ctx      context.Context
+	Ip       string
+	Port     int
+	router   common.RouteIO
+	server   *server.Server
+	logger   *slog.Logger
+	cancel   context.CancelFunc
+	serverMu sync.Mutex
 }
 
 func init() {
@@ -86,14 +88,8 @@ func (ns *NATSServer) Type() string {
 	return ns.config.Type
 }
 
-func (ns *NATSServer) Start(ctx context.Context) error {
+func (ns *NATSServer) Start(ctx context.Context, router common.RouteIO) error {
 	ns.logger.Debug("running")
-	router, ok := ctx.Value(common.RouterContextKey).(common.RouteIO)
-
-	if !ok {
-		return errors.New("nats.server unable to get router from context")
-	}
-
 	ns.router = router
 	moduleContext, cancel := context.WithCancel(ctx)
 	ns.ctx = moduleContext
@@ -109,9 +105,10 @@ func (ns *NATSServer) Start(ctx context.Context) error {
 		return err
 	}
 
+	ns.serverMu.Lock()
 	ns.server = natsServer
+	defer ns.serverMu.Unlock()
 	natsServer.Start()
-	defer natsServer.Shutdown()
 
 	if !natsServer.ReadyForConnections(5 * time.Second) {
 		return errors.New("nats.server failed to start")
@@ -120,13 +117,17 @@ func (ns *NATSServer) Start(ctx context.Context) error {
 
 	<-ns.ctx.Done()
 
-	ns.logger.Debug("done")
 	return nil
 }
 
 func (ns *NATSServer) Stop() {
-	ns.cancel()
+	if ns.cancel != nil {
+		ns.cancel()
+	}
+	ns.serverMu.Lock()
+	defer ns.serverMu.Unlock()
 	if ns.server != nil {
 		ns.server.Shutdown()
 	}
+	ns.logger.Debug("done")
 }

internal/module/psn-client.go

@@ -2,9 +2,9 @@ package module
 
 import (
 	"context"
-	"errors"
 	"log/slog"
 	"net"
+	"sync"
 	"time"
 
 	"github.com/jwetzell/psn-go"
@@ -20,6 +20,7 @@ type PSNClient struct {
 	decoder *psn.Decoder
 	logger  *slog.Logger
 	cancel  context.CancelFunc
+	connMu  sync.Mutex
 }
 
 func init() {
@@ -40,13 +41,8 @@ func (pc *PSNClient) Type() string {
 	return pc.config.Type
 }
 
-func (pc *PSNClient) Start(ctx context.Context) error {
+func (pc *PSNClient) Start(ctx context.Context, router common.RouteIO) error {
 	pc.logger.Debug("running")
-	router, ok := ctx.Value(common.RouterContextKey).(common.RouteIO)
-
-	if !ok {
-		return errors.New("psn.client unable to get router from context")
-	}
 	pc.router = router
 	moduleContext, cancel := context.WithCancel(ctx)
 	pc.ctx = moduleContext
@@ -61,21 +57,22 @@ func (pc *PSNClient) Start(ctx context.Context) error {
 	if err != nil {
 		return err
 	}
-	defer client.Close()
 
+	pc.connMu.Lock()
 	pc.conn = client
+	pc.connMu.Unlock()
 
 	buffer := make([]byte, 2048)
 	for {
 		select {
 		case <-pc.ctx.Done():
-			// TODO(jwetzell): cleanup?
-			pc.logger.Debug("done")
 			return nil
 		default:
+			pc.connMu.Lock()
 			pc.conn.SetDeadline(time.Now().Add(time.Millisecond * 200))
 
 			numBytes, _, err := pc.conn.ReadFromUDP(buffer)
+			pc.connMu.Unlock()
 			if err != nil {
 				//NOTE(jwetzell) we hit deadline
 				if opErr, ok := err.(*net.OpError); ok && opErr.Timeout() {
@@ -105,5 +102,14 @@ func (pc *PSNClient) Start(ctx context.Context) error {
 }
 
 func (pc *PSNClient) Stop() {
-	pc.cancel()
+	if pc.cancel != nil {
+		pc.cancel()
+	}
+	pc.connMu.Lock()
+	defer pc.connMu.Unlock()
+	if pc.conn != nil {
+		pc.conn.Close()
+		pc.conn = nil
+	}
+	pc.logger.Debug("done")
 }

internal/module/redis-client.go

@@ -5,6 +5,7 @@ import (
 	"errors"
 	"fmt"
 	"log/slog"
+	"sync"
 
 	"github.com/google/jsonschema-go/jsonschema"
 	"github.com/jwetzell/showbridge-go/internal/common"
@@ -13,14 +14,15 @@ import (
 )
 
 type RedisClient struct {
-	config config.ModuleConfig
-	ctx    context.Context
-	router common.RouteIO
-	Host   string
-	Port   uint16
-	client *redis.Client
-	logger *slog.Logger
-	cancel context.CancelFunc
+	config   config.ModuleConfig
+	ctx      context.Context
+	router   common.RouteIO
+	Host     string
+	Port     uint16
+	client   *redis.Client
+	logger   *slog.Logger
+	cancel   context.CancelFunc
+	clientMu sync.Mutex
 }
 
 func init() {
@@ -68,20 +70,14 @@ func (rc *RedisClient) Type() string {
 	return rc.config.Type
 }
 
-func (rc *RedisClient) Printf(ctx context.Context, format string, v ...interface{}) {
+func (rc *RedisClient) Printf(ctx context.Context, format string, v ...any) {
 	msg := fmt.Sprintf(format, v...)
 	rc.logger.Debug(msg)
 }
 
-func (rc *RedisClient) Start(ctx context.Context) error {
+func (rc *RedisClient) Start(ctx context.Context, router common.RouteIO) error {
 	redis.SetLogger(rc)
 	rc.logger.Debug("running")
-	router, ok := ctx.Value(common.RouterContextKey).(common.RouteIO)
-
-	if !ok {
-		return errors.New("redis.client unable to get router from context")
-	}
-
 	rc.router = router
 	moduleContext, cancel := context.WithCancel(ctx)
 	rc.ctx = moduleContext
@@ -93,17 +89,25 @@ func (rc *RedisClient) Start(ctx context.Context) error {
 		DB:       0,
 	})
 
+	rc.clientMu.Lock()
 	rc.client = client
-
-	defer client.Close()
+	rc.clientMu.Unlock()
 
 	<-rc.ctx.Done()
-	rc.logger.Debug("done")
 	return nil
 }
 
 func (rc *RedisClient) Stop() {
-	rc.cancel()
+	if rc.cancel != nil {
+		rc.cancel()
+	}
+	rc.clientMu.Lock()
+	defer rc.clientMu.Unlock()
+	if rc.client != nil {
+		rc.client.Close()
+		rc.client = nil
+	}
+	rc.logger.Debug("done")
 }
 
 func (rc *RedisClient) Get(key string) (any, error) {

internal/module/serial-client.go

@@ -7,6 +7,7 @@ import (
 	"errors"
 	"fmt"
 	"log/slog"
+	"sync"
 	"time"
 
 	"github.com/google/jsonschema-go/jsonschema"
@@ -26,6 +27,7 @@ type SerialClient struct {
 	port   serial.Port
 	logger *slog.Logger
 	cancel context.CancelFunc
+	portMu sync.Mutex
 }
 
 func init() {
@@ -43,8 +45,13 @@ func init() {
 					Title: "Baud Rate",
 					Type:  "integer",
 				},
+				"framing": {
+					Title: "Framing Method",
+					Type:  "string",
+					Enum:  []any{"LF", "CR", "CRLF", "SLIP", "RAW"},
+				},
 			},
-			Required:             []string{"port", "baudRate"},
+			Required:             []string{"port", "baudRate", "framing"},
 			AdditionalProperties: &jsonschema.Schema{Not: &jsonschema.Schema{}},
 		},
 		New: func(config config.ModuleConfig) (common.Module, error) {
@@ -88,10 +95,11 @@ func (sc *SerialClient) Type() string {
 }
 
 func (sc *SerialClient) SetupPort() error {
-
+	sc.portMu.Lock()
+	defer sc.portMu.Unlock()
 	port, err := serial.Open(sc.Port, sc.Mode)
 	if err != nil {
-		return fmt.Errorf("serial.client can't open input port: %s", sc.Port)
+		return err
 	}
 
 	sc.port = port
@@ -99,36 +107,20 @@ func (sc *SerialClient) SetupPort() error {
 	return nil
 }
 
-func (sc *SerialClient) Start(ctx context.Context) error {
+func (sc *SerialClient) Start(ctx context.Context, router common.RouteIO) error {
 	sc.logger.Debug("running")
-	router, ok := ctx.Value(common.RouterContextKey).(common.RouteIO)
-
-	if !ok {
-		return errors.New("serial.client unable to get router from context")
-	}
-
 	sc.router = router
 	moduleContext, cancel := context.WithCancel(ctx)
 	sc.ctx = moduleContext
 	sc.cancel = cancel
 
-	// TODO(jwetzell): shutdown with router.Context properly
-	go func() {
-		<-sc.ctx.Done()
-		sc.logger.Debug("done")
-		if sc.port != nil {
-			sc.port.Close()
-		}
-	}()
-
-	for {
+	for sc.ctx.Err() == nil {
 		err := sc.SetupPort()
 		if err != nil {
 			if sc.ctx.Err() != nil {
-				sc.logger.Debug("done")
 				return nil
 			}
-			sc.logger.Error("port setup error", "error", err.Error())
+			sc.logger.Error("port setup error", "port", sc.Port, "error", err.Error())
 			time.Sleep(time.Second * 2)
 			continue
 		}
@@ -136,14 +128,12 @@ func (sc *SerialClient) Start(ctx context.Context) error {
 		buffer := make([]byte, 1024)
 		select {
 		case <-sc.ctx.Done():
-			sc.logger.Debug("done")
 			return nil
 		default:
 		READ:
-			for {
+			for sc.ctx.Err() == nil {
 				select {
 				case <-sc.ctx.Done():
-					sc.logger.Debug("done")
 					return nil
 				default:
 					byteCount, err := sc.port.Read(buffer)
@@ -169,6 +159,7 @@ func (sc *SerialClient) Start(ctx context.Context) error {
 			}
 		}
 	}
+	return nil
 }
 
 func (sc *SerialClient) Output(ctx context.Context, payload any) error {
@@ -184,5 +175,14 @@ func (sc *SerialClient) Output(ctx context.Context, payload any) error {
 }
 
 func (sc *SerialClient) Stop() {
-	sc.cancel()
+	if sc.cancel != nil {
+		sc.cancel()
+	}
+	sc.portMu.Lock()
+	defer sc.portMu.Unlock()
+	if sc.port != nil {
+		sc.port.Close()
+		sc.port = nil
+	}
+	sc.logger.Debug("done")
 }

internal/module/sip-call-server.go

@@ -29,9 +29,10 @@ type SIPCallServer struct {
 	Port      int
 	Transport string
 	UserAgent string
-	dg        *diago.Diago
 	logger    *slog.Logger
 	cancel    context.CancelFunc
+	ua        *sipgo.UserAgent
+	uaMu      sync.Mutex
 }
 
 type SIPCallMessage struct {
@@ -131,13 +132,8 @@ func (scs *SIPCallServer) Type() string {
 	return scs.config.Type
 }
 
-func (scs *SIPCallServer) Start(ctx context.Context) error {
+func (scs *SIPCallServer) Start(ctx context.Context, router common.RouteIO) error {
 	scs.logger.Debug("running")
-	router, ok := ctx.Value(common.RouterContextKey).(common.RouteIO)
-
-	if !ok {
-		return errors.New("sip.call.server unable to get router from context")
-	}
 	scs.router = router
 	moduleContext, cancel := context.WithCancel(ctx)
 	scs.ctx = moduleContext
@@ -150,7 +146,9 @@ func (scs *SIPCallServer) Start(ctx context.Context) error {
 		sipgo.WithUserAgentTransportLayerOptions(sip.WithTransportLayerLogger(diagoLogger)),
 		sipgo.WithUserAgentTransactionLayerOptions(sip.WithTransactionLayerLogger(diagoLogger)),
 	)
-	defer ua.Close()
+	scs.uaMu.Lock()
+	scs.ua = ua
+	scs.uaMu.Unlock()
 
 	sip.SetDefaultLogger(diagoLogger)
 	media.SetDefaultLogger(diagoLogger)
@@ -162,16 +160,14 @@ func (scs *SIPCallServer) Start(ctx context.Context) error {
 		},
 	))
 
-	go func() {
-		dg.Serve(scs.ctx, func(inDialog *diago.DialogServerSession) {
-			scs.HandleCall(inDialog)
-		})
-	}()
-
-	scs.dg = dg
+	err := dg.Serve(scs.ctx, func(inDialog *diago.DialogServerSession) {
+		scs.HandleCall(inDialog)
+	})
+	if err != nil {
+		scs.logger.Error("diago serve error", "error", err)
+	}
 
 	<-scs.ctx.Done()
-	scs.logger.Debug("done")
 	return nil
 }
 
@@ -252,5 +248,13 @@ func (scs *SIPCallServer) Output(ctx context.Context, payload any) error {
 }
 
 func (scs *SIPCallServer) Stop() {
-	scs.cancel()
+	if scs.cancel != nil {
+		scs.cancel()
+	}
+	scs.uaMu.Lock()
+	defer scs.uaMu.Unlock()
+	if scs.ua != nil {
+		scs.ua.Close()
+	}
+	scs.logger.Debug("done")
 }

internal/module/sip-dtmf-server.go

@@ -33,6 +33,8 @@ type SIPDTMFServer struct {
 	Separator string
 	logger    *slog.Logger
 	cancel    context.CancelFunc
+	ua        *sipgo.UserAgent
+	uaMu      sync.Mutex
 }
 
 type SIPDTMFMessage struct {
@@ -78,8 +80,8 @@ func init() {
 				"separator": {
 					Title:     "DTMF Separator",
 					Type:      "string",
-					MinLength: jsonschema.Ptr(1),
-					MaxLength: jsonschema.Ptr(1),
+					MinLength: new(1),
+					MaxLength: new(1),
 				},
 			},
 			Required:             []string{"separator"},
@@ -150,13 +152,8 @@ func (sds *SIPDTMFServer) Type() string {
 	return sds.config.Type
 }
 
-func (sds *SIPDTMFServer) Start(ctx context.Context) error {
+func (sds *SIPDTMFServer) Start(ctx context.Context, router common.RouteIO) error {
 	sds.logger.Debug("running")
-	router, ok := ctx.Value(common.RouterContextKey).(common.RouteIO)
-
-	if !ok {
-		return errors.New("sip.dtmf.server unable to get router from context")
-	}
 	sds.router = router
 	moduleContext, cancel := context.WithCancel(ctx)
 	sds.ctx = moduleContext
@@ -169,7 +166,10 @@ func (sds *SIPDTMFServer) Start(ctx context.Context) error {
 		sipgo.WithUserAgentTransportLayerOptions(sip.WithTransportLayerLogger(diagoLogger)),
 		sipgo.WithUserAgentTransactionLayerOptions(sip.WithTransactionLayerLogger(diagoLogger)),
 	)
-	defer ua.Close()
+
+	sds.uaMu.Lock()
+	sds.ua = ua
+	sds.uaMu.Unlock()
 
 	sip.SetDefaultLogger(diagoLogger)
 	media.SetDefaultLogger(diagoLogger)
@@ -190,7 +190,6 @@ func (sds *SIPDTMFServer) Start(ctx context.Context) error {
 	}
 
 	<-sds.ctx.Done()
-	sds.logger.Debug("done")
 	return nil
 }
 
@@ -286,5 +285,13 @@ func (sds *SIPDTMFServer) Output(ctx context.Context, payload any) error {
 }
 
 func (sds *SIPDTMFServer) Stop() {
-	sds.cancel()
+	if sds.cancel != nil {
+		sds.cancel()
+	}
+	sds.uaMu.Lock()
+	defer sds.uaMu.Unlock()
+	if sds.ua != nil {
+		sds.ua.Close()
+	}
+	sds.logger.Debug("done")
 }

internal/module/tcp-client.go

@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"log/slog"
 	"net"
+	"sync"
 	"time"
 
 	"github.com/google/jsonschema-go/jsonschema"
@@ -23,6 +24,7 @@ type TCPClient struct {
 	Addr   *net.TCPAddr
 	logger *slog.Logger
 	cancel context.CancelFunc
+	connMu sync.Mutex
 }
 
 func init() {
@@ -91,32 +93,17 @@ func (tc *TCPClient) Type() string {
 	return tc.config.Type
 }
 
-func (tc *TCPClient) Start(ctx context.Context) error {
+func (tc *TCPClient) Start(ctx context.Context, router common.RouteIO) error {
 	tc.logger.Debug("running")
-	router, ok := ctx.Value(common.RouterContextKey).(common.RouteIO)
-
-	if !ok {
-		return errors.New("net.tcp.client unable to get router from context")
-	}
 	tc.router = router
 	moduleContext, cancel := context.WithCancel(ctx)
 	tc.ctx = moduleContext
 	tc.cancel = cancel
 
-	// TODO(jwetzell): shutdown with router.Context properly
-	go func() {
-		<-tc.ctx.Done()
-		tc.logger.Debug("done")
-		if tc.conn != nil {
-			tc.conn.Close()
-		}
-	}()
-
-	for {
+	for tc.ctx.Err() == nil {
 		err := tc.SetupConn()
 		if err != nil {
 			if tc.ctx.Err() != nil {
-				tc.logger.Debug("done")
 				return nil
 			}
 			tc.logger.Error("connection error", "error", err.Error())
@@ -127,14 +114,12 @@ func (tc *TCPClient) Start(ctx context.Context) error {
 		buffer := make([]byte, 1024)
 		select {
 		case <-tc.ctx.Done():
-			tc.logger.Debug("done")
 			return nil
 		default:
 		READ:
 			for {
 				select {
 				case <-tc.ctx.Done():
-					tc.logger.Debug("done")
 					return nil
 				default:
 					byteCount, err := tc.conn.Read(buffer)
@@ -160,21 +145,22 @@ func (tc *TCPClient) Start(ctx context.Context) error {
 			}
 		}
 	}
+	return nil
 }
 
 func (tc *TCPClient) SetupConn() error {
+	tc.connMu.Lock()
+	defer tc.connMu.Unlock()
 	client, err := net.DialTCP("tcp", nil, tc.Addr)
 	tc.conn = client
 	return err
 }
 
 func (tc *TCPClient) Output(ctx context.Context, payload any) error {
-	// NOTE(jwetzell): not sure how this would occur but
+	tc.connMu.Lock()
+	defer tc.connMu.Unlock()
 	if tc.conn == nil {
-		err := tc.SetupConn()
-		if err != nil {
-			return err
-		}
+		return errors.New("net.tcp.client client is not setup")
 	}
 	payloadBytes, ok := common.GetAnyAsByteSlice(payload)
 	if !ok {
@@ -185,5 +171,15 @@ func (tc *TCPClient) Output(ctx context.Context, payload any) error {
 }
 
 func (tc *TCPClient) Stop() {
-	tc.cancel()
+	if tc.cancel != nil {
+		tc.cancel()
+	}
+	tc.connMu.Lock()
+	defer tc.connMu.Unlock()
+	if tc.conn != nil {
+		tc.conn.Close()
+		tc.conn = nil
+	}
+	tc.logger.Debug("done")
+
 }

internal/module/tcp-server.go

@@ -8,6 +8,7 @@ import (
 	"log/slog"
 	"net"
 	"slices"
+	"strings"
 	"sync"
 	"syscall"
 	"time"
@@ -24,12 +25,13 @@ type TCPServer struct {
 	Framer        framer.Framer
 	ctx           context.Context
 	router        common.RouteIO
-	quit          chan interface{}
 	wg            sync.WaitGroup
 	connections   []*net.TCPConn
 	connectionsMu sync.RWMutex
 	logger        *slog.Logger
 	cancel        context.CancelFunc
+	listener      *net.TCPListener
+	listenerMu    sync.Mutex
 }
 
 func init() {
@@ -90,7 +92,7 @@ func init() {
 			if err != nil {
 				return nil, err
 			}
-			return &TCPServer{Framer: framer, Addr: addr, config: moduleConfig, quit: make(chan interface{}), logger: CreateLogger(moduleConfig)}, nil
+			return &TCPServer{Framer: framer, Addr: addr, config: moduleConfig, logger: CreateLogger(moduleConfig)}, nil
 		},
 	})
 }
@@ -107,14 +109,14 @@ func (ts *TCPServer) handleClient(client *net.TCPConn) {
 	ts.connectionsMu.Lock()
 	ts.connections = append(ts.connections, client)
 	ts.connectionsMu.Unlock()
-	ts.logger.Debug("net.tcp.server connection accepted", "remoteAddr", client.RemoteAddr().String())
+	ts.logger.Debug("connection accepted", "remoteAddr", client.RemoteAddr().String())
 	defer client.Close()
 
 	buffer := make([]byte, 1024)
 ClientRead:
-	for {
+	for ts.ctx.Err() == nil {
 		select {
-		case <-ts.quit:
+		case <-ts.ctx.Done():
 			client.Close()
 			ts.connectionsMu.Lock()
 			for i := 0; i < len(ts.connections); i++ {
@@ -156,7 +158,6 @@ ClientRead:
 							break
 						}
 					}
-					ts.logger.Debug("stream ended", "remoteAddr", client.RemoteAddr().String())
 					ts.connectionsMu.Unlock()
 				}
 				return
@@ -166,10 +167,9 @@ ClientRead:
 					messages := ts.Framer.Decode(buffer[0:byteCount])
 					for _, message := range messages {
 						if ts.router != nil {
-							senderAddr, ok := client.RemoteAddr().(*net.TCPAddr)
+							_, ok := client.RemoteAddr().(*net.TCPAddr)
 							if ok {
-								senderCtx := context.WithValue(ts.ctx, common.SenderContextKey, senderAddr)
-								ts.router.HandleInput(senderCtx, ts.Id(), message)
+								ts.router.HandleInput(ts.ctx, ts.Id(), message)
 							} else {
 								ts.router.HandleInput(ts.ctx, ts.Id(), message)
 							}
@@ -183,13 +183,8 @@ ClientRead:
 	}
 }
 
-func (ts *TCPServer) Start(ctx context.Context) error {
+func (ts *TCPServer) Start(ctx context.Context, router common.RouteIO) error {
 	ts.logger.Debug("running")
-	router, ok := ctx.Value(common.RouterContextKey).(common.RouteIO)
-
-	if !ok {
-		return errors.New("net.tcp.server unable to get router from context")
-	}
 	ts.router = router
 	moduleContext, cancel := context.WithCancel(ctx)
 	ts.ctx = moduleContext
@@ -199,35 +194,28 @@ func (ts *TCPServer) Start(ctx context.Context) error {
 	if err != nil {
 		return err
 	}
+	ts.listenerMu.Lock()
+	ts.listener = listener
+	ts.listenerMu.Unlock()
 	ts.wg.Add(1)
 
-	go func() {
-		<-ts.ctx.Done()
-		close(ts.quit)
-		listener.Close()
-		ts.logger.Debug("done")
-	}()
-
 AcceptLoop:
-	for {
+	for ts.ctx.Err() == nil {
 		conn, err := listener.AcceptTCP()
 		if err != nil {
 			select {
-			case <-ts.quit:
+			case <-ts.ctx.Done():
 				break AcceptLoop
 			default:
 				ts.logger.Debug("problem with listener", "error", err)
 			}
 		} else {
-			ts.wg.Add(1)
-			go func() {
+			ts.wg.Go(func() {
 				ts.handleClient(conn)
-				ts.wg.Done()
-			}()
+			})
 		}
 	}
 	ts.wg.Done()
-	ts.wg.Wait()
 	return nil
 }
 
@@ -238,23 +226,32 @@ func (ts *TCPServer) Output(ctx context.Context, payload any) error {
 		return errors.New("net.tcp.server is only able to output bytes")
 	}
 	ts.connectionsMu.Lock()
-	errorString := ""
+	var errorString strings.Builder
 
 	for _, connection := range ts.connections {
 		_, err := connection.Write(payloadBytes)
 		if err != nil {
-			errorString += fmt.Sprintf("%s\n", err.Error())
+			fmt.Fprintf(&errorString, "%s\n", err.Error())
 		}
 	}
 	ts.connectionsMu.Unlock()
 
-	if errorString == "" {
+	if errorString.String() == "" {
 		return nil
 	}
-	return fmt.Errorf("net.tcp.server error during output: %s", errorString)
+	return fmt.Errorf("net.tcp.server error during output: %s", errorString.String())
 }
 
 func (ts *TCPServer) Stop() {
-	ts.cancel()
+	if ts.cancel != nil {
+		ts.cancel()
+	}
+	ts.listenerMu.Lock()
+	defer ts.listenerMu.Unlock()
+	if ts.listener != nil {
+		ts.listener.Close()
+		ts.listener = nil
+	}
 	ts.wg.Wait()
+	ts.logger.Debug("done")
 }

internal/module/test/db-sqlite_test.go

@@ -73,7 +73,7 @@ func TestBadDbSqlite(t *testing.T) {
 				return
 			}
 
-			err = moduleInstance.Start(t.Context())
+			err = moduleInstance.Start(t.Context(), nil)
 
 			if err == nil {
 				t.Fatalf("db.sqlite expected to fail")

internal/module/test/http-server_test.go

@@ -73,7 +73,7 @@ func TestBadHTTPServer(t *testing.T) {
 				return
 			}
 
-			err = moduleInstance.Start(t.Context())
+			err = moduleInstance.Start(t.Context(), nil)
 
 			if err == nil {
 				t.Fatalf("http.server expected to fail")

internal/module/test/midi-input_test.go

@@ -73,7 +73,7 @@ func TestBadMIDIInput(t *testing.T) {
 				return
 			}
 
-			err = moduleInstance.Start(t.Context())
+			err = moduleInstance.Start(t.Context(), nil)
 
 			if err == nil {
 				t.Fatalf("midi.input expected to fail")

internal/module/test/midi-output_test.go

@@ -73,7 +73,7 @@ func TestBadMIDIOutput(t *testing.T) {
 				return
 			}
 
-			err = moduleInstance.Start(t.Context())
+			err = moduleInstance.Start(t.Context(), nil)
 
 			if err == nil {
 				t.Fatalf("midi.output expected to fail")

internal/module/test/mqtt-client_test.go

@@ -116,7 +116,7 @@ func TestBadMQTTClient(t *testing.T) {
 				return
 			}
 
-			err = moduleInstance.Start(t.Context())
+			err = moduleInstance.Start(t.Context(), nil)
 
 			if err == nil {
 				t.Fatalf("mqtt.client expected to fail")

internal/module/test/nats-client_test.go

@@ -94,7 +94,7 @@ func TestBadNATSClient(t *testing.T) {
 				return
 			}
 
-			err = moduleInstance.Start(t.Context())
+			err = moduleInstance.Start(t.Context(), nil)
 
 			if err == nil {
 				t.Fatalf("nats.client expected to fail")

internal/module/test/nats-server_test.go

@@ -71,7 +71,7 @@ func TestBadNATSServer(t *testing.T) {
 				return
 			}
 
-			err = moduleInstance.Start(t.Context())
+			err = moduleInstance.Start(t.Context(), nil)
 
 			if err == nil {
 				t.Fatalf("nats.server expected to fail")

internal/module/test/psn-client_test.go

@@ -59,7 +59,7 @@ func TestBadPSNClient(t *testing.T) {
 				return
 			}
 
-			err = moduleInstance.Start(t.Context())
+			err = moduleInstance.Start(t.Context(), nil)
 
 			if err == nil {
 				t.Fatalf("psn.client expected to fail")

internal/module/test/redis-client_test.go

@@ -94,7 +94,7 @@ func TestBadRedisClient(t *testing.T) {
 				return
 			}
 
-			err = moduleInstance.Start(t.Context())
+			err = moduleInstance.Start(t.Context(), nil)
 
 			if err == nil {
 				t.Fatalf("redis.client expected to fail")

internal/module/test/serial-client_test.go

@@ -103,7 +103,7 @@ func TestBadSerialClient(t *testing.T) {
 				return
 			}
 
-			err = moduleInstance.Start(t.Context())
+			err = moduleInstance.Start(t.Context(), nil)
 
 			if err == nil {
 				t.Fatalf("serial.client expected to fail")

internal/module/test/sip-call-server_test.go

@@ -88,7 +88,7 @@ func TestBadSIPCallServer(t *testing.T) {
 				return
 			}
 
-			err = moduleInstance.Start(t.Context())
+			err = moduleInstance.Start(t.Context(), nil)
 
 			if err == nil {
 				t.Fatalf("sip.call.server expected to fail")

internal/module/test/sip-dtmf-server_test.go

@@ -107,7 +107,7 @@ func TestBadSIPDTMFServer(t *testing.T) {
 				return
 			}
 
-			err = moduleInstance.Start(t.Context())
+			err = moduleInstance.Start(t.Context(), nil)
 
 			if err == nil {
 				t.Fatalf("sip.dtmf.server expected to fail")

internal/module/test/tcp-client_test.go

@@ -95,7 +95,7 @@ func TestBadTCPClient(t *testing.T) {
 				return
 			}
 
-			err = moduleInstance.Start(t.Context())
+			err = moduleInstance.Start(t.Context(), nil)
 
 			if err == nil {
 				t.Fatalf("net.tcp.client expected to fail")

internal/module/test/tcp-server_test.go

@@ -120,7 +120,7 @@ func TestBadTCPServer(t *testing.T) {
 				return
 			}
 
-			err = moduleInstance.Start(t.Context())
+			err = moduleInstance.Start(t.Context(), nil)
 
 			if err == nil {
 				t.Fatalf("net.tcp.server expected to fail")

internal/module/test/time-interval_test.go

@@ -75,7 +75,7 @@ func TestBadTimeInterval(t *testing.T) {
 				return
 			}
 
-			err = moduleInstance.Start(t.Context())
+			err = moduleInstance.Start(t.Context(), nil)
 
 			if err == nil {
 				t.Fatalf("time.interval expected to fail")

internal/module/test/time-timer_test.go

@@ -75,7 +75,7 @@ func TestBadTimeTimer(t *testing.T) {
 				return
 			}
 
-			err = moduleInstance.Start(t.Context())
+			err = moduleInstance.Start(t.Context(), nil)
 
 			if err == nil {
 				t.Fatalf("time.timer expected to fail")

internal/module/test/udp-client_test.go

@@ -95,7 +95,7 @@ func TestBadUDPClient(t *testing.T) {
 				return
 			}
 
-			err = moduleInstance.Start(t.Context())
+			err = moduleInstance.Start(t.Context(), nil)
 
 			if err == nil {
 				t.Fatalf("net.udp.client expected to fail")

internal/module/test/udp-multicast_test.go

@@ -102,7 +102,7 @@ func TestBadUDPMulticast(t *testing.T) {
 				return
 			}
 
-			err = moduleInstance.Start(t.Context())
+			err = moduleInstance.Start(t.Context(), nil)
 
 			if err == nil {
 				t.Fatalf("net.udp.multicast expected to fail")

internal/module/test/udp-server_test.go

@@ -99,7 +99,7 @@ func TestBadUDPServer(t *testing.T) {
 				return
 			}
 
-			err = moduleInstance.Start(t.Context())
+			err = moduleInstance.Start(t.Context(), nil)
 
 			if err == nil {
 				t.Fatalf("net.udp.server expected to fail")

internal/module/test/websocket-client_test.go

@@ -0,0 +1,96 @@
+package module_test
+
+import (
+	"testing"
+
+	"github.com/jwetzell/showbridge-go/internal/config"
+	"github.com/jwetzell/showbridge-go/internal/module"
+)
+
+func TestWebSocketClientFromRegistry(t *testing.T) {
+	registration, ok := module.ModuleRegistry["websocket.client"]
+	if !ok {
+		t.Fatalf("websocket.client module not registered")
+	}
+
+	moduleInstance, err := registration.New(config.ModuleConfig{
+		Id:   "test",
+		Type: "websocket.client",
+		Params: map[string]any{
+			"url": "ws://localhost",
+		},
+	})
+
+	if err != nil {
+		t.Fatalf("failed to create websocket.client module: %s", err)
+	}
+
+	if moduleInstance.Id() != "test" {
+		t.Fatalf("websocket.client module has wrong id: %s", moduleInstance.Id())
+	}
+
+	if moduleInstance.Type() != "websocket.client" {
+		t.Fatalf("websocket.client module has wrong type: %s", moduleInstance.Type())
+	}
+}
+
+func TestBadWebSocketClient(t *testing.T) {
+	tests := []struct {
+		name        string
+		params      map[string]any
+		errorString string
+	}{
+		{
+			name:        "no url param",
+			params:      map[string]any{},
+			errorString: "websocket.client url error: not found",
+		},
+		{
+			name: "non-string url param",
+			params: map[string]any{
+				"url": 123,
+			},
+			errorString: "websocket.client url error: not a string",
+		},
+		{
+			name: "invalid url param",
+			params: map[string]any{
+				"url": "invalid-url",
+			},
+			errorString: "websocket.client url error: scheme must be ws or wss",
+		},
+	}
+
+	for _, test := range tests {
+		t.Run(test.name, func(t *testing.T) {
+
+			registration, ok := module.ModuleRegistry["websocket.client"]
+			if !ok {
+				t.Fatalf("websocket.client module not registered")
+			}
+
+			moduleInstance, err := registration.New(config.ModuleConfig{
+				Id:     "test",
+				Type:   "websocket.client",
+				Params: test.params,
+			})
+
+			if err != nil {
+				if test.errorString != err.Error() {
+					t.Fatalf("websocket.client got error '%s', expected '%s'", err.Error(), test.errorString)
+				}
+				return
+			}
+
+			err = moduleInstance.Start(t.Context(), nil)
+
+			if err == nil {
+				t.Fatalf("websocket.client expected to fail")
+			}
+
+			if err.Error() != test.errorString {
+				t.Fatalf("websocket.client got error '%s', expected '%s'", err.Error(), test.errorString)
+			}
+		})
+	}
+}

internal/module/time-interval.go

@@ -2,7 +2,6 @@ package module
 
 import (
 	"context"
-	"errors"
 	"fmt"
 	"log/slog"
 	"time"
@@ -58,13 +57,8 @@ func (i *TimeInterval) Type() string {
 	return i.config.Type
 }
 
-func (i *TimeInterval) Start(ctx context.Context) error {
+func (i *TimeInterval) Start(ctx context.Context, router common.RouteIO) error {
 	i.logger.Debug("running")
-	router, ok := ctx.Value(common.RouterContextKey).(common.RouteIO)
-
-	if !ok {
-		return errors.New("time.interval unable to get router from context")
-	}
 	i.router = router
 	moduleContext, cancel := context.WithCancel(ctx)
 	i.ctx = moduleContext
@@ -72,12 +66,10 @@ func (i *TimeInterval) Start(ctx context.Context) error {
 
 	ticker := time.NewTicker(time.Millisecond * time.Duration(i.Duration))
 	i.ticker = ticker
-	defer ticker.Stop()
 
 	for {
 		select {
 		case <-i.ctx.Done():
-			i.logger.Debug("done")
 			return nil
 		case <-ticker.C:
 			if i.router != nil {
@@ -85,9 +77,15 @@ func (i *TimeInterval) Start(ctx context.Context) error {
 			}
 		}
 	}
-
 }
 
 func (i *TimeInterval) Stop() {
-	i.cancel()
+	if i.cancel != nil {
+		i.cancel()
+	}
+	if i.ticker != nil {
+		i.ticker.Stop()
+		i.ticker = nil
+	}
+	i.logger.Debug("done")
 }

internal/module/time-timer.go

@@ -2,7 +2,6 @@ package module
 
 import (
 	"context"
-	"errors"
 	"fmt"
 	"log/slog"
 	"time"
@@ -59,25 +58,17 @@ func (t *TimeTimer) Type() string {
 	return t.config.Type
 }
 
-func (t *TimeTimer) Start(ctx context.Context) error {
+func (t *TimeTimer) Start(ctx context.Context, router common.RouteIO) error {
 	t.logger.Debug("running")
-	router, ok := ctx.Value(common.RouterContextKey).(common.RouteIO)
-
-	if !ok {
-		return errors.New("net.tcp.client unable to get router from context")
-	}
 	t.router = router
 	moduleContext, cancel := context.WithCancel(ctx)
 	t.ctx = moduleContext
 	t.cancel = cancel
 
 	t.timer = time.NewTimer(time.Millisecond * time.Duration(t.Duration))
-	defer t.timer.Stop()
 	for {
 		select {
 		case <-t.ctx.Done():
-			t.timer.Stop()
-			t.logger.Debug("done")
 			return nil
 		case time := <-t.timer.C:
 			if t.router != nil {
@@ -88,5 +79,12 @@ func (t *TimeTimer) Start(ctx context.Context) error {
 }
 
 func (t *TimeTimer) Stop() {
-	t.cancel()
+	if t.cancel != nil {
+		t.cancel()
+	}
+	if t.timer != nil {
+		t.timer.Stop()
+		t.timer = nil
+	}
+	t.logger.Debug("done")
 }

internal/module/udp-client.go

@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"log/slog"
 	"net"
+	"sync"
 
 	"github.com/google/jsonschema-go/jsonschema"
 	"github.com/jwetzell/showbridge-go/internal/common"
@@ -21,6 +22,7 @@ type UDPClient struct {
 	router common.RouteIO
 	logger *slog.Logger
 	cancel context.CancelFunc
+	connMu sync.Mutex
 }
 
 func init() {
@@ -74,18 +76,15 @@ func (uc *UDPClient) Type() string {
 }
 
 func (uc *UDPClient) SetupConn() error {
+	uc.connMu.Lock()
+	defer uc.connMu.Unlock()
 	client, err := net.DialUDP("udp", nil, uc.Addr)
 	uc.conn = client
 	return err
 }
 
-func (uc *UDPClient) Start(ctx context.Context) error {
+func (uc *UDPClient) Start(ctx context.Context, router common.RouteIO) error {
 	uc.logger.Debug("running")
-	router, ok := ctx.Value(common.RouterContextKey).(common.RouteIO)
-
-	if !ok {
-		return errors.New("net.udp.client unable to get router from context")
-	}
 	uc.router = router
 	moduleContext, cancel := context.WithCancel(ctx)
 	uc.ctx = moduleContext
@@ -97,15 +96,12 @@ func (uc *UDPClient) Start(ctx context.Context) error {
 	}
 
 	<-uc.ctx.Done()
-	uc.logger.Debug("done")
-	if uc.conn != nil {
-		uc.conn.Close()
-	}
 	return nil
 }
 
 func (uc *UDPClient) Output(ctx context.Context, payload any) error {
-
+	uc.connMu.Lock()
+	defer uc.connMu.Unlock()
 	payloadBytes, ok := common.GetAnyAsByteSlice(payload)
 	if !ok {
 		return errors.New("net.udp.client is only able to output bytes")
@@ -123,5 +119,15 @@ func (uc *UDPClient) Output(ctx context.Context, payload any) error {
 }
 
 func (uc *UDPClient) Stop() {
-	uc.cancel()
+	if uc.cancel != nil {
+		uc.cancel()
+	}
+	uc.connMu.Lock()
+	defer uc.connMu.Unlock()
+	if uc.conn != nil {
+		uc.conn.Close()
+		uc.conn = nil
+	}
+
+	uc.logger.Debug("done")
 }

internal/module/udp-multicast.go

@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"log/slog"
 	"net"
+	"sync"
 	"time"
 
 	"github.com/google/jsonschema-go/jsonschema"
@@ -21,6 +22,7 @@ type UDPMulticast struct {
 	Addr   *net.UDPAddr
 	logger *slog.Logger
 	cancel context.CancelFunc
+	connMu sync.Mutex
 }
 
 func init() {
@@ -73,13 +75,8 @@ func (um *UDPMulticast) Type() string {
 	return um.config.Type
 }
 
-func (um *UDPMulticast) Start(ctx context.Context) error {
+func (um *UDPMulticast) Start(ctx context.Context, router common.RouteIO) error {
 	um.logger.Debug("running")
-	router, ok := ctx.Value(common.RouterContextKey).(common.RouteIO)
-
-	if !ok {
-		return errors.New("net.udp.multicast unable to get router from context")
-	}
 	um.router = router
 	moduleContext, cancel := context.WithCancel(ctx)
 	um.ctx = moduleContext
@@ -91,19 +88,21 @@ func (um *UDPMulticast) Start(ctx context.Context) error {
 	}
 	defer client.Close()
 
+	um.connMu.Lock()
 	um.conn = client
+	um.connMu.Unlock()
 
 	buffer := make([]byte, 2048)
 	for {
 		select {
 		case <-um.ctx.Done():
-			// TODO(jwetzell): cleanup?
-			um.logger.Debug("done")
 			return nil
 		default:
+			um.connMu.Lock()
 			um.conn.SetDeadline(time.Now().Add(time.Millisecond * 200))
 
 			numBytes, _, err := um.conn.ReadFromUDP(buffer)
+			um.connMu.Unlock()
 			if err != nil {
 				//NOTE(jwetzell) we hit deadline
 				if opErr, ok := err.(*net.OpError); ok && opErr.Timeout() {
@@ -141,5 +140,14 @@ func (um *UDPMulticast) Output(ctx context.Context, payload any) error {
 }
 
 func (um *UDPMulticast) Stop() {
-	um.cancel()
+	if um.cancel != nil {
+		um.cancel()
+	}
+	um.connMu.Lock()
+	defer um.connMu.Unlock()
+	if um.conn != nil {
+		um.conn.Close()
+		um.conn = nil
+	}
+	um.logger.Debug("done")
 }

internal/module/udp-server.go

@@ -7,6 +7,7 @@ import (
 	"fmt"
 	"log/slog"
 	"net"
+	"sync"
 	"time"
 
 	"github.com/google/jsonschema-go/jsonschema"
@@ -22,6 +23,8 @@ type UDPServer struct {
 	router     common.RouteIO
 	logger     *slog.Logger
 	cancel     context.CancelFunc
+	listener   *net.UDPConn
+	listenerMu sync.Mutex
 }
 
 func init() {
@@ -95,13 +98,8 @@ func (us *UDPServer) Type() string {
 	return us.config.Type
 }
 
-func (us *UDPServer) Start(ctx context.Context) error {
+func (us *UDPServer) Start(ctx context.Context, router common.RouteIO) error {
 	us.logger.Debug("running")
-	router, ok := ctx.Value(common.RouterContextKey).(common.RouteIO)
-
-	if !ok {
-		return errors.New("net.udp.server unable to get router from context")
-	}
 	us.router = router
 	moduleContext, cancel := context.WithCancel(ctx)
 	us.ctx = moduleContext
@@ -111,20 +109,18 @@ func (us *UDPServer) Start(ctx context.Context) error {
 	if err != nil {
 		return err
 	}
-
-	defer listener.Close()
+	us.listenerMu.Lock()
+	us.listener = listener
 
 	buffer := make([]byte, us.BufferSize)
-	for {
+	for us.ctx.Err() == nil {
 		select {
 		case <-us.ctx.Done():
-			// TODO(jwetzell): cleanup?
-			us.logger.Debug("done")
 			return nil
 		default:
 			listener.SetDeadline(time.Now().Add(time.Millisecond * 200))
 
-			numBytes, senderAddr, err := listener.ReadFromUDP(buffer)
+			numBytes, _, err := listener.ReadFromUDP(buffer)
 			if err != nil {
 				//NOTE(jwetzell) we hit deadline
 				if opErr, ok := err.(*net.OpError); ok && opErr.Timeout() {
@@ -134,14 +130,14 @@ func (us *UDPServer) Start(ctx context.Context) error {
 			}
 			message := buffer[:numBytes]
 			if us.router != nil {
-				senderCtx := context.WithValue(us.ctx, common.SenderContextKey, senderAddr)
-				us.router.HandleInput(senderCtx, us.Id(), message)
+				us.router.HandleInput(us.ctx, us.Id(), message)
 			} else {
 				us.logger.Error("input received but no router is configured")
 			}
 		}
 	}
-
+	us.listenerMu.Unlock()
+	return nil
 }
 
 func (us *UDPServer) Output(ctx context.Context, payload any) error {
@@ -149,5 +145,14 @@ func (us *UDPServer) Output(ctx context.Context, payload any) error {
 }
 
 func (us *UDPServer) Stop() {
-	us.cancel()
+	if us.cancel != nil {
+		us.cancel()
+	}
+	us.listenerMu.Lock()
+	defer us.listenerMu.Unlock()
+	if us.listener != nil {
+		us.listener.Close()
+		us.listener = nil
+	}
+	us.logger.Debug("done")
 }

internal/module/websocket-client.go

@@ -0,0 +1,194 @@
+package module
+
+import (
+	"context"
+	"errors"
+	"fmt"
+	"log/slog"
+	"net"
+	"net/url"
+	"sync"
+	"time"
+
+	"github.com/google/jsonschema-go/jsonschema"
+	"github.com/gorilla/websocket"
+	"github.com/jwetzell/showbridge-go/internal/common"
+	"github.com/jwetzell/showbridge-go/internal/config"
+)
+
+type WebSocketClient struct {
+	config config.ModuleConfig
+	URL    url.URL
+	ctx    context.Context
+	conn   *websocket.Conn
+	router common.RouteIO
+	logger *slog.Logger
+	cancel context.CancelFunc
+	connMu sync.Mutex
+}
+
+func init() {
+	RegisterModule(ModuleRegistration{
+		Type:  "websocket.client",
+		Title: "WebSocket Client",
+		ParamsSchema: &jsonschema.Schema{
+			Type: "object",
+			Properties: map[string]*jsonschema.Schema{
+				"url": {
+					Title: "URL",
+					Type:  "string",
+				},
+			},
+			Required:             []string{"url"},
+			AdditionalProperties: &jsonschema.Schema{Not: &jsonschema.Schema{}},
+		},
+		New: func(config config.ModuleConfig) (common.Module, error) {
+			params := config.Params
+			urlString, err := params.GetString("url")
+			if err != nil {
+				return nil, fmt.Errorf("websocket.client url error: %w", err)
+			}
+
+			parsedURL, err := url.Parse(urlString)
+			if err != nil {
+				return nil, fmt.Errorf("websocket.client url error: %w", err)
+			}
+
+			if parsedURL.Scheme != "ws" && parsedURL.Scheme != "wss" {
+				return nil, fmt.Errorf("websocket.client url error: scheme must be ws or wss")
+			}
+
+			return &WebSocketClient{URL: *parsedURL, config: config, logger: CreateLogger(config)}, nil
+		},
+	})
+}
+
+func (wc *WebSocketClient) Id() string {
+	return wc.config.Id
+}
+
+func (wc *WebSocketClient) Type() string {
+	return wc.config.Type
+}
+
+func (wc *WebSocketClient) SetupConn() error {
+	wc.connMu.Lock()
+	defer wc.connMu.Unlock()
+	conn, _, err := websocket.DefaultDialer.Dial(wc.URL.String(), nil)
+	wc.conn = conn
+	return err
+}
+
+func (wc *WebSocketClient) Start(ctx context.Context, router common.RouteIO) error {
+	wc.logger.Debug("running")
+	wc.router = router
+	moduleContext, cancel := context.WithCancel(ctx)
+	wc.ctx = moduleContext
+	wc.cancel = cancel
+
+	for wc.ctx.Err() == nil {
+		err := wc.SetupConn()
+		if err != nil {
+			wc.logger.Error("connection error", "error", err)
+		} else {
+			// NOTE(jwetzell): enter read loop until an error occurs
+			wc.logger.Debug("websocket connection established entering read loop")
+			wc.readLoop()
+		}
+		// NOTE(jwetzell): if connection is lost or read error wait before trying again
+		time.Sleep(2 * time.Second)
+	}
+	<-wc.ctx.Done()
+	return nil
+}
+
+func (wc *WebSocketClient) readLoop() {
+	for wc.ctx.Err() == nil {
+		if wc.conn == nil {
+			wc.logger.Error("websocket connection is not established")
+			return
+		}
+		wc.conn.SetReadDeadline(time.Now().Add(5 * time.Second))
+		messageType, message, err := wc.conn.ReadMessage()
+		if err != nil {
+			if opErr, ok := err.(*net.OpError); ok {
+				// NOTE(jwetzell) we hit deadline
+				if opErr.Timeout() {
+					continue
+				}
+				// NOTE(jwetzell) connection was closed
+				if errors.Is(opErr, net.ErrClosed) {
+					continue
+				}
+			}
+			wc.logger.Error("websocket read error", "error", err)
+			return
+		}
+		if wc.router != nil {
+			switch messageType {
+			case websocket.TextMessage:
+				wc.router.HandleInput(wc.ctx, wc.Id(), string(message))
+			case websocket.BinaryMessage:
+				wc.router.HandleInput(wc.ctx, wc.Id(), message)
+			default:
+				wc.logger.Warn("unsupported message type received", "messageType", messageType)
+			}
+		} else {
+			wc.logger.Error("input received but no router is configured")
+			continue
+		}
+	}
+}
+
+func (wc *WebSocketClient) outputBytes(ctx context.Context, payload []byte) error {
+	if wc.conn == nil {
+		return errors.New("websocket.client client is not setup")
+	}
+	err := wc.conn.WriteMessage(websocket.BinaryMessage, payload)
+
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
+func (wc *WebSocketClient) outputString(ctx context.Context, payload string) error {
+	if wc.conn == nil {
+		return errors.New("websocket.client client is not setup")
+	}
+	err := wc.conn.WriteMessage(websocket.TextMessage, []byte(payload))
+
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
+func (wc *WebSocketClient) Output(ctx context.Context, payload any) error {
+	wc.connMu.Lock()
+	defer wc.connMu.Unlock()
+	payloadBytes, ok := common.GetAnyAsByteSlice(payload)
+	if ok {
+		return wc.outputBytes(ctx, payloadBytes)
+	} else {
+		payloadString, ok := common.GetAnyAs[string](payload)
+		if ok {
+			return wc.outputString(ctx, payloadString)
+		} else {
+			return errors.New("websocket.client payload must be string or []byte")
+		}
+	}
+}
+
+func (wc *WebSocketClient) Stop() {
+	if wc.cancel != nil {
+		wc.cancel()
+	}
+	wc.connMu.Lock()
+	defer wc.connMu.Unlock()
+	if wc.conn != nil {
+		wc.conn.Close()
+		wc.conn = nil
+	}
+	wc.logger.Debug("done")
+}

internal/processor/db-query.go

@@ -8,6 +8,7 @@ import (
 	"log/slog"
 	"text/template"
 
+	"github.com/google/jsonschema-go/jsonschema"
 	"github.com/jwetzell/showbridge-go/internal/common"
 	"github.com/jwetzell/showbridge-go/internal/config"
 )
@@ -17,34 +18,43 @@ type DbQuery struct {
 	ModuleId string
 	Query    *template.Template
 	logger   *slog.Logger
+	module   common.DatabaseModule
 }
 
 func (dq *DbQuery) Process(ctx context.Context, wrappedPayload common.WrappedPayload) (common.WrappedPayload, error) {
-	if wrappedPayload.Modules == nil {
-		wrappedPayload.End = true
-		return wrappedPayload, errors.New("db.query wrapped payload has no modules")
+	if dq.module == nil {
+		if wrappedPayload.Modules == nil {
+			wrappedPayload.End = true
+			return wrappedPayload, errors.New("db.query wrapped payload has no modules")
+		}
+
+		module, ok := wrappedPayload.Modules[dq.ModuleId]
+		if !ok {
+			wrappedPayload.End = true
+			return wrappedPayload, fmt.Errorf("db.query unable to find module with id: %s", dq.ModuleId)
+		}
+
+		dbModule, ok := module.(common.DatabaseModule)
+		if !ok {
+			wrappedPayload.End = true
+			return wrappedPayload, fmt.Errorf("db.query module with id %s is not a DatabaseModule", dq.ModuleId)
+		}
+		dq.module = dbModule
 	}
 
-	module, ok := wrappedPayload.Modules[dq.ModuleId]
-	if !ok {
+	db, err := dq.module.Database()
+	if err != nil {
 		wrappedPayload.End = true
-		return wrappedPayload, fmt.Errorf("db.query unable to find module with id: %s", dq.ModuleId)
+		return wrappedPayload, fmt.Errorf("db.query error getting database from module: %w", err)
 	}
 
-	dbModule, ok := module.(common.DatabaseModule)
-	if !ok {
-		wrappedPayload.End = true
-		return wrappedPayload, fmt.Errorf("db.query module with id %s is not a DatabaseModule", dq.ModuleId)
-	}
-
-	db := dbModule.Database()
 	if db == nil {
 		wrappedPayload.End = true
 		return wrappedPayload, fmt.Errorf("db.query module with id %s returned nil database", dq.ModuleId)
 	}
 
 	var queryBuffer bytes.Buffer
-	err := dq.Query.Execute(&queryBuffer, wrappedPayload)
+	err = dq.Query.Execute(&queryBuffer, wrappedPayload)
 
 	if err != nil {
 		wrappedPayload.End = true
@@ -65,13 +75,14 @@ func (dq *DbQuery) Process(ctx context.Context, wrappedPayload common.WrappedPay
 		return wrappedPayload, fmt.Errorf("db.query error getting columns: %w", err)
 	}
 
+	// TODO(jwetzell): optimize this
 	results := make([]map[string]any, 0)
 
 	for rows.Next() {
-		columnValues := make([]interface{}, len(columns))
+		columnValues := make([]any, len(columns))
 
 		for i := range columnValues {
-			columnValues[i] = new(interface{})
+			columnValues[i] = new(any)
 		}
 
 		if err := rows.Scan(columnValues...); err != nil {
@@ -81,7 +92,7 @@ func (dq *DbQuery) Process(ctx context.Context, wrappedPayload common.WrappedPay
 
 		rowMap := make(map[string]any)
 		for i, colName := range columns {
-			value := *columnValues[i].(*interface{})
+			value := *columnValues[i].(*any)
 			rowMap[colName] = value
 		}
 		results = append(results, rowMap)
@@ -106,6 +117,23 @@ func init() {
 	RegisterProcessor(ProcessorRegistration{
 		Type:  "db.query",
 		Title: "Query Database",
+		ParamsSchema: &jsonschema.Schema{
+			Type: "object",
+			Properties: map[string]*jsonschema.Schema{
+				"module": {
+					Title:       "Module ID",
+					Type:        "string",
+					Description: "ID of the database module to query",
+				},
+				"query": {
+					Title:       "Query",
+					Type:        "string",
+					Description: "SQL query to execute",
+				},
+			},
+			Required:             []string{"module", "query"},
+			AdditionalProperties: &jsonschema.Schema{Not: &jsonschema.Schema{}},
+		},
 		New: func(config config.ProcessorConfig) (Processor, error) {
 
 			params := config.Params

internal/processor/debug-log.go

@@ -9,6 +9,8 @@ import (
 	"github.com/jwetzell/showbridge-go/internal/config"
 )
 
+// TODO(jwetzell): maybe make a more useful logging processor
+
 type DebugLog struct {
 	config config.ProcessorConfig
 	logger *slog.Logger

internal/processor/kv-get.go

@@ -16,27 +16,31 @@ type KVGet struct {
 	ModuleId string
 	Key      string
 	logger   *slog.Logger
+	module   common.KeyValueModule
 }
 
 func (kvg *KVGet) Process(ctx context.Context, wrappedPayload common.WrappedPayload) (common.WrappedPayload, error) {
-	if wrappedPayload.Modules == nil {
-		wrappedPayload.End = true
-		return wrappedPayload, errors.New("kv.get wrapped payload has no modules")
+	if kvg.module == nil {
+		if wrappedPayload.Modules == nil {
+			wrappedPayload.End = true
+			return wrappedPayload, errors.New("kv.get wrapped payload has no modules")
+		}
+
+		module, ok := wrappedPayload.Modules[kvg.ModuleId]
+		if !ok {
+			wrappedPayload.End = true
+			return wrappedPayload, fmt.Errorf("kv.get unable to find module with id: %s", kvg.ModuleId)
+		}
+
+		kvModule, ok := module.(common.KeyValueModule)
+		if !ok {
+			wrappedPayload.End = true
+			return wrappedPayload, fmt.Errorf("kv.get module with id %s is not a KeyValueModule", kvg.ModuleId)
+		}
+		kvg.module = kvModule
 	}
 
-	module, ok := wrappedPayload.Modules[kvg.ModuleId]
-	if !ok {
-		wrappedPayload.End = true
-		return wrappedPayload, fmt.Errorf("kv.get unable to find module with id: %s", kvg.ModuleId)
-	}
-
-	kvModule, ok := module.(common.KeyValueModule)
-	if !ok {
-		wrappedPayload.End = true
-		return wrappedPayload, fmt.Errorf("kv.get module with id %s is not a KeyValueModule", kvg.ModuleId)
-	}
-
-	value, err := kvModule.Get(kvg.Key)
+	value, err := kvg.module.Get(kvg.Key)
 	if err != nil {
 		wrappedPayload.End = true
 		return wrappedPayload, fmt.Errorf("kv.get error getting key: %w", err)

internal/processor/kv-set.go

@@ -19,25 +19,28 @@ type KVSet struct {
 	Key      string
 	Value    *template.Template
 	logger   *slog.Logger
+	module   common.KeyValueModule
 }
 
 func (kvs *KVSet) Process(ctx context.Context, wrappedPayload common.WrappedPayload) (common.WrappedPayload, error) {
+	if kvs.module == nil {
+		if wrappedPayload.Modules == nil {
+			wrappedPayload.End = true
+			return wrappedPayload, errors.New("kv.set wrapped payload has no modules")
+		}
 
-	if wrappedPayload.Modules == nil {
-		wrappedPayload.End = true
-		return wrappedPayload, errors.New("kv.set wrapped payload has no modules")
-	}
+		module, ok := wrappedPayload.Modules[kvs.ModuleId]
+		if !ok {
+			wrappedPayload.End = true
+			return wrappedPayload, fmt.Errorf("kv.set unable to find module with id: %s", kvs.ModuleId)
+		}
 
-	module, ok := wrappedPayload.Modules[kvs.ModuleId]
-	if !ok {
-		wrappedPayload.End = true
-		return wrappedPayload, fmt.Errorf("kv.set unable to find module with id: %s", kvs.ModuleId)
-	}
-
-	kvModule, ok := module.(common.KeyValueModule)
-	if !ok {
-		wrappedPayload.End = true
-		return wrappedPayload, fmt.Errorf("kv.set module with id %s is not a KeyValueModule", kvs.ModuleId)
+		kvModule, ok := module.(common.KeyValueModule)
+		if !ok {
+			wrappedPayload.End = true
+			return wrappedPayload, fmt.Errorf("kv.set module with id %s is not a KeyValueModule", kvs.ModuleId)
+		}
+		kvs.module = kvModule
 	}
 
 	var valueBuffer bytes.Buffer
@@ -48,7 +51,7 @@ func (kvs *KVSet) Process(ctx context.Context, wrappedPayload common.WrappedPayl
 		return wrappedPayload, err
 	}
 
-	err = kvModule.Set(kvs.Key, valueBuffer.String())
+	err = kvs.module.Set(kvs.Key, valueBuffer.String())
 	if err != nil {
 		wrappedPayload.End = true
 		return wrappedPayload, fmt.Errorf("kv.set error setting key: %w", err)

internal/processor/midi-control_change-create.go

@@ -35,6 +35,11 @@ func (mccc *MIDIControlChangeCreate) Process(ctx context.Context, wrappedPayload
 
 	channelValue, err := strconv.ParseUint(channelBuffer.String(), 10, 8)
 
+	if err != nil {
+		wrappedPayload.End = true
+		return wrappedPayload, err
+	}
+
 	var controlBuffer bytes.Buffer
 	err = mccc.Control.Execute(&controlBuffer, templateData)
 
@@ -45,6 +50,11 @@ func (mccc *MIDIControlChangeCreate) Process(ctx context.Context, wrappedPayload
 
 	controlValue, err := strconv.ParseUint(controlBuffer.String(), 10, 8)
 
+	if err != nil {
+		wrappedPayload.End = true
+		return wrappedPayload, err
+	}
+
 	var valueBuffer bytes.Buffer
 	err = mccc.Value.Execute(&valueBuffer, templateData)
 
@@ -55,6 +65,11 @@ func (mccc *MIDIControlChangeCreate) Process(ctx context.Context, wrappedPayload
 
 	valueValue, err := strconv.ParseUint(valueBuffer.String(), 10, 8)
 
+	if err != nil {
+		wrappedPayload.End = true
+		return wrappedPayload, err
+	}
+
 	payloadMessage := midi.ControlChange(uint8(channelValue), uint8(controlValue), uint8(valueValue))
 	wrappedPayload.Payload = payloadMessage
 	return wrappedPayload, nil

internal/processor/midi-note_off-create.go

@@ -35,6 +35,11 @@ func (mnoc *MIDINoteOffCreate) Process(ctx context.Context, wrappedPayload commo
 
 	channelValue, err := strconv.ParseUint(channelBuffer.String(), 10, 8)
 
+	if err != nil {
+		wrappedPayload.End = true
+		return wrappedPayload, err
+	}
+
 	var noteBuffer bytes.Buffer
 	err = mnoc.Note.Execute(&noteBuffer, templateData)
 
@@ -45,6 +50,11 @@ func (mnoc *MIDINoteOffCreate) Process(ctx context.Context, wrappedPayload commo
 
 	noteValue, err := strconv.ParseUint(noteBuffer.String(), 10, 8)
 
+	if err != nil {
+		wrappedPayload.End = true
+		return wrappedPayload, err
+	}
+
 	var velocityBuffer bytes.Buffer
 	err = mnoc.Velocity.Execute(&velocityBuffer, templateData)
 
@@ -54,6 +64,12 @@ func (mnoc *MIDINoteOffCreate) Process(ctx context.Context, wrappedPayload commo
 	}
 
 	velocityValue, err := strconv.ParseUint(velocityBuffer.String(), 10, 8)
+
+	if err != nil {
+		wrappedPayload.End = true
+		return wrappedPayload, err
+	}
+
 	payloadMessage := midi.NoteOffVelocity(uint8(channelValue), uint8(noteValue), uint8(velocityValue))
 	wrappedPayload.Payload = payloadMessage
 	return wrappedPayload, nil

internal/processor/midi-note_on-create.go

@@ -35,6 +35,11 @@ func (mnoc *MIDINoteOnCreate) Process(ctx context.Context, wrappedPayload common
 
 	channelValue, err := strconv.ParseUint(channelBuffer.String(), 10, 8)
 
+	if err != nil {
+		wrappedPayload.End = true
+		return wrappedPayload, err
+	}
+
 	var noteBuffer bytes.Buffer
 	err = mnoc.Note.Execute(&noteBuffer, templateData)
 
@@ -45,6 +50,11 @@ func (mnoc *MIDINoteOnCreate) Process(ctx context.Context, wrappedPayload common
 
 	noteValue, err := strconv.ParseUint(noteBuffer.String(), 10, 8)
 
+	if err != nil {
+		wrappedPayload.End = true
+		return wrappedPayload, err
+	}
+
 	var velocityBuffer bytes.Buffer
 	err = mnoc.Velocity.Execute(&velocityBuffer, templateData)
 
@@ -54,6 +64,11 @@ func (mnoc *MIDINoteOnCreate) Process(ctx context.Context, wrappedPayload common
 	}
 
 	velocityValue, err := strconv.ParseUint(velocityBuffer.String(), 10, 8)
+	if err != nil {
+		wrappedPayload.End = true
+		return wrappedPayload, err
+	}
+
 	payloadMessage := midi.NoteOn(uint8(channelValue), uint8(noteValue), uint8(velocityValue))
 	wrappedPayload.Payload = payloadMessage
 	return wrappedPayload, nil

internal/processor/midi-program_change-create.go

@@ -34,6 +34,11 @@ func (mpcc *MIDIProgramChangeCreate) Process(ctx context.Context, wrappedPayload
 
 	channelValue, err := strconv.ParseUint(channelBuffer.String(), 10, 8)
 
+	if err != nil {
+		wrappedPayload.End = true
+		return wrappedPayload, err
+	}
+
 	var programBuffer bytes.Buffer
 	err = mpcc.Program.Execute(&programBuffer, templateData)
 
@@ -44,6 +49,11 @@ func (mpcc *MIDIProgramChangeCreate) Process(ctx context.Context, wrappedPayload
 
 	programValue, err := strconv.ParseUint(programBuffer.String(), 10, 8)
 
+	if err != nil {
+		wrappedPayload.End = true
+		return wrappedPayload, err
+	}
+
 	payloadMessage := midi.ProgramChange(uint8(channelValue), uint8(programValue))
 	wrappedPayload.Payload = payloadMessage
 	return wrappedPayload, nil

internal/processor/osc-message-encode.go

@@ -3,6 +3,7 @@ package processor
 import (
 	"context"
 	"errors"
+	"fmt"
 
 	osc "github.com/jwetzell/osc-go"
 	"github.com/jwetzell/showbridge-go/internal/common"
@@ -22,7 +23,12 @@ func (ome *OSCMessageEncode) Process(ctx context.Context, wrappedPayload common.
 		return wrappedPayload, errors.New("osc.message.encode processor only accepts an *OSCMessage")
 	}
 
-	wrappedPayload.Payload = payloadMessage.ToBytes()
+	bytes, err := payloadMessage.ToBytes()
+	if err != nil {
+		wrappedPayload.End = true
+		return wrappedPayload, fmt.Errorf("osc.message.encode processor failed to encode OSCMessage: %w", err)
+	}
+	wrappedPayload.Payload = bytes
 	return wrappedPayload, nil
 }
 

internal/processor/router-input.go

@@ -20,14 +20,12 @@ type RouterInput struct {
 func (ro *RouterInput) Process(ctx context.Context, wrappedPayload common.WrappedPayload) (common.WrappedPayload, error) {
 
 	payload := wrappedPayload.Payload
-	router, ok := ctx.Value(common.RouterContextKey).(common.RouteIO)
-	if !ok {
-
+	if wrappedPayload.Router == nil {
 		wrappedPayload.End = true
 		return wrappedPayload, errors.New("router.input no router found")
 	}
 
-	_, err := router.HandleInput(ctx, ro.SourceId, payload)
+	_, err := wrappedPayload.Router.HandleInput(ctx, ro.SourceId, payload)
 
 	if err != nil {
 		wrappedPayload.End = true

internal/processor/router-output.go

@@ -19,13 +19,12 @@ type RouterOutput struct {
 
 func (ro *RouterOutput) Process(ctx context.Context, wrappedPayload common.WrappedPayload) (common.WrappedPayload, error) {
 
-	router, ok := ctx.Value(common.RouterContextKey).(common.RouteIO)
-	if !ok {
+	if wrappedPayload.Router == nil {
 		wrappedPayload.End = true
 		return wrappedPayload, errors.New("router.output no router found")
 	}
 
-	err := router.HandleOutput(ctx, ro.ModuleId, wrappedPayload.Payload)
+	err := wrappedPayload.Router.HandleOutput(ctx, ro.ModuleId, wrappedPayload.Payload)
 
 	if err != nil {
 		wrappedPayload.End = true

internal/processor/script-js.go

@@ -32,11 +32,13 @@ func (sj *ScriptJS) Process(ctx context.Context, wrappedPayload common.WrappedPa
 		}
 	}
 
-	sj.vm.SetProperty(sj.vm.GlobalObject(), sj.payloadAtom, wrappedPayload.Payload)
+	err := sj.vm.SetProperty(sj.vm.GlobalObject(), sj.payloadAtom, wrappedPayload.Payload)
+	if err != nil {
+		wrappedPayload.End = true
+		return wrappedPayload, err
+	}
 
-	sj.vm.SetProperty(sj.vm.GlobalObject(), sj.senderAtom, wrappedPayload.Sender)
-
-	_, err := sj.vm.Eval(sj.Program, quickjs.EvalGlobal)
+	_, err = sj.vm.Eval(sj.Program, quickjs.EvalGlobal)
 
 	if err != nil {
 		wrappedPayload.End = true
@@ -63,12 +65,12 @@ func (sj *ScriptJS) Process(ctx context.Context, wrappedPayload common.WrappedPa
 	outputObject, ok := output.(*quickjs.Object)
 
 	if ok {
-		var outputSlice []interface{}
+		var outputSlice []any
 
 		err = outputObject.Into(&outputSlice)
 
 		if err != nil {
-			var outputMap map[string]interface{}
+			var outputMap map[string]any
 			err = outputObject.Into(&outputMap)
 			if err != nil {
 				wrappedPayload.End = true

internal/processor/script-wasm.go

@@ -14,7 +14,7 @@ import (
 
 type ScriptWASM struct {
 	config   config.ProcessorConfig
-	Program  *extism.CompiledPlugin
+	Program  *extism.Plugin
 	Function string
 }
 
@@ -28,14 +28,7 @@ func (sw *ScriptWASM) Process(ctx context.Context, wrappedPayload common.Wrapped
 		return wrappedPayload, fmt.Errorf("script.wasm can only process a byte array")
 	}
 
-	program, err := sw.Program.Instance(ctx, extism.PluginInstanceConfig{})
-
-	if err != nil {
-		wrappedPayload.End = true
-		return wrappedPayload, err
-	}
-
-	_, output, err := program.Call(sw.Function, payloadBytes)
+	_, output, err := sw.Program.Call(sw.Function, payloadBytes)
 
 	if err != nil {
 		wrappedPayload.End = true
@@ -117,7 +110,13 @@ func init() {
 				return nil, err
 			}
 
-			return &ScriptWASM{config: processorConfig, Program: program, Function: functionString}, nil
+			programInstance, err := program.Instance(context.Background(), extism.PluginInstanceConfig{})
+
+			if err != nil {
+				return nil, err
+			}
+
+			return &ScriptWASM{config: processorConfig, Program: programInstance, Function: functionString}, nil
 		},
 	})
 }

internal/processor/sip-response-dtmf-create.go

@@ -27,6 +27,8 @@ type SipDTMFResponse struct {
 	Digits   string
 }
 
+var validDTMFRegex = regexp.MustCompile(`^[0-9*#A-Da-d]+$`)
+
 func (srdc *SipResponseDTMFCreate) Process(ctx context.Context, wrappedPayload common.WrappedPayload) (common.WrappedPayload, error) {
 
 	templateData := wrappedPayload
@@ -103,7 +105,7 @@ func init() {
 			if err != nil {
 				return nil, err
 			}
-			return &SipResponseDTMFCreate{config: config, Digits: digitsTemplate, PreWait: int(preWaitNum), PostWait: int(postWaitNum), validDTMF: regexp.MustCompile(`^[0-9*#A-Da-d]+$`)}, nil
+			return &SipResponseDTMFCreate{config: config, Digits: digitsTemplate, PreWait: int(preWaitNum), PostWait: int(postWaitNum), validDTMF: validDTMFRegex}, nil
 		},
 	})
 }

internal/processor/test/artnet-packet-decode_test.go

@@ -41,7 +41,7 @@ func TestGoodArtnetPacketDecode(t *testing.T) {
 			name:    "number",
 			payload: []byte{65, 114, 116, 45, 78, 101, 116, 0, 0, 80, 0, 14, 237, 0, 1, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
 			expected: &artnet.ArtDmx{
-				ID:        []byte{'A', 'r', 't', '-', 'N', 'e', 't', 0x00},
+				ID:        [8]byte{'A', 'r', 't', '-', 'N', 'e', 't', 0x00},
 				OpCode:    artnet.OpDmx,
 				ProtVerHi: 0,
 				ProtVerLo: 14,
@@ -49,7 +49,6 @@ func TestGoodArtnetPacketDecode(t *testing.T) {
 				Physical:  0,
 				SubUni:    1,
 				Net:       0,
-				Length:    512,
 				Data:      make([]uint8, 512),
 			},
 		},
@@ -58,7 +57,7 @@ func TestGoodArtnetPacketDecode(t *testing.T) {
 	for _, test := range tests {
 		t.Run(test.name, func(t *testing.T) {
 
-			got, err := packetDecoder.Process(t.Context(), common.GetWrappedPayload(t.Context(), test.payload))
+			got, err := packetDecoder.Process(t.Context(), common.WrappedPayload{Payload: test.payload})
 
 			if err != nil {
 				t.Fatalf("artnet.packet.decode processing failed: %s", err)
@@ -94,7 +93,7 @@ func TestBadArtnetPacketDecode(t *testing.T) {
 	for _, test := range tests {
 		t.Run(test.name, func(t *testing.T) {
 
-			got, err := packetDecoder.Process(t.Context(), common.GetWrappedPayload(t.Context(), test.payload))
+			got, err := packetDecoder.Process(t.Context(), common.WrappedPayload{Payload: test.payload})
 
 			if err == nil {
 				t.Fatalf("artnet.packet.decode expected to fail but succeeded, got: %v", got)
@@ -106,3 +105,15 @@ func TestBadArtnetPacketDecode(t *testing.T) {
 		})
 	}
 }
+
+func BenchmarkArtnetPacketDecode(b *testing.B) {
+	processorInstance := processor.ArtNetPacketDecode{}
+	payload := []byte{65, 114, 116, 45, 78, 101, 116, 0, 0, 80, 0, 14, 237, 0, 1, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
+
+	for b.Loop() {
+		_, err := processorInstance.Process(b.Context(), common.WrappedPayload{Payload: payload})
+		if err != nil {
+			b.Fatalf("artnet.packet.decode processing failed: %s", err)
+		}
+	}
+}

internal/processor/test/artnet-packet-encode_test.go

@@ -41,7 +41,7 @@ func TestGoodArtnetPacketEncode(t *testing.T) {
 			name:     "number",
 			expected: []byte{65, 114, 116, 45, 78, 101, 116, 0, 0, 80, 0, 14, 237, 0, 1, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
 			payload: &artnet.ArtDmx{
-				ID:        []byte{'A', 'r', 't', '-', 'N', 'e', 't', 0x00},
+				ID:        [8]byte{'A', 'r', 't', '-', 'N', 'e', 't', 0x00},
 				OpCode:    artnet.OpDmx,
 				ProtVerHi: 0,
 				ProtVerLo: 14,
@@ -49,7 +49,6 @@ func TestGoodArtnetPacketEncode(t *testing.T) {
 				Physical:  0,
 				SubUni:    1,
 				Net:       0,
-				Length:    512,
 				Data:      make([]uint8, 512),
 			},
 		},
@@ -58,7 +57,7 @@ func TestGoodArtnetPacketEncode(t *testing.T) {
 	for _, test := range tests {
 		t.Run(test.name, func(t *testing.T) {
 
-			got, err := packetEncoder.Process(t.Context(), common.GetWrappedPayload(t.Context(), test.payload))
+			got, err := packetEncoder.Process(t.Context(), common.WrappedPayload{Payload: test.payload})
 
 			if err != nil {
 				t.Fatalf("artnet.packet.encode processing failed: %s", err)
@@ -89,7 +88,7 @@ func TestBadArtnetPacketEncode(t *testing.T) {
 	for _, test := range tests {
 		t.Run(test.name, func(t *testing.T) {
 
-			got, err := packetEncoder.Process(t.Context(), common.GetWrappedPayload(t.Context(), test.payload))
+			got, err := packetEncoder.Process(t.Context(), common.WrappedPayload{Payload: test.payload})
 
 			if err == nil {
 				t.Fatalf("artnet.packet.encode expected to fail but succeeded, got: %v", got)
@@ -101,3 +100,25 @@ func TestBadArtnetPacketEncode(t *testing.T) {
 		})
 	}
 }
+
+func BenchmarkArtnetPacketEncode(b *testing.B) {
+	processorInstance := processor.ArtNetPacketEncode{}
+	payload := &artnet.ArtDmx{
+		ID:        [8]byte{'A', 'r', 't', '-', 'N', 'e', 't', 0x00},
+		OpCode:    artnet.OpDmx,
+		ProtVerHi: 0,
+		ProtVerLo: 14,
+		Sequence:  237,
+		Physical:  0,
+		SubUni:    1,
+		Net:       0,
+		Data:      make([]uint8, 512),
+	}
+
+	for b.Loop() {
+		_, err := processorInstance.Process(b.Context(), common.WrappedPayload{Payload: payload})
+		if err != nil {
+			b.Fatalf("artnet.packet.encode processing failed: %s", err)
+		}
+	}
+}

internal/processor/test/db-query_test.go

@@ -1,7 +1,6 @@
 package processor_test
 
 import (
-	"context"
 	"reflect"
 	"testing"
 
@@ -22,7 +21,7 @@ func TestDbQueryFromRegistry(t *testing.T) {
 		Type: "db.query",
 		Params: map[string]any{
 			"module": "test",
-			"query":  "SELECT sqlite_version();",
+			"query":  "SELECT 1;",
 		},
 	})
 	if err != nil {
@@ -34,14 +33,14 @@ func TestDbQueryFromRegistry(t *testing.T) {
 	}
 
 	payload := "hello"
-	expected := map[string]any{"sqlite_version()": "3.51.3"}
+	expected := map[string]any{"1": int64(1)}
 
-	got, err := processorInstance.Process(t.Context(), common.GetWrappedPayload(test.GetContextWithModules(
-		t.Context(),
-		map[string]common.Module{
+	got, err := processorInstance.Process(t.Context(), common.WrappedPayload{
+		Payload: payload,
+		Modules: map[string]common.Module{
 			"test": test.NewTestDBModule("test"),
 		},
-	), payload))
+	})
 	if err != nil {
 		t.Fatalf("db.query processing failed: %s", err)
 	}
@@ -115,12 +114,12 @@ func TestGoodDbQuery(t *testing.T) {
 				t.Fatalf("db.query failed to create processor: %s", err)
 			}
 
-			got, err := processorInstance.Process(t.Context(), common.GetWrappedPayload(test.GetContextWithModules(
-				t.Context(),
-				map[string]common.Module{
+			got, err := processorInstance.Process(t.Context(), common.WrappedPayload{
+				Modules: map[string]common.Module{
 					"test": test.NewTestDBModule("test"),
 				},
-			), testCase.payload))
+				Payload: testCase.payload,
+			})
 
 			if err != nil {
 				t.Fatalf("db.query processing failed: %s", err)
@@ -135,11 +134,11 @@ func TestGoodDbQuery(t *testing.T) {
 
 func TestBadDbQuery(t *testing.T) {
 	tests := []struct {
-		name              string
-		params            map[string]any
-		payload           any
-		wrappedPayloadCtx context.Context
-		errorString       string
+		name                  string
+		params                map[string]any
+		payload               any
+		wrappedPayloadModules map[string]common.Module
+		errorString           string
 	}{
 		{
 			name:    "no module param",
@@ -147,9 +146,9 @@ func TestBadDbQuery(t *testing.T) {
 			params: map[string]any{
 				"query": "SELECT sqlite_version();",
 			},
-			wrappedPayloadCtx: test.GetContextWithModules(t.Context(), map[string]common.Module{
+			wrappedPayloadModules: map[string]common.Module{
 				"test": test.NewTestDBModule("test"),
-			}),
+			},
 			errorString: "db.query module error: not found",
 		},
 		{
@@ -159,9 +158,9 @@ func TestBadDbQuery(t *testing.T) {
 				"module": 1,
 				"query":  "SELECT sqlite_version();",
 			},
-			wrappedPayloadCtx: test.GetContextWithModules(t.Context(), map[string]common.Module{
+			wrappedPayloadModules: map[string]common.Module{
 				"test": test.NewTestDBModule("test"),
-			}),
+			},
 			errorString: "db.query module error: not a string",
 		},
 		{
@@ -170,9 +169,9 @@ func TestBadDbQuery(t *testing.T) {
 			params: map[string]any{
 				"module": "test",
 			},
-			wrappedPayloadCtx: test.GetContextWithModules(t.Context(), map[string]common.Module{
+			wrappedPayloadModules: map[string]common.Module{
 				"test": test.NewTestDBModule("test"),
-			}),
+			},
 			errorString: "db.query query error: not found",
 		},
 		{
@@ -182,9 +181,9 @@ func TestBadDbQuery(t *testing.T) {
 				"module": "test",
 				"query":  1,
 			},
-			wrappedPayloadCtx: test.GetContextWithModules(t.Context(), map[string]common.Module{
+			wrappedPayloadModules: map[string]common.Module{
 				"test": test.NewTestDBModule("test"),
-			}),
+			},
 			errorString: "db.query query error: not a string",
 		},
 		{
@@ -194,9 +193,9 @@ func TestBadDbQuery(t *testing.T) {
 				"module": "test",
 				"query":  "select * from {{",
 			},
-			wrappedPayloadCtx: test.GetContextWithModules(t.Context(), map[string]common.Module{
+			wrappedPayloadModules: map[string]common.Module{
 				"test": test.NewTestDBModule("test"),
-			}),
+			},
 			errorString: "template: query:1: unclosed action",
 		},
 		{
@@ -206,9 +205,9 @@ func TestBadDbQuery(t *testing.T) {
 				"module": "test",
 				"query":  "select * from {{.Data}}",
 			},
-			wrappedPayloadCtx: test.GetContextWithModules(t.Context(), map[string]common.Module{
+			wrappedPayloadModules: map[string]common.Module{
 				"test": test.NewTestDBModule("test"),
-			}),
+			},
 			errorString: "template: query:1:16: executing \"query\" at <.Data>: can't evaluate field Data in type common.WrappedPayload",
 		},
 		{
@@ -218,9 +217,9 @@ func TestBadDbQuery(t *testing.T) {
 				"module": "test",
 				"query":  "select * from asdf;",
 			},
-			wrappedPayloadCtx: test.GetContextWithModules(t.Context(), map[string]common.Module{
+			wrappedPayloadModules: map[string]common.Module{
 				"test": test.NewTestDBModule("test"),
-			}),
+			},
 			errorString: "db.query error executing query: SQL logic error: no such table: asdf (1)",
 		},
 		{
@@ -230,8 +229,8 @@ func TestBadDbQuery(t *testing.T) {
 				"module": "test",
 				"query":  "select * from test;",
 			},
-			wrappedPayloadCtx: t.Context(),
-			errorString:       "db.query wrapped payload has no modules",
+			wrappedPayloadModules: nil,
+			errorString:           "db.query wrapped payload has no modules",
 		},
 		{
 			name:    "module not found in context",
@@ -240,8 +239,8 @@ func TestBadDbQuery(t *testing.T) {
 				"module": "test",
 				"query":  "select * from test;",
 			},
-			wrappedPayloadCtx: test.GetContextWithModules(t.Context(), map[string]common.Module{}),
-			errorString:       "db.query unable to find module with id: test",
+			wrappedPayloadModules: map[string]common.Module{},
+			errorString:           "db.query unable to find module with id: test",
 		},
 		{
 			name:    "module not found in context",
@@ -250,8 +249,8 @@ func TestBadDbQuery(t *testing.T) {
 				"module": "test",
 				"query":  "select * from test;",
 			},
-			wrappedPayloadCtx: test.GetContextWithModules(t.Context(), map[string]common.Module{}),
-			errorString:       "db.query unable to find module with id: test",
+			wrappedPayloadModules: map[string]common.Module{},
+			errorString:           "db.query unable to find module with id: test",
 		},
 		{
 			name:    "module not a DatabseModule",
@@ -260,9 +259,9 @@ func TestBadDbQuery(t *testing.T) {
 				"module": "test",
 				"query":  "select * from test;",
 			},
-			wrappedPayloadCtx: test.GetContextWithModules(t.Context(), map[string]common.Module{
+			wrappedPayloadModules: map[string]common.Module{
 				"test": test.NewTestKVModule("test"),
-			}),
+			},
 			errorString: "db.query module with id test is not a DatabaseModule",
 		},
 	}
@@ -287,7 +286,10 @@ func TestBadDbQuery(t *testing.T) {
 				return
 			}
 
-			got, err := processorInstance.Process(t.Context(), common.GetWrappedPayload(test.wrappedPayloadCtx, test.payload))
+			got, err := processorInstance.Process(t.Context(), common.WrappedPayload{
+				Payload: test.payload,
+				Modules: test.wrappedPayloadModules,
+			})
 
 			if err == nil {
 				t.Fatalf("db.query expected to fail but got payload: %+v", got)
@@ -299,3 +301,32 @@ func TestBadDbQuery(t *testing.T) {
 		})
 	}
 }
+
+func BenchmarkDbQuery(b *testing.B) {
+	registration, ok := processor.ProcessorRegistry["db.query"]
+	if !ok {
+		b.Fatalf("db.query processor not registered")
+	}
+
+	processorInstance, err := registration.New(config.ProcessorConfig{
+		Type: "db.query",
+		Params: map[string]any{
+			"module": "test",
+			"query":  "SELECT * FROM test;",
+		},
+	})
+
+	if err != nil {
+		b.Fatalf("db.query failed to create processor: %s", err)
+	}
+	modules := map[string]common.Module{
+		"test": test.NewTestDBModule("test"),
+	}
+
+	for b.Loop() {
+		_, err := processorInstance.Process(b.Context(), common.WrappedPayload{Payload: nil, Modules: modules})
+		if err != nil {
+			b.Fatalf("db.query processing failed: %s", err)
+		}
+	}
+}

internal/processor/test/debug-log_test.go

@@ -30,7 +30,7 @@ func TestDebugLogFromRegistry(t *testing.T) {
 	payload := "test"
 	expected := "test"
 
-	got, err := processorInstance.Process(t.Context(), common.GetWrappedPayload(t.Context(), payload))
+	got, err := processorInstance.Process(t.Context(), common.WrappedPayload{Payload: payload})
 	if err != nil {
 		t.Fatalf("debug.log processing failed: %s", err)
 	}
@@ -66,7 +66,7 @@ func TestGoodDebugLog(t *testing.T) {
 				t.Fatalf("debug.log failed to create processor: %s", err)
 			}
 
-			got, err := processorInstance.Process(t.Context(), common.GetWrappedPayload(t.Context(), test.payload))
+			got, err := processorInstance.Process(t.Context(), common.WrappedPayload{Payload: test.payload})
 			if err != nil {
 				t.Fatalf("debug.log processing failed: %s", err)
 			}
@@ -106,7 +106,7 @@ func TestBadDebugLog(t *testing.T) {
 				return
 			}
 
-			got, err := processorInstance.Process(t.Context(), common.GetWrappedPayload(t.Context(), test.payload))
+			got, err := processorInstance.Process(t.Context(), common.WrappedPayload{Payload: test.payload})
 
 			if err == nil {
 				t.Fatalf("debug.log expected to fail but succeeded, got: %v", got)
@@ -118,3 +118,29 @@ func TestBadDebugLog(t *testing.T) {
 		})
 	}
 }
+
+func BenchmarkDebugLog(b *testing.B) {
+	registration, ok := processor.ProcessorRegistry["debug.log"]
+	if !ok {
+		b.Fatalf("debug.log processor not registered")
+	}
+
+	processorInstance, err := registration.New(config.ProcessorConfig{
+		Type:   "debug.log",
+		Params: nil,
+	})
+
+	if err != nil {
+		b.Fatalf("debug.log failed to create processor: %s", err)
+	}
+	modules := map[string]common.Module{}
+
+	count := 0
+	for b.Loop() {
+		_, err := processorInstance.Process(b.Context(), common.WrappedPayload{Payload: count, Modules: modules})
+		if err != nil {
+			b.Fatalf("debug.log processing failed: %s", err)
+		}
+		count++
+	}
+}

internal/processor/test/filter-change_test.go

@@ -29,7 +29,9 @@ func TestFilterChangeFromRegistry(t *testing.T) {
 	payload := "hello"
 	expected := "hello"
 
-	got, err := processorInstance.Process(t.Context(), common.GetWrappedPayload(t.Context(), payload))
+	got, err := processorInstance.Process(t.Context(), common.WrappedPayload{
+		Payload: payload,
+	})
 	if err != nil {
 		t.Fatalf("filter.change processing failed: %s", err)
 	}
@@ -70,7 +72,7 @@ func TestGoodFilterChange(t *testing.T) {
 				t.Fatalf("filter.change failed to create processor: %s", err)
 			}
 
-			got, err := processorInstance.Process(t.Context(), common.GetWrappedPayload(t.Context(), test.payload))
+			got, err := processorInstance.Process(t.Context(), common.WrappedPayload{Payload: test.payload})
 
 			if err != nil {
 				t.Fatalf("filter.change processing failed: %s", err)
@@ -110,7 +112,7 @@ func TestBadFilterChange(t *testing.T) {
 				return
 			}
 
-			got, err := processorInstance.Process(t.Context(), common.GetWrappedPayload(t.Context(), test.payload))
+			got, err := processorInstance.Process(t.Context(), common.WrappedPayload{Payload: test.payload})
 
 			if err == nil {
 				t.Fatalf("filter.change expected to fail but got payload: %+v", got)
@@ -122,3 +124,29 @@ func TestBadFilterChange(t *testing.T) {
 		})
 	}
 }
+
+func BenchmarkFilterChange(b *testing.B) {
+	registration, ok := processor.ProcessorRegistry["filter.change"]
+	if !ok {
+		b.Fatalf("filter.change processor not registered")
+	}
+
+	processorInstance, err := registration.New(config.ProcessorConfig{
+		Type:   "filter.change",
+		Params: nil,
+	})
+
+	if err != nil {
+		b.Fatalf("filter.change failed to create processor: %s", err)
+	}
+	modules := map[string]common.Module{}
+
+	count := 0
+	for b.Loop() {
+		_, err := processorInstance.Process(b.Context(), common.WrappedPayload{Payload: count, Modules: modules})
+		if err != nil {
+			b.Fatalf("filter.change processing failed: %s", err)
+		}
+		count++
+	}
+}

internal/processor/test/filter-expr_test.go

@@ -85,7 +85,7 @@ func TestGoodFilterExpr(t *testing.T) {
 				t.Fatalf("filter.expr failed to create processor: %s", err)
 			}
 
-			got, err := processorInstance.Process(t.Context(), common.GetWrappedPayload(t.Context(), testCase.payload))
+			got, err := processorInstance.Process(t.Context(), common.WrappedPayload{Payload: testCase.payload})
 
 			if err != nil {
 				t.Fatalf("filter.expr processing failed: %s", err)
@@ -159,7 +159,7 @@ func TestBadFilterExpr(t *testing.T) {
 				}
 				return
 			}
-			got, err := processorInstance.Process(t.Context(), common.GetWrappedPayload(t.Context(), test.payload))
+			got, err := processorInstance.Process(t.Context(), common.WrappedPayload{Payload: test.payload})
 
 			if err == nil {
 				t.Fatalf("filter.expr expected to fail but succeeded, got: %v", got)
@@ -171,3 +171,30 @@ func TestBadFilterExpr(t *testing.T) {
 		})
 	}
 }
+
+func BenchmarkFilterExpr(b *testing.B) {
+	registration, ok := processor.ProcessorRegistry["filter.expr"]
+	if !ok {
+		b.Fatalf("filter.expr processor not registered")
+	}
+
+	processorInstance, err := registration.New(config.ProcessorConfig{
+		Type: "filter.expr",
+		Params: map[string]any{
+			"expression": "Payload % 2 == 0",
+		},
+	})
+
+	if err != nil {
+		b.Fatalf("filter.expr failed to create processor: %s", err)
+	}
+
+	count := 0
+	for b.Loop() {
+		_, err := processorInstance.Process(b.Context(), common.WrappedPayload{Payload: count})
+		if err != nil {
+			b.Fatalf("filter.expr processing failed: %s", err)
+		}
+		count++
+	}
+}

internal/processor/test/filter-regex_test.go

@@ -1,6 +1,7 @@
 package processor_test
 
 import (
+	"fmt"
 	"testing"
 
 	"github.com/jwetzell/showbridge-go/internal/common"
@@ -31,7 +32,7 @@ func TestFilterRegexFromRegistry(t *testing.T) {
 	payload := "hello"
 	expected := "hello"
 
-	got, err := processorInstance.Process(t.Context(), common.GetWrappedPayload(t.Context(), payload))
+	got, err := processorInstance.Process(t.Context(), common.WrappedPayload{Payload: payload})
 	if err != nil {
 		t.Fatalf("filter.regex processing failed: %s", err)
 	}
@@ -90,7 +91,7 @@ func TestGoodFilterRegex(t *testing.T) {
 				t.Fatalf("filter.regex failed to create processor: %s", err)
 			}
 
-			got, err := processorInstance.Process(t.Context(), common.GetWrappedPayload(t.Context(), test.payload))
+			got, err := processorInstance.Process(t.Context(), common.WrappedPayload{Payload: test.payload})
 
 			if err != nil {
 				t.Fatalf("filter.regex processing failed: %s", err)
@@ -161,7 +162,7 @@ func TestBadFilterRegex(t *testing.T) {
 				return
 			}
 
-			got, err := processorInstance.Process(t.Context(), common.GetWrappedPayload(t.Context(), test.payload))
+			got, err := processorInstance.Process(t.Context(), common.WrappedPayload{Payload: test.payload})
 
 			if err == nil {
 				t.Fatalf("filter.regex expected to fail but got payload: %+v", got)
@@ -173,3 +174,30 @@ func TestBadFilterRegex(t *testing.T) {
 		})
 	}
 }
+
+func BenchmarkFilterRegex(b *testing.B) {
+	registration, ok := processor.ProcessorRegistry["filter.regex"]
+	if !ok {
+		b.Fatalf("filter.regex processor not registered")
+	}
+
+	processorInstance, err := registration.New(config.ProcessorConfig{
+		Type: "filter.regex",
+		Params: map[string]any{
+			"pattern": ".*",
+		},
+	})
+
+	if err != nil {
+		b.Fatalf("filter.regex failed to create processor: %s", err)
+	}
+
+	count := 0
+	for b.Loop() {
+		_, err := processorInstance.Process(b.Context(), common.WrappedPayload{Payload: fmt.Sprintf("%d", count)})
+		if err != nil {
+			b.Fatalf("filter.regex processing failed: %s", err)
+		}
+		count++
+	}
+}

internal/processor/test/float-parse_test.go

@@ -1,6 +1,7 @@
 package processor_test
 
 import (
+	"fmt"
 	"testing"
 
 	"github.com/jwetzell/showbridge-go/internal/common"
@@ -76,7 +77,7 @@ func TestGoodFloatParse(t *testing.T) {
 				t.Fatalf("float.parse failed to create processor: %s", err)
 			}
 
-			got, err := processorInstance.Process(t.Context(), common.GetWrappedPayload(t.Context(), test.payload))
+			got, err := processorInstance.Process(t.Context(), common.WrappedPayload{Payload: test.payload})
 			if err != nil {
 				t.Fatalf("float.parse processing failed: %s", err)
 			}
@@ -152,7 +153,7 @@ func TestBadFloatParse(t *testing.T) {
 				return
 			}
 
-			got, err := processorInstance.Process(t.Context(), common.GetWrappedPayload(t.Context(), test.payload))
+			got, err := processorInstance.Process(t.Context(), common.WrappedPayload{Payload: test.payload})
 
 			if err == nil {
 				t.Fatalf("float.parse expected to fail but succeeded, got: %v", got)
@@ -164,3 +165,28 @@ func TestBadFloatParse(t *testing.T) {
 		})
 	}
 }
+
+func BenchmarkFloatParse(b *testing.B) {
+	registration, ok := processor.ProcessorRegistry["float.parse"]
+	if !ok {
+		b.Fatalf("float.parse processor not registered")
+	}
+
+	processorInstance, err := registration.New(config.ProcessorConfig{
+		Type:   "float.parse",
+		Params: nil,
+	})
+
+	if err != nil {
+		b.Fatalf("float.parse failed to create processor: %s", err)
+	}
+
+	count := 0
+	for b.Loop() {
+		_, err := processorInstance.Process(b.Context(), common.WrappedPayload{Payload: fmt.Sprintf("%d", count)})
+		if err != nil {
+			b.Fatalf("float.parse processing failed: %s", err)
+		}
+		count++
+	}
+}

internal/processor/test/float-random_test.go

@@ -71,7 +71,7 @@ func TestGoodFloatRandom(t *testing.T) {
 				t.Fatalf("float.random failed to create processor: %s", err)
 			}
 
-			got, err := processorInstance.Process(t.Context(), common.GetWrappedPayload(t.Context(), test.payload))
+			got, err := processorInstance.Process(t.Context(), common.WrappedPayload{Payload: test.payload})
 			if err != nil {
 				t.Fatalf("float.random processing failed: %s", err)
 			}
@@ -172,7 +172,7 @@ func TestBadFloatRandom(t *testing.T) {
 				return
 			}
 
-			got, err := processorInstance.Process(t.Context(), common.GetWrappedPayload(t.Context(), test.payload))
+			got, err := processorInstance.Process(t.Context(), common.WrappedPayload{Payload: test.payload})
 
 			if err == nil {
 				t.Fatalf("float.random expected to fail but got payload: %+v", got)
@@ -184,3 +184,29 @@ func TestBadFloatRandom(t *testing.T) {
 		})
 	}
 }
+
+func BenchmarkFloatRandom(b *testing.B) {
+	registration, ok := processor.ProcessorRegistry["float.random"]
+	if !ok {
+		b.Fatalf("float.random processor not registered")
+	}
+
+	processorInstance, err := registration.New(config.ProcessorConfig{
+		Type: "float.random",
+		Params: map[string]any{
+			"min": 0.0,
+			"max": 1.0,
+		},
+	})
+
+	if err != nil {
+		b.Fatalf("float.random failed to create processor: %s", err)
+	}
+
+	for b.Loop() {
+		_, err := processorInstance.Process(b.Context(), common.WrappedPayload{Payload: nil})
+		if err != nil {
+			b.Fatalf("float.random processing failed: %s", err)
+		}
+	}
+}

internal/processor/test/free-d-create_test.go

@@ -103,7 +103,7 @@ func TestGoodFreeDCreate(t *testing.T) {
 				t.Fatalf("freed.create failed to create processor: %s", err)
 			}
 
-			got, err := processorInstance.Process(t.Context(), common.GetWrappedPayload(t.Context(), test.payload))
+			got, err := processorInstance.Process(t.Context(), common.WrappedPayload{Payload: test.payload})
 			if err != nil {
 				t.Fatalf("freed.create processing failed: %s", err)
 			}
@@ -865,7 +865,7 @@ func TestBadFreeDCreate(t *testing.T) {
 				return
 			}
 
-			got, err := processorInstance.Process(t.Context(), common.GetWrappedPayload(t.Context(), test.payload))
+			got, err := processorInstance.Process(t.Context(), common.WrappedPayload{Payload: test.payload})
 
 			if err == nil {
 				t.Fatalf("freed.create expected to fail but succeeded, got: %v", got)
@@ -877,3 +877,38 @@ func TestBadFreeDCreate(t *testing.T) {
 		})
 	}
 }
+
+func BenchmarkFreeDCreate(b *testing.B) {
+	registration, ok := processor.ProcessorRegistry["freed.create"]
+	if !ok {
+		b.Fatalf("freed.create processor not registered")
+	}
+
+	processorInstance, err := registration.New(config.ProcessorConfig{
+		Type: "freed.create",
+		Params: map[string]any{
+			"id":    "0",
+			"pan":   "0",
+			"tilt":  "0",
+			"roll":  "0",
+			"posX":  "0",
+			"posY":  "0",
+			"posZ":  "0",
+			"zoom":  "0",
+			"focus": "0",
+		},
+	})
+
+	if err != nil {
+		b.Fatalf("freed.create failed to create processor: %s", err)
+	}
+
+	count := 0
+	for b.Loop() {
+		_, err := processorInstance.Process(b.Context(), common.WrappedPayload{Payload: count})
+		if err != nil {
+			b.Fatalf("freed.create processing failed: %s", err)
+		}
+		count++
+	}
+}

internal/processor/test/free-d-decode_test.go

@@ -59,7 +59,7 @@ func TestGoodFreeDDecode(t *testing.T) {
 	for _, test := range tests {
 		t.Run(test.name, func(t *testing.T) {
 
-			got, err := packetEncoder.Process(t.Context(), common.GetWrappedPayload(t.Context(), test.payload))
+			got, err := packetEncoder.Process(t.Context(), common.WrappedPayload{Payload: test.payload})
 
 			if err != nil {
 				t.Fatalf("freed.decode processing failed: %s", err)
@@ -90,7 +90,7 @@ func TestBadFreeDDecode(t *testing.T) {
 	for _, test := range tests {
 		t.Run(test.name, func(t *testing.T) {
 
-			got, err := packetEncoder.Process(t.Context(), common.GetWrappedPayload(t.Context(), test.payload))
+			got, err := packetEncoder.Process(t.Context(), common.WrappedPayload{Payload: test.payload})
 
 			if err == nil {
 				t.Fatalf("freed.decode expected to fail but succeeded, got: %v", got)
@@ -102,3 +102,17 @@ func TestBadFreeDDecode(t *testing.T) {
 		})
 	}
 }
+
+func BenchmarkFreeDDecode(b *testing.B) {
+	processorInstance := processor.FreeDDecode{}
+	payload := []byte{0xd1, 0x01, 0x5a, 0x00, 0x00, 0x2d, 0x00, 0x00, 0xa6, 0x00, 0x00, 0x7f, 0xff, 0x40, 0x7f, 0xff, 0x80, 0x7f, 0xff,
+		0xc0, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x00, 0x00, 50,
+	}
+
+	for b.Loop() {
+		_, err := processorInstance.Process(b.Context(), common.WrappedPayload{Payload: payload})
+		if err != nil {
+			b.Fatalf("freed.encode processing failed: %s", err)
+		}
+	}
+}

internal/processor/test/free-d-encode_test.go

@@ -59,7 +59,7 @@ func TestGoodFreeDEncode(t *testing.T) {
 	for _, test := range tests {
 		t.Run(test.name, func(t *testing.T) {
 
-			got, err := packetEncoder.Process(t.Context(), common.GetWrappedPayload(t.Context(), test.payload))
+			got, err := packetEncoder.Process(t.Context(), common.WrappedPayload{Payload: test.payload})
 
 			if err != nil {
 				t.Fatalf("freed.encode processing failed: %s", err)
@@ -90,7 +90,7 @@ func TestBadFreeDEncode(t *testing.T) {
 	for _, test := range tests {
 		t.Run(test.name, func(t *testing.T) {
 
-			got, err := packetEncoder.Process(t.Context(), common.GetWrappedPayload(t.Context(), test.payload))
+			got, err := packetEncoder.Process(t.Context(), common.WrappedPayload{Payload: test.payload})
 
 			if err == nil {
 				t.Fatalf("freed.encode expected to fail but succeeded, got: %v", got)
@@ -102,3 +102,25 @@ func TestBadFreeDEncode(t *testing.T) {
 		})
 	}
 }
+
+func BenchmarkFreeDEncode(b *testing.B) {
+	processorInstance := processor.FreeDEncode{}
+	payload := freeD.FreeDPosition{
+		ID:    1,
+		Pan:   180,
+		Tilt:  90,
+		Roll:  -180,
+		PosX:  131069,
+		PosY:  131070,
+		PosZ:  131071,
+		Zoom:  66051,
+		Focus: 263430,
+	}
+
+	for b.Loop() {
+		_, err := processorInstance.Process(b.Context(), common.WrappedPayload{Payload: payload})
+		if err != nil {
+			b.Fatalf("freed.encode processing failed: %s", err)
+		}
+	}
+}

internal/processor/test/http-request-do_test.go

@@ -58,7 +58,7 @@ func TestGoodHTTPRequestDo(t *testing.T) {
 				t.Fatalf("http.request.do failed to create processor: %s", err)
 			}
 
-			got, err := processorInstance.Process(t.Context(), common.GetWrappedPayload(t.Context(), test.payload))
+			got, err := processorInstance.Process(t.Context(), common.WrappedPayload{Payload: test.payload})
 			if err != nil {
 				t.Fatalf("http.request.do processing failed: %s", err)
 			}
@@ -149,7 +149,7 @@ func TestBadHTTPRequestDo(t *testing.T) {
 				return
 			}
 
-			got, err := processorInstance.Process(t.Context(), common.GetWrappedPayload(t.Context(), test.payload))
+			got, err := processorInstance.Process(t.Context(), common.WrappedPayload{Payload: test.payload})
 
 			if err == nil {
 				t.Fatalf("http.request.do expected to fail but succeeded, got: %v", got)

internal/processor/test/http-response-create_test.go

@@ -68,7 +68,7 @@ func TestGoodHTTPResponseCreate(t *testing.T) {
 				t.Fatalf("http.response.create failed to create processor: %s", err)
 			}
 
-			got, err := processorInstance.Process(t.Context(), common.GetWrappedPayload(t.Context(), test.payload))
+			got, err := processorInstance.Process(t.Context(), common.WrappedPayload{Payload: test.payload})
 			if err != nil {
 				t.Fatalf("http.response.create processing failed: %s", err)
 			}
@@ -145,7 +145,7 @@ func TestBadHTTPResponseCreate(t *testing.T) {
 				return
 			}
 
-			got, err := processorInstance.Process(t.Context(), common.GetWrappedPayload(t.Context(), test.payload))
+			got, err := processorInstance.Process(t.Context(), common.WrappedPayload{Payload: test.payload})
 
 			if err == nil {
 				t.Fatalf("http.response.create expected to fail but succeeded, got: %v", got)
@@ -157,3 +157,31 @@ func TestBadHTTPResponseCreate(t *testing.T) {
 		})
 	}
 }
+
+func BenchmarkHTTPResponseCreate(b *testing.B) {
+	registration, ok := processor.ProcessorRegistry["http.response.create"]
+	if !ok {
+		b.Fatalf("http.response.create processor not registered")
+	}
+
+	processorInstance, err := registration.New(config.ProcessorConfig{
+		Type: "http.response.create",
+		Params: map[string]any{
+			"status":       200,
+			"bodyTemplate": "Hello, {{.Payload}}!",
+		},
+	})
+
+	if err != nil {
+		b.Fatalf("http.response.create failed to create processor: %s", err)
+	}
+
+	count := 0
+	for b.Loop() {
+		_, err := processorInstance.Process(b.Context(), common.WrappedPayload{Payload: count})
+		if err != nil {
+			b.Fatalf("http.response.create processing failed: %s", err)
+		}
+		count++
+	}
+}

internal/processor/test/int-parse_test.go

@@ -1,6 +1,7 @@
 package processor_test
 
 import (
+	"fmt"
 	"testing"
 
 	"github.com/jwetzell/showbridge-go/internal/common"
@@ -97,7 +98,7 @@ func TestGoodIntParse(t *testing.T) {
 				t.Fatalf("int.parse failed to create processor: %s", err)
 			}
 
-			got, err := processorInstance.Process(t.Context(), common.GetWrappedPayload(t.Context(), test.payload))
+			got, err := processorInstance.Process(t.Context(), common.WrappedPayload{Payload: test.payload})
 			if err != nil {
 				t.Fatalf("int.parse processing failed: %s", err)
 			}
@@ -186,7 +187,7 @@ func TestBadIntParse(t *testing.T) {
 				return
 			}
 
-			got, err := processorInstance.Process(t.Context(), common.GetWrappedPayload(t.Context(), test.payload))
+			got, err := processorInstance.Process(t.Context(), common.WrappedPayload{Payload: test.payload})
 
 			if err == nil {
 				t.Fatalf("int.parse expected to fail but succeeded, got: %v", got)
@@ -198,3 +199,28 @@ func TestBadIntParse(t *testing.T) {
 		})
 	}
 }
+
+func BenchmarkIntParse(b *testing.B) {
+	registration, ok := processor.ProcessorRegistry["int.parse"]
+	if !ok {
+		b.Fatalf("int.parse processor not registered")
+	}
+
+	processorInstance, err := registration.New(config.ProcessorConfig{
+		Type:   "int.parse",
+		Params: nil,
+	})
+
+	if err != nil {
+		b.Fatalf("int.parse failed to create processor: %s", err)
+	}
+
+	count := 0
+	for b.Loop() {
+		_, err := processorInstance.Process(b.Context(), common.WrappedPayload{Payload: fmt.Sprintf("%d", count)})
+		if err != nil {
+			b.Fatalf("int.parse processing failed: %s", err)
+		}
+		count++
+	}
+}

internal/processor/test/int-random_test.go

@@ -51,7 +51,7 @@ func TestIntRandomGoodConfig(t *testing.T) {
 
 	payload := "12345"
 
-	got, err := processorInstance.Process(t.Context(), common.GetWrappedPayload(t.Context(), payload))
+	got, err := processorInstance.Process(t.Context(), common.WrappedPayload{Payload: payload})
 	if err != nil {
 		t.Fatalf("int.random processing failed: %s", err)
 	}
@@ -98,7 +98,7 @@ func TestGoodIntRandom(t *testing.T) {
 				t.Fatalf("int.random failed to create processor: %s", err)
 			}
 
-			got, err := processorInstance.Process(t.Context(), common.GetWrappedPayload(t.Context(), test.payload))
+			got, err := processorInstance.Process(t.Context(), common.WrappedPayload{Payload: test.payload})
 			if err != nil {
 				t.Fatalf("int.random processing failed: %s", err)
 			}
@@ -183,7 +183,7 @@ func TestBadIntRandom(t *testing.T) {
 				return
 			}
 
-			got, err := processorInstance.Process(t.Context(), common.GetWrappedPayload(t.Context(), test.payload))
+			got, err := processorInstance.Process(t.Context(), common.WrappedPayload{Payload: test.payload})
 
 			if err == nil {
 				t.Fatalf("int.random expected to fail but got payload: %+v", got)
@@ -195,3 +195,29 @@ func TestBadIntRandom(t *testing.T) {
 		})
 	}
 }
+
+func BenchmarkIntRandom(b *testing.B) {
+	registration, ok := processor.ProcessorRegistry["int.random"]
+	if !ok {
+		b.Fatalf("int.random processor not registered")
+	}
+
+	processorInstance, err := registration.New(config.ProcessorConfig{
+		Type: "int.random",
+		Params: map[string]any{
+			"min": 0,
+			"max": 100,
+		},
+	})
+
+	if err != nil {
+		b.Fatalf("int.random failed to create processor: %s", err)
+	}
+
+	for b.Loop() {
+		_, err := processorInstance.Process(b.Context(), common.WrappedPayload{Payload: nil})
+		if err != nil {
+			b.Fatalf("int.random processing failed: %s", err)
+		}
+	}
+}

internal/processor/test/int-scale_test.go

@@ -69,7 +69,7 @@ func TestGoodIntScale(t *testing.T) {
 				t.Fatalf("int.scale failed to create processor: %s", err)
 			}
 
-			got, err := processorInstance.Process(t.Context(), common.GetWrappedPayload(t.Context(), test.payload))
+			got, err := processorInstance.Process(t.Context(), common.WrappedPayload{Payload: test.payload})
 			if err != nil {
 				t.Fatalf("int.scale processing failed: %s", err)
 			}
@@ -157,7 +157,7 @@ func TestBadIntScale(t *testing.T) {
 				return
 			}
 
-			got, err := processorInstance.Process(t.Context(), common.GetWrappedPayload(t.Context(), test.payload))
+			got, err := processorInstance.Process(t.Context(), common.WrappedPayload{Payload: test.payload})
 
 			if err == nil {
 				t.Fatalf("int.scale expected to fail but got payload: %+v", got)
@@ -169,3 +169,33 @@ func TestBadIntScale(t *testing.T) {
 		})
 	}
 }
+
+func BenchmarkIntScale(b *testing.B) {
+	registration, ok := processor.ProcessorRegistry["int.scale"]
+	if !ok {
+		b.Fatalf("int.scale processor not registered")
+	}
+
+	processorInstance, err := registration.New(config.ProcessorConfig{
+		Type: "int.scale",
+		Params: map[string]any{
+			"inMin":  0,
+			"inMax":  100,
+			"outMin": 0,
+			"outMax": 127,
+		},
+	})
+
+	if err != nil {
+		b.Fatalf("int.scale failed to create processor: %s", err)
+	}
+
+	count := 0
+	for b.Loop() {
+		_, err := processorInstance.Process(b.Context(), common.WrappedPayload{Payload: count % 100})
+		if err != nil {
+			b.Fatalf("int.scale processing failed: %s", err)
+		}
+		count++
+	}
+}

internal/processor/test/json-decode_test.go

@@ -1,6 +1,7 @@
 package processor_test
 
 import (
+	"fmt"
 	"reflect"
 	"testing"
 
@@ -32,7 +33,7 @@ func TestJsonDecodeFromRegistry(t *testing.T) {
 		"property": "hello",
 	}
 
-	got, err := processorInstance.Process(t.Context(), common.GetWrappedPayload(t.Context(), payload))
+	got, err := processorInstance.Process(t.Context(), common.WrappedPayload{Payload: payload})
 	if err != nil {
 		t.Fatalf("json.decode processing failed: %s", err)
 	}
@@ -75,7 +76,7 @@ func TestGoodJsonDecode(t *testing.T) {
 
 	for _, test := range tests {
 		t.Run(test.name, func(t *testing.T) {
-			got, err := jsonDecoder.Process(t.Context(), common.GetWrappedPayload(t.Context(), test.payload))
+			got, err := jsonDecoder.Process(t.Context(), common.WrappedPayload{Payload: test.payload})
 			if err != nil {
 				t.Fatalf("json.decode processing failed: %s", err)
 			}
@@ -113,7 +114,7 @@ func TestBadJsonDecode(t *testing.T) {
 
 	for _, test := range tests {
 		t.Run(test.name, func(t *testing.T) {
-			got, err := stringEncoder.Process(t.Context(), common.GetWrappedPayload(t.Context(), test.payload))
+			got, err := stringEncoder.Process(t.Context(), common.WrappedPayload{Payload: test.payload})
 
 			if err == nil {
 				t.Fatalf("json.decode expected to fail but got payload: %+v", got)
@@ -124,3 +125,27 @@ func TestBadJsonDecode(t *testing.T) {
 		})
 	}
 }
+
+func BenchmarkJsonDecode(b *testing.B) {
+	registration, ok := processor.ProcessorRegistry["json.decode"]
+	if !ok {
+		b.Fatalf("json.decode processor not registered")
+	}
+
+	processorInstance, err := registration.New(config.ProcessorConfig{
+		Type: "json.decode",
+	})
+
+	if err != nil {
+		b.Fatalf("json.decode failed to create processor: %s", err)
+	}
+
+	count := 0
+	for b.Loop() {
+		_, err := processorInstance.Process(b.Context(), common.WrappedPayload{Payload: []byte(fmt.Sprintf("{\"key\":%d}", count))})
+		if err != nil {
+			b.Fatalf("json.decode processing failed: %s", err)
+		}
+		count++
+	}
+}

internal/processor/test/json-encode_test.go

@@ -1,6 +1,7 @@
 package processor_test
 
 import (
+	"fmt"
 	"slices"
 	"testing"
 
@@ -35,7 +36,7 @@ func TestJsonEncodeFromRegistry(t *testing.T) {
 
 	expected := []byte("{\"property\":\"hello\"}")
 
-	got, err := processorInstance.Process(t.Context(), common.GetWrappedPayload(t.Context(), payload))
+	got, err := processorInstance.Process(t.Context(), common.WrappedPayload{Payload: payload})
 	if err != nil {
 		t.Fatalf("json.encode processing failed: %s", err)
 	}
@@ -69,7 +70,7 @@ func TestGoodJsonEncode(t *testing.T) {
 
 	for _, test := range tests {
 		t.Run(test.name, func(t *testing.T) {
-			got, err := jsonEncoder.Process(t.Context(), common.GetWrappedPayload(t.Context(), test.payload))
+			got, err := jsonEncoder.Process(t.Context(), common.WrappedPayload{Payload: test.payload})
 			if err != nil {
 				t.Fatalf("json.encode processing failed: %s", err)
 			}
@@ -102,7 +103,7 @@ func TestBadJsonEncode(t *testing.T) {
 
 	for _, test := range tests {
 		t.Run(test.name, func(t *testing.T) {
-			got, err := stringEncoder.Process(t.Context(), common.GetWrappedPayload(t.Context(), test.payload))
+			got, err := stringEncoder.Process(t.Context(), common.WrappedPayload{Payload: test.payload})
 
 			if err == nil {
 				t.Fatalf("json.encode expected to fail but got payload: %+v", got)
@@ -113,3 +114,27 @@ func TestBadJsonEncode(t *testing.T) {
 		})
 	}
 }
+
+func BenchmarkJsonEncode(b *testing.B) {
+	registration, ok := processor.ProcessorRegistry["json.encode"]
+	if !ok {
+		b.Fatalf("json.encode processor not registered")
+	}
+
+	processorInstance, err := registration.New(config.ProcessorConfig{
+		Type: "json.encode",
+	})
+
+	if err != nil {
+		b.Fatalf("json.encode failed to create processor: %s", err)
+	}
+
+	count := 0
+	for b.Loop() {
+		_, err := processorInstance.Process(b.Context(), common.WrappedPayload{Payload: fmt.Sprintf("{\"key\":%d}", count)})
+		if err != nil {
+			b.Fatalf("json.encode processing failed: %s", err)
+		}
+		count++
+	}
+}

internal/processor/test/kv-get_test.go

@@ -1,7 +1,6 @@
 package processor_test
 
 import (
-	"context"
 	"reflect"
 	"testing"
 
@@ -35,12 +34,12 @@ func TestKvGetFromRegistry(t *testing.T) {
 	payload := "hello"
 	expected := "test"
 
-	got, err := processorInstance.Process(t.Context(), common.GetWrappedPayload(test.GetContextWithModules(
-		t.Context(),
-		map[string]common.Module{
+	got, err := processorInstance.Process(t.Context(), common.WrappedPayload{
+		Modules: map[string]common.Module{
 			"test": test.NewTestKVModule("test"),
 		},
-	), payload))
+		Payload: payload,
+	})
 	if err != nil {
 		t.Fatalf("kv.get processing failed: %s", err)
 	}
@@ -59,21 +58,10 @@ func TestGoodKvGet(t *testing.T) {
 		expected any
 	}{
 		{
-			name: "basic value",
+			name: "basic key",
 			params: map[string]any{
 				"module": "test",
 				"key":    "test",
-				"value":  "hello",
-			},
-			payload:  "hello",
-			expected: "test",
-		},
-		{
-			name: "template value",
-			params: map[string]any{
-				"module": "test",
-				"key":    "test",
-				"value":  "{{.Payload}}",
 			},
 			payload:  "hello",
 			expected: "test",
@@ -95,12 +83,12 @@ func TestGoodKvGet(t *testing.T) {
 				t.Fatalf("kv.get failed to create processor: %s", err)
 			}
 
-			got, err := processorInstance.Process(t.Context(), common.GetWrappedPayload(test.GetContextWithModules(
-				t.Context(),
-				map[string]common.Module{
+			got, err := processorInstance.Process(t.Context(), common.WrappedPayload{
+				Modules: map[string]common.Module{
 					"test": test.NewTestKVModule("test"),
 				},
-			), testCase.payload))
+				Payload: testCase.payload,
+			})
 
 			if err != nil {
 				t.Fatalf("kv.get processing failed: %s", err)
@@ -115,11 +103,11 @@ func TestGoodKvGet(t *testing.T) {
 
 func TestBadKvGet(t *testing.T) {
 	tests := []struct {
-		name              string
-		params            map[string]any
-		payload           any
-		wrappedPayloadCtx context.Context
-		errorString       string
+		name                  string
+		params                map[string]any
+		payload               any
+		wrappedPayloadModules map[string]common.Module
+		errorString           string
 	}{
 		{
 			name:    "no module param",
@@ -127,9 +115,9 @@ func TestBadKvGet(t *testing.T) {
 			params: map[string]any{
 				"key": "test",
 			},
-			wrappedPayloadCtx: test.GetContextWithModules(t.Context(), map[string]common.Module{
+			wrappedPayloadModules: map[string]common.Module{
 				"test": test.NewTestKVModule("test"),
-			}),
+			},
 			errorString: "kv.get module error: not found",
 		},
 		{
@@ -139,9 +127,9 @@ func TestBadKvGet(t *testing.T) {
 				"module": 1,
 				"key":    "test",
 			},
-			wrappedPayloadCtx: test.GetContextWithModules(t.Context(), map[string]common.Module{
+			wrappedPayloadModules: map[string]common.Module{
 				"test": test.NewTestKVModule("test"),
-			}),
+			},
 			errorString: "kv.get module error: not a string",
 		},
 		{
@@ -150,9 +138,9 @@ func TestBadKvGet(t *testing.T) {
 			params: map[string]any{
 				"module": "test",
 			},
-			wrappedPayloadCtx: test.GetContextWithModules(t.Context(), map[string]common.Module{
+			wrappedPayloadModules: map[string]common.Module{
 				"test": test.NewTestKVModule("test"),
-			}),
+			},
 			errorString: "kv.get key error: not found",
 		},
 		{
@@ -162,9 +150,9 @@ func TestBadKvGet(t *testing.T) {
 				"module": "test",
 				"key":    1,
 			},
-			wrappedPayloadCtx: test.GetContextWithModules(t.Context(), map[string]common.Module{
+			wrappedPayloadModules: map[string]common.Module{
 				"test": test.NewTestKVModule("test"),
-			}),
+			},
 			errorString: "kv.get key error: not a string",
 		},
 		{
@@ -174,8 +162,8 @@ func TestBadKvGet(t *testing.T) {
 				"module": "test",
 				"key":    "test",
 			},
-			wrappedPayloadCtx: t.Context(),
-			errorString:       "kv.get wrapped payload has no modules",
+			wrappedPayloadModules: nil,
+			errorString:           "kv.get wrapped payload has no modules",
 		},
 		{
 			name:    "module not found in context",
@@ -184,8 +172,8 @@ func TestBadKvGet(t *testing.T) {
 				"module": "test",
 				"key":    "test",
 			},
-			wrappedPayloadCtx: test.GetContextWithModules(t.Context(), map[string]common.Module{}),
-			errorString:       "kv.get unable to find module with id: test",
+			wrappedPayloadModules: map[string]common.Module{},
+			errorString:           "kv.get unable to find module with id: test",
 		},
 		{
 			name:    "module not a kv module",
@@ -194,9 +182,9 @@ func TestBadKvGet(t *testing.T) {
 				"module": "test",
 				"key":    "test",
 			},
-			wrappedPayloadCtx: test.GetContextWithModules(t.Context(), map[string]common.Module{
+			wrappedPayloadModules: map[string]common.Module{
 				"test": test.NewTestDBModule("test"),
-			}),
+			},
 			errorString: "kv.get module with id test is not a KeyValueModule",
 		},
 	}
@@ -221,7 +209,7 @@ func TestBadKvGet(t *testing.T) {
 				return
 			}
 
-			got, err := processorInstance.Process(t.Context(), common.GetWrappedPayload(test.wrappedPayloadCtx, test.payload))
+			got, err := processorInstance.Process(t.Context(), common.WrappedPayload{Modules: test.wrappedPayloadModules, Payload: test.payload})
 
 			if err == nil {
 				t.Fatalf("kv.get expected to fail but got payload: %+v", got)
@@ -233,3 +221,32 @@ func TestBadKvGet(t *testing.T) {
 		})
 	}
 }
+
+func BenchmarkKvGet(b *testing.B) {
+	registration, ok := processor.ProcessorRegistry["kv.get"]
+	if !ok {
+		b.Fatalf("kv.get processor not registered")
+	}
+
+	processorInstance, err := registration.New(config.ProcessorConfig{
+		Type: "kv.get",
+		Params: map[string]any{
+			"module": "test",
+			"key":    "test",
+		},
+	})
+
+	if err != nil {
+		b.Fatalf("kv.get failed to create processor: %s", err)
+	}
+	modules := map[string]common.Module{
+		"test": test.NewTestKVModule("test"),
+	}
+
+	for b.Loop() {
+		_, err := processorInstance.Process(b.Context(), common.WrappedPayload{Payload: nil, Modules: modules})
+		if err != nil {
+			b.Fatalf("kv.get processing failed: %s", err)
+		}
+	}
+}

internal/processor/test/kv-set_test.go

@@ -1,7 +1,6 @@
 package processor_test
 
 import (
-	"context"
 	"reflect"
 	"testing"
 
@@ -36,12 +35,12 @@ func TestKvSetFromRegistry(t *testing.T) {
 	payload := ""
 	expected := ""
 
-	got, err := processorInstance.Process(t.Context(), common.GetWrappedPayload(test.GetContextWithModules(
-		t.Context(),
-		map[string]common.Module{
+	got, err := processorInstance.Process(t.Context(), common.WrappedPayload{
+		Modules: map[string]common.Module{
 			"test": &test.TestKVModule{},
 		},
-	), payload))
+		Payload: payload,
+	})
 	if err != nil {
 		t.Fatalf("kv.set processing failed: %s", err)
 	}
@@ -86,12 +85,12 @@ func TestGoodKvSet(t *testing.T) {
 				t.Fatalf("kv.set failed to create processor: %s", err)
 			}
 
-			got, err := processorInstance.Process(t.Context(), common.GetWrappedPayload(test.GetContextWithModules(
-				t.Context(),
-				map[string]common.Module{
+			got, err := processorInstance.Process(t.Context(), common.WrappedPayload{
+				Modules: map[string]common.Module{
 					"test": &test.TestKVModule{},
 				},
-			), testCase.payload))
+				Payload: testCase.payload,
+			})
 
 			if err != nil {
 				t.Fatalf("kv.set processing failed: %s", err)
@@ -106,11 +105,11 @@ func TestGoodKvSet(t *testing.T) {
 
 func TestBadKvSet(t *testing.T) {
 	testCases := []struct {
-		name              string
-		params            map[string]any
-		payload           any
-		wrappedPayloadCtx context.Context
-		errorString       string
+		name                  string
+		params                map[string]any
+		payload               any
+		wrappedPayloadModules map[string]common.Module
+		errorString           string
 	}{
 		{
 			name:    "no module param",
@@ -119,9 +118,9 @@ func TestBadKvSet(t *testing.T) {
 				"key":   "test",
 				"value": "test",
 			},
-			wrappedPayloadCtx: test.GetContextWithModules(t.Context(), map[string]common.Module{
+			wrappedPayloadModules: map[string]common.Module{
 				"test": &test.TestKVModule{},
-			}),
+			},
 			errorString: "kv.set module error: not found",
 		},
 		{
@@ -132,9 +131,9 @@ func TestBadKvSet(t *testing.T) {
 				"key":    "test",
 				"value":  "test",
 			},
-			wrappedPayloadCtx: test.GetContextWithModules(t.Context(), map[string]common.Module{
+			wrappedPayloadModules: map[string]common.Module{
 				"test": &test.TestKVModule{},
-			}),
+			},
 			errorString: "kv.set module error: not a string",
 		},
 		{
@@ -144,9 +143,9 @@ func TestBadKvSet(t *testing.T) {
 				"module": "test",
 				"value":  "test",
 			},
-			wrappedPayloadCtx: test.GetContextWithModules(t.Context(), map[string]common.Module{
+			wrappedPayloadModules: map[string]common.Module{
 				"test": &test.TestKVModule{},
-			}),
+			},
 			errorString: "kv.set key error: not found",
 		},
 		{
@@ -157,9 +156,9 @@ func TestBadKvSet(t *testing.T) {
 				"key":    1,
 				"value":  "test",
 			},
-			wrappedPayloadCtx: test.GetContextWithModules(t.Context(), map[string]common.Module{
+			wrappedPayloadModules: map[string]common.Module{
 				"test": &test.TestKVModule{},
-			}),
+			},
 			errorString: "kv.set key error: not a string",
 		},
 		{
@@ -169,9 +168,9 @@ func TestBadKvSet(t *testing.T) {
 				"module": "test",
 				"key":    "test",
 			},
-			wrappedPayloadCtx: test.GetContextWithModules(t.Context(), map[string]common.Module{
+			wrappedPayloadModules: map[string]common.Module{
 				"test": &test.TestKVModule{},
-			}),
+			},
 			errorString: "kv.set value error: not found",
 		},
 		{
@@ -182,9 +181,9 @@ func TestBadKvSet(t *testing.T) {
 				"key":    "test",
 				"value":  1,
 			},
-			wrappedPayloadCtx: test.GetContextWithModules(t.Context(), map[string]common.Module{
+			wrappedPayloadModules: map[string]common.Module{
 				"test": &test.TestKVModule{},
-			}),
+			},
 			errorString: "kv.set value error: not a string",
 		},
 		{
@@ -195,8 +194,8 @@ func TestBadKvSet(t *testing.T) {
 				"key":    "test",
 				"value":  "hello",
 			},
-			wrappedPayloadCtx: t.Context(),
-			errorString:       "kv.set wrapped payload has no modules",
+			wrappedPayloadModules: nil,
+			errorString:           "kv.set wrapped payload has no modules",
 		},
 		{
 			name:    "value template syntax error",
@@ -206,9 +205,9 @@ func TestBadKvSet(t *testing.T) {
 				"key":    "test",
 				"value":  "{{",
 			},
-			wrappedPayloadCtx: test.GetContextWithModules(t.Context(), map[string]common.Module{
+			wrappedPayloadModules: map[string]common.Module{
 				"test": &test.TestKVModule{},
-			}),
+			},
 			errorString: "template: template:1: unclosed action",
 		},
 		{
@@ -219,9 +218,9 @@ func TestBadKvSet(t *testing.T) {
 				"key":    "test",
 				"value":  "{{.Data}}",
 			},
-			wrappedPayloadCtx: test.GetContextWithModules(t.Context(), map[string]common.Module{
+			wrappedPayloadModules: map[string]common.Module{
 				"test": &test.TestKVModule{},
-			}),
+			},
 			errorString: "template: template:1:2: executing \"template\" at <.Data>: can't evaluate field Data in type common.WrappedPayload",
 		},
 		{
@@ -232,8 +231,8 @@ func TestBadKvSet(t *testing.T) {
 				"key":    "test",
 				"value":  "hello",
 			},
-			wrappedPayloadCtx: test.GetContextWithModules(t.Context(), map[string]common.Module{}),
-			errorString:       "kv.set unable to find module with id: test",
+			wrappedPayloadModules: map[string]common.Module{},
+			errorString:           "kv.set unable to find module with id: test",
 		},
 		{
 			name:    "module not a kv module",
@@ -243,9 +242,9 @@ func TestBadKvSet(t *testing.T) {
 				"key":    "test",
 				"value":  "hello",
 			},
-			wrappedPayloadCtx: test.GetContextWithModules(t.Context(), map[string]common.Module{
+			wrappedPayloadModules: map[string]common.Module{
 				"test": test.NewTestDBModule("test"),
-			}),
+			},
 			errorString: "kv.set module with id test is not a KeyValueModule",
 		},
 	}
@@ -270,7 +269,7 @@ func TestBadKvSet(t *testing.T) {
 				return
 			}
 
-			got, err := processorInstance.Process(t.Context(), common.GetWrappedPayload(testCase.wrappedPayloadCtx, testCase.payload))
+			got, err := processorInstance.Process(t.Context(), common.WrappedPayload{Modules: testCase.wrappedPayloadModules, Payload: testCase.payload})
 
 			if err == nil {
 				t.Fatalf("kv.set expected to fail but got payload: %+v", got)
@@ -282,3 +281,35 @@ func TestBadKvSet(t *testing.T) {
 		})
 	}
 }
+
+func BenchmarkKvSet(b *testing.B) {
+	registration, ok := processor.ProcessorRegistry["kv.set"]
+	if !ok {
+		b.Fatalf("kv.set processor not registered")
+	}
+
+	processorInstance, err := registration.New(config.ProcessorConfig{
+		Type: "kv.set",
+		Params: map[string]any{
+			"module": "test",
+			"key":    "test",
+			"value":  "{{.Payload}}",
+		},
+	})
+
+	if err != nil {
+		b.Fatalf("kv.set failed to create processor: %s", err)
+	}
+	modules := map[string]common.Module{
+		"test": test.NewTestKVModule("test"),
+	}
+
+	count := 0
+	for b.Loop() {
+		_, err := processorInstance.Process(b.Context(), common.WrappedPayload{Payload: count, Modules: modules})
+		if err != nil {
+			b.Fatalf("kv.set processing failed: %s", err)
+		}
+		count++
+	}
+}

internal/processor/test/midi-control_change-create_test.go

@@ -71,7 +71,7 @@ func TestGoodMIDIControlChangeCreate(t *testing.T) {
 				t.Fatalf("midi.control_change.create failed to create processor: %s", err)
 			}
 
-			got, err := processorInstance.Process(t.Context(), common.GetWrappedPayload(t.Context(), test.payload))
+			got, err := processorInstance.Process(t.Context(), common.WrappedPayload{Payload: test.payload})
 			if err != nil {
 				t.Fatalf("midi.control_change.create processing failed: %s", err)
 			}
@@ -147,7 +147,7 @@ func TestBadMIDIControlChangeCreate(t *testing.T) {
 				return
 			}
 
-			got, err := processorInstance.Process(t.Context(), common.GetWrappedPayload(t.Context(), test.payload))
+			got, err := processorInstance.Process(t.Context(), common.WrappedPayload{Payload: test.payload})
 
 			if err == nil {
 				t.Fatalf("midi.control_change.create expected to fail but succeeded, got: %v", got)
@@ -159,3 +159,32 @@ func TestBadMIDIControlChangeCreate(t *testing.T) {
 		})
 	}
 }
+
+func BenchmarkMIDIControlChangeCreate(b *testing.B) {
+	registration, ok := processor.ProcessorRegistry["midi.control_change.create"]
+	if !ok {
+		b.Fatalf("midi.control_change.create processor not registered")
+	}
+
+	processorInstance, err := registration.New(config.ProcessorConfig{
+		Type: "midi.control_change.create",
+		Params: map[string]any{
+			"channel": "1",
+			"control": "64",
+			"value":   "127",
+		},
+	})
+
+	if err != nil {
+		b.Fatalf("midi.control_change.create failed to create processor: %s", err)
+	}
+
+	count := 0
+	for b.Loop() {
+		_, err := processorInstance.Process(b.Context(), common.WrappedPayload{Payload: count})
+		if err != nil {
+			b.Fatalf("midi.control_change.create processing failed: %s", err)
+		}
+		count++
+	}
+}