From 5b0f629b6e1561bb14dc6523783072c5c583f1fb Mon Sep 17 00:00:00 2001
From: Bastiaan <17990055+bbassie@users.noreply.github.com>
Date: Sat, 12 Sep 2026 02:51:39 +0200
Subject: [PATCH] Merge pull request #1016 from bbassie/fix/improve-logging

Add context to connection and response log messages
---
 packages/controller/src/WsServerConnector.ts | 5 ++++-
 packages/lib/src/link/connectors.ts          | 4 +++-
 packages/lib/src/link/link.ts                | 4 ++--
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/packages/controller/src/WsServerConnector.ts b/packages/controller/src/WsServerConnector.ts
index 7277f8c3..439a2056 100644
--- a/packages/controller/src/WsServerConnector.ts
+++ b/packages/controller/src/WsServerConnector.ts
@@ -106,6 +106,9 @@ export default class WsServerConnector extends lib.WebSocketBaseConnector {
 		this._state = "connected";
 		this._attachSocketHandlers();
 		this._dropSendBufferSeq(lastSeq);
+		logger.verbose(
+			`Connector | resuming session with ${this.dst}, resending ${this._sendBuffer.length} buffered messages`
+		);
 		for (let message of this._sendBuffer) {
 			this._socket.send(JSON.stringify(message));
 		}
@@ -113,7 +116,7 @@ export default class WsServerConnector extends lib.WebSocketBaseConnector {
 	}
 
 	_timedOut() {
-		logger.verbose("Connector | Connection timed out");
+		logger.verbose(`Connector | Connection to ${this.dst} timed out`);
 		this._close();
 	}
 
diff --git a/packages/lib/src/link/connectors.ts b/packages/lib/src/link/connectors.ts
index 8ce84f8f..d14b89e3 100644
--- a/packages/lib/src/link/connectors.ts
+++ b/packages/lib/src/link/connectors.ts
@@ -713,12 +713,14 @@ export abstract class WebSocketClientConnector extends WebSocketBaseConnector<We
 			this.emit("connect", data);
 
 		} else if (type === "continue") {
-			logger.info("Connector | resuming existing session");
 			this._state = "connected";
 			this._heartbeatInterval = data.heartbeatInterval;
 			this._sessionTimeout = data.sessionTimeout;
 			this.startHeartbeat();
 			this._dropSendBufferSeq(data.lastSeq);
+			logger.info(
+				`Connector | resuming existing session, resending ${this._sendBuffer.length} buffered messages`
+			);
 			for (let bufferedMessage of this._sendBuffer) {
 				this._sendInternal(bufferedMessage);
 			}
diff --git a/packages/lib/src/link/link.ts b/packages/lib/src/link/link.ts
index 80973177..3fb2e085 100644
--- a/packages/lib/src/link/link.ts
+++ b/packages/lib/src/link/link.ts
@@ -444,7 +444,7 @@ export class Link {
 		let pending = this._pendingRequests.get(message.dst.requestId!);
 		if (!pending) {
 			throw new libErrors.InvalidMessage(
-				`Received response ${message.dst.requestId} without a pending request`
+				`Received response ${message.dst.requestId} from ${message.src} without a pending request`
 			);
 		}
 
@@ -465,7 +465,7 @@ export class Link {
 		let pending = this._pendingRequests.get(message.dst.requestId!);
 		if (!pending) {
 			throw new libErrors.InvalidMessage(
-				`Received error response ${message.dst.requestId} without a pending request`
+				`Received error response ${message.dst.requestId} from ${message.src} without a pending request`
 			);
 		}