From fa877dfc46b2713c34bb7097d967773822e2dd27 Mon Sep 17 00:00:00 2001
From: Anton <steel.kom@gmail.com>
Date: Fri, 8 Nov 2024 01:06:19 +0300
Subject: [PATCH] fix: updated for closing stream more safety (for pass tests)

---
 src/transit.js | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/transit.js b/src/transit.js
index 7f083f53..7c810636 100644
--- a/src/transit.js
+++ b/src/transit.js
@@ -1065,9 +1065,9 @@ class Transit {
 	 */
 	_softDeletePendingResStream(id) {
 		const stream = this.pendingResStreams.get(id);
+		this.pendingResStreams.delete(id);
 
 		if (stream) {
-			this.pendingResStreams.delete(id);
 			this._closeStreamIfPossible(stream);
 		}
 	}
@@ -1082,9 +1082,9 @@ class Transit {
 	 */
 	_deletePendingResStream(id, origin) {
 		const stream = this.pendingResStreams.get(id);
+		this.pendingResStreams.delete(id);
 
 		if (stream) {
-			this.pendingResStreams.delete(id);
 			this._destroyStreamIfPossible(stream, origin);
 		}
 	}
@@ -1098,15 +1098,11 @@ class Transit {
 	 */
 	_softDeletePendingReqStream(id) {
 		const reqStream = this.pendingReqStreams.get(id);
+		this.pendingReqStreams.delete(id);
 		const pass = reqStream ? reqStream.stream : undefined;
 
 		if (pass) {
-			this.pendingReqStreams.delete(id);
 			this._closeStreamIfPossible(pass);
-
-			if (!pass.readableEnded) {
-				pass.push(null);
-			}
 		}
 	}
 
@@ -1120,10 +1116,10 @@ class Transit {
 	 */
 	_deletePendingReqStream(id, origin) {
 		const reqStream = this.pendingReqStreams.get(id);
+		this.pendingReqStreams.delete(id);
 		const pass = reqStream ? reqStream.stream : undefined;
 
 		if (pass) {
-			this.pendingReqStreams.delete(id);
 			this._destroyStreamIfPossible(pass, origin);
 		}
 	}
@@ -1136,7 +1132,7 @@ class Transit {
 	 * @memberof Transit
 	 */
 	_destroyStreamIfPossible(stream, origin) {
-		if (!stream.destroyed) {
+		if (!stream.destroyed && stream.destroy) {
 			const message = origin ? `Stream closed by ${origin}` : "Stream internal error";
 			stream.destroy(new Error(message));
 		}
@@ -1149,7 +1145,7 @@ class Transit {
 	 * @memberof Transit
 	 */
 	_closeStreamIfPossible(stream) {
-		if (!stream.readableEnded) {
+		if (!stream.readableEnded && stream.push) {
 			stream.push(null);
 		}
 	}