Skip to content

Make join throw if called synchronously from a closed spark #59

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

Open
lpinca wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Make join throw if called synchronously from a closed spark #59

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
19 changes: 9 additions & 10 deletions lib/rooms.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,10 @@ Rooms.prototype.except = function except(ids) {
*/

Rooms.prototype.join = function join(room, fn) {
return this.exec('_join', room, fn);
if (this.primus.spark(this.id)) return this.exec('_join', room, fn);
var err = new RoomsError('Spark is closed', this.ctx);
if (fn) return setImmediate(fn, err), this;
throw err;
};

/**
Expand All @@ -127,15 +130,11 @@ Rooms.prototype.join = function join(room, fn) {
Rooms.prototype._join = function _join(room, fn) {
var rm = this;
debug('joining room %s', room);
if (this.primus.spark(this.id)) {
this.adapter.add(this.id, room, function set(err, res) {
if (err) return fn(new RoomsError(err, rm.ctx));
rm.emits('joinroom', room);
fn(null, res);
});
} else {
setImmediate(fn, new RoomsError('Spark is closed', this.ctx));
}
this.adapter.add(this.id, room, function set(err, res) {
if (err) return fn(new RoomsError(err, rm.ctx));
rm.emits('joinroom', room);
fn(null, res);
});
return this;
};

Expand Down
4 changes: 4 additions & 0 deletions test/test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,10 @@ describe('primus-rooms', function () {
it('should prevent closed sparks from joining rooms', function (done) {
primus.on('connection', function (spark) {
spark.on('end', function () {
expect(spark.join.bind(spark, 'room1')).to.throwException(function (err) {
expect(err).to.be.an(Error);
expect(err.message).to.be('Spark is closed');
});
spark.join('room1', function (err) {
expect(err).to.be.an(Error);
expect(err.message).to.be('Spark is closed');
Expand Down