Merge pull request #185 from o4eredko/master

Support multiple negotiate versions and handle backoff.Stop properly
philippseith · Nov 5, 2023 · fcfe993 · fcfe993
2 parents 586d67b + 0480e2d
commit fcfe993
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/client.go b/client.go
@@ -204,6 +204,7 @@ func (c *client) Start() {
 			nextBackoff := boff.NextBackOff()
 			// Check for exceeded backoff
 			if nextBackoff == backoff.Stop {
+				c.setState(ClientClosed)
 				c.setErr(errors.New("backoff exceeded"))
 				return
 			}

diff --git a/httpconnection.go b/httpconnection.go
@@ -113,7 +113,13 @@ func NewHTTPConnection(ctx context.Context, address string, options ...func(*htt
 	}
 
 	q := reqURL.Query()
-	q.Set("id", negotiateResponse.ConnectionID)
+	switch negotiateResponse.NegotiateVersion {
+	case 0:
+		q.Set("id", negotiateResponse.ConnectionID)
+	case 1:
+		q.Set("id", negotiateResponse.ConnectionToken)
+	}
+
 	reqURL.RawQuery = q.Encode()
 
 	// Select the best connection