faye protocol always send and ACK for published messages.
remove OnPublishResponse and make publish a blocking function until we receive ACK from server
This commit is contained in:
parent
33a61d6d27
commit
6e0272acb9
16
client.go
16
client.go
@ -22,8 +22,10 @@ var defaultOpts = options{
|
|||||||
type client interface {
|
type client interface {
|
||||||
Disconnect() error
|
Disconnect() error
|
||||||
Subscribe(subscription string) (*subscription.Subscription, error)
|
Subscribe(subscription string) (*subscription.Subscription, error)
|
||||||
Publish(subscription string, message message.Data) (string, error)
|
Publish(subscription string, message message.Data) error
|
||||||
OnPublishResponse(subscription string, onMsg func(message *message.Message))
|
|
||||||
|
//SetOnTransportDownHandler(onTransportDown func(err error))
|
||||||
|
//SetOnTransportUpHandler(onTransportUp func())
|
||||||
}
|
}
|
||||||
|
|
||||||
//Option set the Client options, such as Transport, message extensions,etc.
|
//Option set the Client options, such as Transport, message extensions,etc.
|
||||||
@ -62,18 +64,10 @@ func (c *Client) Subscribe(subscription string) (*subscription.Subscription, err
|
|||||||
|
|
||||||
//Publish publishes events on a channel by sending event messages, the server MAY respond to a publish event
|
//Publish publishes events on a channel by sending event messages, the server MAY respond to a publish event
|
||||||
//if this feature is supported by the server use the OnPublishResponse to get the publish status.
|
//if this feature is supported by the server use the OnPublishResponse to get the publish status.
|
||||||
func (c *Client) Publish(subscription string, data message.Data) (id string, err error) {
|
func (c *Client) Publish(subscription string, data message.Data) (err error) {
|
||||||
return c.dispatcher.Publish(subscription, data)
|
return c.dispatcher.Publish(subscription, data)
|
||||||
}
|
}
|
||||||
|
|
||||||
//OnPublishResponse sets the handler to be triggered if the server replies to the publish request.
|
|
||||||
//According to the spec the server MAY reply to the publish request, so its not guaranteed that this handler will
|
|
||||||
//ever be triggered.
|
|
||||||
//can be used to identify the status of the published request and for example retry failed published requests.
|
|
||||||
func (c *Client) OnPublishResponse(subscription string, onMsg func(message *message.Message)) {
|
|
||||||
c.dispatcher.OnPublishResponse(subscription, onMsg)
|
|
||||||
}
|
|
||||||
|
|
||||||
//Disconnect closes all subscriptions and inform the server to remove any client-related state.
|
//Disconnect closes all subscriptions and inform the server to remove any client-related state.
|
||||||
//any subsequent method call to the client object will result in undefined behaviour.
|
//any subsequent method call to the client object will result in undefined behaviour.
|
||||||
func (c *Client) Disconnect() error {
|
func (c *Client) Disconnect() error {
|
||||||
|
@ -12,25 +12,6 @@ import (
|
|||||||
"sync/atomic"
|
"sync/atomic"
|
||||||
)
|
)
|
||||||
|
|
||||||
type dispatcher interface {
|
|
||||||
SetTransport(t transport.Transport)
|
|
||||||
//Subscribe informs the server that messages published to that channel are delivered to itself.
|
|
||||||
Subscribe(channel string) (*subscription.Subscription, error)
|
|
||||||
//Unsubscribe informs the server that the client will no longer listen to incoming event messages on
|
|
||||||
//the specified channel/subscription
|
|
||||||
Unsubscribe(sub *subscription.Subscription) error
|
|
||||||
//Publish publishes events on a channel by sending event messages, the server MAY respond to a publish event
|
|
||||||
//if this feature is supported by the server use the OnPublishResponse to get the publish status.
|
|
||||||
Publish(subscription string, message message.Data) (id string, err error)
|
|
||||||
//OnPublishResponse sets the handler to be triggered if the server replies to the publish request
|
|
||||||
//according to the spec the server MAY reply to the publish request, so its not guaranteed that this handler will
|
|
||||||
//ever be triggered
|
|
||||||
//can be used to identify the status of the published request and for example retry failed published requests
|
|
||||||
OnPublishResponse(subscription string, onMsg func(message *message.Message))
|
|
||||||
}
|
|
||||||
|
|
||||||
var _ dispatcher = (*Dispatcher)(nil)
|
|
||||||
|
|
||||||
type Dispatcher struct {
|
type Dispatcher struct {
|
||||||
endpoint string
|
endpoint string
|
||||||
//transports map[string]transport.Transport
|
//transports map[string]transport.Transport
|
||||||
@ -46,8 +27,8 @@ type Dispatcher struct {
|
|||||||
pendingSubsMu sync.Mutex
|
pendingSubsMu sync.Mutex
|
||||||
store *store.SubscriptionsStore
|
store *store.SubscriptionsStore
|
||||||
|
|
||||||
onPublishResponseMu sync.Mutex //todo sync.Map
|
publishACKmu sync.Mutex
|
||||||
onPublishResponse map[string]func(message *message.Message)
|
publishACK map[string]chan error
|
||||||
|
|
||||||
clientID string
|
clientID string
|
||||||
}
|
}
|
||||||
@ -55,13 +36,13 @@ type Dispatcher struct {
|
|||||||
func NewDispatcher(endpoint string, tOpts transport.Options, ext message.Extensions) *Dispatcher {
|
func NewDispatcher(endpoint string, tOpts transport.Options, ext message.Extensions) *Dispatcher {
|
||||||
var msgID uint64
|
var msgID uint64
|
||||||
return &Dispatcher{
|
return &Dispatcher{
|
||||||
endpoint: endpoint,
|
endpoint: endpoint,
|
||||||
msgID: &msgID,
|
msgID: &msgID,
|
||||||
store: store.NewStore(100),
|
store: store.NewStore(100),
|
||||||
transportOpts: tOpts,
|
transportOpts: tOpts,
|
||||||
extensions: ext,
|
extensions: ext,
|
||||||
onPublishResponse: map[string]func(message *message.Message){},
|
publishACK: map[string]chan error{},
|
||||||
pendingSubs: map[string]chan error{},
|
pendingSubs: map[string]chan error{},
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -165,11 +146,12 @@ func (d *Dispatcher) dispatchMessage(msg *message.Message) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if message.IsEventPublish(msg) {
|
if message.IsEventPublish(msg) {
|
||||||
d.onPublishResponseMu.Lock()
|
d.publishACKmu.Lock()
|
||||||
onPublish, ok := d.onPublishResponse[msg.Channel]
|
publishACK, ok := d.publishACK[msg.Id]
|
||||||
d.onPublishResponseMu.Unlock()
|
d.publishACKmu.Unlock()
|
||||||
if ok {
|
if ok {
|
||||||
onPublish(msg)
|
publishACK <- msg.GetError()
|
||||||
|
close(publishACK)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -231,9 +213,9 @@ func (d *Dispatcher) Unsubscribe(sub *subscription.Subscription) error {
|
|||||||
d.store.Remove(sub)
|
d.store.Remove(sub)
|
||||||
//if this is last subscription we will send meta unsubscribe to the server
|
//if this is last subscription we will send meta unsubscribe to the server
|
||||||
if d.store.Count(sub.Name()) == 0 {
|
if d.store.Count(sub.Name()) == 0 {
|
||||||
d.onPublishResponseMu.Lock()
|
d.publishACKmu.Lock()
|
||||||
delete(d.onPublishResponse, sub.Name())
|
delete(d.publishACK, sub.Name())
|
||||||
d.onPublishResponseMu.Unlock()
|
d.publishACKmu.Unlock()
|
||||||
|
|
||||||
m := &message.Message{
|
m := &message.Message{
|
||||||
Channel: message.MetaUnsubscribe,
|
Channel: message.MetaUnsubscribe,
|
||||||
@ -247,8 +229,8 @@ func (d *Dispatcher) Unsubscribe(sub *subscription.Subscription) error {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (d *Dispatcher) Publish(subscription string, data message.Data) (id string, err error) {
|
func (d *Dispatcher) Publish(subscription string, data message.Data) (err error) {
|
||||||
id = d.nextMsgID()
|
id := d.nextMsgID()
|
||||||
|
|
||||||
m := &message.Message{
|
m := &message.Message{
|
||||||
Channel: subscription,
|
Channel: subscription,
|
||||||
@ -256,14 +238,28 @@ func (d *Dispatcher) Publish(subscription string, data message.Data) (id string,
|
|||||||
ClientId: d.clientID,
|
ClientId: d.clientID,
|
||||||
Id: id,
|
Id: id,
|
||||||
}
|
}
|
||||||
if err = d.sendMessage(m); err != nil {
|
|
||||||
return "", err
|
|
||||||
}
|
|
||||||
return id, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (d *Dispatcher) OnPublishResponse(subscription string, onMsg func(message *message.Message)) {
|
//ack from server
|
||||||
d.onPublishResponseMu.Lock()
|
ack := make(chan error)
|
||||||
d.onPublishResponse[subscription] = onMsg
|
d.publishACKmu.Lock()
|
||||||
d.onPublishResponseMu.Unlock()
|
d.publishACK[id] = ack
|
||||||
|
d.publishACKmu.Unlock()
|
||||||
|
|
||||||
|
if err = d.sendMessage(m); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
select { //todo timeout
|
||||||
|
case err = <-ack:
|
||||||
|
}
|
||||||
|
|
||||||
|
d.publishACKmu.Lock()
|
||||||
|
delete(d.publishACK, id)
|
||||||
|
d.publishACKmu.Unlock()
|
||||||
|
|
||||||
|
if err != nil { //todo retries
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
}
|
}
|
||||||
|
@ -4,20 +4,20 @@ import (
|
|||||||
"strings"
|
"strings"
|
||||||
)
|
)
|
||||||
|
|
||||||
type Name struct {
|
type SubscriptionName struct {
|
||||||
n string
|
n string
|
||||||
patterns []string
|
patterns []string
|
||||||
}
|
}
|
||||||
|
|
||||||
func NewName(name string) *Name {
|
func NewName(name string) *SubscriptionName {
|
||||||
var n Name
|
var n SubscriptionName
|
||||||
n.n = name
|
n.n = name
|
||||||
//expand once
|
//expand once
|
||||||
n.patterns = n.expand()
|
n.patterns = n.expand()
|
||||||
return &n
|
return &n
|
||||||
}
|
}
|
||||||
|
|
||||||
func (n *Name) Match(channel string) bool {
|
func (n *SubscriptionName) Match(channel string) bool {
|
||||||
for i := range n.patterns {
|
for i := range n.patterns {
|
||||||
if n.patterns[i] == channel {
|
if n.patterns[i] == channel {
|
||||||
return true
|
return true
|
||||||
@ -26,7 +26,7 @@ func (n *Name) Match(channel string) bool {
|
|||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
|
||||||
func (n *Name) expand() []string {
|
func (n *SubscriptionName) expand() []string {
|
||||||
segments := strings.Split(n.n, "/")
|
segments := strings.Split(n.n, "/")
|
||||||
num_segments := len(segments)
|
num_segments := len(segments)
|
||||||
patterns := make([]string, num_segments+1)
|
patterns := make([]string, num_segments+1)
|
||||||
|
@ -10,13 +10,13 @@ type SubscriptionsStore struct {
|
|||||||
subs map[string][]*subscription.Subscription
|
subs map[string][]*subscription.Subscription
|
||||||
|
|
||||||
//cache for expanded channel names
|
//cache for expanded channel names
|
||||||
cache map[string]*Name
|
cache map[string]*SubscriptionName
|
||||||
}
|
}
|
||||||
|
|
||||||
func NewStore(size int) *SubscriptionsStore {
|
func NewStore(size int) *SubscriptionsStore {
|
||||||
return &SubscriptionsStore{
|
return &SubscriptionsStore{
|
||||||
subs: make(map[string][]*subscription.Subscription, size),
|
subs: make(map[string][]*subscription.Subscription, size),
|
||||||
cache: map[string]*Name{},
|
cache: map[string]*SubscriptionName{},
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -31,7 +31,7 @@ func (s *SubscriptionsStore) Add(sub *subscription.Subscription) {
|
|||||||
func (s *SubscriptionsStore) Match(channel string) []*subscription.Subscription {
|
func (s *SubscriptionsStore) Match(channel string) []*subscription.Subscription {
|
||||||
var (
|
var (
|
||||||
matches []*subscription.Subscription
|
matches []*subscription.Subscription
|
||||||
name *Name
|
name *SubscriptionName
|
||||||
ok bool
|
ok bool
|
||||||
)
|
)
|
||||||
s.mutex.Lock()
|
s.mutex.Lock()
|
||||||
|
@ -64,14 +64,7 @@ func TestServerSubscribeAndPublish10Messages(t *testing.T) {
|
|||||||
var delivered int
|
var delivered int
|
||||||
var done sync.WaitGroup
|
var done sync.WaitGroup
|
||||||
done.Add(10)
|
done.Add(10)
|
||||||
client.OnPublishResponse("/test", func(msg *message.Message) {
|
|
||||||
if !msg.Successful {
|
|
||||||
t.Fatalf("failed to send msg with id %s", msg.Id)
|
|
||||||
}
|
|
||||||
|
|
||||||
delivered++
|
|
||||||
done.Done()
|
|
||||||
})
|
|
||||||
var sub *subscription.Subscription
|
var sub *subscription.Subscription
|
||||||
go func() {
|
go func() {
|
||||||
sub, err = client.Subscribe("/test")
|
sub, err = client.Subscribe("/test")
|
||||||
@ -79,6 +72,8 @@ func TestServerSubscribeAndPublish10Messages(t *testing.T) {
|
|||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
}
|
}
|
||||||
err = sub.OnMessage(func(channel string, data message.Data) {
|
err = sub.OnMessage(func(channel string, data message.Data) {
|
||||||
|
delivered++
|
||||||
|
done.Done()
|
||||||
if data != "hello world" {
|
if data != "hello world" {
|
||||||
t.Fatalf("expecting: `hello world` got : %s", data)
|
t.Fatalf("expecting: `hello world` got : %s", data)
|
||||||
}
|
}
|
||||||
@ -91,11 +86,11 @@ func TestServerSubscribeAndPublish10Messages(t *testing.T) {
|
|||||||
//give some time for setup
|
//give some time for setup
|
||||||
time.Sleep(time.Second)
|
time.Sleep(time.Second)
|
||||||
for i := 0; i < 10; i++ {
|
for i := 0; i < 10; i++ {
|
||||||
id, err := client.Publish("/test", "hello world")
|
err := client.Publish("/test", "hello world")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
}
|
}
|
||||||
log.Println(id, i)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
done.Wait()
|
done.Wait()
|
||||||
@ -104,11 +99,11 @@ func TestServerSubscribeAndPublish10Messages(t *testing.T) {
|
|||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
}
|
}
|
||||||
//try to publish one more message
|
//try to publish one more message
|
||||||
id, err := client.Publish("/test", "hello world")
|
err = client.Publish("/test", "hello world")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
}
|
}
|
||||||
log.Println(id)
|
|
||||||
if delivered != 10 {
|
if delivered != 10 {
|
||||||
t.Fatal("message received after client unsubscribe")
|
t.Fatal("message received after client unsubscribe")
|
||||||
}
|
}
|
||||||
@ -169,7 +164,7 @@ func TestWildcardSubscription(t *testing.T) {
|
|||||||
|
|
||||||
for _, channel := range []string{"/wildcard/foo", "/wildcard/bar"} {
|
for _, channel := range []string{"/wildcard/foo", "/wildcard/bar"} {
|
||||||
for i := 0; i < 10; i++ {
|
for i := 0; i < 10; i++ {
|
||||||
_, err := client.Publish(channel, "hello world")
|
err := client.Publish(channel, "hello world")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
}
|
}
|
||||||
|
@ -11,6 +11,7 @@ type Options struct {
|
|||||||
Headers http.Header
|
Headers http.Header
|
||||||
Cookies http.CookieJar
|
Cookies http.CookieJar
|
||||||
|
|
||||||
|
MaxRetries int
|
||||||
RetryInterval time.Duration
|
RetryInterval time.Duration
|
||||||
DialDeadline time.Duration
|
DialDeadline time.Duration
|
||||||
ReadDeadline time.Duration
|
ReadDeadline time.Duration
|
||||||
|
Loading…
Reference in New Issue
Block a user