Update comments. Client roles in separate file.

gammazero · Sep 30, 2019 · 96d8c23 · 96d8c23
1 parent 4b8fc1a
commit 96d8c23
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 42 deletions.
diff --git a/client/client.go b/client/client.go
@@ -27,40 +27,6 @@ const (
 	CBOR    = serialize.CBOR
 )
 
-// Features supported by nexus client.
-var clientRoles = wamp.Dict{
-	"publisher": wamp.Dict{
-		"features": wamp.Dict{
-			"subscriber_blackwhite_listing": true,
-			"publisher_exclusion":           true,
-		},
-	},
-	"subscriber": wamp.Dict{
-		"features": wamp.Dict{
-			"pattern_based_subscription": true,
-			"publisher_identification":   true,
-		},
-	},
-	"callee": wamp.Dict{
-		"features": wamp.Dict{
-			"pattern_based_registration": true,
-			"shared_registration":        true,
-			"call_canceling":             true,
-			"call_timeout":               true,
-			"caller_identification":      true,
-			"progressive_call_results":   true,
-		},
-	},
-	"caller": wamp.Dict{
-		"features": wamp.Dict{
-			"call_canceling":           true,
-			"call_timeout":             true,
-			"caller_identification":    true,
-			"progressive_call_results": true,
-		},
-	},
-}
-
 // A Client routes messages to/from a WAMP router.
 type Client struct {
 	sess *wamp.Session
@@ -229,6 +195,8 @@ func (c *Client) Subscribe(topic string, fn EventHandler, options wamp.Dict) err
 	}
 }
 
+// SubscribeChan subscribes the client to the specified topic or topic pattern.
+// Events are written to the provided channel.
 func (c *Client) SubscribeChan(topic string, events chan<- *wamp.Event, options wamp.Dict) error {
 	handler := func(ev *wamp.Event) { events <- ev }
 	return c.Subscribe(topic, handler, options)
@@ -325,17 +293,19 @@ func (c *Client) Publish(topic string, options wamp.Dict, args wamp.List, kwargs
 		return ErrNotConn
 	}
 
+	id := c.idGen.Next()
+
+	var pubAck bool
 	if options == nil {
-		options = make(wamp.Dict)
+		options = wamp.Dict{}
+	} else {
+		// Check if the client is asking for a PUBLISHED response.
+		pubAck, _ = options[wamp.OptAcknowledge].(bool)
+		if pubAck {
+			c.expectReply(id)
+		}
 	}
 
-	// Check if the client is asking for a PUBLISHED response.
-	pubAck, _ := options[wamp.OptAcknowledge].(bool)
-
-	id := c.idGen.Next()
-	if pubAck {
-		c.expectReply(id)
-	}
 	c.sess.Send(&wamp.Publish{
 		Request:     id,
 		Options:     options,

diff --git a/client/roles.go b/client/roles.go
@@ -0,0 +1,37 @@
+package client
+
+import "github.com/gammazero/nexus/v3/wamp"
+
+// Features supported by nexus client.
+var clientRoles = wamp.Dict{
+	"publisher": wamp.Dict{
+		"features": wamp.Dict{
+			"subscriber_blackwhite_listing": true,
+			"publisher_exclusion":           true,
+		},
+	},
+	"subscriber": wamp.Dict{
+		"features": wamp.Dict{
+			"pattern_based_subscription": true,
+			"publisher_identification":   true,
+		},
+	},
+	"callee": wamp.Dict{
+		"features": wamp.Dict{
+			"pattern_based_registration": true,
+			"shared_registration":        true,
+			"call_canceling":             true,
+			"call_timeout":               true,
+			"caller_identification":      true,
+			"progressive_call_results":   true,
+		},
+	},
+	"caller": wamp.Dict{
+		"features": wamp.Dict{
+			"call_canceling":           true,
+			"call_timeout":             true,
+			"caller_identification":    true,
+			"progressive_call_results": true,
+		},
+	},
+}