mqtt-gateway v0.6.0

stfnmllr · stfnmllr · commit 3f478c24b478 · 2022-12-26T23:13:12.000+01:00
diff --git a/gateway/cs.go b/gateway/cs.go
@@ -81,13 +81,13 @@ func (cs *CS) handler(wg *sync.WaitGroup, hndCh <-chan *hndMsg, pubCh chan<- *pu
 		topic, err := parseTopic(msg.topic)
 		if err != nil {
 			errCh <- &errMsg{topic: msg.topic, err: err}
-			break
+			continue
 		}
 
 		value, err := msg.fn(msg.value)
 		if err != nil {
 			errCh <- &errMsg{topic: msg.topic, err: err}
-			break
+			continue
 		}
 
 		if topic.isCommand() {
@@ -97,13 +97,13 @@ func (cs *CS) handler(wg *sync.WaitGroup, hndCh <-chan *hndMsg, pubCh chan<- *pu
 }
 
 func (cs *CS) subscribe() {
-	cs.gateway.subscribe(cs.hndCh, cs, joinTopic("cs", cs.name, "enabled", "get"), cs.getEnabled(cs.client))
-	cs.gateway.subscribe(cs.hndCh, cs, joinTopic("cs", cs.name, "enabled", "set"), cs.setEnabled(cs.client))
+	cs.gateway.subscribe(cs.hndCh, cs, joinTopic("cs", cs.name, "mtenabled", "get"), cs.getMTEnabled(cs.client))
+	cs.gateway.subscribe(cs.hndCh, cs, joinTopic("cs", cs.name, "mtenabled", "set"), cs.setMTEnabled(cs.client))
 }
 
 func (cs *CS) unsubscribe() {
-	cs.gateway.unsubscribe(cs, joinTopic("cs", cs.name, "enabled", "get"))
-	cs.gateway.unsubscribe(cs, joinTopic("cs", cs.name, "enabled", "set"))
+	cs.gateway.unsubscribe(cs, joinTopic("cs", cs.name, "mtenabled", "get"))
+	cs.gateway.unsubscribe(cs, joinTopic("cs", cs.name, "mtenabled", "set"))
 }
 
 func (cs *CS) pushHandler(msg client.Msg, err error) {
@@ -115,19 +115,19 @@ func (cs *CS) pushHandler(msg client.Msg, err error) {
 	log.Printf("%s", msg)
 }
 
-func (cs *CS) getEnabled(client *client.Client) hndFn {
+func (cs *CS) getMTEnabled(client *client.Client) hndFn {
 	return func(payload any) (any, error) {
-		return client.Enabled()
+		return client.MTEnabled()
 	}
 }
 
-func (cs *CS) setEnabled(client *client.Client) hndFn {
+func (cs *CS) setMTEnabled(client *client.Client) hndFn {
 	return func(payload any) (any, error) {
 		enabled, ok := payload.(bool)
 		if !ok {
-			return nil, fmt.Errorf("setEnabled: invalid enabled type %[1]T value %[1]v", payload)
+			return nil, fmt.Errorf("setMTEnabled: invalid enabled type %[1]T value %[1]v", payload)
 		}
-		return client.SetEnabled(enabled)
+		return client.SetMTEnabled(enabled)
 	}
 }
 
diff --git a/go.mod b/go.mod
@@ -2,12 +2,12 @@ module github.com/pico-cs/mqtt-gateway
 
 go 1.19
 
-//replace github.com/pico-cs/go-client => ../go-client
-//replace github.com/pico-cs/go-client/client => ../go-client/client
+// replace github.com/pico-cs/go-client => ../go-client
+// replace github.com/pico-cs/go-client/client => ../go-client/client
 
 require (
 	github.com/eclipse/paho.mqtt.golang v1.4.2
-	github.com/pico-cs/go-client v0.2.3
+	github.com/pico-cs/go-client v0.3.1
 	golang.org/x/exp v0.0.0-20221217163422-3c43f8badb15
 	gopkg.in/yaml.v3 v3.0.1
 )
diff --git a/go.sum b/go.sum
@@ -6,8 +6,8 @@ github.com/eclipse/paho.mqtt.golang v1.4.2/go.mod h1:JGt0RsEwEX+Xa/agj90YJ9d9DH2
 github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc=
 github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
-github.com/pico-cs/go-client v0.2.3 h1:SNvavTQuFq+wWqtaxJ8nAMdrXKo3hOYzXAphEvcN9/4=
-github.com/pico-cs/go-client v0.2.3/go.mod h1:ty2wUvjX3bS2gK/dgpGFOjBUFwijDvX+WnHFB5wVKQg=
+github.com/pico-cs/go-client v0.3.1 h1:WPz03asuGK3o5FujURqWlmo9haPg0AcLPTEJFiqvflA=
+github.com/pico-cs/go-client v0.3.1/go.mod h1:ty2wUvjX3bS2gK/dgpGFOjBUFwijDvX+WnHFB5wVKQg=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
 go.bug.st/serial v1.4.1 h1:AwYUNixVf90XymNeJaUkMrPp+GZQe3RMFQmpVdHIUK8=

Original file line number	Diff line number	Diff line change
`@@ -81,13 +81,13 @@ func (cs CS) handler(wg sync.WaitGroup, hndCh <-chan hndMsg, pubCh chan<- pu`
`81`	`81`	`topic, err := parseTopic(msg.topic)`
`82`	`82`	`if err != nil {`
`83`	`83`	`errCh <- &errMsg{topic: msg.topic, err: err}`
`84`		`- break`
	`84`	`+ continue`
`85`	`85`	`}`
`86`	`86`
`87`	`87`	`value, err := msg.fn(msg.value)`
`88`	`88`	`if err != nil {`
`89`	`89`	`errCh <- &errMsg{topic: msg.topic, err: err}`
`90`		`- break`
	`90`	`+ continue`
`91`	`91`	`}`
`92`	`92`
`93`	`93`	`if topic.isCommand() {`
`@@ -97,13 +97,13 @@ func (cs CS) handler(wg sync.WaitGroup, hndCh <-chan hndMsg, pubCh chan<- pu`
`97`	`97`	`}`
`98`	`98`
`99`	`99`	`func (cs *CS) subscribe() {`
`100`		`- cs.gateway.subscribe(cs.hndCh, cs, joinTopic("cs", cs.name, "enabled", "get"), cs.getEnabled(cs.client))`
`101`		`- cs.gateway.subscribe(cs.hndCh, cs, joinTopic("cs", cs.name, "enabled", "set"), cs.setEnabled(cs.client))`
	`100`	`+ cs.gateway.subscribe(cs.hndCh, cs, joinTopic("cs", cs.name, "mtenabled", "get"), cs.getMTEnabled(cs.client))`
	`101`	`+ cs.gateway.subscribe(cs.hndCh, cs, joinTopic("cs", cs.name, "mtenabled", "set"), cs.setMTEnabled(cs.client))`
`102`	`102`	`}`
`103`	`103`
`104`	`104`	`func (cs *CS) unsubscribe() {`
`105`		`- cs.gateway.unsubscribe(cs, joinTopic("cs", cs.name, "enabled", "get"))`
`106`		`- cs.gateway.unsubscribe(cs, joinTopic("cs", cs.name, "enabled", "set"))`
	`105`	`+ cs.gateway.unsubscribe(cs, joinTopic("cs", cs.name, "mtenabled", "get"))`
	`106`	`+ cs.gateway.unsubscribe(cs, joinTopic("cs", cs.name, "mtenabled", "set"))`
`107`	`107`	`}`
`108`	`108`
`109`	`109`	`func (cs *CS) pushHandler(msg client.Msg, err error) {`
`@@ -115,19 +115,19 @@ func (cs *CS) pushHandler(msg client.Msg, err error) {`
`115`	`115`	`log.Printf("%s", msg)`
`116`	`116`	`}`
`117`	`117`
`118`		`-func (cs CS) getEnabled(client client.Client) hndFn {`
	`118`	`+func (cs CS) getMTEnabled(client client.Client) hndFn {`
`119`	`119`	`return func(payload any) (any, error) {`
`120`		`- return client.Enabled()`
	`120`	`+ return client.MTEnabled()`
`121`	`121`	`}`
`122`	`122`	`}`
`123`	`123`
`124`		`-func (cs CS) setEnabled(client client.Client) hndFn {`
	`124`	`+func (cs CS) setMTEnabled(client client.Client) hndFn {`
`125`	`125`	`return func(payload any) (any, error) {`
`126`	`126`	`enabled, ok := payload.(bool)`
`127`	`127`	`if !ok {`
`128`		`- return nil, fmt.Errorf("setEnabled: invalid enabled type %[1]T value %[1]v", payload)`
	`128`	`+ return nil, fmt.Errorf("setMTEnabled: invalid enabled type %[1]T value %[1]v", payload)`
`129`	`129`	`}`
`130`		`- return client.SetEnabled(enabled)`
	`130`	`+ return client.SetMTEnabled(enabled)`
`131`	`131`	`}`
`132`	`132`	`}`
`133`	`133`