From ee460d677d07a90e6f008fb8bcc794bfd1fb8145 Mon Sep 17 00:00:00 2001
From: Cooldude2606 <25043174+Cooldude2606@users.noreply.github.com>
Date: Wed, 27 May 2026 23:10:59 +0100
Subject: [PATCH] Rename `libAddress.index` to `requestIndex` and add
 `addressIndex`

---
 packages/lib/src/data/messages_core.ts | 12 ++++++++++--
 packages/lib/src/link/link.ts          |  4 ++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/packages/lib/src/data/messages_core.ts b/packages/lib/src/data/messages_core.ts
index 36b85720..305905e4 100644
--- a/packages/lib/src/data/messages_core.ts
+++ b/packages/lib/src/data/messages_core.ts
@@ -102,8 +102,16 @@ export class Address {
 	 * Returns a string suitable for indexing the address in a Map
 	 * @returns unique string for this address
 	 */
-	index() {
-		return `${this.type}:${this.id}:${this.requestId}`;
+	requestIndex() {
+		return `${this.type}:${this.id}:${this.requestId}` as const;
+	}
+
+	/**
+	 * Returns a string suitable for indexing the address in a Map
+	 * @returns unique string for this address, excluding required id
+	 */
+	addressIndex() {
+		return `${this.type}:${this.id}` as const;
 	}
 
 	/**
diff --git a/packages/lib/src/link/link.ts b/packages/lib/src/link/link.ts
index ac15d5c6..b7bc8c02 100644
--- a/packages/lib/src/link/link.ts
+++ b/packages/lib/src/link/link.ts
@@ -219,7 +219,7 @@ export class Link {
 
 		if (!message.dst.addressedTo(this.connector.src)) {
 			if (message.type === "response" || message.type === "responseError") {
-				this._forwardedRequests.delete(message.dst.index());
+				this._forwardedRequests.delete(message.dst.requestIndex());
 			}
 			this._routeMessage(message, entry);
 			return;
@@ -566,7 +566,7 @@ export class Link {
 			src: message.src,
 			dst: message.dst,
 		};
-		this._forwardedRequests.set(message.src.index(), pending);
+		this._forwardedRequests.set(message.src.requestIndex(), pending);
 		this.connector.forward(message);
 	}