Skip to content

Fix to manage namespace disconnection and reconnection #568

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

Closed
ifraixedes wants to merge 1 commit into from
Closed

Fix to manage namespace disconnection and reconnection #568

Show file tree
Hide file tree
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
2 changes: 2 additions & 0 deletions lib/namespace.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
this.json = new Flag(this, 'json');
this.ackPackets = 0;
this.acks = {};
this.connected = false;
};

/**
Expand Down Expand Up @@ -158,6 +159,7 @@
} else {
this.$emit('disconnect', packet.reason);
}
this.connected = false;
break;

case 'message':
Expand Down
20 changes: 13 additions & 7 deletions lib/socket.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,13 +75,19 @@
*/

Socket.prototype.of = function (name) {
if (!this.namespaces[name]) {
if (!this.namespaces[name]) {
this.namespaces[name] = new io.SocketNamespace(this, name);

if (name !== '') {
this.namespaces[name].packet({ type: 'connect' });
this.namespaces[name].connected = true;
this.namespaces[name].packet({ type: 'connect' });
}
}
} else {
if (!this.namespaces[name].connected) {
this.namespaces[name].connected = true;
this.namespaces[name].packet({ type: 'connect' });
}
}

return this.namespaces[name];
};
Expand Down Expand Up @@ -161,7 +167,7 @@
} else if (xhr.status == 403) {
self.onError(xhr.responseText);
} else {
self.connecting = false;
self.connecting = false;
!self.reconnecting && self.onError(xhr.responseText);
}
}
Expand Down Expand Up @@ -205,7 +211,7 @@

var self = this;
self.connecting = true;

this.handshake(function (sid, heartbeat, close, transports) {
self.sessionid = sid;
self.closeTimeout = close * 1000;
Expand Down Expand Up @@ -327,7 +333,7 @@
this.transport.payload(this.buffer);
this.buffer = [];
};


/**
* Disconnect the established connect.
Expand Down Expand Up @@ -390,7 +396,7 @@
var port = global.location.port ||
('https:' == global.location.protocol ? 443 : 80);

return this.options.host !== global.location.hostname
return this.options.host !== global.location.hostname
|| this.options.port != port;
};

Expand Down