From 27d5eff771b9c218bd81e2a3265a2c205c5d9b2d Mon Sep 17 00:00:00 2001
From: Reinier Criel <reinier.criel@gmail.com>
Date: Wed, 28 Jan 2026 17:25:49 -0800
Subject: [PATCH] Some small changes

---
 .../src/registryProxy/tunnelRequestHandler.js | 32 +++++++++++--------
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/packages/safe-chain/src/registryProxy/tunnelRequestHandler.js b/packages/safe-chain/src/registryProxy/tunnelRequestHandler.js
index 5eac381..c64de50 100644
--- a/packages/safe-chain/src/registryProxy/tunnelRequestHandler.js
+++ b/packages/safe-chain/src/registryProxy/tunnelRequestHandler.js
@@ -14,22 +14,28 @@ let timedoutImdsEndpoints = [];
  * @returns {void}
  */
 export function tunnelRequest(req, clientSocket, head) {
-  const httpsProxy = process.env.HTTPS_PROXY || process.env.https_proxy;
+  try {
+    const httpsProxy = process.env.HTTPS_PROXY || process.env.https_proxy;
 
-  if (httpsProxy) {
-    // If an HTTPS proxy is set, tunnel the request via the proxy
-    // This is the system proxy, not the safe-chain proxy
-    // The package manager will run via the safe-chain proxy
-    // The safe-chain proxy will then send the request to the system proxy
-    // Typical flow: package manager -> safe-chain proxy -> system proxy -> destination
+    if (httpsProxy) {
+      // If an HTTPS proxy is set, tunnel the request via the proxy
+      // This is the system proxy, not the safe-chain proxy
+      // The package manager will run via the safe-chain proxy
+      // The safe-chain proxy will then send the request to the system proxy
+      // Typical flow: package manager -> safe-chain proxy -> system proxy -> destination
 
-    // There are 2 processes involved in this:
-    // 1. Safe-chain process: has HTTPS_PROXY set to system proxy
-    // 2. Package manager process: has HTTPS_PROXY set to safe-chain proxy
+      // There are 2 processes involved in this:
+      // 1. Safe-chain process: has HTTPS_PROXY set to system proxy
+      // 2. Package manager process: has HTTPS_PROXY set to safe-chain proxy
 
-    tunnelRequestViaProxy(req, clientSocket, head, httpsProxy);
-  } else {
-    tunnelRequestToDestination(req, clientSocket, head);
+      tunnelRequestViaProxy(req, clientSocket, head, httpsProxy);
+    } else {
+      tunnelRequestToDestination(req, clientSocket, head);
+    }
+  } catch (/** @type {any} */ err) {
+    ui.writeError(
+      `Safe-chain: tunnel request failed for ${req.url} : ${err.message}`
+    );
   }
 }