Skip to content

Make autoProcessSubscriptions behaviour work when new subscriptions are made #23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jondubois merged 1 commit into from
Oct 30, 2015
Merged

Make autoProcessSubscriptions behaviour work when new subscriptions are made #23

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion lib/scsocket.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ var SCSocket = function (options) {

this.id = null;
this.state = this.CLOSED;
this.pendingConnectCallback = false;

this.ackTimeout = opts.ackTimeout;

Expand Down Expand Up @@ -378,6 +379,8 @@ SCSocket.prototype._onSCOpen = function (status) {
this._connectAttempts = 0;
if (this.options.autoProcessSubscriptions) {
this.processPendingSubscriptions();
} else {
this.pendingConnectCallback = true;
}

// If the user invokes the callback while in autoProcessSubscriptions mode, it
Expand Down Expand Up @@ -591,7 +594,7 @@ SCSocket.prototype._trySubscribe = function (channel) {
var self = this;

// We can only ever have one pending subscribe action at any given time on a channel
if (this.state == this.OPEN && channel._pendingSubscriptionCid == null) {
if (this.state == this.OPEN && !this.pendingConnectCallback && channel._pendingSubscriptionCid == null) {
var options = {
noTimeout: true
};
Expand Down Expand Up @@ -725,6 +728,8 @@ SCSocket.prototype.isSubscribed = function (channel, includePending) {
SCSocket.prototype.processPendingSubscriptions = function () {
var self = this;

this.pendingConnectCallback = false;

var channels = [];
for (var channelName in this._channels) {
if (this._channels.hasOwnProperty(channelName)) {
Expand Down