Compare commits

...

29 Commits

Author SHA1 Message Date
Joel Wetzell 81ae00c943 wrap config schema errors 2026-05-30 22:18:48 -05:00
Joel Wetzell 49e351c760 update artnet-go 2026-05-30 22:18:39 -05:00
Joel Wetzell e90356762c if tcp client is closed by stop, stop retrying 2026-05-30 22:18:28 -05:00
Joel Wetzell 68586cd588 some close work in websocket.client 2026-05-30 22:18:22 -05:00
Joel Wetzell 5e87cdcc5e Merge pull request #173 from jwetzell/dependabot/go_modules/github.com/nats-io/nats-server/v2-2.14.1
Bump github.com/nats-io/nats-server/v2 from 2.14.0 to 2.14.1
2026-05-27 22:00:49 -05:00
Joel Wetzell 2d6fa2ad19 Merge pull request #174 from jwetzell/dependabot/go_modules/go.bug.st/serial-1.7.1
Bump go.bug.st/serial from 1.7.0 to 1.7.1
2026-05-27 22:00:24 -05:00
Joel Wetzell 3ab2cade81 add more to smoke config 2026-05-27 21:02:09 -05:00
Joel Wetzell 2078d8533f Merge pull request #176 from jwetzell/fix/http-response-schema
align http.response.create schema with reality
2026-05-27 20:59:17 -05:00
Joel Wetzell 9b5a9ce6d0 align http.response.create schema with reality 2026-05-27 20:54:11 -05:00
Joel Wetzell dbeb1e8c29 Merge pull request #175 from jwetzell/chore/shutdown-rework
rework module shutdown process to cancel module context in defer
2026-05-27 20:53:31 -05:00
Joel Wetzell 0b494fce91 rework module shutdown process to cancel module context in defer 2026-05-27 20:50:33 -05:00
Joel Wetzell 52ca801fbd add context to keyvaluemodule get/set 2026-05-27 18:30:23 -05:00
Joel Wetzell 3adbae8068 Merge pull request #172 from jwetzell/dependabot/github_actions/docker/login-action-4.2.0
Bump docker/login-action from 4.1.0 to 4.2.0
2026-05-27 15:35:46 -05:00
Joel Wetzell 4ba718e2c6 Merge pull request #171 from jwetzell/dependabot/github_actions/docker/build-push-action-7.2.0
Bump docker/build-push-action from 7.1.0 to 7.2.0
2026-05-27 15:35:37 -05:00
Joel Wetzell fa595a027b Merge pull request #170 from jwetzell/dependabot/github_actions/docker/metadata-action-6.1.0
Bump docker/metadata-action from 6.0.0 to 6.1.0
2026-05-27 15:35:28 -05:00
Joel Wetzell 5660acfca6 Merge pull request #169 from jwetzell/dependabot/github_actions/docker/setup-buildx-action-4.1.0
Bump docker/setup-buildx-action from 4.0.0 to 4.1.0
2026-05-27 15:35:19 -05:00
dependabot[bot] 3a1bc74fcf Bump go.bug.st/serial from 1.7.0 to 1.7.1
Bumps [go.bug.st/serial](https://github.com/bugst/go-serial) from 1.7.0 to 1.7.1.
- [Release notes](https://github.com/bugst/go-serial/releases)
- [Commits](https://github.com/bugst/go-serial/compare/v1.7.0...v1.7.1)

---
updated-dependencies:
- dependency-name: go.bug.st/serial
  dependency-version: 1.7.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2026-05-26 23:15:14 +00:00
dependabot[bot] 62ce5bf2f8 Bump github.com/nats-io/nats-server/v2 from 2.14.0 to 2.14.1
Bumps [github.com/nats-io/nats-server/v2](https://github.com/nats-io/nats-server) from 2.14.0 to 2.14.1.
- [Release notes](https://github.com/nats-io/nats-server/releases)
- [Changelog](https://github.com/nats-io/nats-server/blob/main/RELEASES.md)
- [Commits](https://github.com/nats-io/nats-server/compare/v2.14.0...v2.14.1)

---
updated-dependencies:
- dependency-name: github.com/nats-io/nats-server/v2
  dependency-version: 2.14.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2026-05-26 23:15:06 +00:00
dependabot[bot] 0f70596eb0 Bump docker/login-action from 4.1.0 to 4.2.0
Bumps [docker/login-action](https://github.com/docker/login-action) from 4.1.0 to 4.2.0.
- [Release notes](https://github.com/docker/login-action/releases)
- [Commits](https://github.com/docker/login-action/compare/4907a6ddec9925e35a0a9e82d7399ccc52663121...650006c6eb7dba73a995cc03b0b2d7f5ca915bee)

---
updated-dependencies:
- dependency-name: docker/login-action
  dependency-version: 4.2.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2026-05-26 23:14:42 +00:00
dependabot[bot] db3d0530a5 Bump docker/build-push-action from 7.1.0 to 7.2.0
Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 7.1.0 to 7.2.0.
- [Release notes](https://github.com/docker/build-push-action/releases)
- [Commits](https://github.com/docker/build-push-action/compare/bcafcacb16a39f128d818304e6c9c0c18556b85f...f9f3042f7e2789586610d6e8b85c8f03e5195baf)

---
updated-dependencies:
- dependency-name: docker/build-push-action
  dependency-version: 7.2.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2026-05-26 23:14:37 +00:00
dependabot[bot] 6b53211267 Bump docker/metadata-action from 6.0.0 to 6.1.0
Bumps [docker/metadata-action](https://github.com/docker/metadata-action) from 6.0.0 to 6.1.0.
- [Release notes](https://github.com/docker/metadata-action/releases)
- [Commits](https://github.com/docker/metadata-action/compare/030e881283bb7a6894de51c315a6bfe6a94e05cf...80c7e94dd9b9319bd5eb7a0e0fe9291e23a2a2e9)

---
updated-dependencies:
- dependency-name: docker/metadata-action
  dependency-version: 6.1.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2026-05-26 23:14:34 +00:00
dependabot[bot] 821d192eb7 Bump docker/setup-buildx-action from 4.0.0 to 4.1.0
Bumps [docker/setup-buildx-action](https://github.com/docker/setup-buildx-action) from 4.0.0 to 4.1.0.
- [Release notes](https://github.com/docker/setup-buildx-action/releases)
- [Commits](https://github.com/docker/setup-buildx-action/compare/4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd...d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5)

---
updated-dependencies:
- dependency-name: docker/setup-buildx-action
  dependency-version: 4.1.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2026-05-26 23:14:31 +00:00
Joel Wetzell b50882fc4a fix error message in test 2026-05-26 17:56:08 -05:00
Joel Wetzell 438c396aeb include processor index in processpayload error 2026-05-26 17:53:34 -05:00
Joel Wetzell f175bed084 go mod tidy 2026-05-26 17:27:47 -05:00
Joel Wetzell 80f8152dfb don't export module/processor/framer registrations 2026-05-26 17:27:35 -05:00
Joel Wetzell 0ff212742a Merge pull request #168 from jwetzell/feat/rate-limiter
add rate limiting filter
2026-05-24 14:24:38 -05:00
Joel Wetzell 8fe0f7e6a2 add rate limiting filter 2026-05-24 14:19:58 -05:00
Joel Wetzell 9db958b523 only run docker job on tag 2026-05-23 11:50:45 -05:00
109 changed files with 786 additions and 547 deletions
+6 -6
View File
@@ -211,7 +211,8 @@ jobs:
files: showbridge_*.tar.gz files: showbridge_*.tar.gz
docker: docker:
runs-on: ubuntu-latest runs-on: ubuntu-latest
needs: linux_amd64 needs: setup_release
if: github.ref_type == 'tag' && github.event_name != 'workflow_dispatch'
steps: steps:
- name: Check out repository - name: Check out repository
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0 uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
@@ -220,24 +221,23 @@ jobs:
uses: docker/setup-qemu-action@ce360397dd3f832beb865e1373c09c0e9f86d70a # v4.0.0 uses: docker/setup-qemu-action@ce360397dd3f832beb865e1373c09c0e9f86d70a # v4.0.0
- name: Set up Docker Buildx - 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 - name: Login to Docker Hub
uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4.1.0 uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4.2.0
with: with:
username: ${{ secrets.DOCKERHUB_USERNAME }} username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }} password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Setup Docker metadata - name: Setup Docker metadata
id: meta id: meta
uses: docker/metadata-action@030e881283bb7a6894de51c315a6bfe6a94e05cf # v6.0.0 uses: docker/metadata-action@80c7e94dd9b9319bd5eb7a0e0fe9291e23a2a2e9 # v6.1.0
with: with:
images: | images: |
jwetzell/showbridge jwetzell/showbridge
- name: Build and push - name: Build and push
uses: docker/build-push-action@bcafcacb16a39f128d818304e6c9c0c18556b85f # v7.1.0 uses: docker/build-push-action@f9f3042f7e2789586610d6e8b85c8f03e5195baf # v7.2.0
if: github.ref_type == 'tag'
with: with:
push: true push: true
context: ./ context: ./
+2 -2
View File
@@ -106,12 +106,12 @@ func readConfig(configPath string) (config.Config, error) {
err = schema.ApplyDefaults(&yamlMap) err = schema.ApplyDefaults(&yamlMap)
if err != nil { if err != nil {
return config.Config{}, err return config.Config{}, fmt.Errorf("failed to apply defaults: %w", err)
} }
err = schema.ValidateConfig(yamlMap) err = schema.ValidateConfig(yamlMap)
if err != nil { if err != nil {
return config.Config{}, err return config.Config{}, fmt.Errorf("failed to validate config: %w", err)
} }
validatedConfigBytes, err := json.Marshal(yamlMap) validatedConfigBytes, err := json.Marshal(yamlMap)
+30 -5
View File
@@ -57,14 +57,25 @@ routes:
processors: processors:
- type: string.create - type: string.create
params: params:
template: "hello" template: "wsecho: {{.Payload.UnixMilli}}"
- type: module.output - type: module.output
params: params:
module: wsecho module: wsecho
- input: ticker
processors:
- type: string.create
params:
template: "tcpout: {{.Payload.UnixMilli}}"
- type: string.encode - type: string.encode
- type: module.output - type: module.output
params: params:
module: tcpout module: tcpout
- input: ticker
processors:
- type: string.create
params:
template: "udpout: {{.Payload.UnixMilli}}"
- type: string.encode
- type: module.output - type: module.output
params: params:
module: udpout module: udpout
@@ -74,14 +85,15 @@ routes:
params: params:
url: "http://localhost:3000/echo" url: "http://localhost:3000/echo"
method: "GET" method: "GET"
- type: struct.field.get
params:
name: "Body"
- type: string.decode
- type: debug.log - type: debug.log
- input: tcpin - input: tcpin
processors: processors:
- type: string.decode - type: string.decode
- type: debug.log - type: debug.log
- input: httpin
processors:
- type: debug.log
- input: udpin - input: udpin
processors: processors:
- type: string.decode - type: string.decode
@@ -98,12 +110,25 @@ routes:
- type: debug.log - type: debug.log
- input: natsin - input: natsin
processors: processors:
- type: struct.field.get
params:
name: "Data"
- type: string.decode
- type: debug.log - type: debug.log
- input: httpin
processors:
- type: http.response.create
params:
status: 200
bodyTemplate: "Hello, World!"
- type: module.output
params:
module: httpin
- input: ticker - input: ticker
processors: processors:
- type: string.create - type: string.create
params: params:
template: "{{.Payload}}" template: "natsout: {{.Payload}}"
- type: pubsub.publish - type: pubsub.publish
params: params:
module: natsout module: natsout
+4 -4
View File
@@ -10,16 +10,17 @@ require (
github.com/extism/go-sdk v1.7.1 github.com/extism/go-sdk v1.7.1
github.com/google/jsonschema-go v0.4.3 github.com/google/jsonschema-go v0.4.3
github.com/gorilla/websocket v1.5.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/free-d-go v0.2.0
github.com/jwetzell/osc-go v0.3.0 github.com/jwetzell/osc-go v0.3.0
github.com/jwetzell/psn-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/nats-io/nats.go v1.52.0
github.com/redis/go-redis/v9 v9.19.0 github.com/redis/go-redis/v9 v9.19.0
github.com/urfave/cli/v3 v3.9.0 github.com/urfave/cli/v3 v3.9.0
gitlab.com/gomidi/midi/v2 v2.3.23 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/quickjs v0.18.2
modernc.org/sqlite v1.50.1 modernc.org/sqlite v1.50.1
sigs.k8s.io/yaml v1.6.0 sigs.k8s.io/yaml v1.6.0
@@ -66,7 +67,6 @@ require (
golang.org/x/net v0.54.0 // indirect golang.org/x/net v0.54.0 // indirect
golang.org/x/sync v0.20.0 // indirect golang.org/x/sync v0.20.0 // indirect
golang.org/x/sys v0.44.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 golang.org/x/tools v0.44.0 // indirect
google.golang.org/protobuf v1.36.11 // indirect google.golang.org/protobuf v1.36.11 // indirect
gopkg.in/hraban/opus.v2 v2.0.0-20230925203106-0188a62cb302 // indirect gopkg.in/hraban/opus.v2 v2.0.0-20230925203106-0188a62cb302 // indirect
+6 -6
View File
@@ -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/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 h1:HfGg9Irj7i+IX1o1QAmPfIBNu/Q5A5Tu3n/MED9k9H4=
github.com/icholy/digest v1.1.0/go.mod h1:QNrsSGQ5v7v9cReDI0+eyjsXGUoRSUZQHeQ5C4XLa0Y= 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.3.0 h1:MDHElOSbpgmIbYGHO9SoxsT7ynrYtV5/UHGT82geHk0=
github.com/jwetzell/artnet-go v0.2.3/go.mod h1:gli97Z32a0kMkZ6taoTiK7/lqHcF/dhiGjGJdx/PxqA= 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 h1:8WQW4du8Sf3d18aUzk9n5jZtHE6WdDQHDFjkFffvycc=
github.com/jwetzell/free-d-go v0.2.0/go.mod h1:yHuRy51NeDfN26eJ6wzZgys8qyQiS7hkYILw8yF+UJ4= 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= 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/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 h1:V0xpGuD/N8Mi+fQNDynXohVvp7ZztevW5io8CUWlPmU=
github.com/nats-io/jwt/v2 v2.8.1/go.mod h1:nWnOEEiVMiKHQpnAy4eXlizVEtSfzacZ1Q43LIRavZg= 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.1 h1:wXs/a5fw9Hzm3CvuzLxGeIwpjPulSa7gMT3eSuhGkcg=
github.com/nats-io/nats-server/v2 v2.14.0/go.mod h1:ImVUUDvfClJbb6cuJQRc1VmgDCXKM5ds0OoiG9MVOKo= 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 h1:n3avV4VBsCgsdwh71TppsTwtv+QdPs7ntSKM8qJLGsc=
github.com/nats-io/nats.go v1.52.0/go.mod h1:26HypzazeOkyO3/mqd1zZd53STJN0EjCYF9Uy2ZOBno= github.com/nats-io/nats.go v1.52.0/go.mod h1:26HypzazeOkyO3/mqd1zZd53STJN0EjCYF9Uy2ZOBno=
github.com/nats-io/nkeys v0.4.15 h1:JACV5jRVO9V856KOapQ7x+EY8Jo3qw1vJt/9Jpwzkk4= github.com/nats-io/nkeys v0.4.15 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= 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 h1:P8NxV4EzV9c+BjpwTeB+G/qa+Xdq/UTazS2fKxY0O0g=
gitlab.com/gomidi/midi/v2 v2.3.23/go.mod h1:jDpP4O4skYi+7iVwt6Zyp18bd2M4hkjtMuw2cmgKgfw= 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.1 h1:5aP8wYL0UjEYOVs3oPAGscjaSfRQLHtCvBFXNN/rwtc=
go.bug.st/serial v1.7.0/go.mod h1:PZfOSahry47TWtrd0tvoKZvmVa7FGrc/1xG9q8Ho3xU= 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 h1:IQRWgT5srOCYfiWnpqUYz9CVmbO8bFmKcwYxpuCSL2g=
go.opentelemetry.io/proto/otlp v1.10.0/go.mod h1:/CV4QoCR/S9yaPj8utp3lvQPoqMtxXdzn7ozvvozVqk= 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= go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE=
+2 -2
View File
@@ -17,8 +17,8 @@ type OutputModule interface {
} }
type KeyValueModule interface { type KeyValueModule interface {
Get(key string) (any, error) Get(ctx context.Context, key string) (any, error)
Set(key string, value any) error Set(ctx context.Context, key string, value any) error
} }
type DatabaseModule interface { type DatabaseModule interface {
+5 -5
View File
@@ -10,15 +10,15 @@ type Framer interface {
func GetFramer(framingType string) Framer { func GetFramer(framingType string) Framer {
switch framingType { switch framingType {
case "CR": case "CR":
return NewByteSeparatorFramer([]byte{'\r'}) return newByteSeparatorFramer([]byte{'\r'})
case "LF": case "LF":
return NewByteSeparatorFramer([]byte{'\n'}) return newByteSeparatorFramer([]byte{'\n'})
case "CRLF": case "CRLF":
return NewByteSeparatorFramer([]byte{'\r', '\n'}) return newByteSeparatorFramer([]byte{'\r', '\n'})
case "SLIP": case "SLIP":
return NewSlipFramer() return newSlipFramer()
case "RAW": case "RAW":
return NewRawFramer() return newRawFramer()
default: default:
return nil return nil
} }
+7 -7
View File
@@ -1,23 +1,23 @@
package framer package framer
type RawFramer struct{} type rawFramer struct{}
func NewRawFramer() *RawFramer { func newRawFramer() *rawFramer {
return &RawFramer{} return &rawFramer{}
} }
func (rf *RawFramer) Decode(data []byte) [][]byte { func (rf *rawFramer) Decode(data []byte) [][]byte {
return [][]byte{data} return [][]byte{data}
} }
func (rf *RawFramer) Encode(data []byte) []byte { func (rf *rawFramer) Encode(data []byte) []byte {
return data return data
} }
func (rf *RawFramer) Clear() { func (rf *rawFramer) Clear() {
// NOTE(jwetzell): no internal state to clear // NOTE(jwetzell): no internal state to clear
} }
func (rf *RawFramer) Buffer() []byte { func (rf *rawFramer) Buffer() []byte {
return []byte{} return []byte{}
} }
+7 -7
View File
@@ -4,16 +4,16 @@ import (
"bytes" "bytes"
) )
type ByteSeparatorFramer struct { type byteSeparatorFramer struct {
buffer []byte buffer []byte
separator []byte separator []byte
} }
func NewByteSeparatorFramer(separator []byte) *ByteSeparatorFramer { func newByteSeparatorFramer(separator []byte) *byteSeparatorFramer {
return &ByteSeparatorFramer{separator: separator, buffer: []byte{}} return &byteSeparatorFramer{separator: separator, buffer: []byte{}}
} }
func (bsf *ByteSeparatorFramer) Decode(data []byte) [][]byte { func (bsf *byteSeparatorFramer) Decode(data []byte) [][]byte {
messages := [][]byte{} messages := [][]byte{}
bsf.buffer = append(bsf.buffer, data...) bsf.buffer = append(bsf.buffer, data...)
@@ -28,14 +28,14 @@ func (bsf *ByteSeparatorFramer) Decode(data []byte) [][]byte {
return messages return messages
} }
func (bsf *ByteSeparatorFramer) Encode(data []byte) []byte { func (bsf *byteSeparatorFramer) Encode(data []byte) []byte {
return append(data, bsf.separator...) return append(data, bsf.separator...)
} }
func (bsf *ByteSeparatorFramer) Clear() { func (bsf *byteSeparatorFramer) Clear() {
bsf.buffer = []byte{} bsf.buffer = []byte{}
} }
func (bsf *ByteSeparatorFramer) Buffer() []byte { func (bsf *byteSeparatorFramer) Buffer() []byte {
return bsf.buffer return bsf.buffer
} }
+7 -7
View File
@@ -1,14 +1,14 @@
package framer package framer
type SlipFramer struct { type slipFramer struct {
buffer []byte buffer []byte
} }
func NewSlipFramer() *SlipFramer { func newSlipFramer() *slipFramer {
return &SlipFramer{buffer: []byte{}} return &slipFramer{buffer: []byte{}}
} }
func (sf *SlipFramer) Decode(data []byte) [][]byte { func (sf *slipFramer) Decode(data []byte) [][]byte {
messages := [][]byte{} messages := [][]byte{}
END := byte(0xc0) END := byte(0xc0)
@@ -49,7 +49,7 @@ func (sf *SlipFramer) Decode(data []byte) [][]byte {
return messages return messages
} }
func (sf *SlipFramer) Encode(data []byte) []byte { func (sf *slipFramer) Encode(data []byte) []byte {
END := byte(0xc0) END := byte(0xc0)
ESC := byte(0xdb) ESC := byte(0xdb)
ESC_END := byte(0xdc) ESC_END := byte(0xdc)
@@ -72,10 +72,10 @@ func (sf *SlipFramer) Encode(data []byte) []byte {
return encodedBytes return encodedBytes
} }
func (sf *SlipFramer) Clear() { func (sf *slipFramer) Clear() {
sf.buffer = []byte{} sf.buffer = []byte{}
} }
func (sf *SlipFramer) Buffer() []byte { func (sf *slipFramer) Buffer() []byte {
return sf.buffer return sf.buffer
} }
+2 -3
View File
@@ -76,20 +76,19 @@ func (dbs *DbSqlite) Start(ctx context.Context, inputHandler common.InputHandler
dbs.db = db dbs.db = db
dbs.dbMu.Unlock() dbs.dbMu.Unlock()
<-dbs.ctx.Done() <-dbs.ctx.Done()
dbs.logger.Debug("done")
return nil return nil
} }
func (dbs *DbSqlite) Stop() { func (dbs *DbSqlite) Stop() {
if dbs.cancel != nil { if dbs.cancel != nil {
dbs.cancel() defer dbs.cancel()
} }
dbs.dbMu.Lock() dbs.dbMu.Lock()
defer dbs.dbMu.Unlock() defer dbs.dbMu.Unlock()
if dbs.db != nil { if dbs.db != nil {
dbs.db.Close() dbs.db.Close()
dbs.db = nil
} }
dbs.logger.Debug("done")
} }
func (dbs *DbSqlite) QueryContext(ctx context.Context, query string, args ...any) (*sql.Rows, error) { func (dbs *DbSqlite) QueryContext(ctx context.Context, query string, args ...any) (*sql.Rows, error) {
+3 -4
View File
@@ -167,12 +167,13 @@ func (hs *HTTPServer) Start(ctx context.Context, inputHandler common.InputHandle
err := httpServer.ListenAndServe() err := httpServer.ListenAndServe()
// TODO(jwetzell): handle server closed error differently // TODO(jwetzell): handle server closed error differently
if err != nil { if err != nil {
if err.Error() != "http: Server closed" { if !errors.Is(err, http.ErrServerClosed) {
return err return err
} }
} }
<-hs.ctx.Done() <-hs.ctx.Done()
hs.logger.Debug("done")
return nil return nil
} }
@@ -200,7 +201,7 @@ func (hs *HTTPServer) Output(ctx context.Context, payload any) error {
func (hs *HTTPServer) Stop() { func (hs *HTTPServer) Stop() {
if hs.cancel != nil { if hs.cancel != nil {
hs.cancel() defer hs.cancel()
} }
hs.serverMu.Lock() hs.serverMu.Lock()
defer hs.serverMu.Unlock() defer hs.serverMu.Unlock()
@@ -209,7 +210,5 @@ func (hs *HTTPServer) Stop() {
hs.server.Shutdown(shutdownCtx) hs.server.Shutdown(shutdownCtx)
shutdownCancel() shutdownCancel()
<-shutdownCtx.Done() <-shutdownCtx.Done()
hs.server = nil
} }
hs.logger.Debug("done")
} }
+2 -3
View File
@@ -83,17 +83,16 @@ func (mi *MIDIInput) Start(ctx context.Context, inputHandler common.InputHandler
mi.stop = stop mi.stop = stop
<-mi.ctx.Done() <-mi.ctx.Done()
mi.logger.Debug("done")
return nil return nil
} }
func (mi *MIDIInput) Stop() { func (mi *MIDIInput) Stop() {
if mi.cancel != nil { if mi.cancel != nil {
mi.cancel() defer mi.cancel()
} }
if mi.stop != nil { if mi.stop != nil {
mi.stop() mi.stop()
mi.stop = nil
} }
midi.CloseDriver() midi.CloseDriver()
mi.logger.Debug("done")
} }
+2 -2
View File
@@ -86,6 +86,7 @@ func (mo *MIDIOutput) Start(ctx context.Context, inputHandler common.InputHandle
mo.sendFuncMu.Unlock() mo.sendFuncMu.Unlock()
<-mo.ctx.Done() <-mo.ctx.Done()
mo.logger.Debug("done")
return nil return nil
} }
@@ -107,8 +108,7 @@ func (mo *MIDIOutput) Output(ctx context.Context, payload any) error {
func (mo *MIDIOutput) Stop() { func (mo *MIDIOutput) Stop() {
if mo.cancel != nil { if mo.cancel != nil {
mo.cancel() defer mo.cancel()
} }
midi.CloseDriver() midi.CloseDriver()
mo.logger.Debug("done")
} }
+24 -3
View File
@@ -30,15 +30,36 @@ func RegisterModule(mod ModuleRegistration) {
moduleRegistryMu.Lock() moduleRegistryMu.Lock()
defer moduleRegistryMu.Unlock() 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)) 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 ( var (
moduleRegistryMu sync.RWMutex moduleRegistryMu sync.RWMutex
ModuleRegistry = make(map[string]ModuleRegistration) moduleRegistry = make(ModuleRegistry)
) )
func CreateLogger(config config.ModuleConfig) *slog.Logger { func CreateLogger(config config.ModuleConfig) *slog.Logger {
+1 -2
View File
@@ -152,6 +152,7 @@ func (mc *MQTTClient) Start(ctx context.Context, inputHandler common.InputHandle
mc.clientMu.Unlock() mc.clientMu.Unlock()
<-mc.ctx.Done() <-mc.ctx.Done()
mc.logger.Debug("done")
return nil return nil
} }
@@ -189,7 +190,5 @@ func (mc *MQTTClient) Stop() {
defer mc.clientMu.Unlock() defer mc.clientMu.Unlock()
if mc.client != nil { if mc.client != nil {
mc.client.Disconnect(250) mc.client.Disconnect(250)
mc.client = nil
} }
mc.logger.Debug("done")
} }
+2 -4
View File
@@ -102,6 +102,7 @@ func (nc *NATSClient) Start(ctx context.Context, inputHandler common.InputHandle
nc.subMu.Unlock() nc.subMu.Unlock()
<-nc.ctx.Done() <-nc.ctx.Done()
nc.logger.Debug("done")
return nil return nil
} }
@@ -135,13 +136,12 @@ func (nc *NATSClient) Publish(ctx context.Context, topic string, payload any) er
func (nc *NATSClient) Stop() { func (nc *NATSClient) Stop() {
if nc.cancel != nil { if nc.cancel != nil {
nc.cancel() defer nc.cancel()
} }
nc.subMu.Lock() nc.subMu.Lock()
defer nc.subMu.Unlock() defer nc.subMu.Unlock()
if nc.sub != nil { if nc.sub != nil {
nc.sub.Unsubscribe() nc.sub.Unsubscribe()
nc.sub = nil
} }
nc.clientMu.Lock() nc.clientMu.Lock()
@@ -150,7 +150,5 @@ func (nc *NATSClient) Stop() {
nc.client.Drain() nc.client.Drain()
// TODO(jwetzell): setup closed callback to get when client is fully closed // TODO(jwetzell): setup closed callback to get when client is fully closed
nc.client.Close() nc.client.Close()
nc.client = nil
} }
nc.logger.Debug("done")
} }
+8 -7
View File
@@ -96,9 +96,10 @@ func (ns *NATSServer) Start(ctx context.Context, inputHandler common.InputHandle
ns.cancel = cancel ns.cancel = cancel
natsServer, err := server.NewServer(&server.Options{ natsServer, err := server.NewServer(&server.Options{
Host: ns.Ip, Host: ns.Ip,
Port: ns.Port, Port: ns.Port,
NoLog: true, NoLog: true,
NoSigs: true,
}) })
if err != nil { if err != nil {
@@ -107,26 +108,26 @@ func (ns *NATSServer) Start(ctx context.Context, inputHandler common.InputHandle
ns.serverMu.Lock() ns.serverMu.Lock()
ns.server = natsServer ns.server = natsServer
defer ns.serverMu.Unlock()
natsServer.Start() natsServer.Start()
if !natsServer.ReadyForConnections(5 * time.Second) { if !natsServer.ReadyForConnections(5 * time.Second) {
return errors.New("nats.server failed to start") return errors.New("nats.server failed to start")
} }
ns.serverMu.Unlock()
<-ns.ctx.Done() <-ns.ctx.Done()
ns.logger.Debug("done")
return nil return nil
} }
func (ns *NATSServer) Stop() { func (ns *NATSServer) Stop() {
if ns.cancel != nil { if ns.cancel != nil {
ns.cancel() defer ns.cancel()
} }
ns.serverMu.Lock() ns.serverMu.Lock()
defer ns.serverMu.Unlock() defer ns.serverMu.Unlock()
if ns.server != nil { if ns.server != nil {
ns.server.Shutdown() ns.server.Shutdown()
ns.server.WaitForShutdown()
} }
ns.logger.Debug("done")
} }
+5 -4
View File
@@ -63,7 +63,7 @@ func (pc *PSNClient) Start(ctx context.Context, inputHandler common.InputHandler
pc.connMu.Unlock() pc.connMu.Unlock()
buffer := make([]byte, 2048) buffer := make([]byte, 2048)
for { for pc.ctx.Err() == nil {
select { select {
case <-pc.ctx.Done(): case <-pc.ctx.Done():
return nil 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() { func (pc *PSNClient) Stop() {
if pc.cancel != nil { if pc.cancel != nil {
pc.cancel() defer pc.cancel()
} }
pc.connMu.Lock() pc.connMu.Lock()
defer pc.connMu.Unlock() defer pc.connMu.Unlock()
if pc.conn != nil { if pc.conn != nil {
pc.conn.Close() pc.conn.Close()
pc.conn = nil
} }
pc.logger.Debug("done")
} }
+6 -7
View File
@@ -94,25 +94,24 @@ func (rc *RedisClient) Start(ctx context.Context, inputHandler common.InputHandl
rc.clientMu.Unlock() rc.clientMu.Unlock()
<-rc.ctx.Done() <-rc.ctx.Done()
rc.logger.Debug("done")
return nil return nil
} }
func (rc *RedisClient) Stop() { func (rc *RedisClient) Stop() {
if rc.cancel != nil { if rc.cancel != nil {
rc.cancel() defer rc.cancel()
} }
rc.clientMu.Lock() rc.clientMu.Lock()
defer rc.clientMu.Unlock() defer rc.clientMu.Unlock()
if rc.client != nil { if rc.client != nil {
rc.client.Close() 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 { if rc.client != nil {
val, err := rc.client.Get(rc.ctx, key).Result() val, err := rc.client.Get(ctx, key).Result()
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -121,9 +120,9 @@ func (rc *RedisClient) Get(key string) (any, error) {
return nil, errors.New("redis.client not setup") 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 { 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 status.Err()
} }
return errors.New("redis.client not setup") return errors.New("redis.client not setup")
+3 -3
View File
@@ -159,6 +159,8 @@ func (sc *SerialClient) Start(ctx context.Context, inputHandler common.InputHand
} }
} }
} }
<-sc.ctx.Done()
sc.logger.Debug("done")
return nil return nil
} }
@@ -176,13 +178,11 @@ func (sc *SerialClient) Output(ctx context.Context, payload any) error {
func (sc *SerialClient) Stop() { func (sc *SerialClient) Stop() {
if sc.cancel != nil { if sc.cancel != nil {
sc.cancel() defer sc.cancel()
} }
sc.portMu.Lock() sc.portMu.Lock()
defer sc.portMu.Unlock() defer sc.portMu.Unlock()
if sc.port != nil { if sc.port != nil {
sc.port.Close() sc.port.Close()
sc.port = nil
} }
sc.logger.Debug("done")
} }
+2 -2
View File
@@ -168,6 +168,7 @@ func (scs *SIPCallServer) Start(ctx context.Context, inputHandler common.InputHa
} }
<-scs.ctx.Done() <-scs.ctx.Done()
scs.logger.Debug("done")
return nil return nil
} }
@@ -251,12 +252,11 @@ func (scs *SIPCallServer) Output(ctx context.Context, payload any) error {
func (scs *SIPCallServer) Stop() { func (scs *SIPCallServer) Stop() {
if scs.cancel != nil { if scs.cancel != nil {
scs.cancel() defer scs.cancel()
} }
scs.uaMu.Lock() scs.uaMu.Lock()
defer scs.uaMu.Unlock() defer scs.uaMu.Unlock()
if scs.ua != nil { if scs.ua != nil {
scs.ua.Close() scs.ua.Close()
} }
scs.logger.Debug("done")
} }
+2 -2
View File
@@ -190,6 +190,7 @@ func (sds *SIPDTMFServer) Start(ctx context.Context, inputHandler common.InputHa
} }
<-sds.ctx.Done() <-sds.ctx.Done()
sds.logger.Debug("done")
return nil return nil
} }
@@ -286,12 +287,11 @@ func (sds *SIPDTMFServer) Output(ctx context.Context, payload any) error {
func (sds *SIPDTMFServer) Stop() { func (sds *SIPDTMFServer) Stop() {
if sds.cancel != nil { if sds.cancel != nil {
sds.cancel() defer sds.cancel()
} }
sds.uaMu.Lock() sds.uaMu.Lock()
defer sds.uaMu.Unlock() defer sds.uaMu.Unlock()
if sds.ua != nil { if sds.ua != nil {
sds.ua.Close() sds.ua.Close()
} }
sds.logger.Debug("done")
} }
+29 -29
View File
@@ -100,11 +100,12 @@ func (tc *TCPClient) Start(ctx context.Context, inputHandler common.InputHandler
tc.ctx = moduleContext tc.ctx = moduleContext
tc.cancel = cancel tc.cancel = cancel
CONNECT_RETRY:
for tc.ctx.Err() == nil { for tc.ctx.Err() == nil {
err := tc.SetupConn() err := tc.SetupConn()
if err != nil { if err != nil {
if tc.ctx.Err() != nil { if tc.ctx.Err() != nil {
return nil break CONNECT_RETRY
} }
tc.logger.Error("connection error", "error", err.Error()) tc.logger.Error("connection error", "error", err.Error())
time.Sleep(time.Second * 2) time.Sleep(time.Second * 2)
@@ -112,39 +113,41 @@ func (tc *TCPClient) Start(ctx context.Context, inputHandler common.InputHandler
} }
buffer := make([]byte, 1024) 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 { READ:
tc.framer.Clear() for tc.ctx.Err() == nil {
break READ 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 tc.framer != nil {
if byteCount > 0 { if byteCount > 0 {
messages := tc.framer.Decode(buffer[0:byteCount]) messages := tc.framer.Decode(buffer[0:byteCount])
for _, message := range messages { for _, message := range messages {
if tc.inputHandler != nil { if tc.inputHandler != nil {
tc.inputHandler(tc.ctx, tc.Id(), message) tc.inputHandler(tc.ctx, tc.Id(), message)
} else { } else {
tc.logger.Error("input received but no input handler is configured") tc.logger.Error("input received but no input handler is configured")
}
}
} }
} }
} }
} }
} }
} }
<-tc.ctx.Done()
tc.logger.Debug("done")
return nil return nil
} }
@@ -172,14 +175,11 @@ func (tc *TCPClient) Output(ctx context.Context, payload any) error {
func (tc *TCPClient) Stop() { func (tc *TCPClient) Stop() {
if tc.cancel != nil { if tc.cancel != nil {
tc.cancel() defer tc.cancel()
} }
tc.connMu.Lock() tc.connMu.Lock()
defer tc.connMu.Unlock() defer tc.connMu.Unlock()
if tc.conn != nil { if tc.conn != nil {
tc.conn.Close() tc.conn.Close()
tc.conn = nil
} }
tc.logger.Debug("done")
} }
+81 -79
View File
@@ -10,7 +10,6 @@ import (
"slices" "slices"
"strings" "strings"
"sync" "sync"
"syscall"
"time" "time"
"github.com/google/jsonschema-go/jsonschema" "github.com/google/jsonschema-go/jsonschema"
@@ -58,12 +57,14 @@ func init() {
return nil, fmt.Errorf("net.tcp.server framing error: %w", err) 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) return nil, fmt.Errorf("net.tcp.server unknown framing method: %s", framingMethodString)
} }
outFramer := framer.GetFramer(framingMethodString)
ipString, err := params.GetString("ip") ipString, err := params.GetString("ip")
if err != nil { if err != nil {
if errors.Is(err, config.ErrParamNotFound) { if errors.Is(err, config.ErrParamNotFound) {
@@ -77,24 +78,33 @@ func init() {
if err != nil { if err != nil {
return nil, err 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 { type TCPServer struct {
config config.ModuleConfig config config.ModuleConfig
Addr *net.TCPAddr Addr *net.TCPAddr
Framer framer.Framer InFramer framer.Framer
ctx context.Context OutFramer framer.Framer
inputHandler common.InputHandler framerType string
wg sync.WaitGroup ctx context.Context
connections []*net.TCPConn inputHandler common.InputHandler
connectionsMu sync.RWMutex wg sync.WaitGroup
logger *slog.Logger connections []tcpConnection
cancel context.CancelFunc connectionsMu sync.RWMutex
listener *net.TCPListener logger *slog.Logger
listenerMu sync.Mutex cancel context.CancelFunc
listener *net.TCPListener
listenerMu sync.Mutex
connectionShutdownCtx context.Context
connectionShutdown context.CancelFunc
} }
func (ts *TCPServer) Id() string { func (ts *TCPServer) Id() string {
@@ -107,70 +117,43 @@ func (ts *TCPServer) Type() string {
func (ts *TCPServer) handleClient(client *net.TCPConn) { func (ts *TCPServer) handleClient(client *net.TCPConn) {
ts.connectionsMu.Lock() 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.connectionsMu.Unlock()
ts.logger.Debug("connection accepted", "remoteAddr", client.RemoteAddr().String()) 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) buffer := make([]byte, 1024)
ClientRead: for ts.ctx.Err() == nil && ts.connectionShutdownCtx.Err() == nil {
for ts.ctx.Err() == nil { client.SetDeadline(time.Now().Add(time.Millisecond * 200))
select { byteCount, err := client.Read(buffer)
case <-ts.ctx.Done(): if err != nil {
client.Close() if opErr, ok := err.(*net.OpError); ok {
ts.connectionsMu.Lock() //NOTE(jwetzell) we hit deadline
for i := 0; i < len(ts.connections); i++ { if opErr.Timeout() {
if ts.connections[i] == client { continue
ts.connections = slices.Delete(ts.connections, i, i+1)
break
} }
} }
ts.connectionsMu.Unlock() break
return }
default: if ts.InFramer != nil {
client.SetDeadline(time.Now().Add(time.Millisecond * 200)) if byteCount > 0 {
byteCount, err := client.Read(buffer) messages := ts.InFramer.Decode(buffer[0:byteCount])
for _, message := range messages {
if err != nil { if ts.inputHandler != nil {
if opErr, ok := err.(*net.OpError); ok { ts.inputHandler(ts.ctx, ts.Id(), message)
//NOTE(jwetzell) we hit deadline } else {
if opErr.Timeout() { ts.logger.Error("input received but no input handler is configured")
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")
}
} }
} }
} }
@@ -185,6 +168,10 @@ func (ts *TCPServer) Start(ctx context.Context, inputHandler common.InputHandler
ts.ctx = moduleContext ts.ctx = moduleContext
ts.cancel = cancel ts.cancel = cancel
shutdownCtx, shutdownCancel := context.WithCancel(context.Background())
ts.connectionShutdownCtx = shutdownCtx
ts.connectionShutdown = shutdownCancel
listener, err := net.ListenTCP("tcp", ts.Addr) listener, err := net.ListenTCP("tcp", ts.Addr)
if err != nil { if err != nil {
return err return err
@@ -198,6 +185,9 @@ AcceptLoop:
for ts.ctx.Err() == nil { for ts.ctx.Err() == nil {
conn, err := listener.AcceptTCP() conn, err := listener.AcceptTCP()
if err != nil { if err != nil {
if errors.Is(err, net.ErrClosed) {
break AcceptLoop
}
select { select {
case <-ts.ctx.Done(): case <-ts.ctx.Done():
break AcceptLoop break AcceptLoop
@@ -211,6 +201,8 @@ AcceptLoop:
} }
} }
ts.wg.Done() ts.wg.Done()
<-ts.ctx.Done()
ts.logger.Debug("done")
return nil 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") return errors.New("net.tcp.server is only able to output bytes")
} }
ts.connectionsMu.Lock() ts.connectionsMu.Lock()
defer ts.connectionsMu.Unlock()
var errorString strings.Builder 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 { for _, connection := range ts.connections {
_, err := connection.Write(payloadBytes) _, err := connection.conn.Write(outputBytes)
if err != nil { if err != nil {
fmt.Fprintf(&errorString, "%s\n", err.Error()) fmt.Fprintf(&errorString, "%s\n", err.Error())
} }
} }
ts.connectionsMu.Unlock()
if errorString.String() == "" { if errorString.String() == "" {
return nil return nil
@@ -239,14 +237,18 @@ func (ts *TCPServer) Output(ctx context.Context, payload any) error {
func (ts *TCPServer) Stop() { func (ts *TCPServer) Stop() {
if ts.cancel != nil { if ts.cancel != nil {
ts.cancel() defer ts.cancel()
} }
if ts.connectionShutdown != nil {
ts.connectionShutdown()
}
ts.listenerMu.Lock() ts.listenerMu.Lock()
defer ts.listenerMu.Unlock() defer ts.listenerMu.Unlock()
if ts.listener != nil { if ts.listener != nil {
ts.listener.Close() ts.listener.Close()
ts.listener = nil
} }
ts.logger.Debug("waiting for connections to close")
ts.wg.Wait() ts.wg.Wait()
ts.logger.Debug("done") ts.logger.Debug("all connections closed")
} }
+3 -3
View File
@@ -9,7 +9,7 @@ import (
) )
func TestDbSqliteFromRegistry(t *testing.T) { func TestDbSqliteFromRegistry(t *testing.T) {
registration, ok := module.ModuleRegistry["db.sqlite"] registration, ok := module.GetModuleRegistration("db.sqlite")
if !ok { if !ok {
t.Fatalf("db.sqlite module not registered") t.Fatalf("db.sqlite module not registered")
} }
@@ -58,7 +58,7 @@ func TestGoodDbSqlite(t *testing.T) {
for _, test := range testCases { for _, test := range testCases {
t.Run(test.name, func(t *testing.T) { t.Run(test.name, func(t *testing.T) {
registration, ok := module.ModuleRegistry["db.sqlite"] registration, ok := module.GetModuleRegistration("db.sqlite")
if !ok { if !ok {
t.Fatalf("db.sqlite module not registered") t.Fatalf("db.sqlite module not registered")
} }
@@ -107,7 +107,7 @@ func TestBadDbSqlite(t *testing.T) {
for _, test := range tests { for _, test := range tests {
t.Run(test.name, func(t *testing.T) { t.Run(test.name, func(t *testing.T) {
registration, ok := module.ModuleRegistry["db.sqlite"] registration, ok := module.GetModuleRegistration("db.sqlite")
if !ok { if !ok {
t.Fatalf("db.sqlite module not registered") t.Fatalf("db.sqlite module not registered")
} }
+3 -3
View File
@@ -9,7 +9,7 @@ import (
) )
func TestHTTPServerFromRegistry(t *testing.T) { func TestHTTPServerFromRegistry(t *testing.T) {
registration, ok := module.ModuleRegistry["http.server"] registration, ok := module.GetModuleRegistration("http.server")
if !ok { if !ok {
t.Fatalf("http.server module not registered") t.Fatalf("http.server module not registered")
} }
@@ -52,7 +52,7 @@ func TestGoodHTTPServer(t *testing.T) {
for _, test := range testCases { for _, test := range testCases {
t.Run(test.name, func(t *testing.T) { t.Run(test.name, func(t *testing.T) {
registration, ok := module.ModuleRegistry["http.server"] registration, ok := module.GetModuleRegistration("http.server")
if !ok { if !ok {
t.Fatalf("http.server module not registered") t.Fatalf("http.server module not registered")
} }
@@ -102,7 +102,7 @@ func TestBadHTTPServer(t *testing.T) {
for _, test := range tests { for _, test := range tests {
t.Run(test.name, func(t *testing.T) { t.Run(test.name, func(t *testing.T) {
registration, ok := module.ModuleRegistry["http.server"] registration, ok := module.GetModuleRegistration("http.server")
if !ok { if !ok {
t.Fatalf("http.server module not registered") t.Fatalf("http.server module not registered")
} }
+2 -2
View File
@@ -8,7 +8,7 @@ import (
) )
func TestMIDIInputFromRegistry(t *testing.T) { func TestMIDIInputFromRegistry(t *testing.T) {
registration, ok := module.ModuleRegistry["midi.input"] registration, ok := module.GetModuleRegistration("midi.input")
if !ok { if !ok {
t.Fatalf("midi.input module not registered") t.Fatalf("midi.input module not registered")
} }
@@ -55,7 +55,7 @@ func TestBadMIDIInput(t *testing.T) {
for _, test := range tests { for _, test := range tests {
t.Run(test.name, func(t *testing.T) { t.Run(test.name, func(t *testing.T) {
registration, ok := module.ModuleRegistry["midi.input"] registration, ok := module.GetModuleRegistration("midi.input")
if !ok { if !ok {
t.Fatalf("midi.input module not registered") t.Fatalf("midi.input module not registered")
} }
+2 -2
View File
@@ -8,7 +8,7 @@ import (
) )
func TestMIDIOutputFromRegistry(t *testing.T) { func TestMIDIOutputFromRegistry(t *testing.T) {
registration, ok := module.ModuleRegistry["midi.output"] registration, ok := module.GetModuleRegistration("midi.output")
if !ok { if !ok {
t.Fatalf("midi.output module not registered") t.Fatalf("midi.output module not registered")
} }
@@ -55,7 +55,7 @@ func TestBadMIDIOutput(t *testing.T) {
for _, test := range tests { for _, test := range tests {
t.Run(test.name, func(t *testing.T) { t.Run(test.name, func(t *testing.T) {
registration, ok := module.ModuleRegistry["midi.output"] registration, ok := module.GetModuleRegistration("midi.output")
if !ok { if !ok {
t.Fatalf("midi.output module not registered") t.Fatalf("midi.output module not registered")
} }
+2 -2
View File
@@ -8,7 +8,7 @@ import (
) )
func TestMQTTClientFromRegistry(t *testing.T) { func TestMQTTClientFromRegistry(t *testing.T) {
registration, ok := module.ModuleRegistry["mqtt.client"] registration, ok := module.GetModuleRegistration("mqtt.client")
if !ok { if !ok {
t.Fatalf("mqtt.client module not registered") t.Fatalf("mqtt.client module not registered")
} }
@@ -98,7 +98,7 @@ func TestBadMQTTClient(t *testing.T) {
for _, test := range tests { for _, test := range tests {
t.Run(test.name, func(t *testing.T) { t.Run(test.name, func(t *testing.T) {
registration, ok := module.ModuleRegistry["mqtt.client"] registration, ok := module.GetModuleRegistration("mqtt.client")
if !ok { if !ok {
t.Fatalf("mqtt.client module not registered") t.Fatalf("mqtt.client module not registered")
} }
+2 -2
View File
@@ -8,7 +8,7 @@ import (
) )
func TestNATSClientFromRegistry(t *testing.T) { func TestNATSClientFromRegistry(t *testing.T) {
registration, ok := module.ModuleRegistry["nats.client"] registration, ok := module.GetModuleRegistration("nats.client")
if !ok { if !ok {
t.Fatalf("nats.client module not registered") t.Fatalf("nats.client module not registered")
} }
@@ -76,7 +76,7 @@ func TestBadNATSClient(t *testing.T) {
for _, test := range tests { for _, test := range tests {
t.Run(test.name, func(t *testing.T) { t.Run(test.name, func(t *testing.T) {
registration, ok := module.ModuleRegistry["nats.client"] registration, ok := module.GetModuleRegistration("nats.client")
if !ok { if !ok {
t.Fatalf("nats.client module not registered") t.Fatalf("nats.client module not registered")
} }
+3 -3
View File
@@ -9,7 +9,7 @@ import (
) )
func TestNATSServerFromRegistry(t *testing.T) { func TestNATSServerFromRegistry(t *testing.T) {
registration, ok := module.ModuleRegistry["nats.server"] registration, ok := module.GetModuleRegistration("nats.server")
if !ok { if !ok {
t.Fatalf("nats.server module not registered") t.Fatalf("nats.server module not registered")
} }
@@ -53,7 +53,7 @@ func TestGoodNATSServer(t *testing.T) {
for _, test := range testCases { for _, test := range testCases {
t.Run(test.name, func(t *testing.T) { t.Run(test.name, func(t *testing.T) {
registration, ok := module.ModuleRegistry["nats.server"] registration, ok := module.GetModuleRegistration("nats.server")
if !ok { if !ok {
t.Fatalf("nats.server module not registered") t.Fatalf("nats.server module not registered")
} }
@@ -100,7 +100,7 @@ func TestBadNATSServer(t *testing.T) {
for _, test := range tests { for _, test := range tests {
t.Run(test.name, func(t *testing.T) { t.Run(test.name, func(t *testing.T) {
registration, ok := module.ModuleRegistry["nats.server"] registration, ok := module.GetModuleRegistration("nats.server")
if !ok { if !ok {
t.Fatalf("nats.server module not registered") t.Fatalf("nats.server module not registered")
} }
+2 -2
View File
@@ -8,7 +8,7 @@ import (
) )
func TestPSNClientFromRegistry(t *testing.T) { func TestPSNClientFromRegistry(t *testing.T) {
registration, ok := module.ModuleRegistry["psn.client"] registration, ok := module.GetModuleRegistration("psn.client")
if !ok { if !ok {
t.Fatalf("psn.client module not registered") t.Fatalf("psn.client module not registered")
} }
@@ -41,7 +41,7 @@ func TestBadPSNClient(t *testing.T) {
for _, test := range tests { for _, test := range tests {
t.Run(test.name, func(t *testing.T) { t.Run(test.name, func(t *testing.T) {
registration, ok := module.ModuleRegistry["psn.client"] registration, ok := module.GetModuleRegistration("psn.client")
if !ok { if !ok {
t.Fatalf("psn.client module not registered") t.Fatalf("psn.client module not registered")
} }
+2 -2
View File
@@ -8,7 +8,7 @@ import (
) )
func TestRedisClientFromRegistry(t *testing.T) { func TestRedisClientFromRegistry(t *testing.T) {
registration, ok := module.ModuleRegistry["redis.client"] registration, ok := module.GetModuleRegistration("redis.client")
if !ok { if !ok {
t.Fatalf("redis.client module not registered") t.Fatalf("redis.client module not registered")
} }
@@ -76,7 +76,7 @@ func TestBadRedisClient(t *testing.T) {
for _, test := range tests { for _, test := range tests {
t.Run(test.name, func(t *testing.T) { t.Run(test.name, func(t *testing.T) {
registration, ok := module.ModuleRegistry["redis.client"] registration, ok := module.GetModuleRegistration("redis.client")
if !ok { if !ok {
t.Fatalf("redis.client module not registered") t.Fatalf("redis.client module not registered")
} }
+2 -2
View File
@@ -8,7 +8,7 @@ import (
) )
func TestSerialClientFromRegistry(t *testing.T) { func TestSerialClientFromRegistry(t *testing.T) {
registration, ok := module.ModuleRegistry["serial.client"] registration, ok := module.GetModuleRegistration("serial.client")
if !ok { if !ok {
t.Fatalf("serial.client module not registered") t.Fatalf("serial.client module not registered")
} }
@@ -85,7 +85,7 @@ func TestBadSerialClient(t *testing.T) {
for _, test := range tests { for _, test := range tests {
t.Run(test.name, func(t *testing.T) { t.Run(test.name, func(t *testing.T) {
registration, ok := module.ModuleRegistry["serial.client"] registration, ok := module.GetModuleRegistration("serial.client")
if !ok { if !ok {
t.Fatalf("serial.client module not registered") t.Fatalf("serial.client module not registered")
} }
+2 -2
View File
@@ -8,7 +8,7 @@ import (
) )
func TestSIPCallServerFromRegistry(t *testing.T) { func TestSIPCallServerFromRegistry(t *testing.T) {
registration, ok := module.ModuleRegistry["sip.call.server"] registration, ok := module.GetModuleRegistration("sip.call.server")
if !ok { if !ok {
t.Fatalf("sip.call.server module not registered") t.Fatalf("sip.call.server module not registered")
} }
@@ -70,7 +70,7 @@ func TestBadSIPCallServer(t *testing.T) {
for _, test := range tests { for _, test := range tests {
t.Run(test.name, func(t *testing.T) { t.Run(test.name, func(t *testing.T) {
registration, ok := module.ModuleRegistry["sip.call.server"] registration, ok := module.GetModuleRegistration("sip.call.server")
if !ok { if !ok {
t.Fatalf("sip.call.server module not registered") t.Fatalf("sip.call.server module not registered")
} }
+2 -2
View File
@@ -8,7 +8,7 @@ import (
) )
func TestSIPDTMFServerFromRegistry(t *testing.T) { func TestSIPDTMFServerFromRegistry(t *testing.T) {
registration, ok := module.ModuleRegistry["sip.dtmf.server"] registration, ok := module.GetModuleRegistration("sip.dtmf.server")
if !ok { if !ok {
t.Fatalf("sip.dtmf.server module not registered") t.Fatalf("sip.dtmf.server module not registered")
} }
@@ -89,7 +89,7 @@ func TestBadSIPDTMFServer(t *testing.T) {
for _, test := range tests { for _, test := range tests {
t.Run(test.name, func(t *testing.T) { t.Run(test.name, func(t *testing.T) {
registration, ok := module.ModuleRegistry["sip.dtmf.server"] registration, ok := module.GetModuleRegistration("sip.dtmf.server")
if !ok { if !ok {
t.Fatalf("sip.dtmf.server module not registered") t.Fatalf("sip.dtmf.server module not registered")
} }
+2 -2
View File
@@ -8,7 +8,7 @@ import (
) )
func TestTCPClientFromRegistry(t *testing.T) { func TestTCPClientFromRegistry(t *testing.T) {
registration, ok := module.ModuleRegistry["net.tcp.client"] registration, ok := module.GetModuleRegistration("net.tcp.client")
if !ok { if !ok {
t.Fatalf("net.tcp.client module not registered") t.Fatalf("net.tcp.client module not registered")
} }
@@ -77,7 +77,7 @@ func TestBadTCPClient(t *testing.T) {
for _, test := range tests { for _, test := range tests {
t.Run(test.name, func(t *testing.T) { t.Run(test.name, func(t *testing.T) {
registration, ok := module.ModuleRegistry["net.tcp.client"] registration, ok := module.GetModuleRegistration("net.tcp.client")
if !ok { if !ok {
t.Fatalf("net.tcp.client module not registered") t.Fatalf("net.tcp.client module not registered")
} }
+3 -3
View File
@@ -9,7 +9,7 @@ import (
) )
func TestTCPServerFromRegistry(t *testing.T) { func TestTCPServerFromRegistry(t *testing.T) {
registration, ok := module.ModuleRegistry["net.tcp.server"] registration, ok := module.GetModuleRegistration("net.tcp.server")
if !ok { if !ok {
t.Fatalf("net.tcp.server module not registered") t.Fatalf("net.tcp.server module not registered")
} }
@@ -54,7 +54,7 @@ func TestGoodTCPServer(t *testing.T) {
for _, test := range testCases { for _, test := range testCases {
t.Run(test.name, func(t *testing.T) { t.Run(test.name, func(t *testing.T) {
registration, ok := module.ModuleRegistry["net.tcp.server"] registration, ok := module.GetModuleRegistration("net.tcp.server")
if !ok { if !ok {
t.Fatalf("net.tcp.server module not registered") t.Fatalf("net.tcp.server module not registered")
} }
@@ -149,7 +149,7 @@ func TestBadTCPServer(t *testing.T) {
for _, test := range tests { for _, test := range tests {
t.Run(test.name, func(t *testing.T) { t.Run(test.name, func(t *testing.T) {
registration, ok := module.ModuleRegistry["net.tcp.server"] registration, ok := module.GetModuleRegistration("net.tcp.server")
if !ok { if !ok {
t.Fatalf("net.tcp.server module not registered") t.Fatalf("net.tcp.server module not registered")
} }
+3 -3
View File
@@ -9,7 +9,7 @@ import (
) )
func TestTimeIntervalFromRegistry(t *testing.T) { func TestTimeIntervalFromRegistry(t *testing.T) {
registration, ok := module.ModuleRegistry["time.interval"] registration, ok := module.GetModuleRegistration("time.interval")
if !ok { if !ok {
t.Fatalf("time.interval module not registered") t.Fatalf("time.interval module not registered")
} }
@@ -52,7 +52,7 @@ func TestGoodTimeInterval(t *testing.T) {
for _, test := range testCases { for _, test := range testCases {
t.Run(test.name, func(t *testing.T) { t.Run(test.name, func(t *testing.T) {
registration, ok := module.ModuleRegistry["time.interval"] registration, ok := module.GetModuleRegistration("time.interval")
if !ok { if !ok {
t.Fatalf("time.interval module not registered") t.Fatalf("time.interval module not registered")
} }
@@ -103,7 +103,7 @@ func TestBadTimeInterval(t *testing.T) {
for _, test := range tests { for _, test := range tests {
t.Run(test.name, func(t *testing.T) { t.Run(test.name, func(t *testing.T) {
registration, ok := module.ModuleRegistry["time.interval"] registration, ok := module.GetModuleRegistration("time.interval")
if !ok { if !ok {
t.Fatalf("time.interval module not registered") t.Fatalf("time.interval module not registered")
} }
+3 -3
View File
@@ -9,7 +9,7 @@ import (
) )
func TestTimeTimerFromRegistry(t *testing.T) { func TestTimeTimerFromRegistry(t *testing.T) {
registration, ok := module.ModuleRegistry["time.timer"] registration, ok := module.GetModuleRegistration("time.timer")
if !ok { if !ok {
t.Fatalf("time.timer module not registered") t.Fatalf("time.timer module not registered")
} }
@@ -52,7 +52,7 @@ func TestGoodTimeTimer(t *testing.T) {
for _, test := range testCases { for _, test := range testCases {
t.Run(test.name, func(t *testing.T) { t.Run(test.name, func(t *testing.T) {
registration, ok := module.ModuleRegistry["time.timer"] registration, ok := module.GetModuleRegistration("time.timer")
if !ok { if !ok {
t.Fatalf("time.timer module not registered") t.Fatalf("time.timer module not registered")
} }
@@ -103,7 +103,7 @@ func TestBadTimeTimer(t *testing.T) {
for _, test := range tests { for _, test := range tests {
t.Run(test.name, func(t *testing.T) { t.Run(test.name, func(t *testing.T) {
registration, ok := module.ModuleRegistry["time.timer"] registration, ok := module.GetModuleRegistration("time.timer")
if !ok { if !ok {
t.Fatalf("time.timer module not registered") t.Fatalf("time.timer module not registered")
} }
+3 -3
View File
@@ -9,7 +9,7 @@ import (
) )
func TestUDPClientFromRegistry(t *testing.T) { func TestUDPClientFromRegistry(t *testing.T) {
registration, ok := module.ModuleRegistry["net.udp.client"] registration, ok := module.GetModuleRegistration("net.udp.client")
if !ok { if !ok {
t.Fatalf("udp.client module not registered") t.Fatalf("udp.client module not registered")
} }
@@ -55,7 +55,7 @@ func TestGoodUDPClient(t *testing.T) {
for _, test := range testCases { for _, test := range testCases {
t.Run(test.name, func(t *testing.T) { t.Run(test.name, func(t *testing.T) {
registration, ok := module.ModuleRegistry["net.udp.client"] registration, ok := module.GetModuleRegistration("net.udp.client")
if !ok { if !ok {
t.Fatalf("net.udp.client module not registered") t.Fatalf("net.udp.client module not registered")
} }
@@ -125,7 +125,7 @@ func TestBadUDPClient(t *testing.T) {
for _, test := range tests { for _, test := range tests {
t.Run(test.name, func(t *testing.T) { t.Run(test.name, func(t *testing.T) {
registration, ok := module.ModuleRegistry["net.udp.client"] registration, ok := module.GetModuleRegistration("net.udp.client")
if !ok { if !ok {
t.Fatalf("net.udp.client module not registered") t.Fatalf("net.udp.client module not registered")
} }
+2 -2
View File
@@ -8,7 +8,7 @@ import (
) )
func TestUDPMulticastFromRegistry(t *testing.T) { func TestUDPMulticastFromRegistry(t *testing.T) {
registration, ok := module.ModuleRegistry["net.udp.multicast"] registration, ok := module.GetModuleRegistration("net.udp.multicast")
if !ok { if !ok {
t.Fatalf("udp.multicast module not registered") t.Fatalf("udp.multicast module not registered")
} }
@@ -84,7 +84,7 @@ func TestBadUDPMulticast(t *testing.T) {
for _, test := range tests { for _, test := range tests {
t.Run(test.name, func(t *testing.T) { t.Run(test.name, func(t *testing.T) {
registration, ok := module.ModuleRegistry["net.udp.multicast"] registration, ok := module.GetModuleRegistration("net.udp.multicast")
if !ok { if !ok {
t.Fatalf("net.udp.multicast module not registered") t.Fatalf("net.udp.multicast module not registered")
} }
+3 -3
View File
@@ -9,7 +9,7 @@ import (
) )
func TestUDPServerFromRegistry(t *testing.T) { func TestUDPServerFromRegistry(t *testing.T) {
registration, ok := module.ModuleRegistry["net.udp.server"] registration, ok := module.GetModuleRegistration("net.udp.server")
if !ok { if !ok {
t.Fatalf("net.udp.server module not registered") t.Fatalf("net.udp.server module not registered")
} }
@@ -52,7 +52,7 @@ func TestGoodUDPServer(t *testing.T) {
for _, test := range testCases { for _, test := range testCases {
t.Run(test.name, func(t *testing.T) { t.Run(test.name, func(t *testing.T) {
registration, ok := module.ModuleRegistry["net.udp.server"] registration, ok := module.GetModuleRegistration("net.udp.server")
if !ok { if !ok {
t.Fatalf("net.udp.server module not registered") t.Fatalf("net.udp.server module not registered")
} }
@@ -128,7 +128,7 @@ func TestBadUDPServer(t *testing.T) {
for _, test := range tests { for _, test := range tests {
t.Run(test.name, func(t *testing.T) { t.Run(test.name, func(t *testing.T) {
registration, ok := module.ModuleRegistry["net.udp.server"] registration, ok := module.GetModuleRegistration("net.udp.server")
if !ok { if !ok {
t.Fatalf("net.udp.server module not registered") t.Fatalf("net.udp.server module not registered")
} }
@@ -8,7 +8,7 @@ import (
) )
func TestWebSocketClientFromRegistry(t *testing.T) { func TestWebSocketClientFromRegistry(t *testing.T) {
registration, ok := module.ModuleRegistry["websocket.client"] registration, ok := module.GetModuleRegistration("websocket.client")
if !ok { if !ok {
t.Fatalf("websocket.client module not registered") t.Fatalf("websocket.client module not registered")
} }
@@ -64,7 +64,7 @@ func TestBadWebSocketClient(t *testing.T) {
for _, test := range tests { for _, test := range tests {
t.Run(test.name, func(t *testing.T) { t.Run(test.name, func(t *testing.T) {
registration, ok := module.ModuleRegistry["websocket.client"] registration, ok := module.GetModuleRegistration("websocket.client")
if !ok { if !ok {
t.Fatalf("websocket.client module not registered") t.Fatalf("websocket.client module not registered")
} }
+7 -6
View File
@@ -67,25 +67,26 @@ func (i *TimeInterval) Start(ctx context.Context, inputHandler common.InputHandl
ticker := time.NewTicker(time.Millisecond * time.Duration(i.Duration)) ticker := time.NewTicker(time.Millisecond * time.Duration(i.Duration))
i.ticker = ticker i.ticker = ticker
for { for i.ctx.Err() == nil {
select { select {
case <-i.ctx.Done():
return nil
case <-ticker.C: case <-ticker.C:
if i.inputHandler != nil { if i.inputHandler != nil {
i.inputHandler(i.ctx, i.Id(), time.Now()) i.inputHandler(i.ctx, i.Id(), time.Now())
} }
default:
continue
} }
} }
<-i.ctx.Done()
i.logger.Debug("done")
return nil
} }
func (i *TimeInterval) Stop() { func (i *TimeInterval) Stop() {
if i.cancel != nil { if i.cancel != nil {
i.cancel() defer i.cancel()
} }
if i.ticker != nil { if i.ticker != nil {
i.ticker.Stop() i.ticker.Stop()
i.ticker = nil
} }
i.logger.Debug("done")
} }
+5 -4
View File
@@ -66,7 +66,7 @@ func (t *TimeTimer) Start(ctx context.Context, inputHandler common.InputHandler)
t.cancel = cancel t.cancel = cancel
t.timer = time.NewTimer(time.Millisecond * time.Duration(t.Duration)) t.timer = time.NewTimer(time.Millisecond * time.Duration(t.Duration))
for { for t.ctx.Err() == nil {
select { select {
case <-t.ctx.Done(): case <-t.ctx.Done():
return nil 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() { func (t *TimeTimer) Stop() {
if t.cancel != nil { if t.cancel != nil {
t.cancel() defer t.cancel()
} }
if t.timer != nil { if t.timer != nil {
t.timer.Stop() t.timer.Stop()
t.timer = nil
} }
t.logger.Debug("done")
} }
+2 -4
View File
@@ -96,6 +96,7 @@ func (uc *UDPClient) Start(ctx context.Context, inputHandler common.InputHandler
} }
<-uc.ctx.Done() <-uc.ctx.Done()
uc.logger.Debug("done")
return nil return nil
} }
@@ -120,14 +121,11 @@ func (uc *UDPClient) Output(ctx context.Context, payload any) error {
func (uc *UDPClient) Stop() { func (uc *UDPClient) Stop() {
if uc.cancel != nil { if uc.cancel != nil {
uc.cancel() defer uc.cancel()
} }
uc.connMu.Lock() uc.connMu.Lock()
defer uc.connMu.Unlock() defer uc.connMu.Unlock()
if uc.conn != nil { if uc.conn != nil {
uc.conn.Close() uc.conn.Close()
uc.conn = nil
} }
uc.logger.Debug("done")
} }
+22 -25
View File
@@ -93,35 +93,34 @@ func (um *UDPMulticast) Start(ctx context.Context, inputHandler common.InputHand
um.connMu.Unlock() um.connMu.Unlock()
buffer := make([]byte, 2048) buffer := make([]byte, 2048)
for { for um.ctx.Err() == nil {
select { um.conn.SetDeadline(time.Now().Add(time.Millisecond * 200))
case <-um.ctx.Done():
return nil
default:
um.connMu.Lock()
um.conn.SetDeadline(time.Now().Add(time.Millisecond * 200))
numBytes, _, err := um.conn.ReadFromUDP(buffer) numBytes, _, err := um.conn.ReadFromUDP(buffer)
um.connMu.Unlock() if err != nil {
if err != nil { if errors.Is(err, net.ErrClosed) {
//NOTE(jwetzell) we hit deadline break
if opErr, ok := err.(*net.OpError); ok && opErr.Timeout() {
continue
}
return err
} }
//NOTE(jwetzell) we hit deadline
if opErr, ok := err.(*net.OpError); ok && opErr.Timeout() {
continue
}
return err
}
if numBytes > 0 { if numBytes > 0 {
message := buffer[:numBytes] message := buffer[:numBytes]
if um.inputHandler != nil { if um.inputHandler != nil {
um.inputHandler(um.ctx, um.Id(), message) um.inputHandler(um.ctx, um.Id(), message)
} else { } else {
um.logger.Error("input received but no input handler is configured") 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 { 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() { func (um *UDPMulticast) Stop() {
if um.cancel != nil { if um.cancel != nil {
um.cancel() defer um.cancel()
} }
um.connMu.Lock() um.connMu.Lock()
defer um.connMu.Unlock() defer um.connMu.Unlock()
if um.conn != nil { if um.conn != nil {
um.conn.Close() um.conn.Close()
um.conn = nil
} }
um.logger.Debug("done")
} }
+17 -22
View File
@@ -111,32 +111,29 @@ func (us *UDPServer) Start(ctx context.Context, inputHandler common.InputHandler
} }
us.listenerMu.Lock() us.listenerMu.Lock()
us.listener = listener us.listener = listener
us.listenerMu.Unlock()
buffer := make([]byte, us.BufferSize) buffer := make([]byte, us.BufferSize)
for us.ctx.Err() == nil { for us.ctx.Err() == nil {
select { listener.SetDeadline(time.Now().Add(time.Millisecond * 200))
case <-us.ctx.Done():
return nil
default:
listener.SetDeadline(time.Now().Add(time.Millisecond * 200))
numBytes, _, err := listener.ReadFromUDP(buffer) numBytes, _, err := listener.ReadFromUDP(buffer)
if err != nil { if err != nil {
//NOTE(jwetzell) we hit deadline //NOTE(jwetzell) we hit deadline
if opErr, ok := err.(*net.OpError); ok && opErr.Timeout() { if opErr, ok := err.(*net.OpError); ok && opErr.Timeout() {
continue 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")
} }
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 return nil
} }
@@ -146,13 +143,11 @@ func (us *UDPServer) Output(ctx context.Context, payload any) error {
func (us *UDPServer) Stop() { func (us *UDPServer) Stop() {
if us.cancel != nil { if us.cancel != nil {
us.cancel() defer us.cancel()
} }
us.listenerMu.Lock() us.listenerMu.Lock()
defer us.listenerMu.Unlock() defer us.listenerMu.Unlock()
if us.listener != nil { if us.listener != nil {
us.listener.Close() us.listener.Close()
us.listener = nil
} }
us.logger.Debug("done")
} }
+38 -16
View File
@@ -5,7 +5,6 @@ import (
"errors" "errors"
"fmt" "fmt"
"log/slog" "log/slog"
"net"
"net/url" "net/url"
"sync" "sync"
"time" "time"
@@ -74,7 +73,30 @@ func (wc *WebSocketClient) Type() string {
func (wc *WebSocketClient) SetupConn() error { func (wc *WebSocketClient) SetupConn() error {
wc.connMu.Lock() wc.connMu.Lock()
defer wc.connMu.Unlock() defer wc.connMu.Unlock()
if wc.conn != nil {
wc.conn.Close()
}
conn, _, err := websocket.DefaultDialer.Dial(wc.URL.String(), nil) 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 wc.conn = conn
return err return err
} }
@@ -92,13 +114,13 @@ func (wc *WebSocketClient) Start(ctx context.Context, inputHandler common.InputH
wc.logger.Error("connection error", "error", err) wc.logger.Error("connection error", "error", err)
} else { } else {
// NOTE(jwetzell): enter read loop until an error occurs // NOTE(jwetzell): enter read loop until an error occurs
wc.logger.Debug("websocket connection established entering read loop")
wc.readLoop() wc.readLoop()
} }
// NOTE(jwetzell): if connection is lost or read error wait before trying again // NOTE(jwetzell): if connection is lost or read error wait before trying again
time.Sleep(2 * time.Second) time.Sleep(2 * time.Second)
} }
<-wc.ctx.Done() <-wc.ctx.Done()
wc.logger.Debug("done")
return nil return nil
} }
@@ -108,24 +130,22 @@ func (wc *WebSocketClient) readLoop() {
wc.logger.Error("websocket connection is not established") wc.logger.Error("websocket connection is not established")
return return
} }
// TODO(jwetzell): other ways to timeout?
wc.conn.SetReadDeadline(time.Now().Add(5 * time.Second)) wc.conn.SetReadDeadline(time.Now().Add(5 * time.Second))
messageType, message, err := wc.conn.ReadMessage() messageType, message, err := wc.conn.ReadMessage()
if err != nil { 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 return
} }
if wc.inputHandler != nil { if wc.inputHandler != nil {
switch messageType { 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: case websocket.TextMessage:
wc.inputHandler(wc.ctx, wc.Id(), string(message)) wc.inputHandler(wc.ctx, wc.Id(), string(message))
case websocket.BinaryMessage: case websocket.BinaryMessage:
@@ -182,13 +202,15 @@ func (wc *WebSocketClient) Output(ctx context.Context, payload any) error {
func (wc *WebSocketClient) Stop() { func (wc *WebSocketClient) Stop() {
if wc.cancel != nil { if wc.cancel != nil {
wc.cancel() defer wc.cancel()
} }
wc.connMu.Lock() wc.connMu.Lock()
defer wc.connMu.Unlock() defer wc.connMu.Unlock()
if wc.conn != nil { 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.Close()
wc.conn = nil
} }
wc.logger.Debug("done")
} }
+58
View File
@@ -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
}
+3 -3
View File
@@ -22,12 +22,12 @@ func init() {
Title: "Status Code", Title: "Status Code",
Type: "integer", Type: "integer",
}, },
"body": { "bodyTemplate": {
Title: "Body", Title: "Body Template",
Type: "string", Type: "string",
}, },
}, },
Required: []string{"status", "body"}, Required: []string{"status", "bodyTemplate"},
AdditionalProperties: &jsonschema.Schema{Not: &jsonschema.Schema{}}, AdditionalProperties: &jsonschema.Schema{Not: &jsonschema.Schema{}},
}, },
New: func(config config.ProcessorConfig) (Processor, error) { New: func(config config.ProcessorConfig) (Processor, error) {
+1 -1
View File
@@ -77,7 +77,7 @@ func (kvg *KVGet) Process(ctx context.Context, wrappedPayload common.WrappedPayl
kvg.module = kvModule kvg.module = kvModule
} }
value, err := kvg.module.Get(kvg.Key) value, err := kvg.module.Get(ctx, kvg.Key)
if err != nil { if err != nil {
wrappedPayload.End = true wrappedPayload.End = true
return wrappedPayload, fmt.Errorf("kv.get error getting key: %w", err) return wrappedPayload, fmt.Errorf("kv.get error getting key: %w", err)
+1 -1
View File
@@ -78,7 +78,7 @@ func (kvs *KVSet) Process(ctx context.Context, wrappedPayload common.WrappedPayl
kvs.module = kvModule kvs.module = kvModule
} }
err := kvs.module.Set(kvs.Key, wrappedPayload.Payload) err := kvs.module.Set(ctx, kvs.Key, wrappedPayload.Payload)
if err != nil { if err != nil {
wrappedPayload.End = true wrappedPayload.End = true
return wrappedPayload, fmt.Errorf("kv.set error setting key: %w", err) return wrappedPayload, fmt.Errorf("kv.set error setting key: %w", err)
+23 -3
View File
@@ -35,13 +35,33 @@ func RegisterProcessor(processor ProcessorRegistration) {
processorRegistryMu.Lock() processorRegistryMu.Lock()
defer processorRegistryMu.Unlock() 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)) 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 ( var (
processorRegistryMu sync.RWMutex processorRegistryMu sync.RWMutex
ProcessorRegistry = make(map[string]ProcessorRegistration) processorRegistry = make(map[string]ProcessorRegistration)
) )
@@ -11,7 +11,7 @@ import (
) )
func TestArtnetPacketDecodeFromRegistry(t *testing.T) { func TestArtnetPacketDecodeFromRegistry(t *testing.T) {
registration, ok := processor.ProcessorRegistry["artnet.packet.decode"] registration, ok := processor.GetProcessorRegistration("artnet.packet.decode")
if !ok { if !ok {
t.Fatalf("artnet.packet.decode processor not registered") t.Fatalf("artnet.packet.decode processor not registered")
} }
@@ -41,15 +41,11 @@ func TestGoodArtnetPacketDecode(t *testing.T) {
name: "number", 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}, 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{ expected: &artnet.ArtDmx{
ID: [8]byte{'A', 'r', 't', '-', 'N', 'e', 't', 0x00}, Sequence: 237,
OpCode: artnet.OpDmx, Physical: 0,
ProtVerHi: 0, SubUni: 1,
ProtVerLo: 14, Net: 0,
Sequence: 237, Data: make([]uint8, 512),
Physical: 0,
SubUni: 1,
Net: 0,
Data: make([]uint8, 512),
}, },
}, },
} }
@@ -11,7 +11,7 @@ import (
) )
func TestArtnetPacketEncodeFromRegistry(t *testing.T) { func TestArtnetPacketEncodeFromRegistry(t *testing.T) {
registration, ok := processor.ProcessorRegistry["artnet.packet.encode"] registration, ok := processor.GetProcessorRegistration("artnet.packet.encode")
if !ok { if !ok {
t.Fatalf("artnet.packet.encode processor not registered") t.Fatalf("artnet.packet.encode processor not registered")
} }
@@ -41,15 +41,11 @@ func TestGoodArtnetPacketEncode(t *testing.T) {
name: "number", 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}, 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{ payload: &artnet.ArtDmx{
ID: [8]byte{'A', 'r', 't', '-', 'N', 'e', 't', 0x00}, Sequence: 237,
OpCode: artnet.OpDmx, Physical: 0,
ProtVerHi: 0, SubUni: 1,
ProtVerLo: 14, Net: 0,
Sequence: 237, Data: make([]uint8, 512),
Physical: 0,
SubUni: 1,
Net: 0,
Data: make([]uint8, 512),
}, },
}, },
} }
@@ -104,15 +100,11 @@ func TestBadArtnetPacketEncode(t *testing.T) {
func BenchmarkArtnetPacketEncode(b *testing.B) { func BenchmarkArtnetPacketEncode(b *testing.B) {
processorInstance := processor.ArtNetPacketEncode{} processorInstance := processor.ArtNetPacketEncode{}
payload := &artnet.ArtDmx{ payload := &artnet.ArtDmx{
ID: [8]byte{'A', 'r', 't', '-', 'N', 'e', 't', 0x00}, Sequence: 237,
OpCode: artnet.OpDmx, Physical: 0,
ProtVerHi: 0, SubUni: 1,
ProtVerLo: 14, Net: 0,
Sequence: 237, Data: make([]uint8, 512),
Physical: 0,
SubUni: 1,
Net: 0,
Data: make([]uint8, 512),
} }
for b.Loop() { for b.Loop() {
+5 -5
View File
@@ -12,7 +12,7 @@ import (
) )
func TestDbQueryFromRegistry(t *testing.T) { func TestDbQueryFromRegistry(t *testing.T) {
registration, ok := processor.ProcessorRegistry["db.query"] registration, ok := processor.GetProcessorRegistration("db.query")
if !ok { if !ok {
t.Fatalf("db.query processor not registered") t.Fatalf("db.query processor not registered")
} }
@@ -100,7 +100,7 @@ func TestGoodDbQuery(t *testing.T) {
} }
for _, testCase := range testCases { for _, testCase := range testCases {
t.Run(testCase.name, func(t *testing.T) { t.Run(testCase.name, func(t *testing.T) {
registration, ok := processor.ProcessorRegistry["db.query"] registration, ok := processor.GetProcessorRegistration("db.query")
if !ok { if !ok {
t.Fatalf("db.query processor not registered") 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", 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"}, payload: test.TestStruct{Data: "hello"},
params: map[string]any{ params: map[string]any{
"module": "test", "module": "test",
@@ -259,7 +259,7 @@ func TestBadDbQuery(t *testing.T) {
for _, test := range tests { for _, test := range tests {
t.Run(test.name, func(t *testing.T) { t.Run(test.name, func(t *testing.T) {
registration, ok := processor.ProcessorRegistry["db.query"] registration, ok := processor.GetProcessorRegistration("db.query")
if !ok { if !ok {
t.Fatalf("db.query processor not registered") t.Fatalf("db.query processor not registered")
} }
@@ -293,7 +293,7 @@ func TestBadDbQuery(t *testing.T) {
} }
func BenchmarkDbQuery(b *testing.B) { func BenchmarkDbQuery(b *testing.B) {
registration, ok := processor.ProcessorRegistry["db.query"] registration, ok := processor.GetProcessorRegistration("db.query")
if !ok { if !ok {
b.Fatalf("db.query processor not registered") b.Fatalf("db.query processor not registered")
} }
+4 -4
View File
@@ -10,7 +10,7 @@ import (
) )
func TestDebugLogFromRegistry(t *testing.T) { func TestDebugLogFromRegistry(t *testing.T) {
registration, ok := processor.ProcessorRegistry["debug.log"] registration, ok := processor.GetProcessorRegistration("debug.log")
if !ok { if !ok {
t.Fatalf("debug.log processor not registered") t.Fatalf("debug.log processor not registered")
} }
@@ -52,7 +52,7 @@ func TestGoodDebugLog(t *testing.T) {
for _, test := range tests { for _, test := range tests {
t.Run(test.name, func(t *testing.T) { t.Run(test.name, func(t *testing.T) {
registration, ok := processor.ProcessorRegistry["debug.log"] registration, ok := processor.GetProcessorRegistration("debug.log")
if !ok { if !ok {
t.Fatalf("debug.log processor not registered") t.Fatalf("debug.log processor not registered")
} }
@@ -89,7 +89,7 @@ func TestBadDebugLog(t *testing.T) {
for _, test := range tests { for _, test := range tests {
t.Run(test.name, func(t *testing.T) { t.Run(test.name, func(t *testing.T) {
registration, ok := processor.ProcessorRegistry["debug.log"] registration, ok := processor.GetProcessorRegistration("debug.log")
if !ok { if !ok {
t.Fatalf("debug.log processor not registered") t.Fatalf("debug.log processor not registered")
} }
@@ -120,7 +120,7 @@ func TestBadDebugLog(t *testing.T) {
} }
func BenchmarkDebugLog(b *testing.B) { func BenchmarkDebugLog(b *testing.B) {
registration, ok := processor.ProcessorRegistry["debug.log"] registration, ok := processor.GetProcessorRegistration("debug.log")
if !ok { if !ok {
b.Fatalf("debug.log processor not registered") b.Fatalf("debug.log processor not registered")
} }
@@ -10,7 +10,7 @@ import (
) )
func TestFilterChangeFromRegistry(t *testing.T) { func TestFilterChangeFromRegistry(t *testing.T) {
registration, ok := processor.ProcessorRegistry["filter.change"] registration, ok := processor.GetProcessorRegistration("filter.change")
if !ok { if !ok {
t.Fatalf("filter.change processor not registered") t.Fatalf("filter.change processor not registered")
} }
@@ -58,7 +58,7 @@ func TestGoodFilterChange(t *testing.T) {
for _, test := range tests { for _, test := range tests {
t.Run(test.name, func(t *testing.T) { t.Run(test.name, func(t *testing.T) {
registration, ok := processor.ProcessorRegistry["filter.change"] registration, ok := processor.GetProcessorRegistration("filter.change")
if !ok { if !ok {
t.Fatalf("filter.change processor not registered") t.Fatalf("filter.change processor not registered")
} }
@@ -95,7 +95,7 @@ func TestBadFilterChange(t *testing.T) {
for _, test := range tests { for _, test := range tests {
t.Run(test.name, func(t *testing.T) { t.Run(test.name, func(t *testing.T) {
registration, ok := processor.ProcessorRegistry["filter.change"] registration, ok := processor.GetProcessorRegistration("filter.change")
if !ok { if !ok {
t.Fatalf("filter.change processor not registered") t.Fatalf("filter.change processor not registered")
} }
@@ -126,7 +126,7 @@ func TestBadFilterChange(t *testing.T) {
} }
func BenchmarkFilterChange(b *testing.B) { func BenchmarkFilterChange(b *testing.B) {
registration, ok := processor.ProcessorRegistry["filter.change"] registration, ok := processor.GetProcessorRegistration("filter.change")
if !ok { if !ok {
b.Fatalf("filter.change processor not registered") b.Fatalf("filter.change processor not registered")
} }
+4 -4
View File
@@ -10,7 +10,7 @@ import (
) )
func TestFilterExprFromRegistry(t *testing.T) { func TestFilterExprFromRegistry(t *testing.T) {
registration, ok := processor.ProcessorRegistry["filter.expr"] registration, ok := processor.GetProcessorRegistration("filter.expr")
if !ok { if !ok {
t.Fatalf("filter.expr processor not registered") t.Fatalf("filter.expr processor not registered")
} }
@@ -71,7 +71,7 @@ func TestGoodFilterExpr(t *testing.T) {
for _, testCase := range testCases { for _, testCase := range testCases {
t.Run(testCase.name, func(t *testing.T) { t.Run(testCase.name, func(t *testing.T) {
registration, ok := processor.ProcessorRegistry["filter.expr"] registration, ok := processor.GetProcessorRegistration("filter.expr")
if !ok { if !ok {
t.Fatalf("filter.expr processor not registered") t.Fatalf("filter.expr processor not registered")
} }
@@ -144,7 +144,7 @@ func TestBadFilterExpr(t *testing.T) {
for _, test := range tests { for _, test := range tests {
t.Run(test.name, func(t *testing.T) { t.Run(test.name, func(t *testing.T) {
registration, ok := processor.ProcessorRegistry["filter.expr"] registration, ok := processor.GetProcessorRegistration("filter.expr")
if !ok { if !ok {
t.Fatalf("filter.expr processor not registered") t.Fatalf("filter.expr processor not registered")
} }
@@ -173,7 +173,7 @@ func TestBadFilterExpr(t *testing.T) {
} }
func BenchmarkFilterExpr(b *testing.B) { func BenchmarkFilterExpr(b *testing.B) {
registration, ok := processor.ProcessorRegistry["filter.expr"] registration, ok := processor.GetProcessorRegistration("filter.expr")
if !ok { if !ok {
b.Fatalf("filter.expr processor not registered") b.Fatalf("filter.expr processor not registered")
} }
+116
View File
@@ -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)
}
})
}
}
+4 -4
View File
@@ -10,7 +10,7 @@ import (
) )
func TestFilterRegexFromRegistry(t *testing.T) { func TestFilterRegexFromRegistry(t *testing.T) {
registration, ok := processor.ProcessorRegistry["filter.regex"] registration, ok := processor.GetProcessorRegistration("filter.regex")
if !ok { if !ok {
t.Fatalf("filter.regex processor not registered") t.Fatalf("filter.regex processor not registered")
} }
@@ -77,7 +77,7 @@ func TestGoodFilterRegex(t *testing.T) {
for _, test := range tests { for _, test := range tests {
t.Run(test.name, func(t *testing.T) { t.Run(test.name, func(t *testing.T) {
registration, ok := processor.ProcessorRegistry["filter.regex"] registration, ok := processor.GetProcessorRegistration("filter.regex")
if !ok { if !ok {
t.Fatalf("filter.regex processor not registered") t.Fatalf("filter.regex processor not registered")
} }
@@ -145,7 +145,7 @@ func TestBadFilterRegex(t *testing.T) {
for _, test := range tests { for _, test := range tests {
t.Run(test.name, func(t *testing.T) { t.Run(test.name, func(t *testing.T) {
registration, ok := processor.ProcessorRegistry["filter.regex"] registration, ok := processor.GetProcessorRegistration("filter.regex")
if !ok { if !ok {
t.Fatalf("filter.regex processor not registered") t.Fatalf("filter.regex processor not registered")
} }
@@ -176,7 +176,7 @@ func TestBadFilterRegex(t *testing.T) {
} }
func BenchmarkFilterRegex(b *testing.B) { func BenchmarkFilterRegex(b *testing.B) {
registration, ok := processor.ProcessorRegistry["filter.regex"] registration, ok := processor.GetProcessorRegistration("filter.regex")
if !ok { if !ok {
b.Fatalf("filter.regex processor not registered") b.Fatalf("filter.regex processor not registered")
} }
+4 -4
View File
@@ -10,7 +10,7 @@ import (
) )
func TestFloatParseFromRegistry(t *testing.T) { func TestFloatParseFromRegistry(t *testing.T) {
registration, ok := processor.ProcessorRegistry["float.parse"] registration, ok := processor.GetProcessorRegistration("float.parse")
if !ok { if !ok {
t.Fatalf("float.parse processor not registered") t.Fatalf("float.parse processor not registered")
} }
@@ -63,7 +63,7 @@ func TestGoodFloatParse(t *testing.T) {
for _, test := range tests { for _, test := range tests {
t.Run(test.name, func(t *testing.T) { t.Run(test.name, func(t *testing.T) {
registration, ok := processor.ProcessorRegistry["float.parse"] registration, ok := processor.GetProcessorRegistration("float.parse")
if !ok { if !ok {
t.Fatalf("float.parse processor not registered") t.Fatalf("float.parse processor not registered")
} }
@@ -136,7 +136,7 @@ func TestBadFloatParse(t *testing.T) {
for _, test := range tests { for _, test := range tests {
t.Run(test.name, func(t *testing.T) { t.Run(test.name, func(t *testing.T) {
registration, ok := processor.ProcessorRegistry["float.parse"] registration, ok := processor.GetProcessorRegistration("float.parse")
if !ok { if !ok {
t.Fatalf("float.parse processor not registered") t.Fatalf("float.parse processor not registered")
} }
@@ -167,7 +167,7 @@ func TestBadFloatParse(t *testing.T) {
} }
func BenchmarkFloatParse(b *testing.B) { func BenchmarkFloatParse(b *testing.B) {
registration, ok := processor.ProcessorRegistry["float.parse"] registration, ok := processor.GetProcessorRegistration("float.parse")
if !ok { if !ok {
b.Fatalf("float.parse processor not registered") b.Fatalf("float.parse processor not registered")
} }
+4 -4
View File
@@ -9,7 +9,7 @@ import (
) )
func TestFloatRandomFromRegistry(t *testing.T) { func TestFloatRandomFromRegistry(t *testing.T) {
registration, ok := processor.ProcessorRegistry["float.random"] registration, ok := processor.GetProcessorRegistration("float.random")
if !ok { if !ok {
t.Fatalf("float.random processor not registered") t.Fatalf("float.random processor not registered")
} }
@@ -57,7 +57,7 @@ func TestGoodFloatRandom(t *testing.T) {
for _, test := range tests { for _, test := range tests {
t.Run(test.name, func(t *testing.T) { t.Run(test.name, func(t *testing.T) {
registration, ok := processor.ProcessorRegistry["float.random"] registration, ok := processor.GetProcessorRegistration("float.random")
if !ok { if !ok {
t.Fatalf("float.random processor not registered") t.Fatalf("float.random processor not registered")
} }
@@ -155,7 +155,7 @@ func TestBadFloatRandom(t *testing.T) {
for _, test := range tests { for _, test := range tests {
t.Run(test.name, func(t *testing.T) { t.Run(test.name, func(t *testing.T) {
registration, ok := processor.ProcessorRegistry["float.random"] registration, ok := processor.GetProcessorRegistration("float.random")
if !ok { if !ok {
t.Fatalf("float.random processor not registered") t.Fatalf("float.random processor not registered")
} }
@@ -186,7 +186,7 @@ func TestBadFloatRandom(t *testing.T) {
} }
func BenchmarkFloatRandom(b *testing.B) { func BenchmarkFloatRandom(b *testing.B) {
registration, ok := processor.ProcessorRegistry["float.random"] registration, ok := processor.GetProcessorRegistration("float.random")
if !ok { if !ok {
b.Fatalf("float.random processor not registered") b.Fatalf("float.random processor not registered")
} }
@@ -11,7 +11,7 @@ import (
) )
func TestFreeDCreateFromRegistry(t *testing.T) { func TestFreeDCreateFromRegistry(t *testing.T) {
registration, ok := processor.ProcessorRegistry["freed.create"] registration, ok := processor.GetProcessorRegistration("freed.create")
if !ok { if !ok {
t.Fatalf("freed.create processor not registered") t.Fatalf("freed.create processor not registered")
} }
@@ -89,7 +89,7 @@ func TestGoodFreeDCreate(t *testing.T) {
for _, test := range tests { for _, test := range tests {
t.Run(test.name, func(t *testing.T) { t.Run(test.name, func(t *testing.T) {
registration, ok := processor.ProcessorRegistry["freed.create"] registration, ok := processor.GetProcessorRegistration("freed.create")
if !ok { if !ok {
t.Fatalf("freed.create processor not registered") t.Fatalf("freed.create processor not registered")
} }
@@ -848,7 +848,7 @@ func TestBadFreeDCreate(t *testing.T) {
for _, test := range tests { for _, test := range tests {
t.Run(test.name, func(t *testing.T) { t.Run(test.name, func(t *testing.T) {
registration, ok := processor.ProcessorRegistry["freed.create"] registration, ok := processor.GetProcessorRegistration("freed.create")
if !ok { if !ok {
t.Fatalf("freed.create processor not registered") t.Fatalf("freed.create processor not registered")
} }
@@ -879,7 +879,7 @@ func TestBadFreeDCreate(t *testing.T) {
} }
func BenchmarkFreeDCreate(b *testing.B) { func BenchmarkFreeDCreate(b *testing.B) {
registration, ok := processor.ProcessorRegistry["freed.create"] registration, ok := processor.GetProcessorRegistration("freed.create")
if !ok { if !ok {
b.Fatalf("freed.create processor not registered") b.Fatalf("freed.create processor not registered")
} }
@@ -11,7 +11,7 @@ import (
) )
func TestFreeDDecodeFromRegistry(t *testing.T) { func TestFreeDDecodeFromRegistry(t *testing.T) {
registration, ok := processor.ProcessorRegistry["freed.decode"] registration, ok := processor.GetProcessorRegistration("freed.decode")
if !ok { if !ok {
t.Fatalf("freed.decode processor not registered") t.Fatalf("freed.decode processor not registered")
} }
@@ -11,7 +11,7 @@ import (
) )
func TestFreeDEncodeFromRegistry(t *testing.T) { func TestFreeDEncodeFromRegistry(t *testing.T) {
registration, ok := processor.ProcessorRegistry["freed.encode"] registration, ok := processor.GetProcessorRegistration("freed.encode")
if !ok { if !ok {
t.Fatalf("freed.encode processor not registered") t.Fatalf("freed.encode processor not registered")
} }
@@ -10,7 +10,7 @@ import (
) )
func TestHTTPRequestCreateFromRegistry(t *testing.T) { func TestHTTPRequestCreateFromRegistry(t *testing.T) {
registration, ok := processor.ProcessorRegistry["http.request.do"] registration, ok := processor.GetProcessorRegistration("http.request.do")
if !ok { if !ok {
t.Fatalf("http.request.do processor not registered") t.Fatalf("http.request.do processor not registered")
} }
@@ -44,7 +44,7 @@ func TestGoodHTTPRequestDo(t *testing.T) {
for _, test := range tests { for _, test := range tests {
t.Run(test.name, func(t *testing.T) { t.Run(test.name, func(t *testing.T) {
registration, ok := processor.ProcessorRegistry["http.request.do"] registration, ok := processor.GetProcessorRegistration("http.request.do")
if !ok { if !ok {
t.Fatalf("http.request.do processor not registered") t.Fatalf("http.request.do processor not registered")
} }
@@ -132,7 +132,7 @@ func TestBadHTTPRequestDo(t *testing.T) {
for _, test := range tests { for _, test := range tests {
t.Run(test.name, func(t *testing.T) { t.Run(test.name, func(t *testing.T) {
registration, ok := processor.ProcessorRegistry["http.request.do"] registration, ok := processor.GetProcessorRegistration("http.request.do")
if !ok { if !ok {
t.Fatalf("http.request.do processor not registered") t.Fatalf("http.request.do processor not registered")
} }
@@ -10,7 +10,7 @@ import (
) )
func TestHTTPResponseCreateFromRegistry(t *testing.T) { func TestHTTPResponseCreateFromRegistry(t *testing.T) {
registration, ok := processor.ProcessorRegistry["http.response.create"] registration, ok := processor.GetProcessorRegistration("http.response.create")
if !ok { if !ok {
t.Fatalf("http.response.create processor not registered") t.Fatalf("http.response.create processor not registered")
} }
@@ -54,7 +54,7 @@ func TestGoodHTTPResponseCreate(t *testing.T) {
for _, test := range tests { for _, test := range tests {
t.Run(test.name, func(t *testing.T) { t.Run(test.name, func(t *testing.T) {
registration, ok := processor.ProcessorRegistry["http.response.create"] registration, ok := processor.GetProcessorRegistration("http.response.create")
if !ok { if !ok {
t.Fatalf("http.response.create processor not registered") t.Fatalf("http.response.create processor not registered")
} }
@@ -128,7 +128,7 @@ func TestBadHTTPResponseCreate(t *testing.T) {
for _, test := range tests { for _, test := range tests {
t.Run(test.name, func(t *testing.T) { t.Run(test.name, func(t *testing.T) {
registration, ok := processor.ProcessorRegistry["http.response.create"] registration, ok := processor.GetProcessorRegistration("http.response.create")
if !ok { if !ok {
t.Fatalf("http.response.create processor not registered") t.Fatalf("http.response.create processor not registered")
} }
@@ -159,7 +159,7 @@ func TestBadHTTPResponseCreate(t *testing.T) {
} }
func BenchmarkHTTPResponseCreate(b *testing.B) { func BenchmarkHTTPResponseCreate(b *testing.B) {
registration, ok := processor.ProcessorRegistry["http.response.create"] registration, ok := processor.GetProcessorRegistration("http.response.create")
if !ok { if !ok {
b.Fatalf("http.response.create processor not registered") b.Fatalf("http.response.create processor not registered")
} }
+4 -4
View File
@@ -10,7 +10,7 @@ import (
) )
func TestIntParseFromRegistry(t *testing.T) { func TestIntParseFromRegistry(t *testing.T) {
registration, ok := processor.ProcessorRegistry["int.parse"] registration, ok := processor.GetProcessorRegistration("int.parse")
if !ok { if !ok {
t.Fatalf("int.parse processor not registered") t.Fatalf("int.parse processor not registered")
} }
@@ -84,7 +84,7 @@ func TestGoodIntParse(t *testing.T) {
for _, test := range tests { for _, test := range tests {
t.Run(test.name, func(t *testing.T) { t.Run(test.name, func(t *testing.T) {
registration, ok := processor.ProcessorRegistry["int.parse"] registration, ok := processor.GetProcessorRegistration("int.parse")
if !ok { if !ok {
t.Fatalf("int.parse processor not registered") t.Fatalf("int.parse processor not registered")
} }
@@ -170,7 +170,7 @@ func TestBadIntParse(t *testing.T) {
for _, test := range tests { for _, test := range tests {
t.Run(test.name, func(t *testing.T) { t.Run(test.name, func(t *testing.T) {
registration, ok := processor.ProcessorRegistry["int.parse"] registration, ok := processor.GetProcessorRegistration("int.parse")
if !ok { if !ok {
t.Fatalf("int.parse processor not registered") t.Fatalf("int.parse processor not registered")
} }
@@ -201,7 +201,7 @@ func TestBadIntParse(t *testing.T) {
} }
func BenchmarkIntParse(b *testing.B) { func BenchmarkIntParse(b *testing.B) {
registration, ok := processor.ProcessorRegistry["int.parse"] registration, ok := processor.GetProcessorRegistration("int.parse")
if !ok { if !ok {
b.Fatalf("int.parse processor not registered") b.Fatalf("int.parse processor not registered")
} }
+5 -5
View File
@@ -9,7 +9,7 @@ import (
) )
func TestIntRandomFromRegistry(t *testing.T) { func TestIntRandomFromRegistry(t *testing.T) {
registration, ok := processor.ProcessorRegistry["int.random"] registration, ok := processor.GetProcessorRegistration("int.random")
if !ok { if !ok {
t.Fatalf("int.random processor not registered") t.Fatalf("int.random processor not registered")
} }
@@ -32,7 +32,7 @@ func TestIntRandomFromRegistry(t *testing.T) {
} }
func TestIntRandomGoodConfig(t *testing.T) { func TestIntRandomGoodConfig(t *testing.T) {
registration, ok := processor.ProcessorRegistry["int.random"] registration, ok := processor.GetProcessorRegistration("int.random")
if !ok { if !ok {
t.Fatalf("int.random processor not registered") t.Fatalf("int.random processor not registered")
} }
@@ -84,7 +84,7 @@ func TestGoodIntRandom(t *testing.T) {
for _, test := range tests { for _, test := range tests {
t.Run(test.name, func(t *testing.T) { t.Run(test.name, func(t *testing.T) {
registration, ok := processor.ProcessorRegistry["int.random"] registration, ok := processor.GetProcessorRegistration("int.random")
if !ok { if !ok {
t.Fatalf("int.random processor not registered") t.Fatalf("int.random processor not registered")
} }
@@ -166,7 +166,7 @@ func TestBadIntRandom(t *testing.T) {
for _, test := range tests { for _, test := range tests {
t.Run(test.name, func(t *testing.T) { t.Run(test.name, func(t *testing.T) {
registration, ok := processor.ProcessorRegistry["int.random"] registration, ok := processor.GetProcessorRegistration("int.random")
if !ok { if !ok {
t.Fatalf("int.random processor not registered") t.Fatalf("int.random processor not registered")
} }
@@ -197,7 +197,7 @@ func TestBadIntRandom(t *testing.T) {
} }
func BenchmarkIntRandom(b *testing.B) { func BenchmarkIntRandom(b *testing.B) {
registration, ok := processor.ProcessorRegistry["int.random"] registration, ok := processor.GetProcessorRegistration("int.random")
if !ok { if !ok {
b.Fatalf("int.random processor not registered") b.Fatalf("int.random processor not registered")
} }
+4 -4
View File
@@ -9,7 +9,7 @@ import (
) )
func TestIntScaleFromRegistry(t *testing.T) { func TestIntScaleFromRegistry(t *testing.T) {
registration, ok := processor.ProcessorRegistry["int.scale"] registration, ok := processor.GetProcessorRegistration("int.scale")
if !ok { if !ok {
t.Fatalf("int.scale processor not registered") t.Fatalf("int.scale processor not registered")
} }
@@ -55,7 +55,7 @@ func TestGoodIntScale(t *testing.T) {
for _, test := range tests { for _, test := range tests {
t.Run(test.name, func(t *testing.T) { t.Run(test.name, func(t *testing.T) {
registration, ok := processor.ProcessorRegistry["int.scale"] registration, ok := processor.GetProcessorRegistration("int.scale")
if !ok { if !ok {
t.Fatalf("int.scale processor not registered") t.Fatalf("int.scale processor not registered")
} }
@@ -140,7 +140,7 @@ func TestBadIntScale(t *testing.T) {
for _, test := range tests { for _, test := range tests {
t.Run(test.name, func(t *testing.T) { t.Run(test.name, func(t *testing.T) {
registration, ok := processor.ProcessorRegistry["int.scale"] registration, ok := processor.GetProcessorRegistration("int.scale")
if !ok { if !ok {
t.Fatalf("int.scale processor not registered") t.Fatalf("int.scale processor not registered")
} }
@@ -171,7 +171,7 @@ func TestBadIntScale(t *testing.T) {
} }
func BenchmarkIntScale(b *testing.B) { func BenchmarkIntScale(b *testing.B) {
registration, ok := processor.ProcessorRegistry["int.scale"] registration, ok := processor.GetProcessorRegistration("int.scale")
if !ok { if !ok {
b.Fatalf("int.scale processor not registered") b.Fatalf("int.scale processor not registered")
} }
+2 -2
View File
@@ -11,7 +11,7 @@ import (
) )
func TestJsonDecodeFromRegistry(t *testing.T) { func TestJsonDecodeFromRegistry(t *testing.T) {
registration, ok := processor.ProcessorRegistry["json.decode"] registration, ok := processor.GetProcessorRegistration("json.decode")
if !ok { if !ok {
t.Fatalf("json.decode processor not registered") t.Fatalf("json.decode processor not registered")
} }
@@ -127,7 +127,7 @@ func TestBadJsonDecode(t *testing.T) {
} }
func BenchmarkJsonDecode(b *testing.B) { func BenchmarkJsonDecode(b *testing.B) {
registration, ok := processor.ProcessorRegistry["json.decode"] registration, ok := processor.GetProcessorRegistration("json.decode")
if !ok { if !ok {
b.Fatalf("json.decode processor not registered") b.Fatalf("json.decode processor not registered")
} }
+2 -2
View File
@@ -12,7 +12,7 @@ import (
) )
func TestJsonEncodeFromRegistry(t *testing.T) { func TestJsonEncodeFromRegistry(t *testing.T) {
registration, ok := processor.ProcessorRegistry["json.encode"] registration, ok := processor.GetProcessorRegistration("json.encode")
if !ok { if !ok {
t.Fatalf("json.encode processor not registered") t.Fatalf("json.encode processor not registered")
} }
@@ -116,7 +116,7 @@ func TestBadJsonEncode(t *testing.T) {
} }
func BenchmarkJsonEncode(b *testing.B) { func BenchmarkJsonEncode(b *testing.B) {
registration, ok := processor.ProcessorRegistry["json.encode"] registration, ok := processor.GetProcessorRegistration("json.encode")
if !ok { if !ok {
b.Fatalf("json.encode processor not registered") b.Fatalf("json.encode processor not registered")
} }
+4 -4
View File
@@ -11,7 +11,7 @@ import (
) )
func TestKvGetFromRegistry(t *testing.T) { func TestKvGetFromRegistry(t *testing.T) {
registration, ok := processor.ProcessorRegistry["kv.get"] registration, ok := processor.GetProcessorRegistration("kv.get")
if !ok { if !ok {
t.Fatalf("kv.get processor not registered") t.Fatalf("kv.get processor not registered")
} }
@@ -75,7 +75,7 @@ func TestGoodKvGet(t *testing.T) {
} }
for _, testCase := range testCases { for _, testCase := range testCases {
t.Run(testCase.name, func(t *testing.T) { t.Run(testCase.name, func(t *testing.T) {
registration, ok := processor.ProcessorRegistry["kv.get"] registration, ok := processor.GetProcessorRegistration("kv.get")
if !ok { if !ok {
t.Fatalf("kv.get processor not registered") t.Fatalf("kv.get processor not registered")
} }
@@ -198,7 +198,7 @@ func TestBadKvGet(t *testing.T) {
for _, test := range tests { for _, test := range tests {
t.Run(test.name, func(t *testing.T) { t.Run(test.name, func(t *testing.T) {
registration, ok := processor.ProcessorRegistry["kv.get"] registration, ok := processor.GetProcessorRegistration("kv.get")
if !ok { if !ok {
t.Fatalf("kv.get processor not registered") t.Fatalf("kv.get processor not registered")
} }
@@ -229,7 +229,7 @@ func TestBadKvGet(t *testing.T) {
} }
func BenchmarkKvGet(b *testing.B) { func BenchmarkKvGet(b *testing.B) {
registration, ok := processor.ProcessorRegistry["kv.get"] registration, ok := processor.GetProcessorRegistration("kv.get")
if !ok { if !ok {
b.Fatalf("kv.get processor not registered") b.Fatalf("kv.get processor not registered")
} }
+4 -4
View File
@@ -11,7 +11,7 @@ import (
) )
func TestKvSetFromRegistry(t *testing.T) { func TestKvSetFromRegistry(t *testing.T) {
registration, ok := processor.ProcessorRegistry["kv.set"] registration, ok := processor.GetProcessorRegistration("kv.set")
if !ok { if !ok {
t.Fatalf("kv.set processor not registered") t.Fatalf("kv.set processor not registered")
} }
@@ -69,7 +69,7 @@ func TestGoodKvSet(t *testing.T) {
} }
for _, testCase := range testCases { for _, testCase := range testCases {
t.Run(testCase.name, func(t *testing.T) { t.Run(testCase.name, func(t *testing.T) {
registration, ok := processor.ProcessorRegistry["kv.set"] registration, ok := processor.GetProcessorRegistration("kv.set")
if !ok { if !ok {
t.Fatalf("kv.set processor not registered") t.Fatalf("kv.set processor not registered")
} }
@@ -192,7 +192,7 @@ func TestBadKvSet(t *testing.T) {
for _, testCase := range testCases { for _, testCase := range testCases {
t.Run(testCase.name, func(t *testing.T) { t.Run(testCase.name, func(t *testing.T) {
registration, ok := processor.ProcessorRegistry["kv.set"] registration, ok := processor.GetProcessorRegistration("kv.set")
if !ok { if !ok {
t.Fatalf("kv.set processor not registered") t.Fatalf("kv.set processor not registered")
} }
@@ -223,7 +223,7 @@ func TestBadKvSet(t *testing.T) {
} }
func BenchmarkKvSet(b *testing.B) { func BenchmarkKvSet(b *testing.B) {
registration, ok := processor.ProcessorRegistry["kv.set"] registration, ok := processor.GetProcessorRegistration("kv.set")
if !ok { if !ok {
b.Fatalf("kv.set processor not registered") b.Fatalf("kv.set processor not registered")
} }
@@ -11,7 +11,7 @@ import (
) )
func TestMIDIControlChangeCreateFromRegistry(t *testing.T) { func TestMIDIControlChangeCreateFromRegistry(t *testing.T) {
registration, ok := processor.ProcessorRegistry["midi.control_change.create"] registration, ok := processor.GetProcessorRegistration("midi.control_change.create")
if !ok { if !ok {
t.Fatalf("midi.control_change.create processor not registered") t.Fatalf("midi.control_change.create processor not registered")
} }
@@ -57,7 +57,7 @@ func TestGoodMIDIControlChangeCreate(t *testing.T) {
for _, test := range tests { for _, test := range tests {
t.Run(test.name, func(t *testing.T) { 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 { if !ok {
t.Fatalf("midi.control_change.create processor not registered") t.Fatalf("midi.control_change.create processor not registered")
} }
@@ -130,7 +130,7 @@ func TestBadMIDIControlChangeCreate(t *testing.T) {
for _, test := range tests { for _, test := range tests {
t.Run(test.name, func(t *testing.T) { 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 { if !ok {
t.Fatalf("midi.control_change.create processor not registered") t.Fatalf("midi.control_change.create processor not registered")
} }
@@ -161,7 +161,7 @@ func TestBadMIDIControlChangeCreate(t *testing.T) {
} }
func BenchmarkMIDIControlChangeCreate(b *testing.B) { func BenchmarkMIDIControlChangeCreate(b *testing.B) {
registration, ok := processor.ProcessorRegistry["midi.control_change.create"] registration, ok := processor.GetProcessorRegistration("midi.control_change.create")
if !ok { if !ok {
b.Fatalf("midi.control_change.create processor not registered") b.Fatalf("midi.control_change.create processor not registered")
} }
@@ -11,7 +11,7 @@ import (
) )
func TestMIDIMessageDecodeFromRegistry(t *testing.T) { func TestMIDIMessageDecodeFromRegistry(t *testing.T) {
registration, ok := processor.ProcessorRegistry["midi.message.decode"] registration, ok := processor.GetProcessorRegistration("midi.message.decode")
if !ok { if !ok {
t.Fatalf("midi.message.decode processor not registered") t.Fatalf("midi.message.decode processor not registered")
} }
@@ -11,7 +11,7 @@ import (
) )
func TestMIDIMessageEncodeFromRegistry(t *testing.T) { func TestMIDIMessageEncodeFromRegistry(t *testing.T) {
registration, ok := processor.ProcessorRegistry["midi.message.encode"] registration, ok := processor.GetProcessorRegistration("midi.message.encode")
if !ok { if !ok {
t.Fatalf("midi.message.encode processor not registered") t.Fatalf("midi.message.encode processor not registered")
} }
@@ -11,7 +11,7 @@ import (
) )
func TestMIDIMessageUnpackFromRegistry(t *testing.T) { func TestMIDIMessageUnpackFromRegistry(t *testing.T) {
registration, ok := processor.ProcessorRegistry["midi.message.unpack"] registration, ok := processor.GetProcessorRegistration("midi.message.unpack")
if !ok { if !ok {
t.Fatalf("midi.message.unpack processor not registered") t.Fatalf("midi.message.unpack processor not registered")
} }
@@ -121,7 +121,7 @@ func TestBadMIDIMessageUnpack(t *testing.T) {
for _, test := range tests { for _, test := range tests {
t.Run(test.name, func(t *testing.T) { t.Run(test.name, func(t *testing.T) {
registration, ok := processor.ProcessorRegistry["midi.message.unpack"] registration, ok := processor.GetProcessorRegistration("midi.message.unpack")
if !ok { if !ok {
t.Fatalf("midi.message.unpack processor not registered") t.Fatalf("midi.message.unpack processor not registered")
} }
@@ -11,7 +11,7 @@ import (
) )
func TestMIDINoteOffCreteaFromRegistry(t *testing.T) { func TestMIDINoteOffCreteaFromRegistry(t *testing.T) {
registration, ok := processor.ProcessorRegistry["midi.note_off.create"] registration, ok := processor.GetProcessorRegistration("midi.note_off.create")
if !ok { if !ok {
t.Fatalf("midi.note_off.create processor not registered") t.Fatalf("midi.note_off.create processor not registered")
} }
@@ -56,7 +56,7 @@ func TestGoodMIDINoteOffCretea(t *testing.T) {
for _, test := range tests { for _, test := range tests {
t.Run(test.name, func(t *testing.T) { 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 { if !ok {
t.Fatalf("midi.note_off.create processor not registered") t.Fatalf("midi.note_off.create processor not registered")
} }
@@ -129,7 +129,7 @@ func TestBadMIDINoteOffCretea(t *testing.T) {
for _, test := range tests { for _, test := range tests {
t.Run(test.name, func(t *testing.T) { 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 { if !ok {
t.Fatalf("midi.note_off.create processor not registered") t.Fatalf("midi.note_off.create processor not registered")
} }
@@ -160,7 +160,7 @@ func TestBadMIDINoteOffCretea(t *testing.T) {
} }
func BenchmarkMIDINoteOffCreate(b *testing.B) { func BenchmarkMIDINoteOffCreate(b *testing.B) {
registration, ok := processor.ProcessorRegistry["midi.note_off.create"] registration, ok := processor.GetProcessorRegistration("midi.note_off.create")
if !ok { if !ok {
b.Fatalf("midi.note_off.create processor not registered") b.Fatalf("midi.note_off.create processor not registered")
} }
@@ -11,7 +11,7 @@ import (
) )
func TestMIDINoteOnCreateFromRegistry(t *testing.T) { func TestMIDINoteOnCreateFromRegistry(t *testing.T) {
registration, ok := processor.ProcessorRegistry["midi.note_on.create"] registration, ok := processor.GetProcessorRegistration("midi.note_on.create")
if !ok { if !ok {
t.Fatalf("midi.note_on.create processor not registered") t.Fatalf("midi.note_on.create processor not registered")
} }
@@ -56,7 +56,7 @@ func TestGoodMIDINoteOnCreate(t *testing.T) {
for _, test := range tests { for _, test := range tests {
t.Run(test.name, func(t *testing.T) { 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 { if !ok {
t.Fatalf("midi.note_on.create processor not registered") t.Fatalf("midi.note_on.create processor not registered")
} }
@@ -126,7 +126,7 @@ func TestBadMIDINoteOnCreate(t *testing.T) {
for _, test := range tests { for _, test := range tests {
t.Run(test.name, func(t *testing.T) { 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 { if !ok {
t.Fatalf("midi.note_on.create processor not registered") t.Fatalf("midi.note_on.create processor not registered")
} }
@@ -157,7 +157,7 @@ func TestBadMIDINoteOnCreate(t *testing.T) {
} }
func BenchmarkMIDINoteOnCreate(b *testing.B) { func BenchmarkMIDINoteOnCreate(b *testing.B) {
registration, ok := processor.ProcessorRegistry["midi.note_on.create"] registration, ok := processor.GetProcessorRegistration("midi.note_on.create")
if !ok { if !ok {
b.Fatalf("midi.note_on.create processor not registered") b.Fatalf("midi.note_on.create processor not registered")
} }
@@ -11,7 +11,7 @@ import (
) )
func TestMIDIProgramChangeCreateFromRegistry(t *testing.T) { func TestMIDIProgramChangeCreateFromRegistry(t *testing.T) {
registration, ok := processor.ProcessorRegistry["midi.program_change.create"] registration, ok := processor.GetProcessorRegistration("midi.program_change.create")
if !ok { if !ok {
t.Fatalf("midi.program_change.create processor not registered") t.Fatalf("midi.program_change.create processor not registered")
} }
@@ -55,7 +55,7 @@ func TestGoodMIDIProgramChangeCreate(t *testing.T) {
for _, test := range tests { for _, test := range tests {
t.Run(test.name, func(t *testing.T) { 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 { if !ok {
t.Fatalf("midi.program_change.create processor not registered") t.Fatalf("midi.program_change.create processor not registered")
} }
@@ -116,7 +116,7 @@ func TestBadMIDIProgramChangeCreate(t *testing.T) {
for _, test := range tests { for _, test := range tests {
t.Run(test.name, func(t *testing.T) { 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 { if !ok {
t.Fatalf("midi.program_change.create processor not registered") t.Fatalf("midi.program_change.create processor not registered")
} }
@@ -147,7 +147,7 @@ func TestBadMIDIProgramChangeCreate(t *testing.T) {
} }
func BenchmarkMIDIProgramChangeCreate(b *testing.B) { func BenchmarkMIDIProgramChangeCreate(b *testing.B) {
registration, ok := processor.ProcessorRegistry["midi.program_change.create"] registration, ok := processor.GetProcessorRegistration("midi.program_change.create")
if !ok { if !ok {
b.Fatalf("midi.program_change.create processor not registered") b.Fatalf("midi.program_change.create processor not registered")
} }
@@ -11,7 +11,7 @@ import (
) )
func TestModuleOutputFromRegistry(t *testing.T) { func TestModuleOutputFromRegistry(t *testing.T) {
registration, ok := processor.ProcessorRegistry["module.output"] registration, ok := processor.GetProcessorRegistration("module.output")
if !ok { if !ok {
t.Fatalf("module.output processor not registered") t.Fatalf("module.output processor not registered")
} }
@@ -37,9 +37,9 @@ func TestModuleOutputFromRegistry(t *testing.T) {
router := test.GetNewTestRouter() router := test.GetNewTestRouter()
got, err := processorInstance.Process(t.Context(), common.WrappedPayload{ got, err := processorInstance.Process(t.Context(), common.WrappedPayload{
InputHandler: router.HandleInput, InputHandler: router.HandleInput,
Modules: map[string]common.Module{"test": &test.TestOutputModule{}}, Modules: map[string]common.Module{"test": &test.TestOutputModule{}},
Payload: payload, Payload: payload,
}) })
if err != nil { if err != nil {
t.Fatalf("module.output processing failed: %s", err) t.Fatalf("module.output processing failed: %s", err)
@@ -62,7 +62,7 @@ func TestGoodModuleOutput(t *testing.T) {
for _, testCase := range testCases { for _, testCase := range testCases {
t.Run(testCase.name, func(t *testing.T) { t.Run(testCase.name, func(t *testing.T) {
registration, ok := processor.ProcessorRegistry["module.output"] registration, ok := processor.GetProcessorRegistration("module.output")
if !ok { if !ok {
t.Fatalf("module.output processor not registered") t.Fatalf("module.output processor not registered")
} }
@@ -126,7 +126,7 @@ func TestBadModuleOutput(t *testing.T) {
for _, testCase := range testCases { for _, testCase := range testCases {
t.Run(testCase.name, func(t *testing.T) { t.Run(testCase.name, func(t *testing.T) {
registration, ok := processor.ProcessorRegistry["module.output"] registration, ok := processor.GetProcessorRegistration("module.output")
if !ok { if !ok {
t.Fatalf("module.output processor not registered") t.Fatalf("module.output processor not registered")
} }
@@ -11,7 +11,7 @@ import (
) )
func TestOSCMessageCreateFromRegistry(t *testing.T) { func TestOSCMessageCreateFromRegistry(t *testing.T) {
registration, ok := processor.ProcessorRegistry["osc.message.create"] registration, ok := processor.GetProcessorRegistration("osc.message.create")
if !ok { if !ok {
t.Fatalf("osc.message.create processor not registered") t.Fatalf("osc.message.create processor not registered")
} }
@@ -146,7 +146,7 @@ func TestGoodOSCMessageCreate(t *testing.T) {
for _, test := range tests { for _, test := range tests {
t.Run(test.name, func(t *testing.T) { t.Run(test.name, func(t *testing.T) {
registration, ok := processor.ProcessorRegistry["osc.message.create"] registration, ok := processor.GetProcessorRegistration("osc.message.create")
if !ok { if !ok {
t.Fatalf("osc.message.create processor not registered") t.Fatalf("osc.message.create processor not registered")
} }
@@ -371,7 +371,7 @@ func TestBadOSCMessageCreate(t *testing.T) {
for _, test := range tests { for _, test := range tests {
t.Run(test.name, func(t *testing.T) { t.Run(test.name, func(t *testing.T) {
registration, ok := processor.ProcessorRegistry["osc.message.create"] registration, ok := processor.GetProcessorRegistration("osc.message.create")
if !ok { if !ok {
t.Fatalf("osc.message.create processor not registered") t.Fatalf("osc.message.create processor not registered")
} }
@@ -402,7 +402,7 @@ func TestBadOSCMessageCreate(t *testing.T) {
} }
func BenchmarkOSCMessageCreate(b *testing.B) { func BenchmarkOSCMessageCreate(b *testing.B) {
registration, ok := processor.ProcessorRegistry["osc.message.create"] registration, ok := processor.GetProcessorRegistration("osc.message.create")
if !ok { if !ok {
b.Fatalf("osc.message.create processor not registered") b.Fatalf("osc.message.create processor not registered")
} }
@@ -11,7 +11,7 @@ import (
) )
func TestOSCMessageDecodeFromRegistry(t *testing.T) { func TestOSCMessageDecodeFromRegistry(t *testing.T) {
registration, ok := processor.ProcessorRegistry["osc.message.decode"] registration, ok := processor.GetProcessorRegistration("osc.message.decode")
if !ok { if !ok {
t.Fatalf("osc.message.decode processor not registered") t.Fatalf("osc.message.decode processor not registered")
} }
@@ -11,7 +11,7 @@ import (
) )
func TestOSCMessageEncodeFromRegistry(t *testing.T) { func TestOSCMessageEncodeFromRegistry(t *testing.T) {
registration, ok := processor.ProcessorRegistry["osc.message.encode"] registration, ok := processor.GetProcessorRegistration("osc.message.encode")
if !ok { if !ok {
t.Fatalf("osc.message.encode processor not registered") t.Fatalf("osc.message.encode processor not registered")
} }
@@ -12,7 +12,7 @@ import (
) )
func TestPubSubPublishFromRegistry(t *testing.T) { func TestPubSubPublishFromRegistry(t *testing.T) {
registration, ok := processor.ProcessorRegistry["pubsub.publish"] registration, ok := processor.GetProcessorRegistration("pubsub.publish")
if !ok { if !ok {
t.Fatalf("pubsub.publish processor not registered") t.Fatalf("pubsub.publish processor not registered")
} }
@@ -70,7 +70,7 @@ func TestGoodPubSubPublish(t *testing.T) {
} }
for _, testCase := range testCases { for _, testCase := range testCases {
t.Run(testCase.name, func(t *testing.T) { t.Run(testCase.name, func(t *testing.T) {
registration, ok := processor.ProcessorRegistry["pubsub.publish"] registration, ok := processor.GetProcessorRegistration("pubsub.publish")
if !ok { if !ok {
t.Fatalf("pubsub.publish processor not registered") t.Fatalf("pubsub.publish processor not registered")
} }
@@ -217,7 +217,7 @@ func TestBadPubSubPublish(t *testing.T) {
for _, test := range tests { for _, test := range tests {
t.Run(test.name, func(t *testing.T) { t.Run(test.name, func(t *testing.T) {
registration, ok := processor.ProcessorRegistry["pubsub.publish"] registration, ok := processor.GetProcessorRegistration("pubsub.publish")
if !ok { if !ok {
t.Fatalf("pubsub.publish processor not registered") t.Fatalf("pubsub.publish processor not registered")
} }
+16 -16
View File
@@ -11,7 +11,7 @@ import (
) )
func TestRouterInputFromRegistry(t *testing.T) { func TestRouterInputFromRegistry(t *testing.T) {
registration, ok := processor.ProcessorRegistry["router.input"] registration, ok := processor.GetProcessorRegistration("router.input")
if !ok { if !ok {
t.Fatalf("router.input processor not registered") t.Fatalf("router.input processor not registered")
} }
@@ -35,8 +35,8 @@ func TestRouterInputFromRegistry(t *testing.T) {
expected := "test" expected := "test"
got, err := processorInstance.Process(t.Context(), common.WrappedPayload{ got, err := processorInstance.Process(t.Context(), common.WrappedPayload{
InputHandler: test.GetNewTestRouter().HandleInput, InputHandler: test.GetNewTestRouter().HandleInput,
Payload: payload, Payload: payload,
}) })
if err != nil { if err != nil {
t.Fatalf("router.input processing failed: %s", err) t.Fatalf("router.input processing failed: %s", err)
@@ -59,7 +59,7 @@ func TestGoodRouterInput(t *testing.T) {
for _, testCase := range testCases { for _, testCase := range testCases {
t.Run(testCase.name, func(t *testing.T) { t.Run(testCase.name, func(t *testing.T) {
registration, ok := processor.ProcessorRegistry["router.input"] registration, ok := processor.GetProcessorRegistration("router.input")
if !ok { if !ok {
t.Fatalf("router.input processor not registered") t.Fatalf("router.input processor not registered")
} }
@@ -95,36 +95,36 @@ func TestBadRouterInput(t *testing.T) {
errorString string errorString string
}{ }{
{ {
name: "no source param", name: "no source param",
params: map[string]any{}, params: map[string]any{},
payload: "test", payload: "test",
inputHandler: router.HandleInput, inputHandler: router.HandleInput,
errorString: "router.input source error: not found", errorString: "router.input source error: not found",
}, },
{ {
name: "non-string source", name: "non-string source",
params: map[string]any{ params: map[string]any{
"source": 123, "source": 123,
}, },
payload: "test", payload: "test",
inputHandler: router.HandleInput, inputHandler: router.HandleInput,
errorString: "router.input source error: not a string", errorString: "router.input source error: not a string",
}, },
{ {
name: "router not found in context", name: "router not found in context",
params: map[string]any{ params: map[string]any{
"source": "test", "source": "test",
}, },
payload: "test", payload: "test",
inputHandler: nil, inputHandler: nil,
errorString: "router.input no input handler found", errorString: "router.input no input handler found",
}, },
} }
for _, testCase := range testCases { for _, testCase := range testCases {
t.Run(testCase.name, func(t *testing.T) { t.Run(testCase.name, func(t *testing.T) {
registration, ok := processor.ProcessorRegistry["router.input"] registration, ok := processor.GetProcessorRegistration("router.input")
if !ok { if !ok {
t.Fatalf("router.input processor not registered") t.Fatalf("router.input processor not registered")
} }
+4 -4
View File
@@ -9,7 +9,7 @@ import (
) )
func TestScriptExprFromRegistry(t *testing.T) { func TestScriptExprFromRegistry(t *testing.T) {
registration, ok := processor.ProcessorRegistry["script.expr"] registration, ok := processor.GetProcessorRegistration("script.expr")
if !ok { if !ok {
t.Fatalf("script.expr processor not registered") t.Fatalf("script.expr processor not registered")
} }
@@ -62,7 +62,7 @@ func TestGoodScriptExpr(t *testing.T) {
for _, test := range tests { for _, test := range tests {
t.Run(test.name, func(t *testing.T) { t.Run(test.name, func(t *testing.T) {
registration, ok := processor.ProcessorRegistry["script.expr"] registration, ok := processor.GetProcessorRegistration("script.expr")
if !ok { if !ok {
t.Fatalf("script.expr processor not registered") t.Fatalf("script.expr processor not registered")
} }
@@ -117,7 +117,7 @@ func TestBadScriptExpr(t *testing.T) {
for _, test := range tests { for _, test := range tests {
t.Run(test.name, func(t *testing.T) { t.Run(test.name, func(t *testing.T) {
registration, ok := processor.ProcessorRegistry["script.expr"] registration, ok := processor.GetProcessorRegistration("script.expr")
if !ok { if !ok {
t.Fatalf("script.expr processor not registered") t.Fatalf("script.expr processor not registered")
} }
@@ -148,7 +148,7 @@ func TestBadScriptExpr(t *testing.T) {
} }
func BenchmarkScriptExpr(b *testing.B) { func BenchmarkScriptExpr(b *testing.B) {
registration, ok := processor.ProcessorRegistry["script.expr"] registration, ok := processor.GetProcessorRegistration("script.expr")
if !ok { if !ok {
b.Fatalf("script.expr processor not registered") b.Fatalf("script.expr processor not registered")
} }
+6 -6
View File
@@ -10,7 +10,7 @@ import (
) )
func TestScriptJSFromRegistry(t *testing.T) { func TestScriptJSFromRegistry(t *testing.T) {
registration, ok := processor.ProcessorRegistry["script.js"] registration, ok := processor.GetProcessorRegistration("script.js")
if !ok { if !ok {
t.Fatalf("script.js processor not registered") t.Fatalf("script.js processor not registered")
} }
@@ -45,7 +45,7 @@ func TestScriptJSFromRegistry(t *testing.T) {
} }
func TestScriptJSNoProgram(t *testing.T) { func TestScriptJSNoProgram(t *testing.T) {
registration, ok := processor.ProcessorRegistry["script.js"] registration, ok := processor.GetProcessorRegistration("script.js")
if !ok { if !ok {
t.Fatalf("script.js processor not registered") t.Fatalf("script.js processor not registered")
} }
@@ -61,7 +61,7 @@ func TestScriptJSNoProgram(t *testing.T) {
} }
func TestScriptJSBadConfigWrongProgramType(t *testing.T) { func TestScriptJSBadConfigWrongProgramType(t *testing.T) {
registration, ok := processor.ProcessorRegistry["script.js"] registration, ok := processor.GetProcessorRegistration("script.js")
if !ok { if !ok {
t.Fatalf("script.js processor not registered") t.Fatalf("script.js processor not registered")
} }
@@ -151,7 +151,7 @@ func TestGoodScriptJS(t *testing.T) {
for _, test := range tests { for _, test := range tests {
t.Run(test.name, func(t *testing.T) { t.Run(test.name, func(t *testing.T) {
registration, ok := processor.ProcessorRegistry["script.js"] registration, ok := processor.GetProcessorRegistration("script.js")
if !ok { if !ok {
t.Fatalf("script.js processor not registered") t.Fatalf("script.js processor not registered")
} }
@@ -199,7 +199,7 @@ func TestBadScriptJS(t *testing.T) {
for _, test := range tests { for _, test := range tests {
t.Run(test.name, func(t *testing.T) { t.Run(test.name, func(t *testing.T) {
registration, ok := processor.ProcessorRegistry["script.js"] registration, ok := processor.GetProcessorRegistration("script.js")
if !ok { if !ok {
t.Fatalf("script.js processor not registered") t.Fatalf("script.js processor not registered")
} }
@@ -230,7 +230,7 @@ func TestBadScriptJS(t *testing.T) {
} }
func BenchmarkScriptJS(b *testing.B) { func BenchmarkScriptJS(b *testing.B) {
registration, ok := processor.ProcessorRegistry["script.js"] registration, ok := processor.GetProcessorRegistration("script.js")
if !ok { if !ok {
b.Fatalf("script.js processor not registered") b.Fatalf("script.js processor not registered")
} }
+4 -4
View File
@@ -11,7 +11,7 @@ import (
) )
func TestScriptWASMFromRegistry(t *testing.T) { func TestScriptWASMFromRegistry(t *testing.T) {
registration, ok := processor.ProcessorRegistry["script.wasm"] registration, ok := processor.GetProcessorRegistration("script.wasm")
if !ok { if !ok {
t.Fatalf("script.wasm processor not registered") t.Fatalf("script.wasm processor not registered")
} }
@@ -60,7 +60,7 @@ func TestGoodScriptWASM(t *testing.T) {
for _, test := range tests { for _, test := range tests {
t.Run(test.name, func(t *testing.T) { t.Run(test.name, func(t *testing.T) {
registration, ok := processor.ProcessorRegistry["script.wasm"] registration, ok := processor.GetProcessorRegistration("script.wasm")
if !ok { if !ok {
t.Fatalf("script.wasm processor not registered") t.Fatalf("script.wasm processor not registered")
} }
@@ -160,7 +160,7 @@ func TestBadScriptWASM(t *testing.T) {
for _, test := range tests { for _, test := range tests {
t.Run(test.name, func(t *testing.T) { t.Run(test.name, func(t *testing.T) {
registration, ok := processor.ProcessorRegistry["script.wasm"] registration, ok := processor.GetProcessorRegistration("script.wasm")
if !ok { if !ok {
t.Fatalf("script.wasm processor not registered") t.Fatalf("script.wasm processor not registered")
} }
@@ -191,7 +191,7 @@ func TestBadScriptWASM(t *testing.T) {
} }
func BenchmarkScriptWASM(b *testing.B) { func BenchmarkScriptWASM(b *testing.B) {
registration, ok := processor.ProcessorRegistry["script.wasm"] registration, ok := processor.GetProcessorRegistration("script.wasm")
if !ok { if !ok {
b.Fatalf("script.wasm processor not registered") b.Fatalf("script.wasm processor not registered")
} }
@@ -10,7 +10,7 @@ import (
) )
func TestSipResponseAudioCreateFromRegistry(t *testing.T) { func TestSipResponseAudioCreateFromRegistry(t *testing.T) {
registration, ok := processor.ProcessorRegistry["sip.response.audio.create"] registration, ok := processor.GetProcessorRegistration("sip.response.audio.create")
if !ok { if !ok {
t.Fatalf("sip.response.audio.create processor not registered") t.Fatalf("sip.response.audio.create processor not registered")
} }
@@ -76,7 +76,7 @@ func TestGoodSipResponseAudioCreate(t *testing.T) {
for _, test := range tests { for _, test := range tests {
t.Run(test.name, func(t *testing.T) { 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 { if !ok {
t.Fatalf("sip.response.audio.create processor not registered") t.Fatalf("sip.response.audio.create processor not registered")
} }
@@ -183,7 +183,7 @@ func TestBadSipResponseAudioCreate(t *testing.T) {
for _, test := range tests { for _, test := range tests {
t.Run(test.name, func(t *testing.T) { 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 { if !ok {
t.Fatalf("sip.response.audio.create processor not registered") t.Fatalf("sip.response.audio.create processor not registered")
} }
@@ -214,7 +214,7 @@ func TestBadSipResponseAudioCreate(t *testing.T) {
} }
func BenchmarkSipResponseAudioCreate(b *testing.B) { func BenchmarkSipResponseAudioCreate(b *testing.B) {
registration, ok := processor.ProcessorRegistry["sip.response.audio.create"] registration, ok := processor.GetProcessorRegistration("sip.response.audio.create")
if !ok { if !ok {
b.Fatalf("sip.response.audio.create processor not registered") b.Fatalf("sip.response.audio.create processor not registered")
} }
@@ -10,7 +10,7 @@ import (
) )
func TestSipResponseDTMFCreateFromRegistry(t *testing.T) { func TestSipResponseDTMFCreateFromRegistry(t *testing.T) {
registration, ok := processor.ProcessorRegistry["sip.response.dtmf.create"] registration, ok := processor.GetProcessorRegistration("sip.response.dtmf.create")
if !ok { if !ok {
t.Fatalf("sip.response.dtmf.create processor not registered") t.Fatalf("sip.response.dtmf.create processor not registered")
} }
@@ -74,7 +74,7 @@ func TestGoodSipResponseDTMFCreate(t *testing.T) {
for _, test := range tests { for _, test := range tests {
t.Run(test.name, func(t *testing.T) { 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 { if !ok {
t.Fatalf("sip.response.dtmf.create processor not registered") t.Fatalf("sip.response.dtmf.create processor not registered")
} }
@@ -191,7 +191,7 @@ func TestBadSipResponseDTMFCreate(t *testing.T) {
for _, test := range tests { for _, test := range tests {
t.Run(test.name, func(t *testing.T) { 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 { if !ok {
t.Fatalf("sip.response.dtmf.create processor not registered") t.Fatalf("sip.response.dtmf.create processor not registered")
} }
@@ -222,7 +222,7 @@ func TestBadSipResponseDTMFCreate(t *testing.T) {
} }
func BenchmarkSipResponseDTMFCreate(b *testing.B) { func BenchmarkSipResponseDTMFCreate(b *testing.B) {
registration, ok := processor.ProcessorRegistry["sip.response.dtmf.create"] registration, ok := processor.GetProcessorRegistration("sip.response.dtmf.create")
if !ok { if !ok {
b.Fatalf("sip.response.dtmf.create processor not registered") b.Fatalf("sip.response.dtmf.create processor not registered")
} }
@@ -10,7 +10,7 @@ import (
) )
func TestStringCreateFromRegistry(t *testing.T) { func TestStringCreateFromRegistry(t *testing.T) {
registration, ok := processor.ProcessorRegistry["string.create"] registration, ok := processor.GetProcessorRegistration("string.create")
if !ok { if !ok {
t.Fatalf("string.create processor not registered") t.Fatalf("string.create processor not registered")
} }
@@ -84,7 +84,7 @@ func TestGoodStringCreate(t *testing.T) {
for _, test := range tests { for _, test := range tests {
t.Run(test.name, func(t *testing.T) { t.Run(test.name, func(t *testing.T) {
registration, ok := processor.ProcessorRegistry["string.create"] registration, ok := processor.GetProcessorRegistration("string.create")
if !ok { if !ok {
t.Fatalf("string.create processor not registered") t.Fatalf("string.create processor not registered")
} }
@@ -157,7 +157,7 @@ func TestBadStringCreate(t *testing.T) {
for _, test := range tests { for _, test := range tests {
t.Run(test.name, func(t *testing.T) { t.Run(test.name, func(t *testing.T) {
registration, ok := processor.ProcessorRegistry["string.create"] registration, ok := processor.GetProcessorRegistration("string.create")
if !ok { if !ok {
t.Fatalf("string.create processor not registered") t.Fatalf("string.create processor not registered")
} }
@@ -188,7 +188,7 @@ func TestBadStringCreate(t *testing.T) {
} }
func BenchmarkStringCreate(b *testing.B) { func BenchmarkStringCreate(b *testing.B) {
registration, ok := processor.ProcessorRegistry["string.create"] registration, ok := processor.GetProcessorRegistration("string.create")
if !ok { if !ok {
b.Fatalf("string.create processor not registered") b.Fatalf("string.create processor not registered")
} }
@@ -10,7 +10,7 @@ import (
) )
func TestStringDecodeFromRegistry(t *testing.T) { func TestStringDecodeFromRegistry(t *testing.T) {
registration, ok := processor.ProcessorRegistry["string.decode"] registration, ok := processor.GetProcessorRegistration("string.decode")
if !ok { if !ok {
t.Fatalf("string.decode processor not registered") t.Fatalf("string.decode processor not registered")
} }
@@ -101,7 +101,7 @@ func TestBadStringDecode(t *testing.T) {
} }
func BenchmarkStringDecode(b *testing.B) { func BenchmarkStringDecode(b *testing.B) {
registration, ok := processor.ProcessorRegistry["string.decode"] registration, ok := processor.GetProcessorRegistration("string.decode")
if !ok { if !ok {
b.Fatalf("string.decode processor not registered") b.Fatalf("string.decode processor not registered")
} }
@@ -11,7 +11,7 @@ import (
) )
func TestStringEncodeFromRegistry(t *testing.T) { func TestStringEncodeFromRegistry(t *testing.T) {
registration, ok := processor.ProcessorRegistry["string.encode"] registration, ok := processor.GetProcessorRegistration("string.encode")
if !ok { if !ok {
t.Fatalf("string.encode processor not registered") t.Fatalf("string.encode processor not registered")
} }
@@ -107,7 +107,7 @@ func TestBadStringEncode(t *testing.T) {
} }
func BenchmarkStringEncode(b *testing.B) { func BenchmarkStringEncode(b *testing.B) {
registration, ok := processor.ProcessorRegistry["string.encode"] registration, ok := processor.GetProcessorRegistration("string.encode")
if !ok { if !ok {
b.Fatalf("string.encode processor not registered") b.Fatalf("string.encode processor not registered")
} }
+4 -4
View File
@@ -11,7 +11,7 @@ import (
) )
func TestStringSplitFromRegistry(t *testing.T) { func TestStringSplitFromRegistry(t *testing.T) {
registration, ok := processor.ProcessorRegistry["string.split"] registration, ok := processor.GetProcessorRegistration("string.split")
if !ok { if !ok {
t.Fatalf("string.split processor not registered") t.Fatalf("string.split processor not registered")
} }
@@ -66,7 +66,7 @@ func TestGoodStringSplit(t *testing.T) {
for _, test := range tests { for _, test := range tests {
t.Run(test.name, func(t *testing.T) { t.Run(test.name, func(t *testing.T) {
registration, ok := processor.ProcessorRegistry["string.split"] registration, ok := processor.GetProcessorRegistration("string.split")
if !ok { if !ok {
t.Fatalf("string.split processor not registered") t.Fatalf("string.split processor not registered")
} }
@@ -126,7 +126,7 @@ func TestBadStringSplit(t *testing.T) {
for _, test := range tests { for _, test := range tests {
t.Run(test.name, func(t *testing.T) { t.Run(test.name, func(t *testing.T) {
registration, ok := processor.ProcessorRegistry["string.split"] registration, ok := processor.GetProcessorRegistration("string.split")
if !ok { if !ok {
t.Fatalf("string.split processor not registered") t.Fatalf("string.split processor not registered")
} }
@@ -156,7 +156,7 @@ func TestBadStringSplit(t *testing.T) {
} }
func BenchmarkStringSplit(b *testing.B) { func BenchmarkStringSplit(b *testing.B) {
registration, ok := processor.ProcessorRegistry["string.split"] registration, ok := processor.GetProcessorRegistration("string.split")
if !ok { if !ok {
b.Fatalf("string.split processor not registered") b.Fatalf("string.split processor not registered")
} }

Some files were not shown because too many files have changed in this diff Show More