Merge pull request #97 from omsmith/fix-multi-client-native-promises

Fix multi client native promises
Brightspace · Dec 19, 2017 · ad5faaf · ad5faaf
2 parents b388610 + 220943a
commit ad5faaf
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 1 deletion.
diff --git a/src/host.js b/src/host.js
@@ -56,6 +56,10 @@ Host.prototype.connect = function connect() {
 	var me = this;
 	return new Promise(function(resolve/*, reject*/) {
 		me.onEvent('ready', function() {
+			if (me._isConnected) {
+				return;
+			}
+
 			resolve(Port.prototype.connect.call(me));
 		});
 		me.open();

diff --git a/test/__throw_rejected_promises.js b/test/__throw_rejected_promises.js
@@ -0,0 +1,3 @@
+'use strict';
+
+process.on('unhandledRejection', e => { process._rawDebug(e); process.exit(1); });
diff --git a/test/host.js b/test/host.js
@@ -126,8 +126,16 @@ describe('host', () => {
 				onEvent.should.have.been.calledWith('ready');
 			});
 
+			it('should not error when client connects after initial client', (done) => {
+				host
+					.connect()
+					.then(() => {
+						host._receiveEvent('ready');
+					})
+					.then(done, done);
+				host._receiveEvent('ready');
+			});
 		});
 
 	});
-
 });
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		'use strict';

		process.on('unhandledRejection', e => { process._rawDebug(e); process.exit(1); });