thirdweb 5.57.0-nightly-cf1683c3feea6eb36ac6b902a1dd64c8ed8803c9-20240918000340 → 5.57.1

package/src/utils/any-evm/deploy-metadata.ts

@@ -50,6 +50,7 @@ export async function fetchDeployMetadata(
     ...parsedMeta,
     version: rawMeta.version,
     bytecode: deployBytecode,
+    name: rawMeta.name,
   };
 }
 

package/src/utils/fetch.test.ts

@@ -0,0 +1,114 @@
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import type { ThirdwebClient } from "../client/client.js";
+import type { Ecosystem } from "../wallets/in-app/web/types.js";
+import {
+  IS_THIRDWEB_URL_CACHE,
+  getClientFetch,
+  isThirdwebUrl,
+} from "./fetch.js";
+
+// Mock fetch
+global.fetch = vi.fn();
+
+describe("getClientFetch", () => {
+  const mockClient: ThirdwebClient = {
+    clientId: "test-client-id",
+    secretKey: undefined,
+  };
+  const mockEcosystem: Ecosystem = { id: "ecosystem.test" };
+
+  beforeEach(() => {
+    vi.resetAllMocks();
+  });
+
+  it("should set correct headers for thirdweb URLs", async () => {
+    vi.spyOn(global, "fetch").mockResolvedValue(new Response());
+    const clientFetch = getClientFetch(mockClient, mockEcosystem);
+    await clientFetch("https://api.thirdweb.com/test");
+
+    expect(global.fetch).toHaveBeenCalledWith(
+      "https://api.thirdweb.com/test",
+      expect.objectContaining({
+        headers: expect.any(Headers),
+      }),
+    );
+
+    // biome-ignore lint/suspicious/noExplicitAny: `any` type ok for tests
+    const headers = (global.fetch as any).mock.calls[0][1].headers;
+    expect(headers.get("x-client-id")).toBe("test-client-id");
+    expect(headers.get("x-ecosystem-id")).toBe("ecosystem.test");
+  });
+
+  it("should not set headers for non-thirdweb URLs", async () => {
+    vi.spyOn(global, "fetch").mockResolvedValue(new Response());
+    const clientFetch = getClientFetch(mockClient, mockEcosystem);
+    await clientFetch("https://example.com");
+
+    expect(global.fetch).toHaveBeenCalledWith(
+      "https://example.com",
+      expect.not.objectContaining({
+        headers: expect.any(Headers),
+      }),
+    );
+  });
+
+  it("should send a bearer token if secret key is a JWT", () => {
+    vi.spyOn(global, "fetch").mockResolvedValue(new Response());
+    const clientFetch = getClientFetch({
+      clientId: "test-client-id",
+      secretKey: "foo.bar.baz",
+    });
+    clientFetch("https://api.thirdweb.com/test");
+
+    expect(global.fetch).toHaveBeenCalledWith(
+      "https://api.thirdweb.com/test",
+      expect.objectContaining({
+        headers: expect.any(Headers),
+      }),
+    );
+
+    // biome-ignore lint/suspicious/noExplicitAny: `any` type ok for tests
+    const headers = (global.fetch as any).mock.calls[0][1].headers;
+    expect(headers.get("authorization")).toBe("Bearer foo.bar.baz");
+  });
+
+  it("should abort the request after timeout", async () => {
+    vi.useFakeTimers();
+    const abortSpy = vi.spyOn(AbortController.prototype, "abort");
+    const clientFetch = getClientFetch(mockClient);
+
+    const fetchPromise = clientFetch("https://api.thirdweb.com/test", {
+      requestTimeoutMs: 5000,
+    });
+    vi.advanceTimersByTime(5001);
+
+    await expect(fetchPromise).rejects.toThrow();
+    expect(abortSpy).toHaveBeenCalled();
+
+    vi.useRealTimers();
+  });
+});
+
+describe("isThirdwebUrl", () => {
+  it("should return true for thirdweb domains", () => {
+    expect(isThirdwebUrl("https://api.thirdweb.com")).toBe(true);
+    expect(isThirdwebUrl("https://example.ipfscdn.io")).toBe(true);
+  });
+
+  it("should return false for non-thirdweb domains", () => {
+    expect(isThirdwebUrl("https://example.com")).toBe(false);
+    expect(isThirdwebUrl("https://otherthirdweb.com")).toBe(false);
+  });
+
+  it("should handle invalid URLs", () => {
+    expect(isThirdwebUrl("not-a-url")).toBe(false);
+  });
+
+  it("should cache results", () => {
+    const url = "https://api.thirdweb.com";
+    isThirdwebUrl(url);
+    isThirdwebUrl(url);
+    // You might need to expose the cache to test this properly
+    expect(IS_THIRDWEB_URL_CACHE.get(url)).toBe(true);
+  });
+});

package/src/utils/fetch.ts

@@ -7,23 +7,14 @@ import {
   detectOS,
   detectPlatform,
 } from "./detect-platform.js";
+import { isJWT } from "./jwt/is-jwt.js";
 
 const DEFAULT_REQUEST_TIMEOUT = 60000;
 
-const FETCH_CACHE = new WeakMap<
-  { client: ThirdwebClient; ecosystem?: Ecosystem },
-  (url: string, init?: RequestInit) => Promise<Response>
->();
-
 /**
  * @internal
  */
 export function getClientFetch(client: ThirdwebClient, ecosystem?: Ecosystem) {
-  if (FETCH_CACHE.has({ client, ecosystem })) {
-    // biome-ignore lint/style/noNonNullAssertion: the `has` above ensures that this will always be set
-    return FETCH_CACHE.get({ client, ecosystem })!;
-  }
-
   /**
    * @internal
    */
@@ -41,7 +32,11 @@ export function getClientFetch(client: ThirdwebClient, ecosystem?: Ecosystem) {
       if (!headers) {
         headers = new Headers();
       }
-      const authToken = getTWAuthToken();
+      const authToken =
+        client.secretKey && isJWT(client.secretKey)
+          ? client.secretKey
+          : undefined;
+
       // if we have an auth token set, use that (thirdweb.com/dashboard sets this for the user)
       // pay urls should never send the auth token, because we always want the "developer" to be the one making the request, not the "end user"
       if (authToken && !isPayUrl(url)) {
@@ -83,7 +78,6 @@ export function getClientFetch(client: ThirdwebClient, ecosystem?: Ecosystem) {
       }
     });
   }
-  FETCH_CACHE.set({ client, ecosystem }, fetchWithHeaders);
   return fetchWithHeaders;
 }
 
@@ -96,7 +90,7 @@ const THIRDWEB_DOMAINS = [
   ".thirdweb-dev.com",
 ] as const;
 
-const IS_THIRDWEB_URL_CACHE = new LruMap<boolean>(4096);
+export const IS_THIRDWEB_URL_CACHE = new LruMap<boolean>(4096);
 
 /**
  * @internal
@@ -196,16 +190,3 @@ function parseOs(os: OperatingSystem | NodeJS.Platform) {
       return osLowerCased.replace(/\s/gi, "_");
   }
 }
-
-function getTWAuthToken(): string | null {
-  if (
-    typeof globalThis !== "undefined" &&
-    "TW_AUTH_TOKEN" in globalThis &&
-    // biome-ignore lint/suspicious/noExplicitAny: get around globalThis typing
-    typeof (globalThis as any).TW_AUTH_TOKEN === "string"
-  ) {
-    // biome-ignore lint/suspicious/noExplicitAny: get around globalThis typing
-    return (globalThis as any).TW_AUTH_TOKEN as string;
-  }
-  return null;
-}

package/src/utils/jwt/is-jwt.ts

@@ -0,0 +1,5 @@
+import type { JWTString } from "./types.js";
+
+export function isJWT(str: string): str is JWTString {
+  return str.split(".").length === 3;
+}

package/src/utils/jwt/types.ts

@@ -8,3 +8,5 @@ export type JWTPayload<Tctx = unknown> = {
   jti: string;
   ctx?: Tctx;
 };
+
+export type JWTString = `${string}.${string}.${string}`;

package/src/version.ts

@@ -1 +1 @@
-export const version = "5.57.0-nightly-cf1683c3feea6eb36ac6b902a1dd64c8ed8803c9-20240918000340";
+export const version = "5.57.1";