From 9bdcec4ca8a4880770a6664d9405e1d774a07f63 Mon Sep 17 00:00:00 2001 From: shanejonas Date: Tue, 1 Jun 2021 11:18:28 -0700 Subject: [PATCH 1/3] add substream name to ended guards --- src/ObjectMultiplex.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ObjectMultiplex.ts b/src/ObjectMultiplex.ts index b4f9a6a..e695d97 100644 --- a/src/ObjectMultiplex.ts +++ b/src/ObjectMultiplex.ts @@ -25,12 +25,12 @@ export class ObjectMultiplex extends Duplex { createStream(name: string): Substream { // guard stream against destroyed already if (this.destroyed) { - throw new Error('ObjectMultiplex - parent stream already destroyed'); + throw new Error(`ObjectMultiplex - parent stream for name "${name}" already destroyed `); } // guard stream against ended already if (this._readableState.ended || this._writableState.ended) { - throw new Error('ObjectMultiplex - parent stream already ended'); + throw new Error(`ObjectMultiplex - parent stream for name "${name}" already ended`); } // validate name From 6657f6a3707e4e85aed01414e2e8bc478221e92b Mon Sep 17 00:00:00 2001 From: Shane Date: Tue, 1 Jun 2021 11:27:08 -0700 Subject: [PATCH 2/3] Update src/ObjectMultiplex.ts Co-authored-by: Mark Stacey --- src/ObjectMultiplex.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ObjectMultiplex.ts b/src/ObjectMultiplex.ts index e695d97..c3bfec6 100644 --- a/src/ObjectMultiplex.ts +++ b/src/ObjectMultiplex.ts @@ -25,7 +25,7 @@ export class ObjectMultiplex extends Duplex { createStream(name: string): Substream { // guard stream against destroyed already if (this.destroyed) { - throw new Error(`ObjectMultiplex - parent stream for name "${name}" already destroyed `); + throw new Error(`ObjectMultiplex - parent stream for name "${name}" already destroyed`); } // guard stream against ended already From 85ed39f244da99fe4dbda5d2b4ad7f66ad1c2260 Mon Sep 17 00:00:00 2001 From: shanejonas Date: Tue, 1 Jun 2021 11:30:52 -0700 Subject: [PATCH 3/3] fix linting issues with stream ended guards --- src/ObjectMultiplex.ts | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/ObjectMultiplex.ts b/src/ObjectMultiplex.ts index 5f24f7b..679018c 100644 --- a/src/ObjectMultiplex.ts +++ b/src/ObjectMultiplex.ts @@ -24,12 +24,16 @@ export class ObjectMultiplex extends Duplex { createStream(name: string): Substream { // guard stream against destroyed already if (this.destroyed) { - throw new Error(`ObjectMultiplex - parent stream for name "${name}" already destroyed`); + throw new Error( + `ObjectMultiplex - parent stream for name "${name}" already destroyed`, + ); } // guard stream against ended already if (this._readableState.ended || this._writableState.ended) { - throw new Error(`ObjectMultiplex - parent stream for name "${name}" already ended`); + throw new Error( + `ObjectMultiplex - parent stream for name "${name}" already ended`, + ); } // validate name