fix: prevent route loss on commit on target route

dao-xyz · Dec 5, 2023 · d17b648 · d17b648
1 parent cafe432
commit d17b648
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/packages/transport/stream/src/__tests__/stream.test.ts b/packages/transport/stream/src/__tests__/stream.test.ts
@@ -175,7 +175,7 @@ describe("streams", function () {
 			let session: TestSessionStream;
 			let streams: ReturnType<typeof createMetrics>[];
 
-			beforeAll(async () => {});
+			beforeAll(async () => { });
 
 			beforeEach(async () => {
 				// 0 and 2 not connected
@@ -501,7 +501,7 @@ describe("streams", function () {
 			let session: TestSessionStream;
 			let streams: ReturnType<typeof createMetrics>[];
 
-			beforeAll(async () => {});
+			beforeAll(async () => { });
 
 			beforeEach(async () => {
 				session = await connected(3, {
@@ -640,7 +640,7 @@ describe("streams", function () {
 			let streams: ReturnType<typeof createMetrics>[];
 			const data = new Uint8Array([1, 2, 3]);
 
-			beforeAll(async () => {});
+			beforeAll(async () => { });
 
 			beforeEach(async () => {
 				session = await connected(3, {
@@ -758,7 +758,7 @@ describe("streams", function () {
 			let streams: ReturnType<typeof createMetrics>[];
 			const data = new Uint8Array([1, 2, 3]);
 
-			beforeAll(async () => {});
+			beforeAll(async () => { });
 
 			beforeEach(async () => {
 				session = await disconnected(5, {
@@ -1095,7 +1095,7 @@ describe("streams", function () {
 		let streams: ReturnType<typeof createMetrics>[];
 		let timer: ReturnType<typeof setTimeout>;
 
-		beforeAll(async () => {});
+		beforeAll(async () => { });
 
 		beforeEach(async () => {
 			session = await connected(3, {

diff --git a/packages/transport/stream/src/index.ts b/packages/transport/stream/src/index.ts
@@ -1419,9 +1419,9 @@ export abstract class DirectStream<
 	): Promise<{ promise: Promise<void> }> {
 		const idString = toBase64(message.id);
 
-		const ppp = this._ackCallbacks.get(idString);
-		if (ppp) {
-			return { promise: ppp.promise };
+		const existing = this._ackCallbacks.get(idString);
+		if (existing) {
+			return { promise: existing.promise };
 		}
 
 		const allAckS: ACK[] = [];

diff --git a/packages/transport/stream/src/routes.ts b/packages/transport/stream/src/routes.ts
@@ -305,11 +305,11 @@ export class Routes {
 						session
 					);
 				}
+				map.delete(target);
+				return;
+			} else {
+				return;
 			}
-			/* 	if (map.size === 1) {
-					this.pendingRoutes.delete(session);
-					return;
-				} */
 		} else {
 			for (const [target, routes] of map) {
 				for (const route of routes) {