- unify message/command format

wolfy-j · wolfy-j · commit 0a364dab7ec8 · 2020-02-28T14:30:48.000+03:00
- soft topic access deny
diff --git a/service.go b/service.go
@@ -166,7 +166,7 @@ func (s *Service) handleCommands(ctx *ConnContext, f http.HandlerFunc, r *http.R
 					return
 				}
 
-				return
+				continue
 			}
 
 			if err := s.connPool.subscribe(ctx, topics...); err != nil {
diff --git a/service_test.go b/service_test.go
@@ -273,8 +273,7 @@ func Test_Service_DenyJoin(t *testing.T) {
 	err = conn.WriteMessage(websocket.TextMessage, []byte(`{"topic":"join", "payload":["topic"]}`))
 	assert.NoError(t, err)
 
-	out := <-read
-	assert.Error(t, out.(error))
+	assert.Equal(t, `{"topic":"#join","payload":["topic"]}`, readStr(<-read))
 }
 
 func Test_Service_DenyJoinServer(t *testing.T) {

Original file line number	Diff line number	Diff line change
`@@ -166,7 +166,7 @@ func (s Service) handleCommands(ctx ConnContext, f http.HandlerFunc, r *http.R`
`166`	`166`	`return`
`167`	`167`	`}`
`168`	`168`
`169`		`- return`
	`169`	`+ continue`
`170`	`170`	`}`
`171`	`171`
`172`	`172`	`if err := s.connPool.subscribe(ctx, topics...); err != nil {`
Original file line number	Diff line number	Diff line change
`@@ -273,8 +273,7 @@ func Test_Service_DenyJoin(t *testing.T) {`
`273`	`273`	err = conn.WriteMessage(websocket.TextMessage, []byte(`{"topic":"join", "payload":["topic"]}`))
`274`	`274`	`assert.NoError(t, err)`
`275`	`275`
`276`		`- out := <-read`
`277`		`- assert.Error(t, out.(error))`
	`276`	+ assert.Equal(t, `{"topic":"#join","payload":["topic"]}`, readStr(<-read))
`278`	`277`	`}`
`279`	`278`
`280`	`279`	`func Test_Service_DenyJoinServer(t *testing.T) {`