add webui to remaining builds

Update module github.com/jackc/pgx/v5 to v5.11.0

.github/workflows/release-showbridge.yaml

@@ -21,7 +21,7 @@ jobs:
         with:
           fetch-depth: 0
       - name: set environment variables
-        run: echo "SHOWBRIDGE_VERSION=${GITHUB_REF_NAME}" >> $GITHUB_ENV
+        run: echo "SHOWBRIDGE_VERSION=${GITHUB_SHA::7}" >> $GITHUB_ENV
       - name: clean tag
         if: startsWith(github.ref, 'refs/tags/v')
         run: echo "SHOWBRIDGE_VERSION=${SHOWBRIDGE_VERSION#v}" >> $GITHUB_ENV
@@ -37,6 +37,37 @@ jobs:
         with:
           draft: true
           generate_release_notes: true
+  build_webui:
+    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: Check out repository
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        with:
+          repository: jwetzell/showbridge-webui
+          ref: main
+
+      - name: Set up Node.js
+        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
+        with:
+          node-version-file: ".nvmrc"
+          cache: "npm"
+          cache-dependency-path: "package-lock.json"
+
+      - name: Install Node.js dependencies
+        run: npm ci
+
+      - run: npm run build -- --base-href=/ui/
+
+      - name: upload webui artifacts
+        uses: actions/upload-artifact@v7
+        with:
+          name: showbridge-webui
+          path: dist/webui/
+
   linux_amd64:
     runs-on: ubuntu-24.04
     needs: setup_release
@@ -54,6 +85,11 @@ jobs:
           go-version-file: "go.mod"
       - name: install alsa lib
         run: sudo apt-get install -y libasound2-dev
+      - name: get webui artifacts
+        uses: actions/download-artifact@v8
+        with:
+          name: showbridge-webui
+          path: internal/api/webui/
       - name: build
         run: |
           CGO_ENABLED=1 go build -o showbridge -ldflags="-s -w -X main.version=${SHOWBRIDGE_VERSION}-${SHORT_COMMIT}" ./cmd/showbridge
@@ -88,9 +124,14 @@ jobs:
           go-version-file: "go.mod"
       - name: install alsa lib
         run: sudo apt-get install -y libasound2-dev
+      - name: get webui artifacts
+        uses: actions/download-artifact@v8
+        with:
+          name: showbridge-webui
+          path: internal/api/webui/
       - name: build
         run: |
-          CGO_ENABLED=1 go build -o showbridge -ldflags="-s -w -X main.version=${SHOWBRIDGE_VERSION}-${SHORT_COMMIT}" ./cmd/showbridge
+          CGO_ENABLED=1 go build -o showbridge -ldflags="-s -w -X main.version=${SHOWBRIDGE_VERSION}-${SHORT_COMMIT}" -tags=showbridge_webui ./cmd/showbridge
           tar -czf showbridge_${SHOWBRIDGE_VERSION}_linux-arm64.tar.gz showbridge
       - name: upload linux artifacts
         uses: actions/upload-artifact@v7
@@ -124,13 +165,18 @@ jobs:
         uses: mlugg/setup-zig@v2
         with:
           version: 0.16.0
+      - name: get webui artifacts
+        uses: actions/download-artifact@v8
+        with:
+          name: showbridge-webui
+          path: internal/api/webui/
       - 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
+          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}" -tags=showbridge_webui ./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
+          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}" -tags=showbridge_webui ./cmd/showbridge
           zip showbridge_${SHOWBRIDGE_VERSION}_windows-arm64.zip showbridge.exe
       - name: upload windows artifacts
         uses: actions/upload-artifact@v7
@@ -160,9 +206,14 @@ jobs:
         uses: actions/setup-go@v7
         with:
           go-version-file: "go.mod"
+      - name: get webui artifacts
+        uses: actions/download-artifact@v8
+        with:
+          name: showbridge-webui
+          path: internal/api/webui/
       - 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
+          CGO_ENABLED=1 GOOS=darwin GOARCH=arm64 go build -o showbridge -ldflags="-s -w -X main.version=${SHOWBRIDGE_VERSION}-${SHORT_COMMIT}" -tags=showbridge_webui ./cmd/showbridge
           tar -czf showbridge_${SHOWBRIDGE_VERSION}_macOS-arm64.tar.gz showbridge
       - name: upload macos artifacts
         uses: actions/upload-artifact@v7
@@ -179,7 +230,7 @@ jobs:
           files: showbridge_*.tar.gz
   macos_amd64:
     runs-on: macos-26-intel
-    needs: setup_release
+    needs: [setup_release, build_webui]
     env:
       SHOWBRIDGE_VERSION: ${{ needs.setup_release.outputs.version }}
       SHORT_COMMIT: ${{ needs.setup_release.outputs.short_commit }}
@@ -192,9 +243,14 @@ jobs:
         uses: actions/setup-go@v7
         with:
           go-version-file: "go.mod"
+      - name: get webui artifacts
+        uses: actions/download-artifact@v8
+        with:
+          name: showbridge-webui
+          path: internal/api/webui/
       - 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
+          CGO_ENABLED=1 GOOS=darwin GOARCH=amd64 go build -o showbridge -ldflags="-s -w -X main.version=${SHOWBRIDGE_VERSION}-${SHORT_COMMIT}" -tags=showbridge_webui ./cmd/showbridge
           tar -czf showbridge_${SHOWBRIDGE_VERSION}_macOS-amd64.tar.gz showbridge
       - name: upload macos artifacts
         uses: actions/upload-artifact@v7

cmd/showbridge/main.go

@@ -13,7 +13,7 @@ import (
 	"syscall"
 
 	"github.com/jwetzell/showbridge-go"
-	"github.com/jwetzell/showbridge-go/internal/config"
+	"github.com/jwetzell/showbridge-go/config"
 	"github.com/jwetzell/showbridge-go/internal/schema"
 	"github.com/urfave/cli/v3"
 	"sigs.k8s.io/yaml"

config.go

@@ -4,8 +4,8 @@ import (
 	"errors"
 	"reflect"
 
+	"github.com/jwetzell/showbridge-go/config"
 	"github.com/jwetzell/showbridge-go/internal/common"
-	"github.com/jwetzell/showbridge-go/internal/config"
 	"github.com/jwetzell/showbridge-go/internal/route"
 )
 

config/params.go

@@ -94,6 +94,11 @@ func (p Params) GetStringSlice(key string) ([]string, error) {
 		return nil, ErrParamNotFound
 	}
 
+	alreadyStringSlice, ok := value.([]string)
+	if ok {
+		return alreadyStringSlice, nil
+	}
+
 	interfaceSlice, ok := value.([]any)
 	if !ok {
 		return nil, ErrParamNotSlice

config/params_test.go

@@ -6,7 +6,7 @@ import (
 	"slices"
 	"testing"
 
-	"github.com/jwetzell/showbridge-go/internal/config"
+	"github.com/jwetzell/showbridge-go/config"
 )
 
 func TestGoodStringParamsJSON(t *testing.T) {

go.mod

@@ -9,10 +9,10 @@ require (
 	github.com/go-sql-driver/mysql v1.10.1
 	github.com/google/jsonschema-go v0.4.3
 	github.com/gorilla/websocket v1.5.3
-	github.com/jackc/pgx/v5 v5.10.0
+	github.com/jackc/pgx/v5 v5.11.0
 	github.com/jwetzell/artnet-go v0.3.0
 	github.com/jwetzell/free-d-go v0.2.0
-	github.com/jwetzell/osc-go v0.3.1
+	github.com/jwetzell/osc-go v0.4.0
 	github.com/jwetzell/psn-go v0.3.0
 	github.com/nats-io/nats-server/v2 v2.14.6
 	github.com/nats-io/nats.go v1.53.1
@@ -20,7 +20,7 @@ require (
 	github.com/urfave/cli/v3 v3.11.0
 	gitlab.com/gomidi/midi/v2 v2.3.24
 	go.bug.st/serial v1.8.0
-	golang.org/x/time v0.15.0
+	golang.org/x/time v0.16.0
 	modernc.org/quickjs v0.24.2
 	modernc.org/sqlite v1.58.0
 	sigs.k8s.io/yaml v1.6.0

go.sum

@@ -45,16 +45,16 @@ github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsI
 github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg=
 github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 h1:iCEnooe7UlwOQYpKFhBabPMi4aNAfoODPEFNiAnClxo=
 github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761/go.mod h1:5TJZWKEWniPve33vlWYSoGYefn3gLQRzjfDlhSJ9ZKM=
-github.com/jackc/pgx/v5 v5.10.0 h1:VhSvgU2jSli8o3AqIEOTJr7rZwAEUVo4E4XhR94Zfr0=
-github.com/jackc/pgx/v5 v5.10.0/go.mod h1:mal1tBGAFfLHvZzaYh77YS/eC6IX9OWbRV1QIIM0Jn4=
+github.com/jackc/pgx/v5 v5.11.0 h1:IzBBtyK9AHqf98cctWFifYSci2hgQR/cd56wB4p+ogg=
+github.com/jackc/pgx/v5 v5.11.0/go.mod h1:mal1tBGAFfLHvZzaYh77YS/eC6IX9OWbRV1QIIM0Jn4=
 github.com/jackc/puddle/v2 v2.2.2 h1:PR8nw+E/1w0GLuRFSmiioY6UooMp6KJv0/61nB7icHo=
 github.com/jackc/puddle/v2 v2.2.2/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFrfEOc3H4=
 github.com/jwetzell/artnet-go v0.3.0 h1:MDHElOSbpgmIbYGHO9SoxsT7ynrYtV5/UHGT82geHk0=
 github.com/jwetzell/artnet-go v0.3.0/go.mod h1:zqRsSsrd6rPwJacwscPteDqGIqevjZ3Z6dpp092VJ1w=
 github.com/jwetzell/free-d-go v0.2.0 h1:8WQW4du8Sf3d18aUzk9n5jZtHE6WdDQHDFjkFffvycc=
 github.com/jwetzell/free-d-go v0.2.0/go.mod h1:yHuRy51NeDfN26eJ6wzZgys8qyQiS7hkYILw8yF+UJ4=
-github.com/jwetzell/osc-go v0.3.1 h1:IyXCUxzMFjiUFOeqOpz57zNv5D3Zf9yEYs2tKmPQnxA=
-github.com/jwetzell/osc-go v0.3.1/go.mod h1:vdfsVQ0fvtaOVwnvaz7IJ0gqtx2bLcswsVU9k7h2UGo=
+github.com/jwetzell/osc-go v0.4.0 h1:TCh67SBt7cNE/6SUEzUNl9gh3iAPpbmob4KgzJOApPw=
+github.com/jwetzell/osc-go v0.4.0/go.mod h1:+2prTtm8arSLJvopFQabuHroqGcDH0rFIuSgTqciMe0=
 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.19.2 h1:hMRETovs/pu/dVWN7zIT1PGG8t509MwT6bO7XSi26R8=
@@ -127,8 +127,8 @@ golang.org/x/sys v0.47.0 h1:o7XGOvZQCADBQQ4Y7VNq2dRWQR7JmOUW8Kxx4ZsNgWs=
 golang.org/x/sys v0.47.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
 golang.org/x/text v0.41.0 h1:vz/seA0lnX87Othu2f/0L24RcgrXD9/YFTSuGjj3rH8=
 golang.org/x/text v0.41.0/go.mod h1:jvf1O8ajNzZqhSrQBPbutR/EB83Cc0CFrezNQIwbb5M=
-golang.org/x/time v0.15.0 h1:bbrp8t3bGUeFOx08pvsMYRTCVSMk89u4tKbNOZbp88U=
-golang.org/x/time v0.15.0/go.mod h1:Y4YMaQmXwGQZoFaVFk4YpCt4FLQMYKZe9oeV/f4MSno=
+golang.org/x/time v0.16.0 h1:vMb6ptszcQMkcwiRTAuNNU50gom6++Q/6gY2hDM6VDE=
+golang.org/x/time v0.16.0/go.mod h1:rVKOqvZeKvrDKTQiAHJ7wmwP0RzleSphoEA9RcdLA0s=
 golang.org/x/tools v0.48.0 h1:3+hClM1aLL5mjMKm5ovokw9epgRXPuu2tILgismM6RE=
 golang.org/x/tools v0.48.0/go.mod h1:08xX0orndb/F7jJxGDicx061tyd5pcMto75YMAXr6lk=
 google.golang.org/protobuf v1.36.11 h1:fV6ZwhNocDyBLK0dj+fg8ektcVegBBuEolpbTQyBNVE=

internal/api/.gitignore

@@ -0,0 +1 @@
+webui/

internal/api/api.go

@@ -11,8 +11,8 @@ import (
 	"sync"
 	"time"
 
+	"github.com/jwetzell/showbridge-go/config"
 	"github.com/jwetzell/showbridge-go/internal/common"
-	"github.com/jwetzell/showbridge-go/internal/config"
 	"github.com/jwetzell/showbridge-go/internal/schema"
 )
 
@@ -48,6 +48,8 @@ func (as *ApiServer) Start(config config.ApiConfig) {
 	mux.HandleFunc("/schema/routes.schema.json", handleRoutesSchema)
 	mux.HandleFunc("/schema/modules.schema.json", handleModulesSchema)
 	mux.HandleFunc("/schema/processors.schema.json", handleProcessorsSchema)
+	mux.HandleFunc("/ui", handleWebUI)
+	mux.HandleFunc("/ui/", handleWebUI)
 
 	as.serverMu.Lock()
 	defer as.serverMu.Unlock()

internal/api/no_webui.go

@@ -0,0 +1,12 @@
+//go:build !showbridge_webui
+
+package api
+
+import (
+	"net/http"
+)
+
+func handleWebUI(w http.ResponseWriter, req *http.Request) {
+
+	http.Error(w, "Web UI is not enabled", http.StatusNotImplemented)
+}

internal/api/webui.go

@@ -0,0 +1,73 @@
+//go:build showbridge_webui
+
+package api
+
+import (
+	"embed"
+	"errors"
+	"io/fs"
+	"net/http"
+	"path"
+	"strings"
+
+	_ "embed"
+)
+
+//go:embed webui
+var webUIFS embed.FS
+
+var fsPrefix = "webui/browser"
+
+var index = path.Join(fsPrefix, "index.html")
+
+func handleWebUI(w http.ResponseWriter, req *http.Request) {
+	requestedPath := strings.TrimLeft(req.URL.Path, "/ui")
+	switch req.Method {
+	case http.MethodGet:
+		var pathToLoad string
+		stat, err := fs.Stat(webUIFS, path.Join(fsPrefix, requestedPath))
+		if err != nil {
+			if errors.Is(err, fs.ErrNotExist) {
+				pathToLoad = index
+			} else {
+				http.Error(w, "Internal server error", http.StatusInternalServerError)
+				return
+			}
+		}
+		if stat != nil {
+			if stat.IsDir() {
+				pathToLoad = index
+			} else {
+				pathToLoad = path.Join(fsPrefix, requestedPath)
+			}
+		}
+		file, err := webUIFS.ReadFile(pathToLoad)
+		if err != nil {
+			http.Error(w, "Internal server error", http.StatusInternalServerError)
+			return
+		}
+		w.Header().Set("Access-Control-Allow-Origin", "*")
+
+		switch path.Ext(pathToLoad) {
+		case ".js":
+			w.Header().Set("Content-Type", "application/javascript")
+		case ".css":
+			w.Header().Set("Content-Type", "text/css")
+		case ".html":
+			w.Header().Set("Content-Type", "text/html")
+		case ".ico":
+			w.Header().Set("Content-Type", "image/x-icon")
+		}
+		w.Write(file)
+		return
+
+	case http.MethodOptions:
+		w.Header().Set("Access-Control-Allow-Origin", "*")
+		w.Header().Set("Access-Control-Allow-Methods", "GET, OPTIONS")
+		w.Header().Set("Access-Control-Allow-Headers", "Content-Type")
+		w.WriteHeader(http.StatusOK)
+	default:
+		w.Header().Set("Access-Control-Allow-Origin", "*")
+		w.WriteHeader(http.StatusMethodNotAllowed)
+	}
+}

internal/module/db-mysql.go

@@ -9,8 +9,8 @@ import (
 	"time"
 
 	"github.com/google/jsonschema-go/jsonschema"
+	"github.com/jwetzell/showbridge-go/config"
 	"github.com/jwetzell/showbridge-go/internal/common"
-	"github.com/jwetzell/showbridge-go/internal/config"
 
 	_ "github.com/go-sql-driver/mysql"
 )

internal/module/db-postgres.go

@@ -8,8 +8,8 @@ import (
 	"sync"
 
 	"github.com/google/jsonschema-go/jsonschema"
+	"github.com/jwetzell/showbridge-go/config"
 	"github.com/jwetzell/showbridge-go/internal/common"
-	"github.com/jwetzell/showbridge-go/internal/config"
 
 	_ "github.com/jackc/pgx/v5/stdlib"
 )

internal/module/db-sqlite.go

@@ -8,8 +8,8 @@ import (
 	"sync"
 
 	"github.com/google/jsonschema-go/jsonschema"
+	"github.com/jwetzell/showbridge-go/config"
 	"github.com/jwetzell/showbridge-go/internal/common"
-	"github.com/jwetzell/showbridge-go/internal/config"
 
 	_ "modernc.org/sqlite"
 )

internal/module/http-server.go

@@ -11,8 +11,8 @@ import (
 	"time"
 
 	"github.com/google/jsonschema-go/jsonschema"
+	"github.com/jwetzell/showbridge-go/config"
 	"github.com/jwetzell/showbridge-go/internal/common"
-	"github.com/jwetzell/showbridge-go/internal/config"
 	"github.com/jwetzell/showbridge-go/internal/processor"
 )
 

internal/module/midi-input.go

@@ -1,4 +1,4 @@
-//go:build cgo
+//go:build cgo && !android
 
 package module
 
@@ -8,8 +8,8 @@ import (
 	"log/slog"
 
 	"github.com/google/jsonschema-go/jsonschema"
+	"github.com/jwetzell/showbridge-go/config"
 	"github.com/jwetzell/showbridge-go/internal/common"
-	"github.com/jwetzell/showbridge-go/internal/config"
 	"gitlab.com/gomidi/midi/v2"
 	_ "gitlab.com/gomidi/midi/v2/drivers/rtmididrv"
 )

internal/module/midi-output.go

@@ -1,4 +1,4 @@
-//go:build cgo
+//go:build cgo && !android
 
 package module
 
@@ -10,8 +10,8 @@ import (
 	"sync"
 
 	"github.com/google/jsonschema-go/jsonschema"
+	"github.com/jwetzell/showbridge-go/config"
 	"github.com/jwetzell/showbridge-go/internal/common"
-	"github.com/jwetzell/showbridge-go/internal/config"
 	"gitlab.com/gomidi/midi/v2"
 	_ "gitlab.com/gomidi/midi/v2/drivers/rtmididrv"
 )

internal/module/module.go

@@ -6,8 +6,8 @@ import (
 	"sync"
 
 	"github.com/google/jsonschema-go/jsonschema"
+	"github.com/jwetzell/showbridge-go/config"
 	"github.com/jwetzell/showbridge-go/internal/common"
-	"github.com/jwetzell/showbridge-go/internal/config"
 )
 
 type ModuleRegistration struct {

internal/module/mqtt-client.go

@@ -10,8 +10,8 @@ import (
 
 	mqtt "github.com/eclipse/paho.mqtt.golang"
 	"github.com/google/jsonschema-go/jsonschema"
+	"github.com/jwetzell/showbridge-go/config"
 	"github.com/jwetzell/showbridge-go/internal/common"
-	"github.com/jwetzell/showbridge-go/internal/config"
 )
 
 func init() {

internal/module/nats-client.go

@@ -7,8 +7,8 @@ import (
 	"sync"
 
 	"github.com/google/jsonschema-go/jsonschema"
+	"github.com/jwetzell/showbridge-go/config"
 	"github.com/jwetzell/showbridge-go/internal/common"
-	"github.com/jwetzell/showbridge-go/internal/config"
 	"github.com/nats-io/nats.go"
 )
 

internal/module/nats-server.go

@@ -11,8 +11,8 @@ import (
 	"time"
 
 	"github.com/google/jsonschema-go/jsonschema"
+	"github.com/jwetzell/showbridge-go/config"
 	"github.com/jwetzell/showbridge-go/internal/common"
-	"github.com/jwetzell/showbridge-go/internal/config"
 	"github.com/nats-io/nats-server/v2/server"
 )
 

internal/module/psn-client.go

@@ -8,8 +8,8 @@ import (
 	"time"
 
 	"github.com/jwetzell/psn-go"
+	"github.com/jwetzell/showbridge-go/config"
 	"github.com/jwetzell/showbridge-go/internal/common"
-	"github.com/jwetzell/showbridge-go/internal/config"
 )
 
 func init() {

internal/module/redis-client.go

@@ -8,8 +8,8 @@ import (
 	"sync"
 
 	"github.com/google/jsonschema-go/jsonschema"
+	"github.com/jwetzell/showbridge-go/config"
 	"github.com/jwetzell/showbridge-go/internal/common"
-	"github.com/jwetzell/showbridge-go/internal/config"
 	"github.com/redis/go-redis/v9"
 )
 

internal/module/serial-client.go

@@ -11,8 +11,8 @@ import (
 	"time"
 
 	"github.com/google/jsonschema-go/jsonschema"
+	"github.com/jwetzell/showbridge-go/config"
 	"github.com/jwetzell/showbridge-go/internal/common"
-	"github.com/jwetzell/showbridge-go/internal/config"
 	"github.com/jwetzell/showbridge-go/internal/framer"
 	"go.bug.st/serial"
 )

internal/module/tcp-client.go

@@ -10,8 +10,8 @@ import (
 	"time"
 
 	"github.com/google/jsonschema-go/jsonschema"
+	"github.com/jwetzell/showbridge-go/config"
 	"github.com/jwetzell/showbridge-go/internal/common"
-	"github.com/jwetzell/showbridge-go/internal/config"
 	"github.com/jwetzell/showbridge-go/internal/framer"
 )
 

internal/module/tcp-server.go

@@ -13,8 +13,8 @@ import (
 	"time"
 
 	"github.com/google/jsonschema-go/jsonschema"
+	"github.com/jwetzell/showbridge-go/config"
 	"github.com/jwetzell/showbridge-go/internal/common"
-	"github.com/jwetzell/showbridge-go/internal/config"
 	"github.com/jwetzell/showbridge-go/internal/framer"
 )
 

internal/module/test/db-mysql_test.go

@@ -4,7 +4,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/jwetzell/showbridge-go/internal/config"
+	"github.com/jwetzell/showbridge-go/config"
 	"github.com/jwetzell/showbridge-go/internal/module"
 )
 

internal/module/test/db-postgres_test.go

@@ -4,7 +4,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/jwetzell/showbridge-go/internal/config"
+	"github.com/jwetzell/showbridge-go/config"
 	"github.com/jwetzell/showbridge-go/internal/module"
 )
 

internal/module/test/db-sqlite_test.go

@@ -4,7 +4,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/jwetzell/showbridge-go/internal/config"
+	"github.com/jwetzell/showbridge-go/config"
 	"github.com/jwetzell/showbridge-go/internal/module"
 )
 

internal/module/test/http-server_test.go

@@ -4,7 +4,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/jwetzell/showbridge-go/internal/config"
+	"github.com/jwetzell/showbridge-go/config"
 	"github.com/jwetzell/showbridge-go/internal/module"
 )
 

internal/module/test/midi-input_test.go

@@ -3,7 +3,7 @@ package module_test
 import (
 	"testing"
 
-	"github.com/jwetzell/showbridge-go/internal/config"
+	"github.com/jwetzell/showbridge-go/config"
 	"github.com/jwetzell/showbridge-go/internal/module"
 )
 

internal/module/test/midi-output_test.go

@@ -3,7 +3,7 @@ package module_test
 import (
 	"testing"
 
-	"github.com/jwetzell/showbridge-go/internal/config"
+	"github.com/jwetzell/showbridge-go/config"
 	"github.com/jwetzell/showbridge-go/internal/module"
 )
 

internal/module/test/module_test.go

@@ -3,8 +3,8 @@ package module_test
 import (
 	"testing"
 
+	"github.com/jwetzell/showbridge-go/config"
 	"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/test"
 )

internal/module/test/mqtt-client_test.go

@@ -3,7 +3,7 @@ package module_test
 import (
 	"testing"
 
-	"github.com/jwetzell/showbridge-go/internal/config"
+	"github.com/jwetzell/showbridge-go/config"
 	"github.com/jwetzell/showbridge-go/internal/module"
 )
 

internal/module/test/nats-client_test.go

@@ -3,7 +3,7 @@ package module_test
 import (
 	"testing"
 
-	"github.com/jwetzell/showbridge-go/internal/config"
+	"github.com/jwetzell/showbridge-go/config"
 	"github.com/jwetzell/showbridge-go/internal/module"
 )
 

internal/module/test/nats-server_test.go

@@ -4,7 +4,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/jwetzell/showbridge-go/internal/config"
+	"github.com/jwetzell/showbridge-go/config"
 	"github.com/jwetzell/showbridge-go/internal/module"
 )
 

internal/module/test/psn-client_test.go

@@ -3,7 +3,7 @@ package module_test
 import (
 	"testing"
 
-	"github.com/jwetzell/showbridge-go/internal/config"
+	"github.com/jwetzell/showbridge-go/config"
 	"github.com/jwetzell/showbridge-go/internal/module"
 )
 

internal/module/test/redis-client_test.go

@@ -3,7 +3,7 @@ package module_test
 import (
 	"testing"
 
-	"github.com/jwetzell/showbridge-go/internal/config"
+	"github.com/jwetzell/showbridge-go/config"
 	"github.com/jwetzell/showbridge-go/internal/module"
 )
 

internal/module/test/serial-client_test.go

@@ -3,7 +3,7 @@ package module_test
 import (
 	"testing"
 
-	"github.com/jwetzell/showbridge-go/internal/config"
+	"github.com/jwetzell/showbridge-go/config"
 	"github.com/jwetzell/showbridge-go/internal/module"
 )
 

internal/module/test/tcp-client_test.go

@@ -3,7 +3,7 @@ package module_test
 import (
 	"testing"
 
-	"github.com/jwetzell/showbridge-go/internal/config"
+	"github.com/jwetzell/showbridge-go/config"
 	"github.com/jwetzell/showbridge-go/internal/module"
 )
 

internal/module/test/tcp-server_test.go

@@ -4,7 +4,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/jwetzell/showbridge-go/internal/config"
+	"github.com/jwetzell/showbridge-go/config"
 	"github.com/jwetzell/showbridge-go/internal/module"
 )
 

internal/module/test/time-interval_test.go

@@ -4,7 +4,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/jwetzell/showbridge-go/internal/config"
+	"github.com/jwetzell/showbridge-go/config"
 	"github.com/jwetzell/showbridge-go/internal/module"
 )
 

internal/module/test/time-timer_test.go

@@ -4,7 +4,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/jwetzell/showbridge-go/internal/config"
+	"github.com/jwetzell/showbridge-go/config"
 	"github.com/jwetzell/showbridge-go/internal/module"
 )
 

internal/module/test/udp-client_test.go

@@ -4,7 +4,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/jwetzell/showbridge-go/internal/config"
+	"github.com/jwetzell/showbridge-go/config"
 	"github.com/jwetzell/showbridge-go/internal/module"
 )
 

internal/module/test/udp-multicast_test.go

@@ -3,7 +3,7 @@ package module_test
 import (
 	"testing"
 
-	"github.com/jwetzell/showbridge-go/internal/config"
+	"github.com/jwetzell/showbridge-go/config"
 	"github.com/jwetzell/showbridge-go/internal/module"
 )
 

internal/module/test/udp-server_test.go

@@ -4,7 +4,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/jwetzell/showbridge-go/internal/config"
+	"github.com/jwetzell/showbridge-go/config"
 	"github.com/jwetzell/showbridge-go/internal/module"
 )
 

internal/module/test/websocket-client_test.go

@@ -3,7 +3,7 @@ package module_test
 import (
 	"testing"
 
-	"github.com/jwetzell/showbridge-go/internal/config"
+	"github.com/jwetzell/showbridge-go/config"
 	"github.com/jwetzell/showbridge-go/internal/module"
 )
 

internal/module/time-interval.go

@@ -7,8 +7,8 @@ import (
 	"time"
 
 	"github.com/google/jsonschema-go/jsonschema"
+	"github.com/jwetzell/showbridge-go/config"
 	"github.com/jwetzell/showbridge-go/internal/common"
-	"github.com/jwetzell/showbridge-go/internal/config"
 )
 
 func init() {

internal/module/time-timer.go

@@ -7,8 +7,8 @@ import (
 	"time"
 
 	"github.com/google/jsonschema-go/jsonschema"
+	"github.com/jwetzell/showbridge-go/config"
 	"github.com/jwetzell/showbridge-go/internal/common"
-	"github.com/jwetzell/showbridge-go/internal/config"
 )
 
 func init() {

internal/module/udp-client.go

@@ -9,8 +9,8 @@ import (
 	"sync"
 
 	"github.com/google/jsonschema-go/jsonschema"
+	"github.com/jwetzell/showbridge-go/config"
 	"github.com/jwetzell/showbridge-go/internal/common"
-	"github.com/jwetzell/showbridge-go/internal/config"
 )
 
 func init() {

internal/module/udp-multicast.go

@@ -10,8 +10,8 @@ import (
 	"time"
 
 	"github.com/google/jsonschema-go/jsonschema"
+	"github.com/jwetzell/showbridge-go/config"
 	"github.com/jwetzell/showbridge-go/internal/common"
-	"github.com/jwetzell/showbridge-go/internal/config"
 )
 
 func init() {

internal/module/udp-server.go

@@ -11,8 +11,8 @@ import (
 	"time"
 
 	"github.com/google/jsonschema-go/jsonschema"
+	"github.com/jwetzell/showbridge-go/config"
 	"github.com/jwetzell/showbridge-go/internal/common"
-	"github.com/jwetzell/showbridge-go/internal/config"
 )
 
 func init() {

internal/module/websocket-client.go

@@ -11,8 +11,8 @@ import (
 
 	"github.com/google/jsonschema-go/jsonschema"
 	"github.com/gorilla/websocket"
+	"github.com/jwetzell/showbridge-go/config"
 	"github.com/jwetzell/showbridge-go/internal/common"
-	"github.com/jwetzell/showbridge-go/internal/config"
 )
 
 func init() {

internal/processor/artnet-packet-decode.go

@@ -5,8 +5,8 @@ import (
 	"fmt"
 
 	"github.com/jwetzell/artnet-go"
+	"github.com/jwetzell/showbridge-go/config"
 	"github.com/jwetzell/showbridge-go/internal/common"
-	"github.com/jwetzell/showbridge-go/internal/config"
 )
 
 func init() {

internal/processor/artnet-packet-encode.go

@@ -5,8 +5,8 @@ import (
 	"fmt"
 
 	"github.com/jwetzell/artnet-go"
+	"github.com/jwetzell/showbridge-go/config"
 	"github.com/jwetzell/showbridge-go/internal/common"
-	"github.com/jwetzell/showbridge-go/internal/config"
 )
 
 func init() {

internal/processor/db-query.go

@@ -9,8 +9,8 @@ import (
 	"text/template"
 
 	"github.com/google/jsonschema-go/jsonschema"
+	"github.com/jwetzell/showbridge-go/config"
 	"github.com/jwetzell/showbridge-go/internal/common"
-	"github.com/jwetzell/showbridge-go/internal/config"
 )
 
 func init() {

internal/processor/debug-log.go

@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"log/slog"
 
+	"github.com/jwetzell/showbridge-go/config"
 	"github.com/jwetzell/showbridge-go/internal/common"
-	"github.com/jwetzell/showbridge-go/internal/config"
 )
 
 func init() {

internal/processor/filter-change.go

@@ -4,8 +4,8 @@ import (
 	"context"
 	"reflect"
 
+	"github.com/jwetzell/showbridge-go/config"
 	"github.com/jwetzell/showbridge-go/internal/common"
-	"github.com/jwetzell/showbridge-go/internal/config"
 )
 
 func init() {

internal/processor/filter-expr.go

@@ -7,8 +7,8 @@ import (
 	"github.com/expr-lang/expr"
 	"github.com/expr-lang/expr/vm"
 	"github.com/google/jsonschema-go/jsonschema"
+	"github.com/jwetzell/showbridge-go/config"
 	"github.com/jwetzell/showbridge-go/internal/common"
-	"github.com/jwetzell/showbridge-go/internal/config"
 )
 
 func init() {

internal/processor/filter-rate.go

@@ -5,8 +5,8 @@ import (
 	"fmt"
 
 	"github.com/google/jsonschema-go/jsonschema"
+	"github.com/jwetzell/showbridge-go/config"
 	"github.com/jwetzell/showbridge-go/internal/common"
-	"github.com/jwetzell/showbridge-go/internal/config"
 	"golang.org/x/time/rate"
 )
 

internal/processor/filter-regex.go

@@ -7,8 +7,8 @@ import (
 	"regexp"
 
 	"github.com/google/jsonschema-go/jsonschema"
+	"github.com/jwetzell/showbridge-go/config"
 	"github.com/jwetzell/showbridge-go/internal/common"
-	"github.com/jwetzell/showbridge-go/internal/config"
 )
 
 func init() {

internal/processor/float-parse.go

@@ -8,8 +8,8 @@ import (
 	"strconv"
 
 	"github.com/google/jsonschema-go/jsonschema"
+	"github.com/jwetzell/showbridge-go/config"
 	"github.com/jwetzell/showbridge-go/internal/common"
-	"github.com/jwetzell/showbridge-go/internal/config"
 )
 
 func init() {

internal/processor/float-random.go

@@ -8,8 +8,8 @@ import (
 	"math/rand/v2"
 
 	"github.com/google/jsonschema-go/jsonschema"
+	"github.com/jwetzell/showbridge-go/config"
 	"github.com/jwetzell/showbridge-go/internal/common"
-	"github.com/jwetzell/showbridge-go/internal/config"
 )
 
 func init() {

internal/processor/free-d-create.go

@@ -9,8 +9,8 @@ import (
 
 	"github.com/google/jsonschema-go/jsonschema"
 	freeD "github.com/jwetzell/free-d-go"
+	"github.com/jwetzell/showbridge-go/config"
 	"github.com/jwetzell/showbridge-go/internal/common"
-	"github.com/jwetzell/showbridge-go/internal/config"
 )
 
 func init() {

internal/processor/free-d-decode.go

@@ -5,8 +5,8 @@ import (
 	"errors"
 
 	freeD "github.com/jwetzell/free-d-go"
+	"github.com/jwetzell/showbridge-go/config"
 	"github.com/jwetzell/showbridge-go/internal/common"
-	"github.com/jwetzell/showbridge-go/internal/config"
 )
 
 func init() {

internal/processor/free-d-encode.go

@@ -5,8 +5,8 @@ import (
 	"errors"
 
 	freeD "github.com/jwetzell/free-d-go"
+	"github.com/jwetzell/showbridge-go/config"
 	"github.com/jwetzell/showbridge-go/internal/common"
-	"github.com/jwetzell/showbridge-go/internal/config"
 )
 
 func init() {

internal/processor/http-request-do.go

@@ -10,8 +10,8 @@ import (
 	"time"
 
 	"github.com/google/jsonschema-go/jsonschema"
+	"github.com/jwetzell/showbridge-go/config"
 	"github.com/jwetzell/showbridge-go/internal/common"
-	"github.com/jwetzell/showbridge-go/internal/config"
 )
 
 func init() {

internal/processor/http-response-create.go

@@ -7,8 +7,8 @@ import (
 	"text/template"
 
 	"github.com/google/jsonschema-go/jsonschema"
+	"github.com/jwetzell/showbridge-go/config"
 	"github.com/jwetzell/showbridge-go/internal/common"
-	"github.com/jwetzell/showbridge-go/internal/config"
 )
 
 func init() {

internal/processor/int-parse.go

@@ -8,8 +8,8 @@ import (
 	"strconv"
 
 	"github.com/google/jsonschema-go/jsonschema"
+	"github.com/jwetzell/showbridge-go/config"
 	"github.com/jwetzell/showbridge-go/internal/common"
-	"github.com/jwetzell/showbridge-go/internal/config"
 )
 
 func init() {

internal/processor/int-random.go

@@ -7,8 +7,8 @@ import (
 	"math/rand/v2"
 
 	"github.com/google/jsonschema-go/jsonschema"
+	"github.com/jwetzell/showbridge-go/config"
 	"github.com/jwetzell/showbridge-go/internal/common"
-	"github.com/jwetzell/showbridge-go/internal/config"
 )
 
 func init() {

internal/processor/int-scale.go

@@ -6,8 +6,8 @@ import (
 	"fmt"
 
 	"github.com/google/jsonschema-go/jsonschema"
+	"github.com/jwetzell/showbridge-go/config"
 	"github.com/jwetzell/showbridge-go/internal/common"
-	"github.com/jwetzell/showbridge-go/internal/config"
 )
 
 func init() {

internal/processor/json-decode.go

@@ -5,8 +5,8 @@ import (
 	"encoding/json"
 	"errors"
 
+	"github.com/jwetzell/showbridge-go/config"
 	"github.com/jwetzell/showbridge-go/internal/common"
-	"github.com/jwetzell/showbridge-go/internal/config"
 )
 
 func init() {

internal/processor/json-encode.go

@@ -5,8 +5,8 @@ import (
 	"context"
 	"encoding/json"
 
+	"github.com/jwetzell/showbridge-go/config"
 	"github.com/jwetzell/showbridge-go/internal/common"
-	"github.com/jwetzell/showbridge-go/internal/config"
 )
 
 func init() {

internal/processor/kv-get.go

@@ -7,8 +7,8 @@ import (
 	"log/slog"
 
 	"github.com/google/jsonschema-go/jsonschema"
+	"github.com/jwetzell/showbridge-go/config"
 	"github.com/jwetzell/showbridge-go/internal/common"
-	"github.com/jwetzell/showbridge-go/internal/config"
 )
 
 func init() {

internal/processor/kv-set.go

@@ -7,8 +7,8 @@ import (
 	"log/slog"
 
 	"github.com/google/jsonschema-go/jsonschema"
+	"github.com/jwetzell/showbridge-go/config"
 	"github.com/jwetzell/showbridge-go/internal/common"
-	"github.com/jwetzell/showbridge-go/internal/config"
 )
 
 func init() {

internal/processor/midi-control_change-create.go

@@ -10,8 +10,8 @@ import (
 	"text/template"
 
 	"github.com/google/jsonschema-go/jsonschema"
+	"github.com/jwetzell/showbridge-go/config"
 	"github.com/jwetzell/showbridge-go/internal/common"
-	"github.com/jwetzell/showbridge-go/internal/config"
 	"gitlab.com/gomidi/midi/v2"
 )
 

internal/processor/midi-message-decode.go

@@ -6,8 +6,8 @@ import (
 	"context"
 	"errors"
 
+	"github.com/jwetzell/showbridge-go/config"
 	"github.com/jwetzell/showbridge-go/internal/common"
-	"github.com/jwetzell/showbridge-go/internal/config"
 	"gitlab.com/gomidi/midi/v2"
 )
 

internal/processor/midi-message-encode.go

@@ -6,8 +6,8 @@ import (
 	"context"
 	"errors"
 
+	"github.com/jwetzell/showbridge-go/config"
 	"github.com/jwetzell/showbridge-go/internal/common"
-	"github.com/jwetzell/showbridge-go/internal/config"
 	"gitlab.com/gomidi/midi/v2"
 )
 

internal/processor/midi-message-unpack.go

@@ -7,8 +7,8 @@ import (
 	"errors"
 	"fmt"
 
+	"github.com/jwetzell/showbridge-go/config"
 	"github.com/jwetzell/showbridge-go/internal/common"
-	"github.com/jwetzell/showbridge-go/internal/config"
 	"gitlab.com/gomidi/midi/v2"
 )
 

internal/processor/midi-note_off-create.go

@@ -10,8 +10,8 @@ import (
 	"text/template"
 
 	"github.com/google/jsonschema-go/jsonschema"
+	"github.com/jwetzell/showbridge-go/config"
 	"github.com/jwetzell/showbridge-go/internal/common"
-	"github.com/jwetzell/showbridge-go/internal/config"
 	"gitlab.com/gomidi/midi/v2"
 )
 

internal/processor/midi-note_on-create.go

@@ -10,8 +10,8 @@ import (
 	"text/template"
 
 	"github.com/google/jsonschema-go/jsonschema"
+	"github.com/jwetzell/showbridge-go/config"
 	"github.com/jwetzell/showbridge-go/internal/common"
-	"github.com/jwetzell/showbridge-go/internal/config"
 	"gitlab.com/gomidi/midi/v2"
 )
 

internal/processor/midi-program_change-create.go

@@ -10,8 +10,8 @@ import (
 	"text/template"
 
 	"github.com/google/jsonschema-go/jsonschema"
+	"github.com/jwetzell/showbridge-go/config"
 	"github.com/jwetzell/showbridge-go/internal/common"
-	"github.com/jwetzell/showbridge-go/internal/config"
 	"gitlab.com/gomidi/midi/v2"
 )
 

internal/processor/module-output.go

@@ -7,8 +7,8 @@ import (
 	"log/slog"
 
 	"github.com/google/jsonschema-go/jsonschema"
+	"github.com/jwetzell/showbridge-go/config"
 	"github.com/jwetzell/showbridge-go/internal/common"
-	"github.com/jwetzell/showbridge-go/internal/config"
 )
 
 func init() {

internal/processor/osc-message-create.go

@@ -11,8 +11,8 @@ import (
 
 	"github.com/google/jsonschema-go/jsonschema"
 	"github.com/jwetzell/osc-go"
+	"github.com/jwetzell/showbridge-go/config"
 	"github.com/jwetzell/showbridge-go/internal/common"
-	"github.com/jwetzell/showbridge-go/internal/config"
 )
 
 func init() {
@@ -60,7 +60,7 @@ func init() {
 			argStrings, err := params.GetStringSlice("args")
 			if err != nil {
 				if errors.Is(err, config.ErrParamNotFound) {
-					return &OSCMessageCreate{config: processorConfig, Address: addressTemplate}, nil
+					return &MessageCreate{config: processorConfig, Address: addressTemplate}, nil
 				} else {
 					return nil, fmt.Errorf("osc.message.create args error: %w", err)
 				}
@@ -86,19 +86,19 @@ func init() {
 				}
 				argTemplates = append(argTemplates, argTemplate)
 			}
-			return &OSCMessageCreate{config: processorConfig, Address: addressTemplate, Args: argTemplates, Types: typesString}, nil
+			return &MessageCreate{config: processorConfig, Address: addressTemplate, Args: argTemplates, Types: typesString}, nil
 		},
 	})
 }
 
-type OSCMessageCreate struct {
+type MessageCreate struct {
 	config  config.ProcessorConfig
 	Address *template.Template
 	Args    []*template.Template
 	Types   string
 }
 
-func (omc *OSCMessageCreate) Process(ctx context.Context, wrappedPayload common.WrappedPayload) (common.WrappedPayload, error) {
+func (omc *MessageCreate) Process(ctx context.Context, wrappedPayload common.WrappedPayload) (common.WrappedPayload, error) {
 
 	templateData := wrappedPayload
 
@@ -122,11 +122,11 @@ func (omc *OSCMessageCreate) Process(ctx context.Context, wrappedPayload common.
 		return wrappedPayload, errors.New("osc.message.create address must start with '/'")
 	}
 
-	payloadMessage := &osc.OSCMessage{
+	payloadMessage := &osc.Message{
 		Address: addressString,
 	}
 
-	args := []osc.OSCArg{}
+	args := []osc.Arg{}
 
 	for argIndex, argTemplate := range omc.Args {
 		var argBuffer bytes.Buffer
@@ -157,83 +157,83 @@ func (omc *OSCMessageCreate) Process(ctx context.Context, wrappedPayload common.
 	return wrappedPayload, nil
 }
 
-func (omc *OSCMessageCreate) Id() string {
+func (omc *MessageCreate) Id() string {
 	return omc.config.Id
 }
 
-func (omc *OSCMessageCreate) Type() string {
+func (omc *MessageCreate) Type() string {
 	return omc.config.Type
 }
 
-func argToTypedArg(rawArg string, oscType byte) (osc.OSCArg, error) {
+func argToTypedArg(rawArg string, oscType byte) (osc.Arg, error) {
 
 	switch oscType {
 	case 's':
-		return osc.OSCArg{
+		return osc.Arg{
 			Value: rawArg,
 			Type:  "s",
 		}, nil
 	case 'i':
 		number, err := strconv.ParseInt(rawArg, 10, 32)
 		if err != nil {
-			return osc.OSCArg{}, err
+			return osc.Arg{}, err
 		}
-		return osc.OSCArg{
+		return osc.Arg{
 			Value: int32(number),
 			Type:  "i",
 		}, nil
 	case 'f':
 		number, err := strconv.ParseFloat(rawArg, 32)
 		if err != nil {
-			return osc.OSCArg{}, err
+			return osc.Arg{}, err
 		}
-		return osc.OSCArg{
+		return osc.Arg{
 			Value: float32(number),
 			Type:  "f",
 		}, nil
 	case 'b':
 		data, err := hex.DecodeString(rawArg)
 		if err != nil {
-			return osc.OSCArg{}, err
+			return osc.Arg{}, err
 		}
-		return osc.OSCArg{
+		return osc.Arg{
 			Value: data,
 			Type:  "b",
 		}, nil
 	case 'h':
 		number, err := strconv.ParseInt(rawArg, 10, 64)
 		if err != nil {
-			return osc.OSCArg{}, err
+			return osc.Arg{}, err
 		}
-		return osc.OSCArg{
+		return osc.Arg{
 			Value: int64(number),
 			Type:  "h",
 		}, nil
 	case 'd':
 		number, err := strconv.ParseFloat(rawArg, 64)
 		if err != nil {
-			return osc.OSCArg{}, err
+			return osc.Arg{}, err
 		}
-		return osc.OSCArg{
+		return osc.Arg{
 			Value: float64(number),
 			Type:  "d",
 		}, nil
 	case 'T':
-		return osc.OSCArg{
+		return osc.Arg{
 			Value: true,
 			Type:  "T",
 		}, nil
 	case 'F':
-		return osc.OSCArg{
+		return osc.Arg{
 			Value: false,
 			Type:  "F",
 		}, nil
 	case 'N':
-		return osc.OSCArg{
+		return osc.Arg{
 			Value: nil,
 			Type:  "N",
 		}, nil
 	default:
-		return osc.OSCArg{}, fmt.Errorf("osc.message.create unhandled osc type: %c", oscType)
+		return osc.Arg{}, fmt.Errorf("osc.message.create unhandled osc type: %c", oscType)
 	}
 }

internal/processor/osc-message-decode.go

@@ -6,8 +6,8 @@ import (
 	"fmt"
 
 	osc "github.com/jwetzell/osc-go"
+	"github.com/jwetzell/showbridge-go/config"
 	"github.com/jwetzell/showbridge-go/internal/common"
-	"github.com/jwetzell/showbridge-go/internal/config"
 )
 
 func init() {

internal/processor/osc-message-encode.go

@@ -6,8 +6,8 @@ import (
 	"fmt"
 
 	osc "github.com/jwetzell/osc-go"
+	"github.com/jwetzell/showbridge-go/config"
 	"github.com/jwetzell/showbridge-go/internal/common"
-	"github.com/jwetzell/showbridge-go/internal/config"
 )
 
 type OSCMessageEncode struct {
@@ -26,7 +26,7 @@ func init() {
 
 func (ome *OSCMessageEncode) Process(ctx context.Context, wrappedPayload common.WrappedPayload) (common.WrappedPayload, error) {
 	payload := wrappedPayload.Payload
-	payloadMessage, ok := common.GetAnyAs[*osc.OSCMessage](payload)
+	payloadMessage, ok := common.GetAnyAs[*osc.Message](payload)
 
 	if !ok {
 		wrappedPayload.End = true

internal/processor/processor.go

@@ -6,8 +6,8 @@ import (
 	"sync"
 
 	"github.com/google/jsonschema-go/jsonschema"
+	"github.com/jwetzell/showbridge-go/config"
 	"github.com/jwetzell/showbridge-go/internal/common"
-	"github.com/jwetzell/showbridge-go/internal/config"
 )
 
 type Processor interface {

internal/processor/pubsub-publish.go

@@ -9,8 +9,8 @@ import (
 	"text/template"
 
 	"github.com/google/jsonschema-go/jsonschema"
+	"github.com/jwetzell/showbridge-go/config"
 	"github.com/jwetzell/showbridge-go/internal/common"
-	"github.com/jwetzell/showbridge-go/internal/config"
 )
 
 func init() {

internal/processor/router-input.go

@@ -7,8 +7,8 @@ import (
 	"log/slog"
 
 	"github.com/google/jsonschema-go/jsonschema"
+	"github.com/jwetzell/showbridge-go/config"
 	"github.com/jwetzell/showbridge-go/internal/common"
-	"github.com/jwetzell/showbridge-go/internal/config"
 )
 
 func init() {

internal/processor/script-expr.go

@@ -7,8 +7,8 @@ import (
 	"github.com/expr-lang/expr"
 	"github.com/expr-lang/expr/vm"
 	"github.com/google/jsonschema-go/jsonschema"
+	"github.com/jwetzell/showbridge-go/config"
 	"github.com/jwetzell/showbridge-go/internal/common"
-	"github.com/jwetzell/showbridge-go/internal/config"
 )
 
 // NOTE(jwetzell): see language definition https://expr-lang.org/docs/language-definition

internal/processor/script-js.go

@@ -5,8 +5,8 @@ import (
 	"fmt"
 
 	"github.com/google/jsonschema-go/jsonschema"
+	"github.com/jwetzell/showbridge-go/config"
 	"github.com/jwetzell/showbridge-go/internal/common"
-	"github.com/jwetzell/showbridge-go/internal/config"
 	"modernc.org/quickjs"
 )
 

internal/processor/script-wasm.go

@@ -8,8 +8,8 @@ import (
 
 	extism "github.com/extism/go-sdk"
 	"github.com/google/jsonschema-go/jsonschema"
+	"github.com/jwetzell/showbridge-go/config"
 	"github.com/jwetzell/showbridge-go/internal/common"
-	"github.com/jwetzell/showbridge-go/internal/config"
 )
 
 func init() {

internal/processor/string-create.go

@@ -7,8 +7,8 @@ import (
 	"text/template"
 
 	"github.com/google/jsonschema-go/jsonschema"
+	"github.com/jwetzell/showbridge-go/config"
 	"github.com/jwetzell/showbridge-go/internal/common"
-	"github.com/jwetzell/showbridge-go/internal/config"
 )
 
 func init() {

internal/processor/string-decode.go

@@ -4,8 +4,8 @@ import (
 	"context"
 	"errors"
 
+	"github.com/jwetzell/showbridge-go/config"
 	"github.com/jwetzell/showbridge-go/internal/common"
-	"github.com/jwetzell/showbridge-go/internal/config"
 )
 
 func init() {

internal/processor/string-encode.go

@@ -4,8 +4,8 @@ import (
 	"context"
 	"errors"
 
+	"github.com/jwetzell/showbridge-go/config"
 	"github.com/jwetzell/showbridge-go/internal/common"
-	"github.com/jwetzell/showbridge-go/internal/config"
 )
 
 func init() {