Fix emitting events twice on duplex streams

code-asher · code-asher · commit fa6f9280bb0d · 2019-03-22T16:17:50.000-05:00
diff --git a/packages/protocol/src/browser/modules/stream.ts b/packages/protocol/src/browser/modules/stream.ts
@@ -161,7 +161,7 @@ export class Duplex<T extends DuplexProxy = DuplexProxy> extends Writable<T> imp
 
 	public constructor(proxyPromise: Promise<T> | T) {
 		super(proxyPromise);
-		this._readable = new Readable(proxyPromise);
+		this._readable = new Readable(proxyPromise, false);
 	}
 
 	public get readable(): boolean {
diff --git a/packages/protocol/src/common/proxy.ts b/packages/protocol/src/common/proxy.ts
@@ -31,12 +31,18 @@ const unpromisify = <T extends ServerProxy>(proxyPromise: Promise<T>): T => {
 export abstract class ClientProxy<T extends ServerProxy> extends EventEmitter {
 	protected readonly proxy: T;
 
-	public constructor(proxyPromise: Promise<T> | T) {
+	/**
+	 * You can specify not to bind events in order to avoid emitting twice for
+	 * duplex streams.
+	 */
+	public constructor(proxyPromise: Promise<T> | T, bindEvents: boolean = true) {
 		super();
 		this.proxy = isPromise(proxyPromise) ? unpromisify(proxyPromise) : proxyPromise;
-		this.proxy.onEvent((event, ...args): void => {
-			this.emit(event, ...args);
-		});
+		if (bindEvents) {
+			this.proxy.onEvent((event, ...args): void => {
+				this.emit(event, ...args);
+			});
+		}
 	}
 }
 
diff --git a/packages/protocol/test/net.test.ts b/packages/protocol/test/net.test.ts
@@ -25,6 +25,19 @@ describe("net", () => {
 			server.close();
 		});
 
+		it("should fail to connect", async () => {
+			const socket = new net.Socket();
+
+			const fn = jest.fn();
+			socket.on("error", fn);
+
+			socket.connect("/tmp/t/e/s/t/d/o/e/s/n/o/t/e/x/i/s/t");
+
+			await new Promise((r): nativeNet.Socket => socket.on("close", r));
+
+			expect(fn).toHaveBeenCalledTimes(1);
+		});
+
 		it("should connect", async () => {
 			await new Promise((resolve): void => {
 				const socket = net.createConnection(socketPath, () => {

Original file line number	Diff line number	Diff line change
`@@ -161,7 +161,7 @@ export class Duplex<T extends DuplexProxy = DuplexProxy> extends Writable<T> imp`
`161`	`161`
`162`	`162`	`public constructor(proxyPromise: Promise<T> \| T) {`
`163`	`163`	`super(proxyPromise);`
`164`		`- this._readable = new Readable(proxyPromise);`
	`164`	`+ this._readable = new Readable(proxyPromise, false);`
`165`	`165`	`}`
`166`	`166`
`167`	`167`	`public get readable(): boolean {`