mirror of
https://github.com/jwetzell/showbridge-go.git
synced 2026-08-10 17:03:38 +00:00
Compare commits
29 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 81ae00c943 | |||
| 49e351c760 | |||
| e90356762c | |||
| 68586cd588 | |||
| 5e87cdcc5e | |||
| 2d6fa2ad19 | |||
| 3ab2cade81 | |||
| 2078d8533f | |||
| 9b5a9ce6d0 | |||
| dbeb1e8c29 | |||
| 0b494fce91 | |||
| 52ca801fbd | |||
| 3adbae8068 | |||
| 4ba718e2c6 | |||
| fa595a027b | |||
| 5660acfca6 | |||
| 3a1bc74fcf | |||
| 62ce5bf2f8 | |||
| 0f70596eb0 | |||
| db3d0530a5 | |||
| 6b53211267 | |||
| 821d192eb7 | |||
| b50882fc4a | |||
| 438c396aeb | |||
| f175bed084 | |||
| 80f8152dfb | |||
| 0ff212742a | |||
| 8fe0f7e6a2 | |||
| 9db958b523 |
@@ -211,7 +211,8 @@ jobs:
|
||||
files: showbridge_*.tar.gz
|
||||
docker:
|
||||
runs-on: ubuntu-latest
|
||||
needs: linux_amd64
|
||||
needs: setup_release
|
||||
if: github.ref_type == 'tag' && github.event_name != 'workflow_dispatch'
|
||||
steps:
|
||||
- name: Check out repository
|
||||
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
|
||||
@@ -220,24 +221,23 @@ jobs:
|
||||
uses: docker/setup-qemu-action@ce360397dd3f832beb865e1373c09c0e9f86d70a # v4.0.0
|
||||
|
||||
- name: Set up Docker Buildx
|
||||
uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4.0.0
|
||||
uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4.1.0
|
||||
|
||||
- name: Login to Docker Hub
|
||||
uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4.1.0
|
||||
uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4.2.0
|
||||
with:
|
||||
username: ${{ secrets.DOCKERHUB_USERNAME }}
|
||||
password: ${{ secrets.DOCKERHUB_TOKEN }}
|
||||
|
||||
- name: Setup Docker metadata
|
||||
id: meta
|
||||
uses: docker/metadata-action@030e881283bb7a6894de51c315a6bfe6a94e05cf # v6.0.0
|
||||
uses: docker/metadata-action@80c7e94dd9b9319bd5eb7a0e0fe9291e23a2a2e9 # v6.1.0
|
||||
with:
|
||||
images: |
|
||||
jwetzell/showbridge
|
||||
|
||||
- name: Build and push
|
||||
uses: docker/build-push-action@bcafcacb16a39f128d818304e6c9c0c18556b85f # v7.1.0
|
||||
if: github.ref_type == 'tag'
|
||||
uses: docker/build-push-action@f9f3042f7e2789586610d6e8b85c8f03e5195baf # v7.2.0
|
||||
with:
|
||||
push: true
|
||||
context: ./
|
||||
|
||||
@@ -106,12 +106,12 @@ func readConfig(configPath string) (config.Config, error) {
|
||||
|
||||
err = schema.ApplyDefaults(&yamlMap)
|
||||
if err != nil {
|
||||
return config.Config{}, err
|
||||
return config.Config{}, fmt.Errorf("failed to apply defaults: %w", err)
|
||||
}
|
||||
|
||||
err = schema.ValidateConfig(yamlMap)
|
||||
if err != nil {
|
||||
return config.Config{}, err
|
||||
return config.Config{}, fmt.Errorf("failed to validate config: %w", err)
|
||||
}
|
||||
|
||||
validatedConfigBytes, err := json.Marshal(yamlMap)
|
||||
|
||||
+30
-5
@@ -57,14 +57,25 @@ routes:
|
||||
processors:
|
||||
- type: string.create
|
||||
params:
|
||||
template: "hello"
|
||||
template: "wsecho: {{.Payload.UnixMilli}}"
|
||||
- type: module.output
|
||||
params:
|
||||
module: wsecho
|
||||
- input: ticker
|
||||
processors:
|
||||
- type: string.create
|
||||
params:
|
||||
template: "tcpout: {{.Payload.UnixMilli}}"
|
||||
- type: string.encode
|
||||
- type: module.output
|
||||
params:
|
||||
module: tcpout
|
||||
- input: ticker
|
||||
processors:
|
||||
- type: string.create
|
||||
params:
|
||||
template: "udpout: {{.Payload.UnixMilli}}"
|
||||
- type: string.encode
|
||||
- type: module.output
|
||||
params:
|
||||
module: udpout
|
||||
@@ -74,14 +85,15 @@ routes:
|
||||
params:
|
||||
url: "http://localhost:3000/echo"
|
||||
method: "GET"
|
||||
- type: struct.field.get
|
||||
params:
|
||||
name: "Body"
|
||||
- type: string.decode
|
||||
- type: debug.log
|
||||
- input: tcpin
|
||||
processors:
|
||||
- type: string.decode
|
||||
- type: debug.log
|
||||
- input: httpin
|
||||
processors:
|
||||
- type: debug.log
|
||||
- input: udpin
|
||||
processors:
|
||||
- type: string.decode
|
||||
@@ -98,12 +110,25 @@ routes:
|
||||
- type: debug.log
|
||||
- input: natsin
|
||||
processors:
|
||||
- type: struct.field.get
|
||||
params:
|
||||
name: "Data"
|
||||
- type: string.decode
|
||||
- type: debug.log
|
||||
- input: httpin
|
||||
processors:
|
||||
- type: http.response.create
|
||||
params:
|
||||
status: 200
|
||||
bodyTemplate: "Hello, World!"
|
||||
- type: module.output
|
||||
params:
|
||||
module: httpin
|
||||
- input: ticker
|
||||
processors:
|
||||
- type: string.create
|
||||
params:
|
||||
template: "{{.Payload}}"
|
||||
template: "natsout: {{.Payload}}"
|
||||
- type: pubsub.publish
|
||||
params:
|
||||
module: natsout
|
||||
|
||||
@@ -10,16 +10,17 @@ require (
|
||||
github.com/extism/go-sdk v1.7.1
|
||||
github.com/google/jsonschema-go v0.4.3
|
||||
github.com/gorilla/websocket v1.5.3
|
||||
github.com/jwetzell/artnet-go v0.2.3
|
||||
github.com/jwetzell/artnet-go v0.3.0
|
||||
github.com/jwetzell/free-d-go v0.2.0
|
||||
github.com/jwetzell/osc-go v0.3.0
|
||||
github.com/jwetzell/psn-go v0.3.0
|
||||
github.com/nats-io/nats-server/v2 v2.14.0
|
||||
github.com/nats-io/nats-server/v2 v2.14.1
|
||||
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.7.0
|
||||
go.bug.st/serial v1.7.1
|
||||
golang.org/x/time v0.15.0
|
||||
modernc.org/quickjs v0.18.2
|
||||
modernc.org/sqlite v1.50.1
|
||||
sigs.k8s.io/yaml v1.6.0
|
||||
@@ -66,7 +67,6 @@ require (
|
||||
golang.org/x/net v0.54.0 // indirect
|
||||
golang.org/x/sync v0.20.0 // indirect
|
||||
golang.org/x/sys v0.44.0 // indirect
|
||||
golang.org/x/time v0.15.0 // indirect
|
||||
golang.org/x/tools v0.44.0 // indirect
|
||||
google.golang.org/protobuf v1.36.11 // indirect
|
||||
gopkg.in/hraban/opus.v2 v2.0.0-20230925203106-0188a62cb302 // indirect
|
||||
|
||||
@@ -52,8 +52,8 @@ github.com/ianlancetaylor/demangle v0.0.0-20260505044615-1ff4bf46051f h1:NW3E2QS
|
||||
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.3 h1:yPDckAFFSbJnpjMX5Y+tFh8xiP2zH3iqZxrXZrJg91g=
|
||||
github.com/jwetzell/artnet-go v0.2.3/go.mod h1:gli97Z32a0kMkZ6taoTiK7/lqHcF/dhiGjGJdx/PxqA=
|
||||
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.0 h1:z75TxuQSEmdcmZ56OAepkDa3m88SdZh//3m4nBb/XZI=
|
||||
@@ -74,8 +74,8 @@ github.com/minio/highwayhash v1.0.4 h1:asJizugGgchQod2ja9NJlGOWq4s7KsAWr5XUc9Clg
|
||||
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.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-server/v2 v2.14.1 h1:wXs/a5fw9Hzm3CvuzLxGeIwpjPulSa7gMT3eSuhGkcg=
|
||||
github.com/nats-io/nats-server/v2 v2.14.1/go.mod h1:4N17zLpuS7WMbG8T9gsE2B7z9hC9PraPyulVBfpK6nU=
|
||||
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=
|
||||
@@ -118,8 +118,8 @@ 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.7.0 h1:Svs5xR0s4JF+KIg+1d9QE4iXqEIJvTr5vESFUjSu7mE=
|
||||
go.bug.st/serial v1.7.0/go.mod h1:PZfOSahry47TWtrd0tvoKZvmVa7FGrc/1xG9q8Ho3xU=
|
||||
go.bug.st/serial v1.7.1 h1:5aP8wYL0UjEYOVs3oPAGscjaSfRQLHtCvBFXNN/rwtc=
|
||||
go.bug.st/serial v1.7.1/go.mod h1:d0MmS16Qt9b1m06yoYRNUXhRRTJV5Qg2S5EKqQtnayQ=
|
||||
go.opentelemetry.io/proto/otlp v1.10.0 h1:IQRWgT5srOCYfiWnpqUYz9CVmbO8bFmKcwYxpuCSL2g=
|
||||
go.opentelemetry.io/proto/otlp v1.10.0/go.mod h1:/CV4QoCR/S9yaPj8utp3lvQPoqMtxXdzn7ozvvozVqk=
|
||||
go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE=
|
||||
|
||||
@@ -17,8 +17,8 @@ type OutputModule interface {
|
||||
}
|
||||
|
||||
type KeyValueModule interface {
|
||||
Get(key string) (any, error)
|
||||
Set(key string, value any) error
|
||||
Get(ctx context.Context, key string) (any, error)
|
||||
Set(ctx context.Context, key string, value any) error
|
||||
}
|
||||
|
||||
type DatabaseModule interface {
|
||||
|
||||
@@ -10,15 +10,15 @@ type Framer interface {
|
||||
func GetFramer(framingType string) Framer {
|
||||
switch framingType {
|
||||
case "CR":
|
||||
return NewByteSeparatorFramer([]byte{'\r'})
|
||||
return newByteSeparatorFramer([]byte{'\r'})
|
||||
case "LF":
|
||||
return NewByteSeparatorFramer([]byte{'\n'})
|
||||
return newByteSeparatorFramer([]byte{'\n'})
|
||||
case "CRLF":
|
||||
return NewByteSeparatorFramer([]byte{'\r', '\n'})
|
||||
return newByteSeparatorFramer([]byte{'\r', '\n'})
|
||||
case "SLIP":
|
||||
return NewSlipFramer()
|
||||
return newSlipFramer()
|
||||
case "RAW":
|
||||
return NewRawFramer()
|
||||
return newRawFramer()
|
||||
default:
|
||||
return nil
|
||||
}
|
||||
|
||||
@@ -1,23 +1,23 @@
|
||||
package framer
|
||||
|
||||
type RawFramer struct{}
|
||||
type rawFramer struct{}
|
||||
|
||||
func NewRawFramer() *RawFramer {
|
||||
return &RawFramer{}
|
||||
func newRawFramer() *rawFramer {
|
||||
return &rawFramer{}
|
||||
}
|
||||
|
||||
func (rf *RawFramer) Decode(data []byte) [][]byte {
|
||||
func (rf *rawFramer) Decode(data []byte) [][]byte {
|
||||
return [][]byte{data}
|
||||
}
|
||||
|
||||
func (rf *RawFramer) Encode(data []byte) []byte {
|
||||
func (rf *rawFramer) Encode(data []byte) []byte {
|
||||
return data
|
||||
}
|
||||
|
||||
func (rf *RawFramer) Clear() {
|
||||
func (rf *rawFramer) Clear() {
|
||||
// NOTE(jwetzell): no internal state to clear
|
||||
}
|
||||
|
||||
func (rf *RawFramer) Buffer() []byte {
|
||||
func (rf *rawFramer) Buffer() []byte {
|
||||
return []byte{}
|
||||
}
|
||||
|
||||
@@ -4,16 +4,16 @@ import (
|
||||
"bytes"
|
||||
)
|
||||
|
||||
type ByteSeparatorFramer struct {
|
||||
type byteSeparatorFramer struct {
|
||||
buffer []byte
|
||||
separator []byte
|
||||
}
|
||||
|
||||
func NewByteSeparatorFramer(separator []byte) *ByteSeparatorFramer {
|
||||
return &ByteSeparatorFramer{separator: separator, buffer: []byte{}}
|
||||
func newByteSeparatorFramer(separator []byte) *byteSeparatorFramer {
|
||||
return &byteSeparatorFramer{separator: separator, buffer: []byte{}}
|
||||
}
|
||||
|
||||
func (bsf *ByteSeparatorFramer) Decode(data []byte) [][]byte {
|
||||
func (bsf *byteSeparatorFramer) Decode(data []byte) [][]byte {
|
||||
messages := [][]byte{}
|
||||
|
||||
bsf.buffer = append(bsf.buffer, data...)
|
||||
@@ -28,14 +28,14 @@ func (bsf *ByteSeparatorFramer) Decode(data []byte) [][]byte {
|
||||
return messages
|
||||
}
|
||||
|
||||
func (bsf *ByteSeparatorFramer) Encode(data []byte) []byte {
|
||||
func (bsf *byteSeparatorFramer) Encode(data []byte) []byte {
|
||||
return append(data, bsf.separator...)
|
||||
}
|
||||
|
||||
func (bsf *ByteSeparatorFramer) Clear() {
|
||||
func (bsf *byteSeparatorFramer) Clear() {
|
||||
bsf.buffer = []byte{}
|
||||
}
|
||||
|
||||
func (bsf *ByteSeparatorFramer) Buffer() []byte {
|
||||
func (bsf *byteSeparatorFramer) Buffer() []byte {
|
||||
return bsf.buffer
|
||||
}
|
||||
|
||||
@@ -1,14 +1,14 @@
|
||||
package framer
|
||||
|
||||
type SlipFramer struct {
|
||||
type slipFramer struct {
|
||||
buffer []byte
|
||||
}
|
||||
|
||||
func NewSlipFramer() *SlipFramer {
|
||||
return &SlipFramer{buffer: []byte{}}
|
||||
func newSlipFramer() *slipFramer {
|
||||
return &slipFramer{buffer: []byte{}}
|
||||
}
|
||||
|
||||
func (sf *SlipFramer) Decode(data []byte) [][]byte {
|
||||
func (sf *slipFramer) Decode(data []byte) [][]byte {
|
||||
messages := [][]byte{}
|
||||
|
||||
END := byte(0xc0)
|
||||
@@ -49,7 +49,7 @@ func (sf *SlipFramer) Decode(data []byte) [][]byte {
|
||||
return messages
|
||||
}
|
||||
|
||||
func (sf *SlipFramer) Encode(data []byte) []byte {
|
||||
func (sf *slipFramer) Encode(data []byte) []byte {
|
||||
END := byte(0xc0)
|
||||
ESC := byte(0xdb)
|
||||
ESC_END := byte(0xdc)
|
||||
@@ -72,10 +72,10 @@ func (sf *SlipFramer) Encode(data []byte) []byte {
|
||||
return encodedBytes
|
||||
}
|
||||
|
||||
func (sf *SlipFramer) Clear() {
|
||||
func (sf *slipFramer) Clear() {
|
||||
sf.buffer = []byte{}
|
||||
}
|
||||
|
||||
func (sf *SlipFramer) Buffer() []byte {
|
||||
func (sf *slipFramer) Buffer() []byte {
|
||||
return sf.buffer
|
||||
}
|
||||
|
||||
@@ -76,20 +76,19 @@ func (dbs *DbSqlite) Start(ctx context.Context, inputHandler common.InputHandler
|
||||
dbs.db = db
|
||||
dbs.dbMu.Unlock()
|
||||
<-dbs.ctx.Done()
|
||||
dbs.logger.Debug("done")
|
||||
return nil
|
||||
}
|
||||
|
||||
func (dbs *DbSqlite) Stop() {
|
||||
if dbs.cancel != nil {
|
||||
dbs.cancel()
|
||||
defer dbs.cancel()
|
||||
}
|
||||
dbs.dbMu.Lock()
|
||||
defer dbs.dbMu.Unlock()
|
||||
if dbs.db != nil {
|
||||
dbs.db.Close()
|
||||
dbs.db = nil
|
||||
}
|
||||
dbs.logger.Debug("done")
|
||||
}
|
||||
|
||||
func (dbs *DbSqlite) QueryContext(ctx context.Context, query string, args ...any) (*sql.Rows, error) {
|
||||
|
||||
@@ -167,12 +167,13 @@ func (hs *HTTPServer) Start(ctx context.Context, inputHandler common.InputHandle
|
||||
err := httpServer.ListenAndServe()
|
||||
// TODO(jwetzell): handle server closed error differently
|
||||
if err != nil {
|
||||
if err.Error() != "http: Server closed" {
|
||||
if !errors.Is(err, http.ErrServerClosed) {
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
||||
<-hs.ctx.Done()
|
||||
hs.logger.Debug("done")
|
||||
return nil
|
||||
}
|
||||
|
||||
@@ -200,7 +201,7 @@ func (hs *HTTPServer) Output(ctx context.Context, payload any) error {
|
||||
|
||||
func (hs *HTTPServer) Stop() {
|
||||
if hs.cancel != nil {
|
||||
hs.cancel()
|
||||
defer hs.cancel()
|
||||
}
|
||||
hs.serverMu.Lock()
|
||||
defer hs.serverMu.Unlock()
|
||||
@@ -209,7 +210,5 @@ func (hs *HTTPServer) Stop() {
|
||||
hs.server.Shutdown(shutdownCtx)
|
||||
shutdownCancel()
|
||||
<-shutdownCtx.Done()
|
||||
hs.server = nil
|
||||
}
|
||||
hs.logger.Debug("done")
|
||||
}
|
||||
|
||||
@@ -83,17 +83,16 @@ func (mi *MIDIInput) Start(ctx context.Context, inputHandler common.InputHandler
|
||||
mi.stop = stop
|
||||
|
||||
<-mi.ctx.Done()
|
||||
mi.logger.Debug("done")
|
||||
return nil
|
||||
}
|
||||
|
||||
func (mi *MIDIInput) Stop() {
|
||||
if mi.cancel != nil {
|
||||
mi.cancel()
|
||||
defer mi.cancel()
|
||||
}
|
||||
if mi.stop != nil {
|
||||
mi.stop()
|
||||
mi.stop = nil
|
||||
}
|
||||
midi.CloseDriver()
|
||||
mi.logger.Debug("done")
|
||||
}
|
||||
|
||||
@@ -86,6 +86,7 @@ func (mo *MIDIOutput) Start(ctx context.Context, inputHandler common.InputHandle
|
||||
mo.sendFuncMu.Unlock()
|
||||
|
||||
<-mo.ctx.Done()
|
||||
mo.logger.Debug("done")
|
||||
return nil
|
||||
}
|
||||
|
||||
@@ -107,8 +108,7 @@ func (mo *MIDIOutput) Output(ctx context.Context, payload any) error {
|
||||
|
||||
func (mo *MIDIOutput) Stop() {
|
||||
if mo.cancel != nil {
|
||||
mo.cancel()
|
||||
defer mo.cancel()
|
||||
}
|
||||
midi.CloseDriver()
|
||||
mo.logger.Debug("done")
|
||||
}
|
||||
|
||||
@@ -30,15 +30,36 @@ func RegisterModule(mod ModuleRegistration) {
|
||||
moduleRegistryMu.Lock()
|
||||
defer moduleRegistryMu.Unlock()
|
||||
|
||||
if _, ok := ModuleRegistry[string(mod.Type)]; ok {
|
||||
if _, ok := moduleRegistry[string(mod.Type)]; ok {
|
||||
panic(fmt.Sprintf("module already registered: %s", mod.Type))
|
||||
}
|
||||
ModuleRegistry[string(mod.Type)] = mod
|
||||
moduleRegistry[string(mod.Type)] = mod
|
||||
}
|
||||
|
||||
type ModuleRegistry map[string]ModuleRegistration
|
||||
|
||||
func GetModuleRegistration(moduleType string) (ModuleRegistration, bool) {
|
||||
moduleRegistryMu.RLock()
|
||||
defer moduleRegistryMu.RUnlock()
|
||||
|
||||
mod, ok := moduleRegistry[moduleType]
|
||||
return mod, ok
|
||||
}
|
||||
|
||||
func GetModuleRegistrations() []ModuleRegistration {
|
||||
moduleRegistryMu.RLock()
|
||||
defer moduleRegistryMu.RUnlock()
|
||||
|
||||
registrations := make([]ModuleRegistration, 0, len(moduleRegistry))
|
||||
for _, mod := range moduleRegistry {
|
||||
registrations = append(registrations, mod)
|
||||
}
|
||||
return registrations
|
||||
}
|
||||
|
||||
var (
|
||||
moduleRegistryMu sync.RWMutex
|
||||
ModuleRegistry = make(map[string]ModuleRegistration)
|
||||
moduleRegistry = make(ModuleRegistry)
|
||||
)
|
||||
|
||||
func CreateLogger(config config.ModuleConfig) *slog.Logger {
|
||||
|
||||
@@ -152,6 +152,7 @@ func (mc *MQTTClient) Start(ctx context.Context, inputHandler common.InputHandle
|
||||
mc.clientMu.Unlock()
|
||||
|
||||
<-mc.ctx.Done()
|
||||
mc.logger.Debug("done")
|
||||
return nil
|
||||
}
|
||||
|
||||
@@ -189,7 +190,5 @@ func (mc *MQTTClient) Stop() {
|
||||
defer mc.clientMu.Unlock()
|
||||
if mc.client != nil {
|
||||
mc.client.Disconnect(250)
|
||||
mc.client = nil
|
||||
}
|
||||
mc.logger.Debug("done")
|
||||
}
|
||||
|
||||
@@ -102,6 +102,7 @@ func (nc *NATSClient) Start(ctx context.Context, inputHandler common.InputHandle
|
||||
nc.subMu.Unlock()
|
||||
|
||||
<-nc.ctx.Done()
|
||||
nc.logger.Debug("done")
|
||||
return nil
|
||||
}
|
||||
|
||||
@@ -135,13 +136,12 @@ func (nc *NATSClient) Publish(ctx context.Context, topic string, payload any) er
|
||||
|
||||
func (nc *NATSClient) Stop() {
|
||||
if nc.cancel != nil {
|
||||
nc.cancel()
|
||||
defer nc.cancel()
|
||||
}
|
||||
nc.subMu.Lock()
|
||||
defer nc.subMu.Unlock()
|
||||
if nc.sub != nil {
|
||||
nc.sub.Unsubscribe()
|
||||
nc.sub = nil
|
||||
}
|
||||
|
||||
nc.clientMu.Lock()
|
||||
@@ -150,7 +150,5 @@ func (nc *NATSClient) Stop() {
|
||||
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")
|
||||
}
|
||||
|
||||
@@ -96,9 +96,10 @@ func (ns *NATSServer) Start(ctx context.Context, inputHandler common.InputHandle
|
||||
ns.cancel = cancel
|
||||
|
||||
natsServer, err := server.NewServer(&server.Options{
|
||||
Host: ns.Ip,
|
||||
Port: ns.Port,
|
||||
NoLog: true,
|
||||
Host: ns.Ip,
|
||||
Port: ns.Port,
|
||||
NoLog: true,
|
||||
NoSigs: true,
|
||||
})
|
||||
|
||||
if err != nil {
|
||||
@@ -107,26 +108,26 @@ func (ns *NATSServer) Start(ctx context.Context, inputHandler common.InputHandle
|
||||
|
||||
ns.serverMu.Lock()
|
||||
ns.server = natsServer
|
||||
defer ns.serverMu.Unlock()
|
||||
natsServer.Start()
|
||||
|
||||
if !natsServer.ReadyForConnections(5 * time.Second) {
|
||||
return errors.New("nats.server failed to start")
|
||||
}
|
||||
ns.serverMu.Unlock()
|
||||
|
||||
<-ns.ctx.Done()
|
||||
|
||||
ns.logger.Debug("done")
|
||||
return nil
|
||||
}
|
||||
|
||||
func (ns *NATSServer) Stop() {
|
||||
if ns.cancel != nil {
|
||||
ns.cancel()
|
||||
defer ns.cancel()
|
||||
}
|
||||
ns.serverMu.Lock()
|
||||
defer ns.serverMu.Unlock()
|
||||
if ns.server != nil {
|
||||
ns.server.Shutdown()
|
||||
ns.server.WaitForShutdown()
|
||||
}
|
||||
ns.logger.Debug("done")
|
||||
}
|
||||
|
||||
@@ -63,7 +63,7 @@ func (pc *PSNClient) Start(ctx context.Context, inputHandler common.InputHandler
|
||||
pc.connMu.Unlock()
|
||||
|
||||
buffer := make([]byte, 2048)
|
||||
for {
|
||||
for pc.ctx.Err() == nil {
|
||||
select {
|
||||
case <-pc.ctx.Done():
|
||||
return nil
|
||||
@@ -99,17 +99,18 @@ func (pc *PSNClient) Start(ctx context.Context, inputHandler common.InputHandler
|
||||
}
|
||||
}
|
||||
}
|
||||
<-pc.ctx.Done()
|
||||
pc.logger.Debug("done")
|
||||
return nil
|
||||
}
|
||||
|
||||
func (pc *PSNClient) Stop() {
|
||||
if pc.cancel != nil {
|
||||
pc.cancel()
|
||||
defer pc.cancel()
|
||||
}
|
||||
pc.connMu.Lock()
|
||||
defer pc.connMu.Unlock()
|
||||
if pc.conn != nil {
|
||||
pc.conn.Close()
|
||||
pc.conn = nil
|
||||
}
|
||||
pc.logger.Debug("done")
|
||||
}
|
||||
|
||||
@@ -94,25 +94,24 @@ func (rc *RedisClient) Start(ctx context.Context, inputHandler common.InputHandl
|
||||
rc.clientMu.Unlock()
|
||||
|
||||
<-rc.ctx.Done()
|
||||
rc.logger.Debug("done")
|
||||
return nil
|
||||
}
|
||||
|
||||
func (rc *RedisClient) Stop() {
|
||||
if rc.cancel != nil {
|
||||
rc.cancel()
|
||||
defer 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) {
|
||||
func (rc *RedisClient) Get(ctx context.Context, key string) (any, error) {
|
||||
if rc.client != nil {
|
||||
val, err := rc.client.Get(rc.ctx, key).Result()
|
||||
val, err := rc.client.Get(ctx, key).Result()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
@@ -121,9 +120,9 @@ func (rc *RedisClient) Get(key string) (any, error) {
|
||||
return nil, errors.New("redis.client not setup")
|
||||
}
|
||||
|
||||
func (rc *RedisClient) Set(key string, value any) error {
|
||||
func (rc *RedisClient) Set(ctx context.Context, key string, value any) error {
|
||||
if rc.client != nil {
|
||||
status := rc.client.Set(rc.ctx, key, value, 0)
|
||||
status := rc.client.Set(ctx, key, value, 0)
|
||||
return status.Err()
|
||||
}
|
||||
return errors.New("redis.client not setup")
|
||||
|
||||
@@ -159,6 +159,8 @@ func (sc *SerialClient) Start(ctx context.Context, inputHandler common.InputHand
|
||||
}
|
||||
}
|
||||
}
|
||||
<-sc.ctx.Done()
|
||||
sc.logger.Debug("done")
|
||||
return nil
|
||||
}
|
||||
|
||||
@@ -176,13 +178,11 @@ func (sc *SerialClient) Output(ctx context.Context, payload any) error {
|
||||
|
||||
func (sc *SerialClient) Stop() {
|
||||
if sc.cancel != nil {
|
||||
sc.cancel()
|
||||
defer sc.cancel()
|
||||
}
|
||||
sc.portMu.Lock()
|
||||
defer sc.portMu.Unlock()
|
||||
if sc.port != nil {
|
||||
sc.port.Close()
|
||||
sc.port = nil
|
||||
}
|
||||
sc.logger.Debug("done")
|
||||
}
|
||||
|
||||
@@ -168,6 +168,7 @@ func (scs *SIPCallServer) Start(ctx context.Context, inputHandler common.InputHa
|
||||
}
|
||||
|
||||
<-scs.ctx.Done()
|
||||
scs.logger.Debug("done")
|
||||
return nil
|
||||
}
|
||||
|
||||
@@ -251,12 +252,11 @@ func (scs *SIPCallServer) Output(ctx context.Context, payload any) error {
|
||||
|
||||
func (scs *SIPCallServer) Stop() {
|
||||
if scs.cancel != nil {
|
||||
scs.cancel()
|
||||
defer scs.cancel()
|
||||
}
|
||||
scs.uaMu.Lock()
|
||||
defer scs.uaMu.Unlock()
|
||||
if scs.ua != nil {
|
||||
scs.ua.Close()
|
||||
}
|
||||
scs.logger.Debug("done")
|
||||
}
|
||||
|
||||
@@ -190,6 +190,7 @@ func (sds *SIPDTMFServer) Start(ctx context.Context, inputHandler common.InputHa
|
||||
}
|
||||
|
||||
<-sds.ctx.Done()
|
||||
sds.logger.Debug("done")
|
||||
return nil
|
||||
}
|
||||
|
||||
@@ -286,12 +287,11 @@ func (sds *SIPDTMFServer) Output(ctx context.Context, payload any) error {
|
||||
|
||||
func (sds *SIPDTMFServer) Stop() {
|
||||
if sds.cancel != nil {
|
||||
sds.cancel()
|
||||
defer sds.cancel()
|
||||
}
|
||||
sds.uaMu.Lock()
|
||||
defer sds.uaMu.Unlock()
|
||||
if sds.ua != nil {
|
||||
sds.ua.Close()
|
||||
}
|
||||
sds.logger.Debug("done")
|
||||
}
|
||||
|
||||
@@ -100,11 +100,12 @@ func (tc *TCPClient) Start(ctx context.Context, inputHandler common.InputHandler
|
||||
tc.ctx = moduleContext
|
||||
tc.cancel = cancel
|
||||
|
||||
CONNECT_RETRY:
|
||||
for tc.ctx.Err() == nil {
|
||||
err := tc.SetupConn()
|
||||
if err != nil {
|
||||
if tc.ctx.Err() != nil {
|
||||
return nil
|
||||
break CONNECT_RETRY
|
||||
}
|
||||
tc.logger.Error("connection error", "error", err.Error())
|
||||
time.Sleep(time.Second * 2)
|
||||
@@ -112,39 +113,41 @@ func (tc *TCPClient) Start(ctx context.Context, inputHandler common.InputHandler
|
||||
}
|
||||
|
||||
buffer := make([]byte, 1024)
|
||||
select {
|
||||
case <-tc.ctx.Done():
|
||||
return nil
|
||||
default:
|
||||
READ:
|
||||
for {
|
||||
select {
|
||||
case <-tc.ctx.Done():
|
||||
return nil
|
||||
default:
|
||||
byteCount, err := tc.conn.Read(buffer)
|
||||
|
||||
if err != nil {
|
||||
tc.framer.Clear()
|
||||
break READ
|
||||
READ:
|
||||
for tc.ctx.Err() == nil {
|
||||
tc.conn.SetReadDeadline(time.Now().Add(time.Millisecond * 200))
|
||||
byteCount, err := tc.conn.Read(buffer)
|
||||
|
||||
if err != nil {
|
||||
if opErr, ok := err.(*net.OpError); ok {
|
||||
//NOTE(jwetzell) we hit deadline
|
||||
if opErr.Timeout() {
|
||||
continue
|
||||
}
|
||||
}
|
||||
if errors.Is(err, net.ErrClosed) {
|
||||
break CONNECT_RETRY
|
||||
}
|
||||
break READ
|
||||
}
|
||||
|
||||
if tc.framer != nil {
|
||||
if byteCount > 0 {
|
||||
messages := tc.framer.Decode(buffer[0:byteCount])
|
||||
for _, message := range messages {
|
||||
if tc.inputHandler != nil {
|
||||
tc.inputHandler(tc.ctx, tc.Id(), message)
|
||||
} else {
|
||||
tc.logger.Error("input received but no input handler is configured")
|
||||
}
|
||||
}
|
||||
if tc.framer != nil {
|
||||
if byteCount > 0 {
|
||||
messages := tc.framer.Decode(buffer[0:byteCount])
|
||||
for _, message := range messages {
|
||||
if tc.inputHandler != nil {
|
||||
tc.inputHandler(tc.ctx, tc.Id(), message)
|
||||
} else {
|
||||
tc.logger.Error("input received but no input handler is configured")
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
<-tc.ctx.Done()
|
||||
tc.logger.Debug("done")
|
||||
return nil
|
||||
}
|
||||
|
||||
@@ -172,14 +175,11 @@ func (tc *TCPClient) Output(ctx context.Context, payload any) error {
|
||||
|
||||
func (tc *TCPClient) Stop() {
|
||||
if tc.cancel != nil {
|
||||
tc.cancel()
|
||||
defer tc.cancel()
|
||||
}
|
||||
tc.connMu.Lock()
|
||||
defer tc.connMu.Unlock()
|
||||
if tc.conn != nil {
|
||||
tc.conn.Close()
|
||||
tc.conn = nil
|
||||
}
|
||||
tc.logger.Debug("done")
|
||||
|
||||
}
|
||||
|
||||
@@ -10,7 +10,6 @@ import (
|
||||
"slices"
|
||||
"strings"
|
||||
"sync"
|
||||
"syscall"
|
||||
"time"
|
||||
|
||||
"github.com/google/jsonschema-go/jsonschema"
|
||||
@@ -58,12 +57,14 @@ func init() {
|
||||
return nil, fmt.Errorf("net.tcp.server framing error: %w", err)
|
||||
}
|
||||
|
||||
framer := framer.GetFramer(framingMethodString)
|
||||
inFramer := framer.GetFramer(framingMethodString)
|
||||
|
||||
if framer == nil {
|
||||
if inFramer == nil {
|
||||
return nil, fmt.Errorf("net.tcp.server unknown framing method: %s", framingMethodString)
|
||||
}
|
||||
|
||||
outFramer := framer.GetFramer(framingMethodString)
|
||||
|
||||
ipString, err := params.GetString("ip")
|
||||
if err != nil {
|
||||
if errors.Is(err, config.ErrParamNotFound) {
|
||||
@@ -77,24 +78,33 @@ func init() {
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return &TCPServer{Framer: framer, Addr: addr, config: moduleConfig, logger: CreateLogger(moduleConfig)}, nil
|
||||
return &TCPServer{InFramer: inFramer, OutFramer: outFramer, framerType: framingMethodString, Addr: addr, config: moduleConfig, logger: CreateLogger(moduleConfig)}, nil
|
||||
},
|
||||
})
|
||||
}
|
||||
|
||||
type tcpConnection struct {
|
||||
conn *net.TCPConn
|
||||
framer framer.Framer
|
||||
}
|
||||
|
||||
type TCPServer struct {
|
||||
config config.ModuleConfig
|
||||
Addr *net.TCPAddr
|
||||
Framer framer.Framer
|
||||
ctx context.Context
|
||||
inputHandler common.InputHandler
|
||||
wg sync.WaitGroup
|
||||
connections []*net.TCPConn
|
||||
connectionsMu sync.RWMutex
|
||||
logger *slog.Logger
|
||||
cancel context.CancelFunc
|
||||
listener *net.TCPListener
|
||||
listenerMu sync.Mutex
|
||||
config config.ModuleConfig
|
||||
Addr *net.TCPAddr
|
||||
InFramer framer.Framer
|
||||
OutFramer framer.Framer
|
||||
framerType string
|
||||
ctx context.Context
|
||||
inputHandler common.InputHandler
|
||||
wg sync.WaitGroup
|
||||
connections []tcpConnection
|
||||
connectionsMu sync.RWMutex
|
||||
logger *slog.Logger
|
||||
cancel context.CancelFunc
|
||||
listener *net.TCPListener
|
||||
listenerMu sync.Mutex
|
||||
connectionShutdownCtx context.Context
|
||||
connectionShutdown context.CancelFunc
|
||||
}
|
||||
|
||||
func (ts *TCPServer) Id() string {
|
||||
@@ -107,70 +117,43 @@ func (ts *TCPServer) Type() string {
|
||||
|
||||
func (ts *TCPServer) handleClient(client *net.TCPConn) {
|
||||
ts.connectionsMu.Lock()
|
||||
ts.connections = append(ts.connections, client)
|
||||
ts.connections = append(ts.connections, tcpConnection{conn: client, framer: framer.GetFramer(ts.framerType)})
|
||||
ts.connectionsMu.Unlock()
|
||||
ts.logger.Debug("connection accepted", "remoteAddr", client.RemoteAddr().String())
|
||||
defer client.Close()
|
||||
defer func() {
|
||||
client.Close()
|
||||
ts.connectionsMu.Lock()
|
||||
for i := 0; i < len(ts.connections); i++ {
|
||||
if ts.connections[i].conn == client {
|
||||
ts.connections = slices.Delete(ts.connections, i, i+1)
|
||||
break
|
||||
}
|
||||
}
|
||||
ts.connectionsMu.Unlock()
|
||||
ts.logger.Debug("connection closed", "remoteAddr", client.RemoteAddr().String())
|
||||
}()
|
||||
|
||||
buffer := make([]byte, 1024)
|
||||
ClientRead:
|
||||
for ts.ctx.Err() == nil {
|
||||
select {
|
||||
case <-ts.ctx.Done():
|
||||
client.Close()
|
||||
ts.connectionsMu.Lock()
|
||||
for i := 0; i < len(ts.connections); i++ {
|
||||
if ts.connections[i] == client {
|
||||
ts.connections = slices.Delete(ts.connections, i, i+1)
|
||||
break
|
||||
for ts.ctx.Err() == nil && ts.connectionShutdownCtx.Err() == nil {
|
||||
client.SetDeadline(time.Now().Add(time.Millisecond * 200))
|
||||
byteCount, err := client.Read(buffer)
|
||||
if err != nil {
|
||||
if opErr, ok := err.(*net.OpError); ok {
|
||||
//NOTE(jwetzell) we hit deadline
|
||||
if opErr.Timeout() {
|
||||
continue
|
||||
}
|
||||
}
|
||||
ts.connectionsMu.Unlock()
|
||||
return
|
||||
default:
|
||||
client.SetDeadline(time.Now().Add(time.Millisecond * 200))
|
||||
byteCount, err := client.Read(buffer)
|
||||
|
||||
if err != nil {
|
||||
if opErr, ok := err.(*net.OpError); ok {
|
||||
//NOTE(jwetzell) we hit deadline
|
||||
if opErr.Timeout() {
|
||||
continue ClientRead
|
||||
}
|
||||
if errors.Is(opErr, syscall.ECONNRESET) {
|
||||
ts.connectionsMu.Lock()
|
||||
for i := 0; i < len(ts.connections); i++ {
|
||||
if ts.connections[i] == client {
|
||||
ts.connections = slices.Delete(ts.connections, i, i+1)
|
||||
break
|
||||
}
|
||||
}
|
||||
ts.logger.Debug("connection reset", "remoteAddr", client.RemoteAddr().String())
|
||||
ts.connectionsMu.Unlock()
|
||||
}
|
||||
}
|
||||
|
||||
if err.Error() == "EOF" {
|
||||
ts.connectionsMu.Lock()
|
||||
for i := 0; i < len(ts.connections); i++ {
|
||||
if ts.connections[i] == client {
|
||||
ts.connections = slices.Delete(ts.connections, i, i+1)
|
||||
break
|
||||
}
|
||||
}
|
||||
ts.connectionsMu.Unlock()
|
||||
}
|
||||
return
|
||||
}
|
||||
if ts.Framer != nil {
|
||||
if byteCount > 0 {
|
||||
messages := ts.Framer.Decode(buffer[0:byteCount])
|
||||
for _, message := range messages {
|
||||
if ts.inputHandler != nil {
|
||||
ts.inputHandler(ts.ctx, ts.Id(), message)
|
||||
} else {
|
||||
ts.logger.Error("input received but no input handler is configured")
|
||||
}
|
||||
break
|
||||
}
|
||||
if ts.InFramer != nil {
|
||||
if byteCount > 0 {
|
||||
messages := ts.InFramer.Decode(buffer[0:byteCount])
|
||||
for _, message := range messages {
|
||||
if ts.inputHandler != nil {
|
||||
ts.inputHandler(ts.ctx, ts.Id(), message)
|
||||
} else {
|
||||
ts.logger.Error("input received but no input handler is configured")
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -185,6 +168,10 @@ func (ts *TCPServer) Start(ctx context.Context, inputHandler common.InputHandler
|
||||
ts.ctx = moduleContext
|
||||
ts.cancel = cancel
|
||||
|
||||
shutdownCtx, shutdownCancel := context.WithCancel(context.Background())
|
||||
ts.connectionShutdownCtx = shutdownCtx
|
||||
ts.connectionShutdown = shutdownCancel
|
||||
|
||||
listener, err := net.ListenTCP("tcp", ts.Addr)
|
||||
if err != nil {
|
||||
return err
|
||||
@@ -198,6 +185,9 @@ AcceptLoop:
|
||||
for ts.ctx.Err() == nil {
|
||||
conn, err := listener.AcceptTCP()
|
||||
if err != nil {
|
||||
if errors.Is(err, net.ErrClosed) {
|
||||
break AcceptLoop
|
||||
}
|
||||
select {
|
||||
case <-ts.ctx.Done():
|
||||
break AcceptLoop
|
||||
@@ -211,6 +201,8 @@ AcceptLoop:
|
||||
}
|
||||
}
|
||||
ts.wg.Done()
|
||||
<-ts.ctx.Done()
|
||||
ts.logger.Debug("done")
|
||||
return nil
|
||||
}
|
||||
|
||||
@@ -221,15 +213,21 @@ 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()
|
||||
defer ts.connectionsMu.Unlock()
|
||||
var errorString strings.Builder
|
||||
|
||||
if ts.OutFramer == nil {
|
||||
return errors.New("no output framer configured")
|
||||
}
|
||||
|
||||
outputBytes := ts.OutFramer.Encode(payloadBytes)
|
||||
|
||||
for _, connection := range ts.connections {
|
||||
_, err := connection.Write(payloadBytes)
|
||||
_, err := connection.conn.Write(outputBytes)
|
||||
if err != nil {
|
||||
fmt.Fprintf(&errorString, "%s\n", err.Error())
|
||||
}
|
||||
}
|
||||
ts.connectionsMu.Unlock()
|
||||
|
||||
if errorString.String() == "" {
|
||||
return nil
|
||||
@@ -239,14 +237,18 @@ func (ts *TCPServer) Output(ctx context.Context, payload any) error {
|
||||
|
||||
func (ts *TCPServer) Stop() {
|
||||
if ts.cancel != nil {
|
||||
ts.cancel()
|
||||
defer ts.cancel()
|
||||
}
|
||||
if ts.connectionShutdown != nil {
|
||||
ts.connectionShutdown()
|
||||
}
|
||||
|
||||
ts.listenerMu.Lock()
|
||||
defer ts.listenerMu.Unlock()
|
||||
if ts.listener != nil {
|
||||
ts.listener.Close()
|
||||
ts.listener = nil
|
||||
}
|
||||
ts.logger.Debug("waiting for connections to close")
|
||||
ts.wg.Wait()
|
||||
ts.logger.Debug("done")
|
||||
ts.logger.Debug("all connections closed")
|
||||
}
|
||||
|
||||
@@ -9,7 +9,7 @@ import (
|
||||
)
|
||||
|
||||
func TestDbSqliteFromRegistry(t *testing.T) {
|
||||
registration, ok := module.ModuleRegistry["db.sqlite"]
|
||||
registration, ok := module.GetModuleRegistration("db.sqlite")
|
||||
if !ok {
|
||||
t.Fatalf("db.sqlite module not registered")
|
||||
}
|
||||
@@ -58,7 +58,7 @@ func TestGoodDbSqlite(t *testing.T) {
|
||||
for _, test := range testCases {
|
||||
t.Run(test.name, func(t *testing.T) {
|
||||
|
||||
registration, ok := module.ModuleRegistry["db.sqlite"]
|
||||
registration, ok := module.GetModuleRegistration("db.sqlite")
|
||||
if !ok {
|
||||
t.Fatalf("db.sqlite module not registered")
|
||||
}
|
||||
@@ -107,7 +107,7 @@ func TestBadDbSqlite(t *testing.T) {
|
||||
for _, test := range tests {
|
||||
t.Run(test.name, func(t *testing.T) {
|
||||
|
||||
registration, ok := module.ModuleRegistry["db.sqlite"]
|
||||
registration, ok := module.GetModuleRegistration("db.sqlite")
|
||||
if !ok {
|
||||
t.Fatalf("db.sqlite module not registered")
|
||||
}
|
||||
|
||||
@@ -9,7 +9,7 @@ import (
|
||||
)
|
||||
|
||||
func TestHTTPServerFromRegistry(t *testing.T) {
|
||||
registration, ok := module.ModuleRegistry["http.server"]
|
||||
registration, ok := module.GetModuleRegistration("http.server")
|
||||
if !ok {
|
||||
t.Fatalf("http.server module not registered")
|
||||
}
|
||||
@@ -52,7 +52,7 @@ func TestGoodHTTPServer(t *testing.T) {
|
||||
for _, test := range testCases {
|
||||
t.Run(test.name, func(t *testing.T) {
|
||||
|
||||
registration, ok := module.ModuleRegistry["http.server"]
|
||||
registration, ok := module.GetModuleRegistration("http.server")
|
||||
if !ok {
|
||||
t.Fatalf("http.server module not registered")
|
||||
}
|
||||
@@ -102,7 +102,7 @@ func TestBadHTTPServer(t *testing.T) {
|
||||
for _, test := range tests {
|
||||
t.Run(test.name, func(t *testing.T) {
|
||||
|
||||
registration, ok := module.ModuleRegistry["http.server"]
|
||||
registration, ok := module.GetModuleRegistration("http.server")
|
||||
if !ok {
|
||||
t.Fatalf("http.server module not registered")
|
||||
}
|
||||
|
||||
@@ -8,7 +8,7 @@ import (
|
||||
)
|
||||
|
||||
func TestMIDIInputFromRegistry(t *testing.T) {
|
||||
registration, ok := module.ModuleRegistry["midi.input"]
|
||||
registration, ok := module.GetModuleRegistration("midi.input")
|
||||
if !ok {
|
||||
t.Fatalf("midi.input module not registered")
|
||||
}
|
||||
@@ -55,7 +55,7 @@ func TestBadMIDIInput(t *testing.T) {
|
||||
for _, test := range tests {
|
||||
t.Run(test.name, func(t *testing.T) {
|
||||
|
||||
registration, ok := module.ModuleRegistry["midi.input"]
|
||||
registration, ok := module.GetModuleRegistration("midi.input")
|
||||
if !ok {
|
||||
t.Fatalf("midi.input module not registered")
|
||||
}
|
||||
|
||||
@@ -8,7 +8,7 @@ import (
|
||||
)
|
||||
|
||||
func TestMIDIOutputFromRegistry(t *testing.T) {
|
||||
registration, ok := module.ModuleRegistry["midi.output"]
|
||||
registration, ok := module.GetModuleRegistration("midi.output")
|
||||
if !ok {
|
||||
t.Fatalf("midi.output module not registered")
|
||||
}
|
||||
@@ -55,7 +55,7 @@ func TestBadMIDIOutput(t *testing.T) {
|
||||
for _, test := range tests {
|
||||
t.Run(test.name, func(t *testing.T) {
|
||||
|
||||
registration, ok := module.ModuleRegistry["midi.output"]
|
||||
registration, ok := module.GetModuleRegistration("midi.output")
|
||||
if !ok {
|
||||
t.Fatalf("midi.output module not registered")
|
||||
}
|
||||
|
||||
@@ -8,7 +8,7 @@ import (
|
||||
)
|
||||
|
||||
func TestMQTTClientFromRegistry(t *testing.T) {
|
||||
registration, ok := module.ModuleRegistry["mqtt.client"]
|
||||
registration, ok := module.GetModuleRegistration("mqtt.client")
|
||||
if !ok {
|
||||
t.Fatalf("mqtt.client module not registered")
|
||||
}
|
||||
@@ -98,7 +98,7 @@ func TestBadMQTTClient(t *testing.T) {
|
||||
for _, test := range tests {
|
||||
t.Run(test.name, func(t *testing.T) {
|
||||
|
||||
registration, ok := module.ModuleRegistry["mqtt.client"]
|
||||
registration, ok := module.GetModuleRegistration("mqtt.client")
|
||||
if !ok {
|
||||
t.Fatalf("mqtt.client module not registered")
|
||||
}
|
||||
|
||||
@@ -8,7 +8,7 @@ import (
|
||||
)
|
||||
|
||||
func TestNATSClientFromRegistry(t *testing.T) {
|
||||
registration, ok := module.ModuleRegistry["nats.client"]
|
||||
registration, ok := module.GetModuleRegistration("nats.client")
|
||||
if !ok {
|
||||
t.Fatalf("nats.client module not registered")
|
||||
}
|
||||
@@ -76,7 +76,7 @@ func TestBadNATSClient(t *testing.T) {
|
||||
for _, test := range tests {
|
||||
t.Run(test.name, func(t *testing.T) {
|
||||
|
||||
registration, ok := module.ModuleRegistry["nats.client"]
|
||||
registration, ok := module.GetModuleRegistration("nats.client")
|
||||
if !ok {
|
||||
t.Fatalf("nats.client module not registered")
|
||||
}
|
||||
|
||||
@@ -9,7 +9,7 @@ import (
|
||||
)
|
||||
|
||||
func TestNATSServerFromRegistry(t *testing.T) {
|
||||
registration, ok := module.ModuleRegistry["nats.server"]
|
||||
registration, ok := module.GetModuleRegistration("nats.server")
|
||||
if !ok {
|
||||
t.Fatalf("nats.server module not registered")
|
||||
}
|
||||
@@ -53,7 +53,7 @@ func TestGoodNATSServer(t *testing.T) {
|
||||
for _, test := range testCases {
|
||||
t.Run(test.name, func(t *testing.T) {
|
||||
|
||||
registration, ok := module.ModuleRegistry["nats.server"]
|
||||
registration, ok := module.GetModuleRegistration("nats.server")
|
||||
if !ok {
|
||||
t.Fatalf("nats.server module not registered")
|
||||
}
|
||||
@@ -100,7 +100,7 @@ func TestBadNATSServer(t *testing.T) {
|
||||
for _, test := range tests {
|
||||
t.Run(test.name, func(t *testing.T) {
|
||||
|
||||
registration, ok := module.ModuleRegistry["nats.server"]
|
||||
registration, ok := module.GetModuleRegistration("nats.server")
|
||||
if !ok {
|
||||
t.Fatalf("nats.server module not registered")
|
||||
}
|
||||
|
||||
@@ -8,7 +8,7 @@ import (
|
||||
)
|
||||
|
||||
func TestPSNClientFromRegistry(t *testing.T) {
|
||||
registration, ok := module.ModuleRegistry["psn.client"]
|
||||
registration, ok := module.GetModuleRegistration("psn.client")
|
||||
if !ok {
|
||||
t.Fatalf("psn.client module not registered")
|
||||
}
|
||||
@@ -41,7 +41,7 @@ func TestBadPSNClient(t *testing.T) {
|
||||
for _, test := range tests {
|
||||
t.Run(test.name, func(t *testing.T) {
|
||||
|
||||
registration, ok := module.ModuleRegistry["psn.client"]
|
||||
registration, ok := module.GetModuleRegistration("psn.client")
|
||||
if !ok {
|
||||
t.Fatalf("psn.client module not registered")
|
||||
}
|
||||
|
||||
@@ -8,7 +8,7 @@ import (
|
||||
)
|
||||
|
||||
func TestRedisClientFromRegistry(t *testing.T) {
|
||||
registration, ok := module.ModuleRegistry["redis.client"]
|
||||
registration, ok := module.GetModuleRegistration("redis.client")
|
||||
if !ok {
|
||||
t.Fatalf("redis.client module not registered")
|
||||
}
|
||||
@@ -76,7 +76,7 @@ func TestBadRedisClient(t *testing.T) {
|
||||
for _, test := range tests {
|
||||
t.Run(test.name, func(t *testing.T) {
|
||||
|
||||
registration, ok := module.ModuleRegistry["redis.client"]
|
||||
registration, ok := module.GetModuleRegistration("redis.client")
|
||||
if !ok {
|
||||
t.Fatalf("redis.client module not registered")
|
||||
}
|
||||
|
||||
@@ -8,7 +8,7 @@ import (
|
||||
)
|
||||
|
||||
func TestSerialClientFromRegistry(t *testing.T) {
|
||||
registration, ok := module.ModuleRegistry["serial.client"]
|
||||
registration, ok := module.GetModuleRegistration("serial.client")
|
||||
if !ok {
|
||||
t.Fatalf("serial.client module not registered")
|
||||
}
|
||||
@@ -85,7 +85,7 @@ func TestBadSerialClient(t *testing.T) {
|
||||
for _, test := range tests {
|
||||
t.Run(test.name, func(t *testing.T) {
|
||||
|
||||
registration, ok := module.ModuleRegistry["serial.client"]
|
||||
registration, ok := module.GetModuleRegistration("serial.client")
|
||||
if !ok {
|
||||
t.Fatalf("serial.client module not registered")
|
||||
}
|
||||
|
||||
@@ -8,7 +8,7 @@ import (
|
||||
)
|
||||
|
||||
func TestSIPCallServerFromRegistry(t *testing.T) {
|
||||
registration, ok := module.ModuleRegistry["sip.call.server"]
|
||||
registration, ok := module.GetModuleRegistration("sip.call.server")
|
||||
if !ok {
|
||||
t.Fatalf("sip.call.server module not registered")
|
||||
}
|
||||
@@ -70,7 +70,7 @@ func TestBadSIPCallServer(t *testing.T) {
|
||||
for _, test := range tests {
|
||||
t.Run(test.name, func(t *testing.T) {
|
||||
|
||||
registration, ok := module.ModuleRegistry["sip.call.server"]
|
||||
registration, ok := module.GetModuleRegistration("sip.call.server")
|
||||
if !ok {
|
||||
t.Fatalf("sip.call.server module not registered")
|
||||
}
|
||||
|
||||
@@ -8,7 +8,7 @@ import (
|
||||
)
|
||||
|
||||
func TestSIPDTMFServerFromRegistry(t *testing.T) {
|
||||
registration, ok := module.ModuleRegistry["sip.dtmf.server"]
|
||||
registration, ok := module.GetModuleRegistration("sip.dtmf.server")
|
||||
if !ok {
|
||||
t.Fatalf("sip.dtmf.server module not registered")
|
||||
}
|
||||
@@ -89,7 +89,7 @@ func TestBadSIPDTMFServer(t *testing.T) {
|
||||
for _, test := range tests {
|
||||
t.Run(test.name, func(t *testing.T) {
|
||||
|
||||
registration, ok := module.ModuleRegistry["sip.dtmf.server"]
|
||||
registration, ok := module.GetModuleRegistration("sip.dtmf.server")
|
||||
if !ok {
|
||||
t.Fatalf("sip.dtmf.server module not registered")
|
||||
}
|
||||
|
||||
@@ -8,7 +8,7 @@ import (
|
||||
)
|
||||
|
||||
func TestTCPClientFromRegistry(t *testing.T) {
|
||||
registration, ok := module.ModuleRegistry["net.tcp.client"]
|
||||
registration, ok := module.GetModuleRegistration("net.tcp.client")
|
||||
if !ok {
|
||||
t.Fatalf("net.tcp.client module not registered")
|
||||
}
|
||||
@@ -77,7 +77,7 @@ func TestBadTCPClient(t *testing.T) {
|
||||
for _, test := range tests {
|
||||
t.Run(test.name, func(t *testing.T) {
|
||||
|
||||
registration, ok := module.ModuleRegistry["net.tcp.client"]
|
||||
registration, ok := module.GetModuleRegistration("net.tcp.client")
|
||||
if !ok {
|
||||
t.Fatalf("net.tcp.client module not registered")
|
||||
}
|
||||
|
||||
@@ -9,7 +9,7 @@ import (
|
||||
)
|
||||
|
||||
func TestTCPServerFromRegistry(t *testing.T) {
|
||||
registration, ok := module.ModuleRegistry["net.tcp.server"]
|
||||
registration, ok := module.GetModuleRegistration("net.tcp.server")
|
||||
if !ok {
|
||||
t.Fatalf("net.tcp.server module not registered")
|
||||
}
|
||||
@@ -54,7 +54,7 @@ func TestGoodTCPServer(t *testing.T) {
|
||||
for _, test := range testCases {
|
||||
t.Run(test.name, func(t *testing.T) {
|
||||
|
||||
registration, ok := module.ModuleRegistry["net.tcp.server"]
|
||||
registration, ok := module.GetModuleRegistration("net.tcp.server")
|
||||
if !ok {
|
||||
t.Fatalf("net.tcp.server module not registered")
|
||||
}
|
||||
@@ -149,7 +149,7 @@ func TestBadTCPServer(t *testing.T) {
|
||||
for _, test := range tests {
|
||||
t.Run(test.name, func(t *testing.T) {
|
||||
|
||||
registration, ok := module.ModuleRegistry["net.tcp.server"]
|
||||
registration, ok := module.GetModuleRegistration("net.tcp.server")
|
||||
if !ok {
|
||||
t.Fatalf("net.tcp.server module not registered")
|
||||
}
|
||||
|
||||
@@ -9,7 +9,7 @@ import (
|
||||
)
|
||||
|
||||
func TestTimeIntervalFromRegistry(t *testing.T) {
|
||||
registration, ok := module.ModuleRegistry["time.interval"]
|
||||
registration, ok := module.GetModuleRegistration("time.interval")
|
||||
if !ok {
|
||||
t.Fatalf("time.interval module not registered")
|
||||
}
|
||||
@@ -52,7 +52,7 @@ func TestGoodTimeInterval(t *testing.T) {
|
||||
for _, test := range testCases {
|
||||
t.Run(test.name, func(t *testing.T) {
|
||||
|
||||
registration, ok := module.ModuleRegistry["time.interval"]
|
||||
registration, ok := module.GetModuleRegistration("time.interval")
|
||||
if !ok {
|
||||
t.Fatalf("time.interval module not registered")
|
||||
}
|
||||
@@ -103,7 +103,7 @@ func TestBadTimeInterval(t *testing.T) {
|
||||
for _, test := range tests {
|
||||
t.Run(test.name, func(t *testing.T) {
|
||||
|
||||
registration, ok := module.ModuleRegistry["time.interval"]
|
||||
registration, ok := module.GetModuleRegistration("time.interval")
|
||||
if !ok {
|
||||
t.Fatalf("time.interval module not registered")
|
||||
}
|
||||
|
||||
@@ -9,7 +9,7 @@ import (
|
||||
)
|
||||
|
||||
func TestTimeTimerFromRegistry(t *testing.T) {
|
||||
registration, ok := module.ModuleRegistry["time.timer"]
|
||||
registration, ok := module.GetModuleRegistration("time.timer")
|
||||
if !ok {
|
||||
t.Fatalf("time.timer module not registered")
|
||||
}
|
||||
@@ -52,7 +52,7 @@ func TestGoodTimeTimer(t *testing.T) {
|
||||
for _, test := range testCases {
|
||||
t.Run(test.name, func(t *testing.T) {
|
||||
|
||||
registration, ok := module.ModuleRegistry["time.timer"]
|
||||
registration, ok := module.GetModuleRegistration("time.timer")
|
||||
if !ok {
|
||||
t.Fatalf("time.timer module not registered")
|
||||
}
|
||||
@@ -103,7 +103,7 @@ func TestBadTimeTimer(t *testing.T) {
|
||||
for _, test := range tests {
|
||||
t.Run(test.name, func(t *testing.T) {
|
||||
|
||||
registration, ok := module.ModuleRegistry["time.timer"]
|
||||
registration, ok := module.GetModuleRegistration("time.timer")
|
||||
if !ok {
|
||||
t.Fatalf("time.timer module not registered")
|
||||
}
|
||||
|
||||
@@ -9,7 +9,7 @@ import (
|
||||
)
|
||||
|
||||
func TestUDPClientFromRegistry(t *testing.T) {
|
||||
registration, ok := module.ModuleRegistry["net.udp.client"]
|
||||
registration, ok := module.GetModuleRegistration("net.udp.client")
|
||||
if !ok {
|
||||
t.Fatalf("udp.client module not registered")
|
||||
}
|
||||
@@ -55,7 +55,7 @@ func TestGoodUDPClient(t *testing.T) {
|
||||
for _, test := range testCases {
|
||||
t.Run(test.name, func(t *testing.T) {
|
||||
|
||||
registration, ok := module.ModuleRegistry["net.udp.client"]
|
||||
registration, ok := module.GetModuleRegistration("net.udp.client")
|
||||
if !ok {
|
||||
t.Fatalf("net.udp.client module not registered")
|
||||
}
|
||||
@@ -125,7 +125,7 @@ func TestBadUDPClient(t *testing.T) {
|
||||
for _, test := range tests {
|
||||
t.Run(test.name, func(t *testing.T) {
|
||||
|
||||
registration, ok := module.ModuleRegistry["net.udp.client"]
|
||||
registration, ok := module.GetModuleRegistration("net.udp.client")
|
||||
if !ok {
|
||||
t.Fatalf("net.udp.client module not registered")
|
||||
}
|
||||
|
||||
@@ -8,7 +8,7 @@ import (
|
||||
)
|
||||
|
||||
func TestUDPMulticastFromRegistry(t *testing.T) {
|
||||
registration, ok := module.ModuleRegistry["net.udp.multicast"]
|
||||
registration, ok := module.GetModuleRegistration("net.udp.multicast")
|
||||
if !ok {
|
||||
t.Fatalf("udp.multicast module not registered")
|
||||
}
|
||||
@@ -84,7 +84,7 @@ func TestBadUDPMulticast(t *testing.T) {
|
||||
for _, test := range tests {
|
||||
t.Run(test.name, func(t *testing.T) {
|
||||
|
||||
registration, ok := module.ModuleRegistry["net.udp.multicast"]
|
||||
registration, ok := module.GetModuleRegistration("net.udp.multicast")
|
||||
if !ok {
|
||||
t.Fatalf("net.udp.multicast module not registered")
|
||||
}
|
||||
|
||||
@@ -9,7 +9,7 @@ import (
|
||||
)
|
||||
|
||||
func TestUDPServerFromRegistry(t *testing.T) {
|
||||
registration, ok := module.ModuleRegistry["net.udp.server"]
|
||||
registration, ok := module.GetModuleRegistration("net.udp.server")
|
||||
if !ok {
|
||||
t.Fatalf("net.udp.server module not registered")
|
||||
}
|
||||
@@ -52,7 +52,7 @@ func TestGoodUDPServer(t *testing.T) {
|
||||
for _, test := range testCases {
|
||||
t.Run(test.name, func(t *testing.T) {
|
||||
|
||||
registration, ok := module.ModuleRegistry["net.udp.server"]
|
||||
registration, ok := module.GetModuleRegistration("net.udp.server")
|
||||
if !ok {
|
||||
t.Fatalf("net.udp.server module not registered")
|
||||
}
|
||||
@@ -128,7 +128,7 @@ func TestBadUDPServer(t *testing.T) {
|
||||
for _, test := range tests {
|
||||
t.Run(test.name, func(t *testing.T) {
|
||||
|
||||
registration, ok := module.ModuleRegistry["net.udp.server"]
|
||||
registration, ok := module.GetModuleRegistration("net.udp.server")
|
||||
if !ok {
|
||||
t.Fatalf("net.udp.server module not registered")
|
||||
}
|
||||
|
||||
@@ -8,7 +8,7 @@ import (
|
||||
)
|
||||
|
||||
func TestWebSocketClientFromRegistry(t *testing.T) {
|
||||
registration, ok := module.ModuleRegistry["websocket.client"]
|
||||
registration, ok := module.GetModuleRegistration("websocket.client")
|
||||
if !ok {
|
||||
t.Fatalf("websocket.client module not registered")
|
||||
}
|
||||
@@ -64,7 +64,7 @@ func TestBadWebSocketClient(t *testing.T) {
|
||||
for _, test := range tests {
|
||||
t.Run(test.name, func(t *testing.T) {
|
||||
|
||||
registration, ok := module.ModuleRegistry["websocket.client"]
|
||||
registration, ok := module.GetModuleRegistration("websocket.client")
|
||||
if !ok {
|
||||
t.Fatalf("websocket.client module not registered")
|
||||
}
|
||||
|
||||
@@ -67,25 +67,26 @@ func (i *TimeInterval) Start(ctx context.Context, inputHandler common.InputHandl
|
||||
ticker := time.NewTicker(time.Millisecond * time.Duration(i.Duration))
|
||||
i.ticker = ticker
|
||||
|
||||
for {
|
||||
for i.ctx.Err() == nil {
|
||||
select {
|
||||
case <-i.ctx.Done():
|
||||
return nil
|
||||
case <-ticker.C:
|
||||
if i.inputHandler != nil {
|
||||
i.inputHandler(i.ctx, i.Id(), time.Now())
|
||||
}
|
||||
default:
|
||||
continue
|
||||
}
|
||||
}
|
||||
<-i.ctx.Done()
|
||||
i.logger.Debug("done")
|
||||
return nil
|
||||
}
|
||||
|
||||
func (i *TimeInterval) Stop() {
|
||||
if i.cancel != nil {
|
||||
i.cancel()
|
||||
defer i.cancel()
|
||||
}
|
||||
if i.ticker != nil {
|
||||
i.ticker.Stop()
|
||||
i.ticker = nil
|
||||
}
|
||||
i.logger.Debug("done")
|
||||
}
|
||||
|
||||
@@ -66,7 +66,7 @@ func (t *TimeTimer) Start(ctx context.Context, inputHandler common.InputHandler)
|
||||
t.cancel = cancel
|
||||
|
||||
t.timer = time.NewTimer(time.Millisecond * time.Duration(t.Duration))
|
||||
for {
|
||||
for t.ctx.Err() == nil {
|
||||
select {
|
||||
case <-t.ctx.Done():
|
||||
return nil
|
||||
@@ -76,15 +76,16 @@ func (t *TimeTimer) Start(ctx context.Context, inputHandler common.InputHandler)
|
||||
}
|
||||
}
|
||||
}
|
||||
<-t.ctx.Done()
|
||||
t.logger.Debug("done")
|
||||
return nil
|
||||
}
|
||||
|
||||
func (t *TimeTimer) Stop() {
|
||||
if t.cancel != nil {
|
||||
t.cancel()
|
||||
defer t.cancel()
|
||||
}
|
||||
if t.timer != nil {
|
||||
t.timer.Stop()
|
||||
t.timer = nil
|
||||
}
|
||||
t.logger.Debug("done")
|
||||
}
|
||||
|
||||
@@ -96,6 +96,7 @@ func (uc *UDPClient) Start(ctx context.Context, inputHandler common.InputHandler
|
||||
}
|
||||
|
||||
<-uc.ctx.Done()
|
||||
uc.logger.Debug("done")
|
||||
return nil
|
||||
}
|
||||
|
||||
@@ -120,14 +121,11 @@ func (uc *UDPClient) Output(ctx context.Context, payload any) error {
|
||||
|
||||
func (uc *UDPClient) Stop() {
|
||||
if uc.cancel != nil {
|
||||
uc.cancel()
|
||||
defer uc.cancel()
|
||||
}
|
||||
uc.connMu.Lock()
|
||||
defer uc.connMu.Unlock()
|
||||
if uc.conn != nil {
|
||||
uc.conn.Close()
|
||||
uc.conn = nil
|
||||
}
|
||||
|
||||
uc.logger.Debug("done")
|
||||
}
|
||||
|
||||
@@ -93,35 +93,34 @@ func (um *UDPMulticast) Start(ctx context.Context, inputHandler common.InputHand
|
||||
um.connMu.Unlock()
|
||||
|
||||
buffer := make([]byte, 2048)
|
||||
for {
|
||||
select {
|
||||
case <-um.ctx.Done():
|
||||
return nil
|
||||
default:
|
||||
um.connMu.Lock()
|
||||
um.conn.SetDeadline(time.Now().Add(time.Millisecond * 200))
|
||||
for um.ctx.Err() == nil {
|
||||
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() {
|
||||
continue
|
||||
}
|
||||
return err
|
||||
numBytes, _, err := um.conn.ReadFromUDP(buffer)
|
||||
if err != nil {
|
||||
if errors.Is(err, net.ErrClosed) {
|
||||
break
|
||||
}
|
||||
//NOTE(jwetzell) we hit deadline
|
||||
if opErr, ok := err.(*net.OpError); ok && opErr.Timeout() {
|
||||
continue
|
||||
}
|
||||
return err
|
||||
}
|
||||
|
||||
if numBytes > 0 {
|
||||
message := buffer[:numBytes]
|
||||
if numBytes > 0 {
|
||||
message := buffer[:numBytes]
|
||||
|
||||
if um.inputHandler != nil {
|
||||
um.inputHandler(um.ctx, um.Id(), message)
|
||||
} else {
|
||||
um.logger.Error("input received but no input handler is configured")
|
||||
}
|
||||
if um.inputHandler != nil {
|
||||
um.inputHandler(um.ctx, um.Id(), message)
|
||||
} else {
|
||||
um.logger.Error("input received but no input handler is configured")
|
||||
}
|
||||
}
|
||||
}
|
||||
<-um.ctx.Done()
|
||||
um.logger.Debug("done")
|
||||
return nil
|
||||
}
|
||||
|
||||
func (um *UDPMulticast) Output(ctx context.Context, payload any) error {
|
||||
@@ -141,13 +140,11 @@ func (um *UDPMulticast) Output(ctx context.Context, payload any) error {
|
||||
|
||||
func (um *UDPMulticast) Stop() {
|
||||
if um.cancel != nil {
|
||||
um.cancel()
|
||||
defer um.cancel()
|
||||
}
|
||||
um.connMu.Lock()
|
||||
defer um.connMu.Unlock()
|
||||
if um.conn != nil {
|
||||
um.conn.Close()
|
||||
um.conn = nil
|
||||
}
|
||||
um.logger.Debug("done")
|
||||
}
|
||||
|
||||
@@ -111,32 +111,29 @@ func (us *UDPServer) Start(ctx context.Context, inputHandler common.InputHandler
|
||||
}
|
||||
us.listenerMu.Lock()
|
||||
us.listener = listener
|
||||
us.listenerMu.Unlock()
|
||||
|
||||
buffer := make([]byte, us.BufferSize)
|
||||
for us.ctx.Err() == nil {
|
||||
select {
|
||||
case <-us.ctx.Done():
|
||||
return nil
|
||||
default:
|
||||
listener.SetDeadline(time.Now().Add(time.Millisecond * 200))
|
||||
listener.SetDeadline(time.Now().Add(time.Millisecond * 200))
|
||||
|
||||
numBytes, _, err := listener.ReadFromUDP(buffer)
|
||||
if err != nil {
|
||||
//NOTE(jwetzell) we hit deadline
|
||||
if opErr, ok := err.(*net.OpError); ok && opErr.Timeout() {
|
||||
continue
|
||||
}
|
||||
return err
|
||||
}
|
||||
message := buffer[:numBytes]
|
||||
if us.inputHandler != nil {
|
||||
us.inputHandler(us.ctx, us.Id(), message)
|
||||
} else {
|
||||
us.logger.Error("input received but no input handler is configured")
|
||||
numBytes, _, err := listener.ReadFromUDP(buffer)
|
||||
if err != nil {
|
||||
//NOTE(jwetzell) we hit deadline
|
||||
if opErr, ok := err.(*net.OpError); ok && opErr.Timeout() {
|
||||
continue
|
||||
}
|
||||
break
|
||||
}
|
||||
message := buffer[:numBytes]
|
||||
if us.inputHandler != nil {
|
||||
us.inputHandler(us.ctx, us.Id(), message)
|
||||
} else {
|
||||
us.logger.Error("input received but no input handler is configured")
|
||||
}
|
||||
}
|
||||
us.listenerMu.Unlock()
|
||||
<-us.ctx.Done()
|
||||
us.logger.Debug("done")
|
||||
return nil
|
||||
}
|
||||
|
||||
@@ -146,13 +143,11 @@ func (us *UDPServer) Output(ctx context.Context, payload any) error {
|
||||
|
||||
func (us *UDPServer) Stop() {
|
||||
if us.cancel != nil {
|
||||
us.cancel()
|
||||
defer us.cancel()
|
||||
}
|
||||
us.listenerMu.Lock()
|
||||
defer us.listenerMu.Unlock()
|
||||
if us.listener != nil {
|
||||
us.listener.Close()
|
||||
us.listener = nil
|
||||
}
|
||||
us.logger.Debug("done")
|
||||
}
|
||||
|
||||
@@ -5,7 +5,6 @@ import (
|
||||
"errors"
|
||||
"fmt"
|
||||
"log/slog"
|
||||
"net"
|
||||
"net/url"
|
||||
"sync"
|
||||
"time"
|
||||
@@ -74,7 +73,30 @@ func (wc *WebSocketClient) Type() string {
|
||||
func (wc *WebSocketClient) SetupConn() error {
|
||||
wc.connMu.Lock()
|
||||
defer wc.connMu.Unlock()
|
||||
if wc.conn != nil {
|
||||
wc.conn.Close()
|
||||
}
|
||||
conn, _, err := websocket.DefaultDialer.Dial(wc.URL.String(), nil)
|
||||
|
||||
if err != nil {
|
||||
return fmt.Errorf("websocket.client dial error: %w", err)
|
||||
}
|
||||
|
||||
conn.SetCloseHandler(func(code int, text string) error {
|
||||
// NOTE(jwetzell): attempt to send close message back to server before closing connection
|
||||
err := wc.conn.WriteControl(
|
||||
websocket.CloseMessage,
|
||||
websocket.FormatCloseMessage(websocket.CloseNormalClosure, ""),
|
||||
time.Now().Add(time.Minute),
|
||||
)
|
||||
wc.connMu.Lock()
|
||||
defer wc.connMu.Unlock()
|
||||
if wc.conn != nil {
|
||||
wc.conn.Close()
|
||||
}
|
||||
return err
|
||||
})
|
||||
|
||||
wc.conn = conn
|
||||
return err
|
||||
}
|
||||
@@ -92,13 +114,13 @@ func (wc *WebSocketClient) Start(ctx context.Context, inputHandler common.InputH
|
||||
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()
|
||||
wc.logger.Debug("done")
|
||||
return nil
|
||||
}
|
||||
|
||||
@@ -108,24 +130,22 @@ func (wc *WebSocketClient) readLoop() {
|
||||
wc.logger.Error("websocket connection is not established")
|
||||
return
|
||||
}
|
||||
// TODO(jwetzell): other ways to timeout?
|
||||
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.inputHandler != nil {
|
||||
switch messageType {
|
||||
case websocket.CloseMessage:
|
||||
return
|
||||
case websocket.PingMessage:
|
||||
err := wc.conn.WriteMessage(websocket.PongMessage, nil)
|
||||
if err != nil {
|
||||
wc.logger.Error("websocket pong error", "error", err)
|
||||
return
|
||||
}
|
||||
case websocket.TextMessage:
|
||||
wc.inputHandler(wc.ctx, wc.Id(), string(message))
|
||||
case websocket.BinaryMessage:
|
||||
@@ -182,13 +202,15 @@ func (wc *WebSocketClient) Output(ctx context.Context, payload any) error {
|
||||
|
||||
func (wc *WebSocketClient) Stop() {
|
||||
if wc.cancel != nil {
|
||||
wc.cancel()
|
||||
defer wc.cancel()
|
||||
}
|
||||
wc.connMu.Lock()
|
||||
defer wc.connMu.Unlock()
|
||||
if wc.conn != nil {
|
||||
err := wc.conn.WriteControl(websocket.CloseMessage, nil, time.Now().Add(time.Minute))
|
||||
if err != nil {
|
||||
wc.logger.Error("websocket close error", "error", err)
|
||||
}
|
||||
wc.conn.Close()
|
||||
wc.conn = nil
|
||||
}
|
||||
wc.logger.Debug("done")
|
||||
}
|
||||
|
||||
@@ -0,0 +1,58 @@
|
||||
package processor
|
||||
|
||||
import (
|
||||
"context"
|
||||
"fmt"
|
||||
|
||||
"github.com/google/jsonschema-go/jsonschema"
|
||||
"github.com/jwetzell/showbridge-go/internal/common"
|
||||
"github.com/jwetzell/showbridge-go/internal/config"
|
||||
"golang.org/x/time/rate"
|
||||
)
|
||||
|
||||
func init() {
|
||||
RegisterProcessor(ProcessorRegistration{
|
||||
Type: "filter.rate",
|
||||
Title: "Filter by Rate",
|
||||
ParamsSchema: &jsonschema.Schema{
|
||||
Type: "object",
|
||||
Properties: map[string]*jsonschema.Schema{
|
||||
"rate": {
|
||||
Type: "integer",
|
||||
Title: "Rate",
|
||||
Description: "The number of events to allow per second.",
|
||||
},
|
||||
},
|
||||
Required: []string{"rate"},
|
||||
},
|
||||
New: func(config config.ProcessorConfig) (Processor, error) {
|
||||
params := config.Params
|
||||
rateInt, err := params.GetInt("rate")
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("filter.rate rate error: %w", err)
|
||||
}
|
||||
|
||||
limiter := rate.NewLimiter(rate.Limit(rateInt), rateInt*2)
|
||||
|
||||
return &FilterRate{config: config, limiter: limiter}, nil
|
||||
},
|
||||
})
|
||||
}
|
||||
|
||||
type FilterRate struct {
|
||||
config config.ProcessorConfig
|
||||
limiter *rate.Limiter
|
||||
}
|
||||
|
||||
func (fc *FilterRate) Process(ctx context.Context, wrappedPayload common.WrappedPayload) (common.WrappedPayload, error) {
|
||||
err := fc.limiter.Wait(ctx)
|
||||
if err != nil {
|
||||
wrappedPayload.End = true
|
||||
return wrappedPayload, err
|
||||
}
|
||||
return wrappedPayload, nil
|
||||
}
|
||||
|
||||
func (fc *FilterRate) Type() string {
|
||||
return fc.config.Type
|
||||
}
|
||||
@@ -22,12 +22,12 @@ func init() {
|
||||
Title: "Status Code",
|
||||
Type: "integer",
|
||||
},
|
||||
"body": {
|
||||
Title: "Body",
|
||||
"bodyTemplate": {
|
||||
Title: "Body Template",
|
||||
Type: "string",
|
||||
},
|
||||
},
|
||||
Required: []string{"status", "body"},
|
||||
Required: []string{"status", "bodyTemplate"},
|
||||
AdditionalProperties: &jsonschema.Schema{Not: &jsonschema.Schema{}},
|
||||
},
|
||||
New: func(config config.ProcessorConfig) (Processor, error) {
|
||||
|
||||
@@ -77,7 +77,7 @@ func (kvg *KVGet) Process(ctx context.Context, wrappedPayload common.WrappedPayl
|
||||
kvg.module = kvModule
|
||||
}
|
||||
|
||||
value, err := kvg.module.Get(kvg.Key)
|
||||
value, err := kvg.module.Get(ctx, kvg.Key)
|
||||
if err != nil {
|
||||
wrappedPayload.End = true
|
||||
return wrappedPayload, fmt.Errorf("kv.get error getting key: %w", err)
|
||||
|
||||
@@ -78,7 +78,7 @@ func (kvs *KVSet) Process(ctx context.Context, wrappedPayload common.WrappedPayl
|
||||
kvs.module = kvModule
|
||||
}
|
||||
|
||||
err := kvs.module.Set(kvs.Key, wrappedPayload.Payload)
|
||||
err := kvs.module.Set(ctx, kvs.Key, wrappedPayload.Payload)
|
||||
if err != nil {
|
||||
wrappedPayload.End = true
|
||||
return wrappedPayload, fmt.Errorf("kv.set error setting key: %w", err)
|
||||
|
||||
@@ -35,13 +35,33 @@ func RegisterProcessor(processor ProcessorRegistration) {
|
||||
processorRegistryMu.Lock()
|
||||
defer processorRegistryMu.Unlock()
|
||||
|
||||
if _, ok := ProcessorRegistry[string(processor.Type)]; ok {
|
||||
if _, ok := processorRegistry[string(processor.Type)]; ok {
|
||||
panic(fmt.Sprintf("processor already registered: %s", processor.Type))
|
||||
}
|
||||
ProcessorRegistry[string(processor.Type)] = processor
|
||||
processorRegistry[string(processor.Type)] = processor
|
||||
}
|
||||
|
||||
type ProcessorRegistry map[string]ProcessorRegistration
|
||||
|
||||
func GetProcessorRegistration(processorType string) (ProcessorRegistration, bool) {
|
||||
processorRegistryMu.RLock()
|
||||
defer processorRegistryMu.RUnlock()
|
||||
processor, ok := processorRegistry[processorType]
|
||||
return processor, ok
|
||||
}
|
||||
|
||||
func GetProcessorRegistrations() []ProcessorRegistration {
|
||||
processorRegistryMu.RLock()
|
||||
defer processorRegistryMu.RUnlock()
|
||||
|
||||
registrations := make([]ProcessorRegistration, 0, len(processorRegistry))
|
||||
for _, processor := range processorRegistry {
|
||||
registrations = append(registrations, processor)
|
||||
}
|
||||
return registrations
|
||||
}
|
||||
|
||||
var (
|
||||
processorRegistryMu sync.RWMutex
|
||||
ProcessorRegistry = make(map[string]ProcessorRegistration)
|
||||
processorRegistry = make(map[string]ProcessorRegistration)
|
||||
)
|
||||
|
||||
@@ -11,7 +11,7 @@ import (
|
||||
)
|
||||
|
||||
func TestArtnetPacketDecodeFromRegistry(t *testing.T) {
|
||||
registration, ok := processor.ProcessorRegistry["artnet.packet.decode"]
|
||||
registration, ok := processor.GetProcessorRegistration("artnet.packet.decode")
|
||||
if !ok {
|
||||
t.Fatalf("artnet.packet.decode processor not registered")
|
||||
}
|
||||
@@ -41,15 +41,11 @@ 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: [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),
|
||||
Sequence: 237,
|
||||
Physical: 0,
|
||||
SubUni: 1,
|
||||
Net: 0,
|
||||
Data: make([]uint8, 512),
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
@@ -11,7 +11,7 @@ import (
|
||||
)
|
||||
|
||||
func TestArtnetPacketEncodeFromRegistry(t *testing.T) {
|
||||
registration, ok := processor.ProcessorRegistry["artnet.packet.encode"]
|
||||
registration, ok := processor.GetProcessorRegistration("artnet.packet.encode")
|
||||
if !ok {
|
||||
t.Fatalf("artnet.packet.encode processor not registered")
|
||||
}
|
||||
@@ -41,15 +41,11 @@ 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: [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),
|
||||
Sequence: 237,
|
||||
Physical: 0,
|
||||
SubUni: 1,
|
||||
Net: 0,
|
||||
Data: make([]uint8, 512),
|
||||
},
|
||||
},
|
||||
}
|
||||
@@ -104,15 +100,11 @@ 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),
|
||||
Sequence: 237,
|
||||
Physical: 0,
|
||||
SubUni: 1,
|
||||
Net: 0,
|
||||
Data: make([]uint8, 512),
|
||||
}
|
||||
|
||||
for b.Loop() {
|
||||
|
||||
@@ -12,7 +12,7 @@ import (
|
||||
)
|
||||
|
||||
func TestDbQueryFromRegistry(t *testing.T) {
|
||||
registration, ok := processor.ProcessorRegistry["db.query"]
|
||||
registration, ok := processor.GetProcessorRegistration("db.query")
|
||||
if !ok {
|
||||
t.Fatalf("db.query processor not registered")
|
||||
}
|
||||
@@ -100,7 +100,7 @@ func TestGoodDbQuery(t *testing.T) {
|
||||
}
|
||||
for _, testCase := range testCases {
|
||||
t.Run(testCase.name, func(t *testing.T) {
|
||||
registration, ok := processor.ProcessorRegistry["db.query"]
|
||||
registration, ok := processor.GetProcessorRegistration("db.query")
|
||||
if !ok {
|
||||
t.Fatalf("db.query processor not registered")
|
||||
}
|
||||
@@ -243,7 +243,7 @@ func TestBadDbQuery(t *testing.T) {
|
||||
errorString: "db.query unable to find module with id: test",
|
||||
},
|
||||
{
|
||||
name: "module not a DatabseModule",
|
||||
name: "module not a DatabaseModule",
|
||||
payload: test.TestStruct{Data: "hello"},
|
||||
params: map[string]any{
|
||||
"module": "test",
|
||||
@@ -259,7 +259,7 @@ func TestBadDbQuery(t *testing.T) {
|
||||
for _, test := range tests {
|
||||
t.Run(test.name, func(t *testing.T) {
|
||||
|
||||
registration, ok := processor.ProcessorRegistry["db.query"]
|
||||
registration, ok := processor.GetProcessorRegistration("db.query")
|
||||
if !ok {
|
||||
t.Fatalf("db.query processor not registered")
|
||||
}
|
||||
@@ -293,7 +293,7 @@ func TestBadDbQuery(t *testing.T) {
|
||||
}
|
||||
|
||||
func BenchmarkDbQuery(b *testing.B) {
|
||||
registration, ok := processor.ProcessorRegistry["db.query"]
|
||||
registration, ok := processor.GetProcessorRegistration("db.query")
|
||||
if !ok {
|
||||
b.Fatalf("db.query processor not registered")
|
||||
}
|
||||
|
||||
@@ -10,7 +10,7 @@ import (
|
||||
)
|
||||
|
||||
func TestDebugLogFromRegistry(t *testing.T) {
|
||||
registration, ok := processor.ProcessorRegistry["debug.log"]
|
||||
registration, ok := processor.GetProcessorRegistration("debug.log")
|
||||
if !ok {
|
||||
t.Fatalf("debug.log processor not registered")
|
||||
}
|
||||
@@ -52,7 +52,7 @@ func TestGoodDebugLog(t *testing.T) {
|
||||
for _, test := range tests {
|
||||
t.Run(test.name, func(t *testing.T) {
|
||||
|
||||
registration, ok := processor.ProcessorRegistry["debug.log"]
|
||||
registration, ok := processor.GetProcessorRegistration("debug.log")
|
||||
if !ok {
|
||||
t.Fatalf("debug.log processor not registered")
|
||||
}
|
||||
@@ -89,7 +89,7 @@ func TestBadDebugLog(t *testing.T) {
|
||||
for _, test := range tests {
|
||||
t.Run(test.name, func(t *testing.T) {
|
||||
|
||||
registration, ok := processor.ProcessorRegistry["debug.log"]
|
||||
registration, ok := processor.GetProcessorRegistration("debug.log")
|
||||
if !ok {
|
||||
t.Fatalf("debug.log processor not registered")
|
||||
}
|
||||
@@ -120,7 +120,7 @@ func TestBadDebugLog(t *testing.T) {
|
||||
}
|
||||
|
||||
func BenchmarkDebugLog(b *testing.B) {
|
||||
registration, ok := processor.ProcessorRegistry["debug.log"]
|
||||
registration, ok := processor.GetProcessorRegistration("debug.log")
|
||||
if !ok {
|
||||
b.Fatalf("debug.log processor not registered")
|
||||
}
|
||||
|
||||
@@ -10,7 +10,7 @@ import (
|
||||
)
|
||||
|
||||
func TestFilterChangeFromRegistry(t *testing.T) {
|
||||
registration, ok := processor.ProcessorRegistry["filter.change"]
|
||||
registration, ok := processor.GetProcessorRegistration("filter.change")
|
||||
if !ok {
|
||||
t.Fatalf("filter.change processor not registered")
|
||||
}
|
||||
@@ -58,7 +58,7 @@ func TestGoodFilterChange(t *testing.T) {
|
||||
|
||||
for _, test := range tests {
|
||||
t.Run(test.name, func(t *testing.T) {
|
||||
registration, ok := processor.ProcessorRegistry["filter.change"]
|
||||
registration, ok := processor.GetProcessorRegistration("filter.change")
|
||||
if !ok {
|
||||
t.Fatalf("filter.change processor not registered")
|
||||
}
|
||||
@@ -95,7 +95,7 @@ func TestBadFilterChange(t *testing.T) {
|
||||
|
||||
for _, test := range tests {
|
||||
t.Run(test.name, func(t *testing.T) {
|
||||
registration, ok := processor.ProcessorRegistry["filter.change"]
|
||||
registration, ok := processor.GetProcessorRegistration("filter.change")
|
||||
if !ok {
|
||||
t.Fatalf("filter.change processor not registered")
|
||||
}
|
||||
@@ -126,7 +126,7 @@ func TestBadFilterChange(t *testing.T) {
|
||||
}
|
||||
|
||||
func BenchmarkFilterChange(b *testing.B) {
|
||||
registration, ok := processor.ProcessorRegistry["filter.change"]
|
||||
registration, ok := processor.GetProcessorRegistration("filter.change")
|
||||
if !ok {
|
||||
b.Fatalf("filter.change processor not registered")
|
||||
}
|
||||
|
||||
@@ -10,7 +10,7 @@ import (
|
||||
)
|
||||
|
||||
func TestFilterExprFromRegistry(t *testing.T) {
|
||||
registration, ok := processor.ProcessorRegistry["filter.expr"]
|
||||
registration, ok := processor.GetProcessorRegistration("filter.expr")
|
||||
if !ok {
|
||||
t.Fatalf("filter.expr processor not registered")
|
||||
}
|
||||
@@ -71,7 +71,7 @@ func TestGoodFilterExpr(t *testing.T) {
|
||||
|
||||
for _, testCase := range testCases {
|
||||
t.Run(testCase.name, func(t *testing.T) {
|
||||
registration, ok := processor.ProcessorRegistry["filter.expr"]
|
||||
registration, ok := processor.GetProcessorRegistration("filter.expr")
|
||||
if !ok {
|
||||
t.Fatalf("filter.expr processor not registered")
|
||||
}
|
||||
@@ -144,7 +144,7 @@ func TestBadFilterExpr(t *testing.T) {
|
||||
|
||||
for _, test := range tests {
|
||||
t.Run(test.name, func(t *testing.T) {
|
||||
registration, ok := processor.ProcessorRegistry["filter.expr"]
|
||||
registration, ok := processor.GetProcessorRegistration("filter.expr")
|
||||
if !ok {
|
||||
t.Fatalf("filter.expr processor not registered")
|
||||
}
|
||||
@@ -173,7 +173,7 @@ func TestBadFilterExpr(t *testing.T) {
|
||||
}
|
||||
|
||||
func BenchmarkFilterExpr(b *testing.B) {
|
||||
registration, ok := processor.ProcessorRegistry["filter.expr"]
|
||||
registration, ok := processor.GetProcessorRegistration("filter.expr")
|
||||
if !ok {
|
||||
b.Fatalf("filter.expr processor not registered")
|
||||
}
|
||||
|
||||
@@ -0,0 +1,116 @@
|
||||
package processor_test
|
||||
|
||||
import (
|
||||
"testing"
|
||||
|
||||
"github.com/jwetzell/showbridge-go/internal/common"
|
||||
"github.com/jwetzell/showbridge-go/internal/config"
|
||||
"github.com/jwetzell/showbridge-go/internal/processor"
|
||||
"github.com/jwetzell/showbridge-go/internal/test"
|
||||
)
|
||||
|
||||
func TestFilterRateFromRegistry(t *testing.T) {
|
||||
registration, ok := processor.GetProcessorRegistration("filter.rate")
|
||||
if !ok {
|
||||
t.Fatalf("filter.rate processor not registered")
|
||||
}
|
||||
|
||||
processorInstance, err := registration.New(config.ProcessorConfig{
|
||||
Type: "filter.rate",
|
||||
Params: map[string]any{
|
||||
"rate": 1,
|
||||
},
|
||||
})
|
||||
if err != nil {
|
||||
t.Fatalf("failed to create filter.rate processor: %s", err)
|
||||
}
|
||||
|
||||
if processorInstance.Type() != "filter.rate" {
|
||||
t.Fatalf("filter.rate processor has wrong type: %s", processorInstance.Type())
|
||||
}
|
||||
}
|
||||
|
||||
func TestGoodFilterRate(t *testing.T) {
|
||||
testCases := []struct {
|
||||
name string
|
||||
params map[string]any
|
||||
payload any
|
||||
match bool
|
||||
}{}
|
||||
|
||||
for _, testCase := range testCases {
|
||||
t.Run(testCase.name, func(t *testing.T) {
|
||||
registration, ok := processor.GetProcessorRegistration("filter.rate")
|
||||
if !ok {
|
||||
t.Fatalf("filter.rate processor not registered")
|
||||
}
|
||||
|
||||
processorInstance, err := registration.New(config.ProcessorConfig{
|
||||
Type: "filter.rate",
|
||||
Params: testCase.params,
|
||||
})
|
||||
|
||||
if err != nil {
|
||||
t.Fatalf("filter.rate failed to create processor: %s", err)
|
||||
}
|
||||
|
||||
_, err = processorInstance.Process(t.Context(), common.WrappedPayload{Payload: testCase.payload})
|
||||
// TODO(jwetzell): figure out how to test the rate limiting behavior
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestBadFilterRate(t *testing.T) {
|
||||
tests := []struct {
|
||||
name string
|
||||
params map[string]any
|
||||
payload any
|
||||
errorString string
|
||||
}{
|
||||
{
|
||||
name: "no rate parameter",
|
||||
params: map[string]any{
|
||||
// no rate parameter
|
||||
},
|
||||
payload: test.TestStruct{},
|
||||
errorString: "filter.rate rate error: not found",
|
||||
},
|
||||
{
|
||||
name: "non-int rate parameter",
|
||||
params: map[string]any{
|
||||
"rate": "12345",
|
||||
},
|
||||
payload: test.TestStruct{},
|
||||
errorString: "filter.rate rate error: not a number",
|
||||
},
|
||||
}
|
||||
|
||||
for _, test := range tests {
|
||||
t.Run(test.name, func(t *testing.T) {
|
||||
registration, ok := processor.GetProcessorRegistration("filter.rate")
|
||||
if !ok {
|
||||
t.Fatalf("filter.rate processor not registered")
|
||||
}
|
||||
|
||||
processorInstance, err := registration.New(config.ProcessorConfig{
|
||||
Type: "filter.rate",
|
||||
Params: test.params,
|
||||
})
|
||||
if err != nil {
|
||||
if err.Error() != test.errorString {
|
||||
t.Fatalf("filter.rate got error '%s', expected '%s'", err.Error(), test.errorString)
|
||||
}
|
||||
return
|
||||
}
|
||||
got, err := processorInstance.Process(t.Context(), common.WrappedPayload{Payload: test.payload})
|
||||
|
||||
if err == nil {
|
||||
t.Fatalf("filter.rate expected to fail but succeeded, got: %v", got)
|
||||
|
||||
}
|
||||
if err.Error() != test.errorString {
|
||||
t.Fatalf("filter.rate got error '%s', expected '%s'", err.Error(), test.errorString)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
@@ -10,7 +10,7 @@ import (
|
||||
)
|
||||
|
||||
func TestFilterRegexFromRegistry(t *testing.T) {
|
||||
registration, ok := processor.ProcessorRegistry["filter.regex"]
|
||||
registration, ok := processor.GetProcessorRegistration("filter.regex")
|
||||
if !ok {
|
||||
t.Fatalf("filter.regex processor not registered")
|
||||
}
|
||||
@@ -77,7 +77,7 @@ func TestGoodFilterRegex(t *testing.T) {
|
||||
|
||||
for _, test := range tests {
|
||||
t.Run(test.name, func(t *testing.T) {
|
||||
registration, ok := processor.ProcessorRegistry["filter.regex"]
|
||||
registration, ok := processor.GetProcessorRegistration("filter.regex")
|
||||
if !ok {
|
||||
t.Fatalf("filter.regex processor not registered")
|
||||
}
|
||||
@@ -145,7 +145,7 @@ func TestBadFilterRegex(t *testing.T) {
|
||||
|
||||
for _, test := range tests {
|
||||
t.Run(test.name, func(t *testing.T) {
|
||||
registration, ok := processor.ProcessorRegistry["filter.regex"]
|
||||
registration, ok := processor.GetProcessorRegistration("filter.regex")
|
||||
if !ok {
|
||||
t.Fatalf("filter.regex processor not registered")
|
||||
}
|
||||
@@ -176,7 +176,7 @@ func TestBadFilterRegex(t *testing.T) {
|
||||
}
|
||||
|
||||
func BenchmarkFilterRegex(b *testing.B) {
|
||||
registration, ok := processor.ProcessorRegistry["filter.regex"]
|
||||
registration, ok := processor.GetProcessorRegistration("filter.regex")
|
||||
if !ok {
|
||||
b.Fatalf("filter.regex processor not registered")
|
||||
}
|
||||
|
||||
@@ -10,7 +10,7 @@ import (
|
||||
)
|
||||
|
||||
func TestFloatParseFromRegistry(t *testing.T) {
|
||||
registration, ok := processor.ProcessorRegistry["float.parse"]
|
||||
registration, ok := processor.GetProcessorRegistration("float.parse")
|
||||
if !ok {
|
||||
t.Fatalf("float.parse processor not registered")
|
||||
}
|
||||
@@ -63,7 +63,7 @@ func TestGoodFloatParse(t *testing.T) {
|
||||
|
||||
for _, test := range tests {
|
||||
t.Run(test.name, func(t *testing.T) {
|
||||
registration, ok := processor.ProcessorRegistry["float.parse"]
|
||||
registration, ok := processor.GetProcessorRegistration("float.parse")
|
||||
if !ok {
|
||||
t.Fatalf("float.parse processor not registered")
|
||||
}
|
||||
@@ -136,7 +136,7 @@ func TestBadFloatParse(t *testing.T) {
|
||||
|
||||
for _, test := range tests {
|
||||
t.Run(test.name, func(t *testing.T) {
|
||||
registration, ok := processor.ProcessorRegistry["float.parse"]
|
||||
registration, ok := processor.GetProcessorRegistration("float.parse")
|
||||
if !ok {
|
||||
t.Fatalf("float.parse processor not registered")
|
||||
}
|
||||
@@ -167,7 +167,7 @@ func TestBadFloatParse(t *testing.T) {
|
||||
}
|
||||
|
||||
func BenchmarkFloatParse(b *testing.B) {
|
||||
registration, ok := processor.ProcessorRegistry["float.parse"]
|
||||
registration, ok := processor.GetProcessorRegistration("float.parse")
|
||||
if !ok {
|
||||
b.Fatalf("float.parse processor not registered")
|
||||
}
|
||||
|
||||
@@ -9,7 +9,7 @@ import (
|
||||
)
|
||||
|
||||
func TestFloatRandomFromRegistry(t *testing.T) {
|
||||
registration, ok := processor.ProcessorRegistry["float.random"]
|
||||
registration, ok := processor.GetProcessorRegistration("float.random")
|
||||
if !ok {
|
||||
t.Fatalf("float.random processor not registered")
|
||||
}
|
||||
@@ -57,7 +57,7 @@ func TestGoodFloatRandom(t *testing.T) {
|
||||
|
||||
for _, test := range tests {
|
||||
t.Run(test.name, func(t *testing.T) {
|
||||
registration, ok := processor.ProcessorRegistry["float.random"]
|
||||
registration, ok := processor.GetProcessorRegistration("float.random")
|
||||
if !ok {
|
||||
t.Fatalf("float.random processor not registered")
|
||||
}
|
||||
@@ -155,7 +155,7 @@ func TestBadFloatRandom(t *testing.T) {
|
||||
for _, test := range tests {
|
||||
t.Run(test.name, func(t *testing.T) {
|
||||
|
||||
registration, ok := processor.ProcessorRegistry["float.random"]
|
||||
registration, ok := processor.GetProcessorRegistration("float.random")
|
||||
if !ok {
|
||||
t.Fatalf("float.random processor not registered")
|
||||
}
|
||||
@@ -186,7 +186,7 @@ func TestBadFloatRandom(t *testing.T) {
|
||||
}
|
||||
|
||||
func BenchmarkFloatRandom(b *testing.B) {
|
||||
registration, ok := processor.ProcessorRegistry["float.random"]
|
||||
registration, ok := processor.GetProcessorRegistration("float.random")
|
||||
if !ok {
|
||||
b.Fatalf("float.random processor not registered")
|
||||
}
|
||||
|
||||
@@ -11,7 +11,7 @@ import (
|
||||
)
|
||||
|
||||
func TestFreeDCreateFromRegistry(t *testing.T) {
|
||||
registration, ok := processor.ProcessorRegistry["freed.create"]
|
||||
registration, ok := processor.GetProcessorRegistration("freed.create")
|
||||
if !ok {
|
||||
t.Fatalf("freed.create processor not registered")
|
||||
}
|
||||
@@ -89,7 +89,7 @@ func TestGoodFreeDCreate(t *testing.T) {
|
||||
for _, test := range tests {
|
||||
t.Run(test.name, func(t *testing.T) {
|
||||
|
||||
registration, ok := processor.ProcessorRegistry["freed.create"]
|
||||
registration, ok := processor.GetProcessorRegistration("freed.create")
|
||||
if !ok {
|
||||
t.Fatalf("freed.create processor not registered")
|
||||
}
|
||||
@@ -848,7 +848,7 @@ func TestBadFreeDCreate(t *testing.T) {
|
||||
for _, test := range tests {
|
||||
t.Run(test.name, func(t *testing.T) {
|
||||
|
||||
registration, ok := processor.ProcessorRegistry["freed.create"]
|
||||
registration, ok := processor.GetProcessorRegistration("freed.create")
|
||||
if !ok {
|
||||
t.Fatalf("freed.create processor not registered")
|
||||
}
|
||||
@@ -879,7 +879,7 @@ func TestBadFreeDCreate(t *testing.T) {
|
||||
}
|
||||
|
||||
func BenchmarkFreeDCreate(b *testing.B) {
|
||||
registration, ok := processor.ProcessorRegistry["freed.create"]
|
||||
registration, ok := processor.GetProcessorRegistration("freed.create")
|
||||
if !ok {
|
||||
b.Fatalf("freed.create processor not registered")
|
||||
}
|
||||
|
||||
@@ -11,7 +11,7 @@ import (
|
||||
)
|
||||
|
||||
func TestFreeDDecodeFromRegistry(t *testing.T) {
|
||||
registration, ok := processor.ProcessorRegistry["freed.decode"]
|
||||
registration, ok := processor.GetProcessorRegistration("freed.decode")
|
||||
if !ok {
|
||||
t.Fatalf("freed.decode processor not registered")
|
||||
}
|
||||
|
||||
@@ -11,7 +11,7 @@ import (
|
||||
)
|
||||
|
||||
func TestFreeDEncodeFromRegistry(t *testing.T) {
|
||||
registration, ok := processor.ProcessorRegistry["freed.encode"]
|
||||
registration, ok := processor.GetProcessorRegistration("freed.encode")
|
||||
if !ok {
|
||||
t.Fatalf("freed.encode processor not registered")
|
||||
}
|
||||
|
||||
@@ -10,7 +10,7 @@ import (
|
||||
)
|
||||
|
||||
func TestHTTPRequestCreateFromRegistry(t *testing.T) {
|
||||
registration, ok := processor.ProcessorRegistry["http.request.do"]
|
||||
registration, ok := processor.GetProcessorRegistration("http.request.do")
|
||||
if !ok {
|
||||
t.Fatalf("http.request.do processor not registered")
|
||||
}
|
||||
@@ -44,7 +44,7 @@ func TestGoodHTTPRequestDo(t *testing.T) {
|
||||
for _, test := range tests {
|
||||
t.Run(test.name, func(t *testing.T) {
|
||||
|
||||
registration, ok := processor.ProcessorRegistry["http.request.do"]
|
||||
registration, ok := processor.GetProcessorRegistration("http.request.do")
|
||||
if !ok {
|
||||
t.Fatalf("http.request.do processor not registered")
|
||||
}
|
||||
@@ -132,7 +132,7 @@ func TestBadHTTPRequestDo(t *testing.T) {
|
||||
for _, test := range tests {
|
||||
t.Run(test.name, func(t *testing.T) {
|
||||
|
||||
registration, ok := processor.ProcessorRegistry["http.request.do"]
|
||||
registration, ok := processor.GetProcessorRegistration("http.request.do")
|
||||
if !ok {
|
||||
t.Fatalf("http.request.do processor not registered")
|
||||
}
|
||||
|
||||
@@ -10,7 +10,7 @@ import (
|
||||
)
|
||||
|
||||
func TestHTTPResponseCreateFromRegistry(t *testing.T) {
|
||||
registration, ok := processor.ProcessorRegistry["http.response.create"]
|
||||
registration, ok := processor.GetProcessorRegistration("http.response.create")
|
||||
if !ok {
|
||||
t.Fatalf("http.response.create processor not registered")
|
||||
}
|
||||
@@ -54,7 +54,7 @@ func TestGoodHTTPResponseCreate(t *testing.T) {
|
||||
for _, test := range tests {
|
||||
t.Run(test.name, func(t *testing.T) {
|
||||
|
||||
registration, ok := processor.ProcessorRegistry["http.response.create"]
|
||||
registration, ok := processor.GetProcessorRegistration("http.response.create")
|
||||
if !ok {
|
||||
t.Fatalf("http.response.create processor not registered")
|
||||
}
|
||||
@@ -128,7 +128,7 @@ func TestBadHTTPResponseCreate(t *testing.T) {
|
||||
for _, test := range tests {
|
||||
t.Run(test.name, func(t *testing.T) {
|
||||
|
||||
registration, ok := processor.ProcessorRegistry["http.response.create"]
|
||||
registration, ok := processor.GetProcessorRegistration("http.response.create")
|
||||
if !ok {
|
||||
t.Fatalf("http.response.create processor not registered")
|
||||
}
|
||||
@@ -159,7 +159,7 @@ func TestBadHTTPResponseCreate(t *testing.T) {
|
||||
}
|
||||
|
||||
func BenchmarkHTTPResponseCreate(b *testing.B) {
|
||||
registration, ok := processor.ProcessorRegistry["http.response.create"]
|
||||
registration, ok := processor.GetProcessorRegistration("http.response.create")
|
||||
if !ok {
|
||||
b.Fatalf("http.response.create processor not registered")
|
||||
}
|
||||
|
||||
@@ -10,7 +10,7 @@ import (
|
||||
)
|
||||
|
||||
func TestIntParseFromRegistry(t *testing.T) {
|
||||
registration, ok := processor.ProcessorRegistry["int.parse"]
|
||||
registration, ok := processor.GetProcessorRegistration("int.parse")
|
||||
if !ok {
|
||||
t.Fatalf("int.parse processor not registered")
|
||||
}
|
||||
@@ -84,7 +84,7 @@ func TestGoodIntParse(t *testing.T) {
|
||||
|
||||
for _, test := range tests {
|
||||
t.Run(test.name, func(t *testing.T) {
|
||||
registration, ok := processor.ProcessorRegistry["int.parse"]
|
||||
registration, ok := processor.GetProcessorRegistration("int.parse")
|
||||
if !ok {
|
||||
t.Fatalf("int.parse processor not registered")
|
||||
}
|
||||
@@ -170,7 +170,7 @@ func TestBadIntParse(t *testing.T) {
|
||||
|
||||
for _, test := range tests {
|
||||
t.Run(test.name, func(t *testing.T) {
|
||||
registration, ok := processor.ProcessorRegistry["int.parse"]
|
||||
registration, ok := processor.GetProcessorRegistration("int.parse")
|
||||
if !ok {
|
||||
t.Fatalf("int.parse processor not registered")
|
||||
}
|
||||
@@ -201,7 +201,7 @@ func TestBadIntParse(t *testing.T) {
|
||||
}
|
||||
|
||||
func BenchmarkIntParse(b *testing.B) {
|
||||
registration, ok := processor.ProcessorRegistry["int.parse"]
|
||||
registration, ok := processor.GetProcessorRegistration("int.parse")
|
||||
if !ok {
|
||||
b.Fatalf("int.parse processor not registered")
|
||||
}
|
||||
|
||||
@@ -9,7 +9,7 @@ import (
|
||||
)
|
||||
|
||||
func TestIntRandomFromRegistry(t *testing.T) {
|
||||
registration, ok := processor.ProcessorRegistry["int.random"]
|
||||
registration, ok := processor.GetProcessorRegistration("int.random")
|
||||
if !ok {
|
||||
t.Fatalf("int.random processor not registered")
|
||||
}
|
||||
@@ -32,7 +32,7 @@ func TestIntRandomFromRegistry(t *testing.T) {
|
||||
}
|
||||
|
||||
func TestIntRandomGoodConfig(t *testing.T) {
|
||||
registration, ok := processor.ProcessorRegistry["int.random"]
|
||||
registration, ok := processor.GetProcessorRegistration("int.random")
|
||||
if !ok {
|
||||
t.Fatalf("int.random processor not registered")
|
||||
}
|
||||
@@ -84,7 +84,7 @@ func TestGoodIntRandom(t *testing.T) {
|
||||
|
||||
for _, test := range tests {
|
||||
t.Run(test.name, func(t *testing.T) {
|
||||
registration, ok := processor.ProcessorRegistry["int.random"]
|
||||
registration, ok := processor.GetProcessorRegistration("int.random")
|
||||
if !ok {
|
||||
t.Fatalf("int.random processor not registered")
|
||||
}
|
||||
@@ -166,7 +166,7 @@ func TestBadIntRandom(t *testing.T) {
|
||||
for _, test := range tests {
|
||||
t.Run(test.name, func(t *testing.T) {
|
||||
|
||||
registration, ok := processor.ProcessorRegistry["int.random"]
|
||||
registration, ok := processor.GetProcessorRegistration("int.random")
|
||||
if !ok {
|
||||
t.Fatalf("int.random processor not registered")
|
||||
}
|
||||
@@ -197,7 +197,7 @@ func TestBadIntRandom(t *testing.T) {
|
||||
}
|
||||
|
||||
func BenchmarkIntRandom(b *testing.B) {
|
||||
registration, ok := processor.ProcessorRegistry["int.random"]
|
||||
registration, ok := processor.GetProcessorRegistration("int.random")
|
||||
if !ok {
|
||||
b.Fatalf("int.random processor not registered")
|
||||
}
|
||||
|
||||
@@ -9,7 +9,7 @@ import (
|
||||
)
|
||||
|
||||
func TestIntScaleFromRegistry(t *testing.T) {
|
||||
registration, ok := processor.ProcessorRegistry["int.scale"]
|
||||
registration, ok := processor.GetProcessorRegistration("int.scale")
|
||||
if !ok {
|
||||
t.Fatalf("int.scale processor not registered")
|
||||
}
|
||||
@@ -55,7 +55,7 @@ func TestGoodIntScale(t *testing.T) {
|
||||
|
||||
for _, test := range tests {
|
||||
t.Run(test.name, func(t *testing.T) {
|
||||
registration, ok := processor.ProcessorRegistry["int.scale"]
|
||||
registration, ok := processor.GetProcessorRegistration("int.scale")
|
||||
if !ok {
|
||||
t.Fatalf("int.scale processor not registered")
|
||||
}
|
||||
@@ -140,7 +140,7 @@ func TestBadIntScale(t *testing.T) {
|
||||
for _, test := range tests {
|
||||
t.Run(test.name, func(t *testing.T) {
|
||||
|
||||
registration, ok := processor.ProcessorRegistry["int.scale"]
|
||||
registration, ok := processor.GetProcessorRegistration("int.scale")
|
||||
if !ok {
|
||||
t.Fatalf("int.scale processor not registered")
|
||||
}
|
||||
@@ -171,7 +171,7 @@ func TestBadIntScale(t *testing.T) {
|
||||
}
|
||||
|
||||
func BenchmarkIntScale(b *testing.B) {
|
||||
registration, ok := processor.ProcessorRegistry["int.scale"]
|
||||
registration, ok := processor.GetProcessorRegistration("int.scale")
|
||||
if !ok {
|
||||
b.Fatalf("int.scale processor not registered")
|
||||
}
|
||||
|
||||
@@ -11,7 +11,7 @@ import (
|
||||
)
|
||||
|
||||
func TestJsonDecodeFromRegistry(t *testing.T) {
|
||||
registration, ok := processor.ProcessorRegistry["json.decode"]
|
||||
registration, ok := processor.GetProcessorRegistration("json.decode")
|
||||
if !ok {
|
||||
t.Fatalf("json.decode processor not registered")
|
||||
}
|
||||
@@ -127,7 +127,7 @@ func TestBadJsonDecode(t *testing.T) {
|
||||
}
|
||||
|
||||
func BenchmarkJsonDecode(b *testing.B) {
|
||||
registration, ok := processor.ProcessorRegistry["json.decode"]
|
||||
registration, ok := processor.GetProcessorRegistration("json.decode")
|
||||
if !ok {
|
||||
b.Fatalf("json.decode processor not registered")
|
||||
}
|
||||
|
||||
@@ -12,7 +12,7 @@ import (
|
||||
)
|
||||
|
||||
func TestJsonEncodeFromRegistry(t *testing.T) {
|
||||
registration, ok := processor.ProcessorRegistry["json.encode"]
|
||||
registration, ok := processor.GetProcessorRegistration("json.encode")
|
||||
if !ok {
|
||||
t.Fatalf("json.encode processor not registered")
|
||||
}
|
||||
@@ -116,7 +116,7 @@ func TestBadJsonEncode(t *testing.T) {
|
||||
}
|
||||
|
||||
func BenchmarkJsonEncode(b *testing.B) {
|
||||
registration, ok := processor.ProcessorRegistry["json.encode"]
|
||||
registration, ok := processor.GetProcessorRegistration("json.encode")
|
||||
if !ok {
|
||||
b.Fatalf("json.encode processor not registered")
|
||||
}
|
||||
|
||||
@@ -11,7 +11,7 @@ import (
|
||||
)
|
||||
|
||||
func TestKvGetFromRegistry(t *testing.T) {
|
||||
registration, ok := processor.ProcessorRegistry["kv.get"]
|
||||
registration, ok := processor.GetProcessorRegistration("kv.get")
|
||||
if !ok {
|
||||
t.Fatalf("kv.get processor not registered")
|
||||
}
|
||||
@@ -75,7 +75,7 @@ func TestGoodKvGet(t *testing.T) {
|
||||
}
|
||||
for _, testCase := range testCases {
|
||||
t.Run(testCase.name, func(t *testing.T) {
|
||||
registration, ok := processor.ProcessorRegistry["kv.get"]
|
||||
registration, ok := processor.GetProcessorRegistration("kv.get")
|
||||
if !ok {
|
||||
t.Fatalf("kv.get processor not registered")
|
||||
}
|
||||
@@ -198,7 +198,7 @@ func TestBadKvGet(t *testing.T) {
|
||||
for _, test := range tests {
|
||||
t.Run(test.name, func(t *testing.T) {
|
||||
|
||||
registration, ok := processor.ProcessorRegistry["kv.get"]
|
||||
registration, ok := processor.GetProcessorRegistration("kv.get")
|
||||
if !ok {
|
||||
t.Fatalf("kv.get processor not registered")
|
||||
}
|
||||
@@ -229,7 +229,7 @@ func TestBadKvGet(t *testing.T) {
|
||||
}
|
||||
|
||||
func BenchmarkKvGet(b *testing.B) {
|
||||
registration, ok := processor.ProcessorRegistry["kv.get"]
|
||||
registration, ok := processor.GetProcessorRegistration("kv.get")
|
||||
if !ok {
|
||||
b.Fatalf("kv.get processor not registered")
|
||||
}
|
||||
|
||||
@@ -11,7 +11,7 @@ import (
|
||||
)
|
||||
|
||||
func TestKvSetFromRegistry(t *testing.T) {
|
||||
registration, ok := processor.ProcessorRegistry["kv.set"]
|
||||
registration, ok := processor.GetProcessorRegistration("kv.set")
|
||||
if !ok {
|
||||
t.Fatalf("kv.set processor not registered")
|
||||
}
|
||||
@@ -69,7 +69,7 @@ func TestGoodKvSet(t *testing.T) {
|
||||
}
|
||||
for _, testCase := range testCases {
|
||||
t.Run(testCase.name, func(t *testing.T) {
|
||||
registration, ok := processor.ProcessorRegistry["kv.set"]
|
||||
registration, ok := processor.GetProcessorRegistration("kv.set")
|
||||
if !ok {
|
||||
t.Fatalf("kv.set processor not registered")
|
||||
}
|
||||
@@ -192,7 +192,7 @@ func TestBadKvSet(t *testing.T) {
|
||||
for _, testCase := range testCases {
|
||||
t.Run(testCase.name, func(t *testing.T) {
|
||||
|
||||
registration, ok := processor.ProcessorRegistry["kv.set"]
|
||||
registration, ok := processor.GetProcessorRegistration("kv.set")
|
||||
if !ok {
|
||||
t.Fatalf("kv.set processor not registered")
|
||||
}
|
||||
@@ -223,7 +223,7 @@ func TestBadKvSet(t *testing.T) {
|
||||
}
|
||||
|
||||
func BenchmarkKvSet(b *testing.B) {
|
||||
registration, ok := processor.ProcessorRegistry["kv.set"]
|
||||
registration, ok := processor.GetProcessorRegistration("kv.set")
|
||||
if !ok {
|
||||
b.Fatalf("kv.set processor not registered")
|
||||
}
|
||||
|
||||
@@ -11,7 +11,7 @@ import (
|
||||
)
|
||||
|
||||
func TestMIDIControlChangeCreateFromRegistry(t *testing.T) {
|
||||
registration, ok := processor.ProcessorRegistry["midi.control_change.create"]
|
||||
registration, ok := processor.GetProcessorRegistration("midi.control_change.create")
|
||||
if !ok {
|
||||
t.Fatalf("midi.control_change.create processor not registered")
|
||||
}
|
||||
@@ -57,7 +57,7 @@ func TestGoodMIDIControlChangeCreate(t *testing.T) {
|
||||
|
||||
for _, test := range tests {
|
||||
t.Run(test.name, func(t *testing.T) {
|
||||
registration, ok := processor.ProcessorRegistry["midi.control_change.create"]
|
||||
registration, ok := processor.GetProcessorRegistration("midi.control_change.create")
|
||||
if !ok {
|
||||
t.Fatalf("midi.control_change.create processor not registered")
|
||||
}
|
||||
@@ -130,7 +130,7 @@ func TestBadMIDIControlChangeCreate(t *testing.T) {
|
||||
|
||||
for _, test := range tests {
|
||||
t.Run(test.name, func(t *testing.T) {
|
||||
registration, ok := processor.ProcessorRegistry["midi.control_change.create"]
|
||||
registration, ok := processor.GetProcessorRegistration("midi.control_change.create")
|
||||
if !ok {
|
||||
t.Fatalf("midi.control_change.create processor not registered")
|
||||
}
|
||||
@@ -161,7 +161,7 @@ func TestBadMIDIControlChangeCreate(t *testing.T) {
|
||||
}
|
||||
|
||||
func BenchmarkMIDIControlChangeCreate(b *testing.B) {
|
||||
registration, ok := processor.ProcessorRegistry["midi.control_change.create"]
|
||||
registration, ok := processor.GetProcessorRegistration("midi.control_change.create")
|
||||
if !ok {
|
||||
b.Fatalf("midi.control_change.create processor not registered")
|
||||
}
|
||||
|
||||
@@ -11,7 +11,7 @@ import (
|
||||
)
|
||||
|
||||
func TestMIDIMessageDecodeFromRegistry(t *testing.T) {
|
||||
registration, ok := processor.ProcessorRegistry["midi.message.decode"]
|
||||
registration, ok := processor.GetProcessorRegistration("midi.message.decode")
|
||||
if !ok {
|
||||
t.Fatalf("midi.message.decode processor not registered")
|
||||
}
|
||||
|
||||
@@ -11,7 +11,7 @@ import (
|
||||
)
|
||||
|
||||
func TestMIDIMessageEncodeFromRegistry(t *testing.T) {
|
||||
registration, ok := processor.ProcessorRegistry["midi.message.encode"]
|
||||
registration, ok := processor.GetProcessorRegistration("midi.message.encode")
|
||||
if !ok {
|
||||
t.Fatalf("midi.message.encode processor not registered")
|
||||
}
|
||||
|
||||
@@ -11,7 +11,7 @@ import (
|
||||
)
|
||||
|
||||
func TestMIDIMessageUnpackFromRegistry(t *testing.T) {
|
||||
registration, ok := processor.ProcessorRegistry["midi.message.unpack"]
|
||||
registration, ok := processor.GetProcessorRegistration("midi.message.unpack")
|
||||
if !ok {
|
||||
t.Fatalf("midi.message.unpack processor not registered")
|
||||
}
|
||||
@@ -121,7 +121,7 @@ func TestBadMIDIMessageUnpack(t *testing.T) {
|
||||
for _, test := range tests {
|
||||
t.Run(test.name, func(t *testing.T) {
|
||||
|
||||
registration, ok := processor.ProcessorRegistry["midi.message.unpack"]
|
||||
registration, ok := processor.GetProcessorRegistration("midi.message.unpack")
|
||||
if !ok {
|
||||
t.Fatalf("midi.message.unpack processor not registered")
|
||||
}
|
||||
|
||||
@@ -11,7 +11,7 @@ import (
|
||||
)
|
||||
|
||||
func TestMIDINoteOffCreteaFromRegistry(t *testing.T) {
|
||||
registration, ok := processor.ProcessorRegistry["midi.note_off.create"]
|
||||
registration, ok := processor.GetProcessorRegistration("midi.note_off.create")
|
||||
if !ok {
|
||||
t.Fatalf("midi.note_off.create processor not registered")
|
||||
}
|
||||
@@ -56,7 +56,7 @@ func TestGoodMIDINoteOffCretea(t *testing.T) {
|
||||
|
||||
for _, test := range tests {
|
||||
t.Run(test.name, func(t *testing.T) {
|
||||
registration, ok := processor.ProcessorRegistry["midi.note_off.create"]
|
||||
registration, ok := processor.GetProcessorRegistration("midi.note_off.create")
|
||||
if !ok {
|
||||
t.Fatalf("midi.note_off.create processor not registered")
|
||||
}
|
||||
@@ -129,7 +129,7 @@ func TestBadMIDINoteOffCretea(t *testing.T) {
|
||||
|
||||
for _, test := range tests {
|
||||
t.Run(test.name, func(t *testing.T) {
|
||||
registration, ok := processor.ProcessorRegistry["midi.note_off.create"]
|
||||
registration, ok := processor.GetProcessorRegistration("midi.note_off.create")
|
||||
if !ok {
|
||||
t.Fatalf("midi.note_off.create processor not registered")
|
||||
}
|
||||
@@ -160,7 +160,7 @@ func TestBadMIDINoteOffCretea(t *testing.T) {
|
||||
}
|
||||
|
||||
func BenchmarkMIDINoteOffCreate(b *testing.B) {
|
||||
registration, ok := processor.ProcessorRegistry["midi.note_off.create"]
|
||||
registration, ok := processor.GetProcessorRegistration("midi.note_off.create")
|
||||
if !ok {
|
||||
b.Fatalf("midi.note_off.create processor not registered")
|
||||
}
|
||||
|
||||
@@ -11,7 +11,7 @@ import (
|
||||
)
|
||||
|
||||
func TestMIDINoteOnCreateFromRegistry(t *testing.T) {
|
||||
registration, ok := processor.ProcessorRegistry["midi.note_on.create"]
|
||||
registration, ok := processor.GetProcessorRegistration("midi.note_on.create")
|
||||
if !ok {
|
||||
t.Fatalf("midi.note_on.create processor not registered")
|
||||
}
|
||||
@@ -56,7 +56,7 @@ func TestGoodMIDINoteOnCreate(t *testing.T) {
|
||||
|
||||
for _, test := range tests {
|
||||
t.Run(test.name, func(t *testing.T) {
|
||||
registration, ok := processor.ProcessorRegistry["midi.note_on.create"]
|
||||
registration, ok := processor.GetProcessorRegistration("midi.note_on.create")
|
||||
if !ok {
|
||||
t.Fatalf("midi.note_on.create processor not registered")
|
||||
}
|
||||
@@ -126,7 +126,7 @@ func TestBadMIDINoteOnCreate(t *testing.T) {
|
||||
|
||||
for _, test := range tests {
|
||||
t.Run(test.name, func(t *testing.T) {
|
||||
registration, ok := processor.ProcessorRegistry["midi.note_on.create"]
|
||||
registration, ok := processor.GetProcessorRegistration("midi.note_on.create")
|
||||
if !ok {
|
||||
t.Fatalf("midi.note_on.create processor not registered")
|
||||
}
|
||||
@@ -157,7 +157,7 @@ func TestBadMIDINoteOnCreate(t *testing.T) {
|
||||
}
|
||||
|
||||
func BenchmarkMIDINoteOnCreate(b *testing.B) {
|
||||
registration, ok := processor.ProcessorRegistry["midi.note_on.create"]
|
||||
registration, ok := processor.GetProcessorRegistration("midi.note_on.create")
|
||||
if !ok {
|
||||
b.Fatalf("midi.note_on.create processor not registered")
|
||||
}
|
||||
|
||||
@@ -11,7 +11,7 @@ import (
|
||||
)
|
||||
|
||||
func TestMIDIProgramChangeCreateFromRegistry(t *testing.T) {
|
||||
registration, ok := processor.ProcessorRegistry["midi.program_change.create"]
|
||||
registration, ok := processor.GetProcessorRegistration("midi.program_change.create")
|
||||
if !ok {
|
||||
t.Fatalf("midi.program_change.create processor not registered")
|
||||
}
|
||||
@@ -55,7 +55,7 @@ func TestGoodMIDIProgramChangeCreate(t *testing.T) {
|
||||
|
||||
for _, test := range tests {
|
||||
t.Run(test.name, func(t *testing.T) {
|
||||
registration, ok := processor.ProcessorRegistry["midi.program_change.create"]
|
||||
registration, ok := processor.GetProcessorRegistration("midi.program_change.create")
|
||||
if !ok {
|
||||
t.Fatalf("midi.program_change.create processor not registered")
|
||||
}
|
||||
@@ -116,7 +116,7 @@ func TestBadMIDIProgramChangeCreate(t *testing.T) {
|
||||
|
||||
for _, test := range tests {
|
||||
t.Run(test.name, func(t *testing.T) {
|
||||
registration, ok := processor.ProcessorRegistry["midi.program_change.create"]
|
||||
registration, ok := processor.GetProcessorRegistration("midi.program_change.create")
|
||||
if !ok {
|
||||
t.Fatalf("midi.program_change.create processor not registered")
|
||||
}
|
||||
@@ -147,7 +147,7 @@ func TestBadMIDIProgramChangeCreate(t *testing.T) {
|
||||
}
|
||||
|
||||
func BenchmarkMIDIProgramChangeCreate(b *testing.B) {
|
||||
registration, ok := processor.ProcessorRegistry["midi.program_change.create"]
|
||||
registration, ok := processor.GetProcessorRegistration("midi.program_change.create")
|
||||
if !ok {
|
||||
b.Fatalf("midi.program_change.create processor not registered")
|
||||
}
|
||||
|
||||
@@ -11,7 +11,7 @@ import (
|
||||
)
|
||||
|
||||
func TestModuleOutputFromRegistry(t *testing.T) {
|
||||
registration, ok := processor.ProcessorRegistry["module.output"]
|
||||
registration, ok := processor.GetProcessorRegistration("module.output")
|
||||
if !ok {
|
||||
t.Fatalf("module.output processor not registered")
|
||||
}
|
||||
@@ -37,9 +37,9 @@ func TestModuleOutputFromRegistry(t *testing.T) {
|
||||
router := test.GetNewTestRouter()
|
||||
|
||||
got, err := processorInstance.Process(t.Context(), common.WrappedPayload{
|
||||
InputHandler: router.HandleInput,
|
||||
Modules: map[string]common.Module{"test": &test.TestOutputModule{}},
|
||||
Payload: payload,
|
||||
InputHandler: router.HandleInput,
|
||||
Modules: map[string]common.Module{"test": &test.TestOutputModule{}},
|
||||
Payload: payload,
|
||||
})
|
||||
if err != nil {
|
||||
t.Fatalf("module.output processing failed: %s", err)
|
||||
@@ -62,7 +62,7 @@ func TestGoodModuleOutput(t *testing.T) {
|
||||
for _, testCase := range testCases {
|
||||
t.Run(testCase.name, func(t *testing.T) {
|
||||
|
||||
registration, ok := processor.ProcessorRegistry["module.output"]
|
||||
registration, ok := processor.GetProcessorRegistration("module.output")
|
||||
if !ok {
|
||||
t.Fatalf("module.output processor not registered")
|
||||
}
|
||||
@@ -126,7 +126,7 @@ func TestBadModuleOutput(t *testing.T) {
|
||||
for _, testCase := range testCases {
|
||||
t.Run(testCase.name, func(t *testing.T) {
|
||||
|
||||
registration, ok := processor.ProcessorRegistry["module.output"]
|
||||
registration, ok := processor.GetProcessorRegistration("module.output")
|
||||
if !ok {
|
||||
t.Fatalf("module.output processor not registered")
|
||||
}
|
||||
|
||||
@@ -11,7 +11,7 @@ import (
|
||||
)
|
||||
|
||||
func TestOSCMessageCreateFromRegistry(t *testing.T) {
|
||||
registration, ok := processor.ProcessorRegistry["osc.message.create"]
|
||||
registration, ok := processor.GetProcessorRegistration("osc.message.create")
|
||||
if !ok {
|
||||
t.Fatalf("osc.message.create processor not registered")
|
||||
}
|
||||
@@ -146,7 +146,7 @@ func TestGoodOSCMessageCreate(t *testing.T) {
|
||||
|
||||
for _, test := range tests {
|
||||
t.Run(test.name, func(t *testing.T) {
|
||||
registration, ok := processor.ProcessorRegistry["osc.message.create"]
|
||||
registration, ok := processor.GetProcessorRegistration("osc.message.create")
|
||||
if !ok {
|
||||
t.Fatalf("osc.message.create processor not registered")
|
||||
}
|
||||
@@ -371,7 +371,7 @@ func TestBadOSCMessageCreate(t *testing.T) {
|
||||
|
||||
for _, test := range tests {
|
||||
t.Run(test.name, func(t *testing.T) {
|
||||
registration, ok := processor.ProcessorRegistry["osc.message.create"]
|
||||
registration, ok := processor.GetProcessorRegistration("osc.message.create")
|
||||
if !ok {
|
||||
t.Fatalf("osc.message.create processor not registered")
|
||||
}
|
||||
@@ -402,7 +402,7 @@ func TestBadOSCMessageCreate(t *testing.T) {
|
||||
}
|
||||
|
||||
func BenchmarkOSCMessageCreate(b *testing.B) {
|
||||
registration, ok := processor.ProcessorRegistry["osc.message.create"]
|
||||
registration, ok := processor.GetProcessorRegistration("osc.message.create")
|
||||
if !ok {
|
||||
b.Fatalf("osc.message.create processor not registered")
|
||||
}
|
||||
|
||||
@@ -11,7 +11,7 @@ import (
|
||||
)
|
||||
|
||||
func TestOSCMessageDecodeFromRegistry(t *testing.T) {
|
||||
registration, ok := processor.ProcessorRegistry["osc.message.decode"]
|
||||
registration, ok := processor.GetProcessorRegistration("osc.message.decode")
|
||||
if !ok {
|
||||
t.Fatalf("osc.message.decode processor not registered")
|
||||
}
|
||||
|
||||
@@ -11,7 +11,7 @@ import (
|
||||
)
|
||||
|
||||
func TestOSCMessageEncodeFromRegistry(t *testing.T) {
|
||||
registration, ok := processor.ProcessorRegistry["osc.message.encode"]
|
||||
registration, ok := processor.GetProcessorRegistration("osc.message.encode")
|
||||
if !ok {
|
||||
t.Fatalf("osc.message.encode processor not registered")
|
||||
}
|
||||
|
||||
@@ -12,7 +12,7 @@ import (
|
||||
)
|
||||
|
||||
func TestPubSubPublishFromRegistry(t *testing.T) {
|
||||
registration, ok := processor.ProcessorRegistry["pubsub.publish"]
|
||||
registration, ok := processor.GetProcessorRegistration("pubsub.publish")
|
||||
if !ok {
|
||||
t.Fatalf("pubsub.publish processor not registered")
|
||||
}
|
||||
@@ -70,7 +70,7 @@ func TestGoodPubSubPublish(t *testing.T) {
|
||||
}
|
||||
for _, testCase := range testCases {
|
||||
t.Run(testCase.name, func(t *testing.T) {
|
||||
registration, ok := processor.ProcessorRegistry["pubsub.publish"]
|
||||
registration, ok := processor.GetProcessorRegistration("pubsub.publish")
|
||||
if !ok {
|
||||
t.Fatalf("pubsub.publish processor not registered")
|
||||
}
|
||||
@@ -217,7 +217,7 @@ func TestBadPubSubPublish(t *testing.T) {
|
||||
for _, test := range tests {
|
||||
t.Run(test.name, func(t *testing.T) {
|
||||
|
||||
registration, ok := processor.ProcessorRegistry["pubsub.publish"]
|
||||
registration, ok := processor.GetProcessorRegistration("pubsub.publish")
|
||||
if !ok {
|
||||
t.Fatalf("pubsub.publish processor not registered")
|
||||
}
|
||||
|
||||
@@ -11,7 +11,7 @@ import (
|
||||
)
|
||||
|
||||
func TestRouterInputFromRegistry(t *testing.T) {
|
||||
registration, ok := processor.ProcessorRegistry["router.input"]
|
||||
registration, ok := processor.GetProcessorRegistration("router.input")
|
||||
if !ok {
|
||||
t.Fatalf("router.input processor not registered")
|
||||
}
|
||||
@@ -35,8 +35,8 @@ func TestRouterInputFromRegistry(t *testing.T) {
|
||||
expected := "test"
|
||||
|
||||
got, err := processorInstance.Process(t.Context(), common.WrappedPayload{
|
||||
InputHandler: test.GetNewTestRouter().HandleInput,
|
||||
Payload: payload,
|
||||
InputHandler: test.GetNewTestRouter().HandleInput,
|
||||
Payload: payload,
|
||||
})
|
||||
if err != nil {
|
||||
t.Fatalf("router.input processing failed: %s", err)
|
||||
@@ -59,7 +59,7 @@ func TestGoodRouterInput(t *testing.T) {
|
||||
for _, testCase := range testCases {
|
||||
t.Run(testCase.name, func(t *testing.T) {
|
||||
|
||||
registration, ok := processor.ProcessorRegistry["router.input"]
|
||||
registration, ok := processor.GetProcessorRegistration("router.input")
|
||||
if !ok {
|
||||
t.Fatalf("router.input processor not registered")
|
||||
}
|
||||
@@ -95,36 +95,36 @@ func TestBadRouterInput(t *testing.T) {
|
||||
errorString string
|
||||
}{
|
||||
{
|
||||
name: "no source param",
|
||||
params: map[string]any{},
|
||||
payload: "test",
|
||||
inputHandler: router.HandleInput,
|
||||
errorString: "router.input source error: not found",
|
||||
name: "no source param",
|
||||
params: map[string]any{},
|
||||
payload: "test",
|
||||
inputHandler: router.HandleInput,
|
||||
errorString: "router.input source error: not found",
|
||||
},
|
||||
{
|
||||
name: "non-string source",
|
||||
params: map[string]any{
|
||||
"source": 123,
|
||||
},
|
||||
payload: "test",
|
||||
inputHandler: router.HandleInput,
|
||||
errorString: "router.input source error: not a string",
|
||||
payload: "test",
|
||||
inputHandler: router.HandleInput,
|
||||
errorString: "router.input source error: not a string",
|
||||
},
|
||||
{
|
||||
name: "router not found in context",
|
||||
params: map[string]any{
|
||||
"source": "test",
|
||||
},
|
||||
payload: "test",
|
||||
inputHandler: nil,
|
||||
errorString: "router.input no input handler found",
|
||||
payload: "test",
|
||||
inputHandler: nil,
|
||||
errorString: "router.input no input handler found",
|
||||
},
|
||||
}
|
||||
|
||||
for _, testCase := range testCases {
|
||||
t.Run(testCase.name, func(t *testing.T) {
|
||||
|
||||
registration, ok := processor.ProcessorRegistry["router.input"]
|
||||
registration, ok := processor.GetProcessorRegistration("router.input")
|
||||
if !ok {
|
||||
t.Fatalf("router.input processor not registered")
|
||||
}
|
||||
|
||||
@@ -9,7 +9,7 @@ import (
|
||||
)
|
||||
|
||||
func TestScriptExprFromRegistry(t *testing.T) {
|
||||
registration, ok := processor.ProcessorRegistry["script.expr"]
|
||||
registration, ok := processor.GetProcessorRegistration("script.expr")
|
||||
if !ok {
|
||||
t.Fatalf("script.expr processor not registered")
|
||||
}
|
||||
@@ -62,7 +62,7 @@ func TestGoodScriptExpr(t *testing.T) {
|
||||
|
||||
for _, test := range tests {
|
||||
t.Run(test.name, func(t *testing.T) {
|
||||
registration, ok := processor.ProcessorRegistry["script.expr"]
|
||||
registration, ok := processor.GetProcessorRegistration("script.expr")
|
||||
if !ok {
|
||||
t.Fatalf("script.expr processor not registered")
|
||||
}
|
||||
@@ -117,7 +117,7 @@ func TestBadScriptExpr(t *testing.T) {
|
||||
|
||||
for _, test := range tests {
|
||||
t.Run(test.name, func(t *testing.T) {
|
||||
registration, ok := processor.ProcessorRegistry["script.expr"]
|
||||
registration, ok := processor.GetProcessorRegistration("script.expr")
|
||||
if !ok {
|
||||
t.Fatalf("script.expr processor not registered")
|
||||
}
|
||||
@@ -148,7 +148,7 @@ func TestBadScriptExpr(t *testing.T) {
|
||||
}
|
||||
|
||||
func BenchmarkScriptExpr(b *testing.B) {
|
||||
registration, ok := processor.ProcessorRegistry["script.expr"]
|
||||
registration, ok := processor.GetProcessorRegistration("script.expr")
|
||||
if !ok {
|
||||
b.Fatalf("script.expr processor not registered")
|
||||
}
|
||||
|
||||
@@ -10,7 +10,7 @@ import (
|
||||
)
|
||||
|
||||
func TestScriptJSFromRegistry(t *testing.T) {
|
||||
registration, ok := processor.ProcessorRegistry["script.js"]
|
||||
registration, ok := processor.GetProcessorRegistration("script.js")
|
||||
if !ok {
|
||||
t.Fatalf("script.js processor not registered")
|
||||
}
|
||||
@@ -45,7 +45,7 @@ func TestScriptJSFromRegistry(t *testing.T) {
|
||||
}
|
||||
|
||||
func TestScriptJSNoProgram(t *testing.T) {
|
||||
registration, ok := processor.ProcessorRegistry["script.js"]
|
||||
registration, ok := processor.GetProcessorRegistration("script.js")
|
||||
if !ok {
|
||||
t.Fatalf("script.js processor not registered")
|
||||
}
|
||||
@@ -61,7 +61,7 @@ func TestScriptJSNoProgram(t *testing.T) {
|
||||
}
|
||||
|
||||
func TestScriptJSBadConfigWrongProgramType(t *testing.T) {
|
||||
registration, ok := processor.ProcessorRegistry["script.js"]
|
||||
registration, ok := processor.GetProcessorRegistration("script.js")
|
||||
if !ok {
|
||||
t.Fatalf("script.js processor not registered")
|
||||
}
|
||||
@@ -151,7 +151,7 @@ func TestGoodScriptJS(t *testing.T) {
|
||||
|
||||
for _, test := range tests {
|
||||
t.Run(test.name, func(t *testing.T) {
|
||||
registration, ok := processor.ProcessorRegistry["script.js"]
|
||||
registration, ok := processor.GetProcessorRegistration("script.js")
|
||||
if !ok {
|
||||
t.Fatalf("script.js processor not registered")
|
||||
}
|
||||
@@ -199,7 +199,7 @@ func TestBadScriptJS(t *testing.T) {
|
||||
|
||||
for _, test := range tests {
|
||||
t.Run(test.name, func(t *testing.T) {
|
||||
registration, ok := processor.ProcessorRegistry["script.js"]
|
||||
registration, ok := processor.GetProcessorRegistration("script.js")
|
||||
if !ok {
|
||||
t.Fatalf("script.js processor not registered")
|
||||
}
|
||||
@@ -230,7 +230,7 @@ func TestBadScriptJS(t *testing.T) {
|
||||
}
|
||||
|
||||
func BenchmarkScriptJS(b *testing.B) {
|
||||
registration, ok := processor.ProcessorRegistry["script.js"]
|
||||
registration, ok := processor.GetProcessorRegistration("script.js")
|
||||
if !ok {
|
||||
b.Fatalf("script.js processor not registered")
|
||||
}
|
||||
|
||||
@@ -11,7 +11,7 @@ import (
|
||||
)
|
||||
|
||||
func TestScriptWASMFromRegistry(t *testing.T) {
|
||||
registration, ok := processor.ProcessorRegistry["script.wasm"]
|
||||
registration, ok := processor.GetProcessorRegistration("script.wasm")
|
||||
if !ok {
|
||||
t.Fatalf("script.wasm processor not registered")
|
||||
}
|
||||
@@ -60,7 +60,7 @@ func TestGoodScriptWASM(t *testing.T) {
|
||||
|
||||
for _, test := range tests {
|
||||
t.Run(test.name, func(t *testing.T) {
|
||||
registration, ok := processor.ProcessorRegistry["script.wasm"]
|
||||
registration, ok := processor.GetProcessorRegistration("script.wasm")
|
||||
if !ok {
|
||||
t.Fatalf("script.wasm processor not registered")
|
||||
}
|
||||
@@ -160,7 +160,7 @@ func TestBadScriptWASM(t *testing.T) {
|
||||
|
||||
for _, test := range tests {
|
||||
t.Run(test.name, func(t *testing.T) {
|
||||
registration, ok := processor.ProcessorRegistry["script.wasm"]
|
||||
registration, ok := processor.GetProcessorRegistration("script.wasm")
|
||||
if !ok {
|
||||
t.Fatalf("script.wasm processor not registered")
|
||||
}
|
||||
@@ -191,7 +191,7 @@ func TestBadScriptWASM(t *testing.T) {
|
||||
}
|
||||
|
||||
func BenchmarkScriptWASM(b *testing.B) {
|
||||
registration, ok := processor.ProcessorRegistry["script.wasm"]
|
||||
registration, ok := processor.GetProcessorRegistration("script.wasm")
|
||||
if !ok {
|
||||
b.Fatalf("script.wasm processor not registered")
|
||||
}
|
||||
|
||||
@@ -10,7 +10,7 @@ import (
|
||||
)
|
||||
|
||||
func TestSipResponseAudioCreateFromRegistry(t *testing.T) {
|
||||
registration, ok := processor.ProcessorRegistry["sip.response.audio.create"]
|
||||
registration, ok := processor.GetProcessorRegistration("sip.response.audio.create")
|
||||
if !ok {
|
||||
t.Fatalf("sip.response.audio.create processor not registered")
|
||||
}
|
||||
@@ -76,7 +76,7 @@ func TestGoodSipResponseAudioCreate(t *testing.T) {
|
||||
for _, test := range tests {
|
||||
t.Run(test.name, func(t *testing.T) {
|
||||
|
||||
registration, ok := processor.ProcessorRegistry["sip.response.audio.create"]
|
||||
registration, ok := processor.GetProcessorRegistration("sip.response.audio.create")
|
||||
if !ok {
|
||||
t.Fatalf("sip.response.audio.create processor not registered")
|
||||
}
|
||||
@@ -183,7 +183,7 @@ func TestBadSipResponseAudioCreate(t *testing.T) {
|
||||
for _, test := range tests {
|
||||
t.Run(test.name, func(t *testing.T) {
|
||||
|
||||
registration, ok := processor.ProcessorRegistry["sip.response.audio.create"]
|
||||
registration, ok := processor.GetProcessorRegistration("sip.response.audio.create")
|
||||
if !ok {
|
||||
t.Fatalf("sip.response.audio.create processor not registered")
|
||||
}
|
||||
@@ -214,7 +214,7 @@ func TestBadSipResponseAudioCreate(t *testing.T) {
|
||||
}
|
||||
|
||||
func BenchmarkSipResponseAudioCreate(b *testing.B) {
|
||||
registration, ok := processor.ProcessorRegistry["sip.response.audio.create"]
|
||||
registration, ok := processor.GetProcessorRegistration("sip.response.audio.create")
|
||||
if !ok {
|
||||
b.Fatalf("sip.response.audio.create processor not registered")
|
||||
}
|
||||
|
||||
@@ -10,7 +10,7 @@ import (
|
||||
)
|
||||
|
||||
func TestSipResponseDTMFCreateFromRegistry(t *testing.T) {
|
||||
registration, ok := processor.ProcessorRegistry["sip.response.dtmf.create"]
|
||||
registration, ok := processor.GetProcessorRegistration("sip.response.dtmf.create")
|
||||
if !ok {
|
||||
t.Fatalf("sip.response.dtmf.create processor not registered")
|
||||
}
|
||||
@@ -74,7 +74,7 @@ func TestGoodSipResponseDTMFCreate(t *testing.T) {
|
||||
for _, test := range tests {
|
||||
t.Run(test.name, func(t *testing.T) {
|
||||
|
||||
registration, ok := processor.ProcessorRegistry["sip.response.dtmf.create"]
|
||||
registration, ok := processor.GetProcessorRegistration("sip.response.dtmf.create")
|
||||
if !ok {
|
||||
t.Fatalf("sip.response.dtmf.create processor not registered")
|
||||
}
|
||||
@@ -191,7 +191,7 @@ func TestBadSipResponseDTMFCreate(t *testing.T) {
|
||||
for _, test := range tests {
|
||||
t.Run(test.name, func(t *testing.T) {
|
||||
|
||||
registration, ok := processor.ProcessorRegistry["sip.response.dtmf.create"]
|
||||
registration, ok := processor.GetProcessorRegistration("sip.response.dtmf.create")
|
||||
if !ok {
|
||||
t.Fatalf("sip.response.dtmf.create processor not registered")
|
||||
}
|
||||
@@ -222,7 +222,7 @@ func TestBadSipResponseDTMFCreate(t *testing.T) {
|
||||
}
|
||||
|
||||
func BenchmarkSipResponseDTMFCreate(b *testing.B) {
|
||||
registration, ok := processor.ProcessorRegistry["sip.response.dtmf.create"]
|
||||
registration, ok := processor.GetProcessorRegistration("sip.response.dtmf.create")
|
||||
if !ok {
|
||||
b.Fatalf("sip.response.dtmf.create processor not registered")
|
||||
}
|
||||
|
||||
@@ -10,7 +10,7 @@ import (
|
||||
)
|
||||
|
||||
func TestStringCreateFromRegistry(t *testing.T) {
|
||||
registration, ok := processor.ProcessorRegistry["string.create"]
|
||||
registration, ok := processor.GetProcessorRegistration("string.create")
|
||||
if !ok {
|
||||
t.Fatalf("string.create processor not registered")
|
||||
}
|
||||
@@ -84,7 +84,7 @@ func TestGoodStringCreate(t *testing.T) {
|
||||
|
||||
for _, test := range tests {
|
||||
t.Run(test.name, func(t *testing.T) {
|
||||
registration, ok := processor.ProcessorRegistry["string.create"]
|
||||
registration, ok := processor.GetProcessorRegistration("string.create")
|
||||
if !ok {
|
||||
t.Fatalf("string.create processor not registered")
|
||||
}
|
||||
@@ -157,7 +157,7 @@ func TestBadStringCreate(t *testing.T) {
|
||||
for _, test := range tests {
|
||||
t.Run(test.name, func(t *testing.T) {
|
||||
|
||||
registration, ok := processor.ProcessorRegistry["string.create"]
|
||||
registration, ok := processor.GetProcessorRegistration("string.create")
|
||||
if !ok {
|
||||
t.Fatalf("string.create processor not registered")
|
||||
}
|
||||
@@ -188,7 +188,7 @@ func TestBadStringCreate(t *testing.T) {
|
||||
}
|
||||
|
||||
func BenchmarkStringCreate(b *testing.B) {
|
||||
registration, ok := processor.ProcessorRegistry["string.create"]
|
||||
registration, ok := processor.GetProcessorRegistration("string.create")
|
||||
if !ok {
|
||||
b.Fatalf("string.create processor not registered")
|
||||
}
|
||||
|
||||
@@ -10,7 +10,7 @@ import (
|
||||
)
|
||||
|
||||
func TestStringDecodeFromRegistry(t *testing.T) {
|
||||
registration, ok := processor.ProcessorRegistry["string.decode"]
|
||||
registration, ok := processor.GetProcessorRegistration("string.decode")
|
||||
if !ok {
|
||||
t.Fatalf("string.decode processor not registered")
|
||||
}
|
||||
@@ -101,7 +101,7 @@ func TestBadStringDecode(t *testing.T) {
|
||||
}
|
||||
|
||||
func BenchmarkStringDecode(b *testing.B) {
|
||||
registration, ok := processor.ProcessorRegistry["string.decode"]
|
||||
registration, ok := processor.GetProcessorRegistration("string.decode")
|
||||
if !ok {
|
||||
b.Fatalf("string.decode processor not registered")
|
||||
}
|
||||
|
||||
@@ -11,7 +11,7 @@ import (
|
||||
)
|
||||
|
||||
func TestStringEncodeFromRegistry(t *testing.T) {
|
||||
registration, ok := processor.ProcessorRegistry["string.encode"]
|
||||
registration, ok := processor.GetProcessorRegistration("string.encode")
|
||||
if !ok {
|
||||
t.Fatalf("string.encode processor not registered")
|
||||
}
|
||||
@@ -107,7 +107,7 @@ func TestBadStringEncode(t *testing.T) {
|
||||
}
|
||||
|
||||
func BenchmarkStringEncode(b *testing.B) {
|
||||
registration, ok := processor.ProcessorRegistry["string.encode"]
|
||||
registration, ok := processor.GetProcessorRegistration("string.encode")
|
||||
if !ok {
|
||||
b.Fatalf("string.encode processor not registered")
|
||||
}
|
||||
|
||||
@@ -11,7 +11,7 @@ import (
|
||||
)
|
||||
|
||||
func TestStringSplitFromRegistry(t *testing.T) {
|
||||
registration, ok := processor.ProcessorRegistry["string.split"]
|
||||
registration, ok := processor.GetProcessorRegistration("string.split")
|
||||
if !ok {
|
||||
t.Fatalf("string.split processor not registered")
|
||||
}
|
||||
@@ -66,7 +66,7 @@ func TestGoodStringSplit(t *testing.T) {
|
||||
|
||||
for _, test := range tests {
|
||||
t.Run(test.name, func(t *testing.T) {
|
||||
registration, ok := processor.ProcessorRegistry["string.split"]
|
||||
registration, ok := processor.GetProcessorRegistration("string.split")
|
||||
if !ok {
|
||||
t.Fatalf("string.split processor not registered")
|
||||
}
|
||||
@@ -126,7 +126,7 @@ func TestBadStringSplit(t *testing.T) {
|
||||
|
||||
for _, test := range tests {
|
||||
t.Run(test.name, func(t *testing.T) {
|
||||
registration, ok := processor.ProcessorRegistry["string.split"]
|
||||
registration, ok := processor.GetProcessorRegistration("string.split")
|
||||
if !ok {
|
||||
t.Fatalf("string.split processor not registered")
|
||||
}
|
||||
@@ -156,7 +156,7 @@ func TestBadStringSplit(t *testing.T) {
|
||||
}
|
||||
|
||||
func BenchmarkStringSplit(b *testing.B) {
|
||||
registration, ok := processor.ProcessorRegistry["string.split"]
|
||||
registration, ok := processor.GetProcessorRegistration("string.split")
|
||||
if !ok {
|
||||
b.Fatalf("string.split processor not registered")
|
||||
}
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user