fix RPC pathname override behavior (#5915)

Author: jnsdls

.changeset/odd-hats-give.md

@@ -0,0 +1,5 @@
+---
+"thirdweb": patch
+---
+
+respect custom RPC urls passed directly

packages/thirdweb/src/chains/utils.test.ts

@@ -23,6 +23,7 @@ import {
   getChainDecimals,
   getChainNativeCurrencyName,
   getChainSymbol,
+  getRpcUrlForChain,
 } from "./utils.js";
 
 const legacyChain: LegacyChain = {
@@ -306,4 +307,75 @@ describe("defineChain", () => {
       testnet: undefined,
     });
   });
+
+  describe("getRpcUrlForChain", () => {
+    it("should construct RPC URL using chain ID and client ID when chain is a number", () => {
+      const options = {
+        client: { ...TEST_CLIENT, clientId: "test-client-id" },
+        chain: 1,
+      };
+      const result = getRpcUrlForChain(options);
+      expect(result).toBe("https://1.rpc.thirdweb.com/test-client-id");
+    });
+
+    it("should return the custom RPC URL if provided", () => {
+      const options = {
+        client: { ...TEST_CLIENT, clientId: "test-client-id" },
+        chain: {
+          id: 1,
+          rpc: "https://custom-rpc.com",
+        },
+      };
+      const result = getRpcUrlForChain(options);
+      expect(result).toBe("https://custom-rpc.com");
+    });
+
+    it("should add client ID to thirdweb RPC URL", () => {
+      const options = {
+        client: { ...TEST_CLIENT, clientId: "test-client-id" },
+        chain: {
+          id: 1,
+          rpc: "https://1.rpc.thirdweb.com",
+        },
+      };
+      const result = getRpcUrlForChain(options);
+      expect(result).toBe("https://1.rpc.thirdweb.com/test-client-id");
+    });
+
+    it("should honor client ID passed directly in rpc field", () => {
+      const options = {
+        client: { ...TEST_CLIENT, clientId: "test-client-id" },
+        chain: {
+          id: 1,
+          rpc: "https://1.rpc.thirdweb.com/abc",
+        },
+      };
+      const result = getRpcUrlForChain(options);
+      expect(result).toBe("https://1.rpc.thirdweb.com/abc");
+    });
+
+    it("should replace template string in rpc url", () => {
+      const options = {
+        client: { ...TEST_CLIENT, clientId: "test-client-id" },
+        chain: {
+          id: 1,
+          rpc: "https://1.rpc.thirdweb.com/${THIRDWEB_API_KEY}",
+        },
+      };
+      const result = getRpcUrlForChain(options);
+      expect(result).toBe("https://1.rpc.thirdweb.com/test-client-id");
+    });
+
+    it("should return the RPC URL without modification if it's not a thirdweb URL", () => {
+      const options = {
+        client: { ...TEST_CLIENT, clientId: "test-client-id" },
+        chain: {
+          id: 1,
+          rpc: "https://custom-rpc.com",
+        },
+      };
+      const result = getRpcUrlForChain(options);
+      expect(result).toBe("https://custom-rpc.com");
+    });
+  });
 });

packages/thirdweb/src/chains/utils.ts

@@ -193,7 +193,9 @@ export function getRpcUrlForChain(options: GetRpcUrlForChainOptions): string {
     const rpcUrl = new URL(
       options.chain.rpc.replace(DEFAULT_RPC_URL, baseRpcUrl),
     );
-    rpcUrl.pathname = `/${options.client.clientId}`;
+    if (rpcUrl.pathname === "/" || rpcUrl.pathname.startsWith("/$")) {
+      rpcUrl.pathname = `/${options.client.clientId}`;
+    }
     return rpcUrl.toString();
   }
   return rpc;