fix: emit setup errors not caused by closed channel

Fixes #95
jwalton · Aug 24, 2021 · 7c5fe10 · 7c5fe10
1 parent 69f1da3
commit 7c5fe10
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/src/ChannelWrapper.js b/src/ChannelWrapper.js
@@ -236,11 +236,11 @@ export default class ChannelWrapper extends EventEmitter {
                     this._setups.map((setupFn) =>
                         // TODO: Use a timeout here to guard against setupFns that never resolve?
                         pb.call(setupFn, this, channel).catch((err) => {
-                            if (this._channel) {
-                                this.emit('error', err, { name: this.name });
-                            } else {
-                                // Don't emit an error if setups failed because the channel was closing.
+                            if (err.name === 'IllegalOperationError' && err.message === 'Channel closed') {
+                                // Don't emit an error if setups failed because the channel closed.
+                                return;
                             }
+                            this.emit('error', err, { name: this.name });
                         })
                     )
                 ).then(() => {

diff --git a/test/ChannelWrapperTest.js b/test/ChannelWrapperTest.js
@@ -107,7 +107,9 @@ describe('ChannelWrapper', function () {
 
         const setup2 = sinon.spy(() =>
             promiseTools.delay(20).then(function () {
-                throw new Error('Boom!');
+                const e = new Error('Channel closed');
+                e.name = 'IllegalOperationError';
+                throw e;
             })
         );