move any helper methods to common and reuse for params getter

This commit is contained in:
Joel Wetzell
2026-03-10 18:14:30 -05:00
parent 65476d5ecc
commit 5a0f21bd64
36 changed files with 373 additions and 355 deletions

View File

@@ -187,7 +187,7 @@ func (hs *HTTPServer) Output(ctx context.Context, payload any) error {
return errors.New("http.server output must originate from an http.server input")
}
payloadResponse, ok := processor.GetAnyAs[processor.HTTPResponse](payload)
payloadResponse, ok := common.GetAnyAs[processor.HTTPResponse](payload)
if !ok {
return errors.New("http.server is only able to output HTTPResponse")

View File

@@ -10,7 +10,6 @@ import (
"github.com/jwetzell/showbridge-go/internal/common"
"github.com/jwetzell/showbridge-go/internal/config"
"github.com/jwetzell/showbridge-go/internal/processor"
"gitlab.com/gomidi/midi/v2"
_ "gitlab.com/gomidi/midi/v2/drivers/rtmididrv"
)
@@ -85,7 +84,7 @@ func (mo *MIDIOutput) Output(ctx context.Context, payload any) error {
return errors.New("midi.output output is not setup")
}
payloadMessage, ok := processor.GetAnyAs[midi.Message](payload)
payloadMessage, ok := common.GetAnyAs[midi.Message](payload)
if !ok {
return errors.New("midi.output can only ouptut midi.Message")

View File

@@ -9,7 +9,6 @@ import (
mqtt "github.com/eclipse/paho.mqtt.golang"
"github.com/jwetzell/showbridge-go/internal/common"
"github.com/jwetzell/showbridge-go/internal/config"
"github.com/jwetzell/showbridge-go/internal/processor"
)
type MQTTClient struct {
@@ -102,7 +101,7 @@ func (mc *MQTTClient) Start(ctx context.Context) error {
}
func (mc *MQTTClient) Output(ctx context.Context, payload any) error {
payloadMessage, ok := processor.GetAnyAs[mqtt.Message](payload)
payloadMessage, ok := common.GetAnyAs[mqtt.Message](payload)
if !ok {
return errors.New("mqtt.client is only able to output a MQTTMessage")

View File

@@ -94,7 +94,7 @@ func (nc *NATSClient) Start(ctx context.Context) error {
func (nc *NATSClient) Output(ctx context.Context, payload any) error {
payloadMessage, ok := processor.GetAnyAs[processor.NATSMessage](payload)
payloadMessage, ok := common.GetAnyAs[processor.NATSMessage](payload)
if !ok {
return errors.New("nats.client is only able to output NATSMessage")

View File

@@ -12,7 +12,6 @@ import (
"github.com/jwetzell/showbridge-go/internal/common"
"github.com/jwetzell/showbridge-go/internal/config"
"github.com/jwetzell/showbridge-go/internal/framer"
"github.com/jwetzell/showbridge-go/internal/processor"
"go.bug.st/serial"
)
@@ -157,7 +156,7 @@ func (sc *SerialClient) Start(ctx context.Context) error {
func (sc *SerialClient) Output(ctx context.Context, payload any) error {
payloadBytes, ok := processor.GetAnyAs[[]byte](payload)
payloadBytes, ok := common.GetAnyAs[[]byte](payload)
if !ok {
return errors.New("serial.client can only ouptut bytes")

View File

@@ -173,7 +173,7 @@ func (scs *SIPCallServer) Output(ctx context.Context, payload any) error {
return errors.New("sip.call.server inDialog already ended")
}
payloadDTMFResponse, ok := processor.GetAnyAs[processor.SipDTMFResponse](payload)
payloadDTMFResponse, ok := common.GetAnyAs[processor.SipDTMFResponse](payload)
if ok {
dtmfWriter := call.inDialog.AudioWriterDTMF()
@@ -189,7 +189,7 @@ func (scs *SIPCallServer) Output(ctx context.Context, payload any) error {
return nil
}
payloadAudioFileResponse, ok := processor.GetAnyAs[processor.SipAudioFileResponse](payload)
payloadAudioFileResponse, ok := common.GetAnyAs[processor.SipAudioFileResponse](payload)
if ok {
audioFile, err := os.Open(payloadAudioFileResponse.AudioFile)

View File

@@ -199,7 +199,7 @@ func (sds *SIPDTMFServer) Output(ctx context.Context, payload any) error {
return errors.New("sip.dtmf.server inDialog already ended")
}
payloadDTMFResponse, ok := processor.GetAnyAs[processor.SipDTMFResponse](payload)
payloadDTMFResponse, ok := common.GetAnyAs[processor.SipDTMFResponse](payload)
if ok {
dtmfWriter := call.inDialog.AudioWriterDTMF()
@@ -216,7 +216,7 @@ func (sds *SIPDTMFServer) Output(ctx context.Context, payload any) error {
return nil
}
payloadAudioFileResponse, ok := processor.GetAnyAs[processor.SipAudioFileResponse](payload)
payloadAudioFileResponse, ok := common.GetAnyAs[processor.SipAudioFileResponse](payload)
if ok {
audioFile, err := os.Open(payloadAudioFileResponse.AudioFile)

View File

@@ -11,7 +11,6 @@ import (
"github.com/jwetzell/showbridge-go/internal/common"
"github.com/jwetzell/showbridge-go/internal/config"
"github.com/jwetzell/showbridge-go/internal/framer"
"github.com/jwetzell/showbridge-go/internal/processor"
)
type TCPClient struct {
@@ -153,7 +152,7 @@ func (tc *TCPClient) Output(ctx context.Context, payload any) error {
return err
}
}
payloadBytes, ok := processor.GetAnyAs[[]byte](payload)
payloadBytes, ok := common.GetAnyAs[[]byte](payload)
if !ok {
return errors.New("net.tcp.client is only able to output bytes")
}

View File

@@ -14,7 +14,6 @@ import (
"github.com/jwetzell/showbridge-go/internal/common"
"github.com/jwetzell/showbridge-go/internal/config"
"github.com/jwetzell/showbridge-go/internal/framer"
"github.com/jwetzell/showbridge-go/internal/processor"
)
type TCPServer struct {
@@ -207,7 +206,7 @@ AcceptLoop:
}
func (ts *TCPServer) Output(ctx context.Context, payload any) error {
payloadBytes, ok := processor.GetAnyAs[[]byte](payload)
payloadBytes, ok := common.GetAnyAs[[]byte](payload)
if !ok {
return errors.New("net.tcp.server is only able to output bytes")

View File

@@ -9,7 +9,6 @@ import (
"github.com/jwetzell/showbridge-go/internal/common"
"github.com/jwetzell/showbridge-go/internal/config"
"github.com/jwetzell/showbridge-go/internal/processor"
)
type UDPClient struct {
@@ -88,7 +87,7 @@ func (uc *UDPClient) Start(ctx context.Context) error {
func (uc *UDPClient) Output(ctx context.Context, payload any) error {
payloadBytes, ok := processor.GetAnyAs[[]byte](payload)
payloadBytes, ok := common.GetAnyAs[[]byte](payload)
if !ok {
return errors.New("net.udp.client is only able to output bytes")
}

View File

@@ -10,7 +10,6 @@ import (
"github.com/jwetzell/showbridge-go/internal/common"
"github.com/jwetzell/showbridge-go/internal/config"
"github.com/jwetzell/showbridge-go/internal/processor"
)
type UDPMulticast struct {
@@ -109,7 +108,7 @@ func (um *UDPMulticast) Start(ctx context.Context) error {
func (um *UDPMulticast) Output(ctx context.Context, payload any) error {
payloadBytes, ok := processor.GetAnyAs[[]byte](payload)
payloadBytes, ok := common.GetAnyAs[[]byte](payload)
if !ok {
return errors.New("net.udp.multicast can only output bytes")
}