@mendable/firecrawl-js 4.38.0 → 4.39.0

package/dist/index.js

@@ -1,6 +1,6 @@
 import {
   require_package
-} from "./chunk-KSTNOGOD.js";
+} from "./chunk-4DPCCKWG.js";
 
 // src/v2/utils/httpClient.ts
 import axios from "axios";
@@ -620,6 +620,7 @@ function prepareSearchPayload(req) {
   if (req.limit != null) payload.limit = req.limit;
   if (req.tbs != null) payload.tbs = req.tbs;
   if (req.location != null) payload.location = req.location;
+  if (req.country != null) payload.country = req.country;
   if (req.ignoreInvalidURLs != null)
     payload.ignoreInvalidURLs = req.ignoreInvalidURLs;
   if (req.timeout != null) payload.timeout = req.timeout;
@@ -1240,6 +1241,9 @@ function prepareAgentPayload(args) {
     body.threatProtection = args.threatProtection;
   if (args.auditMetadata != null)
     body.auditMetadata = args.auditMetadata;
+  if (args.threadId != null) body.threadId = args.threadId;
+  if (args.mode != null) body.mode = args.mode;
+  if (args.exchange != null) body.exchange = args.exchange;
   return body;
 }
 async function startAgent(http, args) {
@@ -1310,6 +1314,17 @@ async function getAgentSnapshot(http, jobId, snapshotId) {
     throw err;
   }
 }
+async function getAgentThread(http, threadId, options) {
+  try {
+    const query = options?.includeData ? "?includeData=true" : "";
+    const res = await http.get(`/v2/agent/threads/${threadId}${query}`);
+    if (res.status !== 200) throwForBadResponse(res, "agent thread");
+    return res.data;
+  } catch (err) {
+    if (err?.isAxiosError) return normalizeAxiosError(err, "agent thread");
+    throw err;
+  }
+}
 async function cancelAgent(http, jobId) {
   try {
     const res = await http.delete(`/v2/agent/${jobId}`);
@@ -1550,9 +1565,7 @@ var ResearchClient = class {
     appendParam(params, "query", options.query);
     appendParam(params, "k", options.k);
     try {
-      const res = await this.http.get(
-        withQuery(`${BASE}/papers/${encodeURIComponent(id)}`, params)
-      );
+      const res = await this.http.get(withQuery(`${BASE}/papers/${encodeURIComponent(id)}`, params));
       if (res.status !== 200) throwForBadResponse(res, "get paper");
       return res.data;
     } catch (err) {
@@ -1578,10 +1591,7 @@ var ResearchClient = class {
     appendParam(params, "anchor", options.anchor);
     try {
       const res = await this.http.get(
-        withQuery(
-          `${BASE}/papers/${encodeURIComponent(id)}/similar`,
-          params
-        )
+        withQuery(`${BASE}/papers/${encodeURIComponent(id)}/similar`, params)
       );
       if (res.status !== 200) throwForBadResponse(res, "find similar papers");
       return res.data;
@@ -1590,7 +1600,16 @@ var ResearchClient = class {
     }
   }
   /**
-   * Search GitHub issue/PR history and repository readmes.
+   * Search the research index GitHub slice: issue/PR history and repository
+   * readmes.
+   *
+   * @deprecated Use `developerSearch()` on the client instead. This
+   * endpoint stops responding after 2026-11-03. The developer index searches
+   * GitHub issues, pull requests and readmes plus curated documentation
+   * sources, returns matched passages, and adds filters for repo, language,
+   * license and stars. It does not carry over the `scores` breakdown or the
+   * `resultType: "web"` fallback results. See
+   * https://docs.firecrawl.dev/features/developer.
    * @param query Search query.
    * @param options Optional `k`.
    */
@@ -2079,6 +2098,9 @@ var FirecrawlClient = class {
    * Access the v2 research endpoints — Firecrawl's **research paper index**
    * (~43M paper abstracts) plus GitHub history/readmes.
    *
+   * `research.searchGithub()` is deprecated and stops responding after
+   * 2026-11-03. Use `developerSearch()` instead.
+   *
    * The paper corpus is roughly 90% biomedical and life sciences — PubMed,
    * bioRxiv and medRxiv — with arXiv covering physics, mathematics and
    * computer science.
@@ -2338,6 +2360,14 @@ var FirecrawlClient = class {
   async getAgentSnapshot(jobId, snapshotId) {
     return getAgentSnapshot(this.http, jobId, snapshotId);
   }
+  /**
+   * Get a thread and its runs, oldest turn first.
+   * @param threadId Thread id, as returned by startAgent or getAgentStatus.
+   * @param options.includeData Inline each succeeded run's data.
+   */
+  async getAgentThread(threadId, options) {
+    return getAgentThread(this.http, threadId, options);
+  }
   // Browser
   /**
    * Create a new browser session.
@@ -2480,7 +2510,7 @@ var FirecrawlApp = class {
       if (typeof process !== "undefined" && process.env && process.env.npm_package_version) {
         return process.env.npm_package_version;
       }
-      const packageJson = await import("./package-OS7RONXY.js");
+      const packageJson = await import("./package-D2QZMRW7.js");
       return packageJson.default.version;
     } catch (error) {
       const isTest = typeof process !== "undefined" && (process.env.JEST_WORKER_ID != null || false);

package/dist/{package-OS7RONXY.js → package-D2QZMRW7.js}

@@ -1,4 +1,4 @@
 import {
   require_package
-} from "./chunk-KSTNOGOD.js";
+} from "./chunk-4DPCCKWG.js";
 export default require_package();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mendable/firecrawl-js",
-  "version": "4.38.0",
+  "version": "4.39.0",
   "description": "JavaScript SDK for the Firecrawl API: web scraping, crawling, web search, and scientific literature search over a research paper index of PubMed, bioRxiv, medRxiv and arXiv abstracts",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/pnpm-workspace.yaml

@@ -15,3 +15,4 @@ overrides:
   "form-data@>=4.0.0 <4.0.6": "4.0.6"
   "@babel/core@>=7.0.0 <7.29.6": "7.29.7"
   "esbuild@>=0.17.0 <0.28.1": "0.28.1"
+  "browserslist@<=4.28.6": ">=4.28.7 <5.0.0"

package/src/__tests__/e2e/v2/batch.test.ts

@@ -4,6 +4,7 @@
 import Firecrawl from "../../../index";
 import { config } from "dotenv";
 import { getIdentity, getApiUrl } from "./utils/idmux";
+import { testTimeoutMs, waitForJob, withRateLimitRetry } from "./utils/rateLimit";
 import { describe, test, expect, beforeAll } from "@jest/globals";
 
 config();
@@ -13,7 +14,7 @@ let client: Firecrawl;
 
 beforeAll(async () => {
   const { apiKey } = await getIdentity({ name: "js-e2e-batch" });
-  client = new Firecrawl({ apiKey, apiUrl: API_URL });
+  client = withRateLimitRetry(new Firecrawl({ apiKey, apiUrl: API_URL }));
 });
 
 describe("v2.batch e2e", () => {
@@ -22,19 +23,21 @@ describe("v2.batch e2e", () => {
       "https://docs.firecrawl.dev",
       "https://firecrawl.dev",
     ];
-    const job = await client.batchScrape(urls, { options: { formats: ["markdown"] }, pollInterval: 1, timeout: 180 });
+    const start = await client.startBatchScrape(urls, { options: { formats: ["markdown"] } });
+    const job = await waitForJob(() => client.getBatchScrapeStatus(start.id), { pollInterval: 1, timeout: 210 });
     expect(["completed", "failed"]).toContain(job.status);
     expect(job.completed).toBeGreaterThanOrEqual(0);
     expect(job.total).toBeGreaterThanOrEqual(0);
     expect(Array.isArray(job.data)).toBe(true);
-  }, 240_000);
+  }, testTimeoutMs(362_000));
 
   test("batch scrape with wait returns job id for error retrieval", async () => {
     const urls = [
       "https://docs.firecrawl.dev",
       "https://firecrawl.dev",
     ];
-    const job = await client.batchScrape(urls, { options: { formats: ["markdown"] }, pollInterval: 1, timeout: 180 });
+    const start = await client.startBatchScrape(urls, { options: { formats: ["markdown"] } });
+    const job = await waitForJob(() => client.getBatchScrapeStatus(start.id), { pollInterval: 1, timeout: 210 });
     // Verify job has id field
     expect(job.id).toBeDefined();
     expect(typeof job.id).toBe("string");
@@ -44,7 +47,7 @@ describe("v2.batch e2e", () => {
     expect(errors).toHaveProperty("robotsBlocked");
     expect(Array.isArray(errors.errors)).toBe(true);
     expect(Array.isArray(errors.robotsBlocked)).toBe(true);
-  }, 240_000);
+  }, testTimeoutMs(512_000));
 
   test("start batch minimal and status", async () => {
     const urls = ["https://docs.firecrawl.dev", "https://firecrawl.dev"]; 
@@ -57,11 +60,11 @@ describe("v2.batch e2e", () => {
     // Verify status includes id field
     expect(status.id).toBeDefined();
     expect(status.id).toBe(start.id);
-  }, 120_000);
+  }, testTimeoutMs(151_000));
 
   test("wait batch with all params", async () => {
     const urls = ["https://docs.firecrawl.dev", "https://firecrawl.dev"]; 
-    const job = await client.batchScrape(urls, {
+    const start = await client.startBatchScrape(urls, {
       options: {
         formats: [
           "markdown",
@@ -74,14 +77,13 @@ describe("v2.batch e2e", () => {
       ignoreInvalidURLs: true,
       maxConcurrency: 2,
       zeroDataRetention: false,
-      pollInterval: 1,
-      timeout: 180,
     });
+    const job = await waitForJob(() => client.getBatchScrapeStatus(start.id), { pollInterval: 1, timeout: 210 });
     expect(["completed", "failed", "cancelled"]).toContain(job.status);
     expect(job.completed).toBeGreaterThanOrEqual(0);
     expect(job.total).toBeGreaterThanOrEqual(0);
     expect(Array.isArray(job.data)).toBe(true);
-  }, 300_000);
+  }, testTimeoutMs(362_000));
 
   test("cancel batch", async () => {
     const urls = ["https://docs.firecrawl.dev", "https://firecrawl.dev"]; 
@@ -89,6 +91,6 @@ describe("v2.batch e2e", () => {
     expect(typeof start.id).toBe("string");
     const cancelled = await client.cancelBatchScrape(start.id);
     expect(cancelled).toBe(true);
-  }, 120_000);
+  }, testTimeoutMs(151_000));
 });
 

package/src/__tests__/e2e/v2/crawl.test.ts

@@ -4,6 +4,7 @@
 import Firecrawl from "../../../index";
 import { config } from "dotenv";
 import { getIdentity, getApiUrl } from "./utils/idmux";
+import { testTimeoutMs, waitForJob, withRateLimitRetry } from "./utils/rateLimit";
 import { describe, test, expect, beforeAll } from "@jest/globals";
 
 config();
@@ -13,7 +14,7 @@ let client: Firecrawl;
 
 beforeAll(async () => {
   const { apiKey } = await getIdentity({ name: "js-e2e-crawl" });
-  client = new Firecrawl({ apiKey, apiUrl: API_URL });
+  client = withRateLimitRetry(new Firecrawl({ apiKey, apiUrl: API_URL }));
 });
 
 describe("v2.crawl e2e", () => {
@@ -23,21 +24,21 @@ describe("v2.crawl e2e", () => {
     const job = await client.startCrawl("https://docs.firecrawl.dev", { limit: 3 });
     expect(typeof job.id).toBe("string");
     expect(typeof job.url).toBe("string");
-  }, 90_000);
+  }, testTimeoutMs(90_000));
 
   test("start crawl with options", async () => {
     if (!client) throw new Error();
     const job = await client.startCrawl("https://docs.firecrawl.dev", { limit: 5, maxDiscoveryDepth: 2 });
     expect(typeof job.id).toBe("string");
     expect(typeof job.url).toBe("string");
-  }, 90_000);
+  }, testTimeoutMs(90_000));
 
   test("start crawl with prompt", async () => {
     if (!client) throw new Error();
     const job = await client.startCrawl("https://firecrawl.dev", { prompt: "Extract all blog posts", limit: 3 });
     expect(typeof job.id).toBe("string");
     expect(typeof job.url).toBe("string");
-  }, 90_000);
+  }, testTimeoutMs(90_000));
 
   test("get crawl status", async () => {
     if (!client) throw new Error();
@@ -50,14 +51,14 @@ describe("v2.crawl e2e", () => {
     expect(status.id).toBe(start.id);
     // next/expiresAt may be null/undefined depending on state; check shape
     expect(Array.isArray(status.data)).toBe(true);
-  }, 120_000);
+  }, testTimeoutMs(151_000));
 
   test("cancel crawl", async () => {
     if (!client) throw new Error();
     const start = await client.startCrawl("https://docs.firecrawl.dev", { limit: 3 });
     const ok = await client.cancelCrawl(start.id);
     expect(ok).toBe(true);
-  }, 120_000);
+  }, testTimeoutMs(151_000));
 
   test("get crawl errors", async () => {
     if (!client) throw new Error();
@@ -73,12 +74,12 @@ describe("v2.crawl e2e", () => {
       expect(typeof e.url === "string" || e.url == null).toBe(true);
       expect(typeof e.error === "string" || e.error == null).toBe(true);
     }
-  }, 120_000);
+  }, testTimeoutMs(151_000));
 
   test("get crawl errors with invalid id should throw", async () => {
     if (!client) throw new Error();
     await expect(client.getCrawlErrors("invalid-job-id-12345")).rejects.toThrow();
-  }, 60_000);
+  }, testTimeoutMs(60_000));
 
   test("get active crawls", async () => {
     if (!client) throw new Error();
@@ -93,7 +94,7 @@ describe("v2.crawl e2e", () => {
         expect(typeof c.options === "object").toBe(true);
       }
     }
-  }, 90_000);
+  }, testTimeoutMs(90_000));
 
   test("get active crawls with running crawl", async () => {
     if (!client) throw new Error();
@@ -104,20 +105,22 @@ describe("v2.crawl e2e", () => {
     const ids = active.crawls.map(c => c.id);
     expect(ids.includes(start.id)).toBe(true);
     await client.cancelCrawl(start.id);
-  }, 120_000);
+  }, testTimeoutMs(301_000));
 
   test("crawl with wait", async () => {
     if (!client) throw new Error();
-    const job = await client.crawl("https://docs.firecrawl.dev", { limit: 3, maxDiscoveryDepth: 2, pollInterval: 1, timeout: 120 });
+    const start = await client.startCrawl("https://docs.firecrawl.dev", { limit: 3, maxDiscoveryDepth: 2 });
+    const job = await waitForJob(() => client.getCrawlStatus(start.id), { pollInterval: 1, timeout: 120 });
     expect(["completed", "failed"]).toContain(job.status);
     expect(job.completed).toBeGreaterThanOrEqual(0);
     expect(job.total).toBeGreaterThanOrEqual(0);
     expect(Array.isArray(job.data)).toBe(true);
-  }, 180_000);
+  }, testTimeoutMs(272_000));
 
   test("crawl with wait returns job id for error retrieval", async () => {
     if (!client) throw new Error();
-    const job = await client.crawl("https://docs.firecrawl.dev", { limit: 3, maxDiscoveryDepth: 2, pollInterval: 1, timeout: 120 });
+    const start = await client.startCrawl("https://docs.firecrawl.dev", { limit: 3, maxDiscoveryDepth: 2 });
+    const job = await waitForJob(() => client.getCrawlStatus(start.id), { pollInterval: 1, timeout: 120 });
     // Verify job has id field
     expect(job.id).toBeDefined();
     expect(typeof job.id).toBe("string");
@@ -127,16 +130,17 @@ describe("v2.crawl e2e", () => {
     expect(errors).toHaveProperty("robotsBlocked");
     expect(Array.isArray(errors.errors)).toBe(true);
     expect(Array.isArray(errors.robotsBlocked)).toBe(true);
-  }, 180_000);
+  }, testTimeoutMs(422_000));
 
   test("crawl with prompt and wait", async () => {
     if (!client) throw new Error();
-    const job = await client.crawl("https://docs.firecrawl.dev", { prompt: "Extract all blog posts", limit: 3, pollInterval: 1, timeout: 120 });
+    const start = await client.startCrawl("https://docs.firecrawl.dev", { prompt: "Extract all blog posts", limit: 3 });
+    const job = await waitForJob(() => client.getCrawlStatus(start.id), { pollInterval: 1, timeout: 120 });
     expect(["completed", "failed"]).toContain(job.status);
     expect(job.completed).toBeGreaterThanOrEqual(0);
     expect(job.total).toBeGreaterThanOrEqual(0);
     expect(Array.isArray(job.data)).toBe(true);
-  }, 180_000);
+  }, testTimeoutMs(272_000));
 
   test("crawl with scrape options", async () => {
     if (!client) throw new Error();
@@ -145,7 +149,7 @@ describe("v2.crawl e2e", () => {
       scrapeOptions: { formats: ["markdown", "links"], onlyMainContent: false, mobile: true },
     });
     expect(typeof job.id).toBe("string");
-  }, 120_000);
+  }, testTimeoutMs(120_000));
 
   test("crawl with json format object", async () => {
     if (!client) throw new Error();
@@ -154,7 +158,7 @@ describe("v2.crawl e2e", () => {
       scrapeOptions: { formats: [{ type: "json", prompt: "Extract page title", schema: { type: "object", properties: { title: { type: "string" } }, required: ["title"] } }] },
     });
     expect(typeof job.id).toBe("string");
-  }, 120_000);
+  }, testTimeoutMs(120_000));
 
   test("crawl all parameters", async () => {
     if (!client) throw new Error();
@@ -187,13 +191,13 @@ describe("v2.crawl e2e", () => {
       zeroDataRetention: false,
     });
     expect(typeof job.id).toBe("string");
-  }, 180_000);
+  }, testTimeoutMs(180_000));
 
   test("crawl params preview", async () => {
     if (!client) throw new Error();
     const params = await client.crawlParamsPreview("https://docs.firecrawl.dev", "Extract all blog posts and documentation");
     expect(params && typeof params === "object").toBe(true);
     // Optional fields may or may not be present; just assert object shape
-  }, 60_000);
+  }, testTimeoutMs(60_000));
 });
 

package/src/__tests__/e2e/v2/extract.test.ts

@@ -4,6 +4,7 @@
 import Firecrawl from "../../../index";
 import { config } from "dotenv";
 import { getIdentity, getApiUrl } from "./utils/idmux";
+import { testTimeoutMs, waitForJob, withRateLimitRetry } from "./utils/rateLimit";
 import { describe, test, expect, beforeAll } from "@jest/globals";
 import { z } from "zod";
 
@@ -14,14 +15,38 @@ let client: Firecrawl;
 
 beforeAll(async () => {
   const { apiKey } = await getIdentity({ name: "js-e2e-extract" });
-  client = new Firecrawl({ apiKey, apiUrl: API_URL });
+  client = withRateLimitRetry(new Firecrawl({ apiKey, apiUrl: API_URL }));
 });
 
 describe("v2.extract e2e", () => {
+  /**
+   * Starts an extract, then polls it. Mirrors client.extract, but keeps every
+   * request retryable: the wrapper cannot run client.extract again, because a
+   * second run would start a second job.
+   *
+   * The bound is 180s, the time an extract needs, and the same bound batch
+   * uses.
+   *
+   * The bound is not the whole cost of the test. startExtract goes through
+   * the wrapper too, so it can spend the retry budget before the poll starts:
+   * 150s for the start, plus 180 + 2 + 150 = 332s for the poll, so 482s. Each
+   * test below therefore carries a 333_000 ms base, which gives 483s. The
+   * unit test "every wrapped call in a test fits its budget" holds that sum.
+   */
+  async function extractAndWait(
+    args: Parameters<typeof client.startExtract>[0],
+  ) {
+    const started = await client.startExtract(args);
+    if (!started.id) return started;
+    return waitForJob(() => client.getExtractStatus(started.id!), {
+      timeout: 180,
+    });
+  }
+
   test("extract minimal with prompt", async () => {
-    const resp = await client.extract({ urls: ["https://docs.firecrawl.dev"], prompt: "Extract the main page title" });
+    const resp = await extractAndWait({ urls: ["https://docs.firecrawl.dev"], prompt: "Extract the main page title" });
     expect(typeof resp.success === "boolean" || resp.success == null).toBe(true);
-  }, 120_000);
+  }, testTimeoutMs(333_000));
 
   test("extract with schema", async () => {
     const schema = {
@@ -29,7 +54,7 @@ describe("v2.extract e2e", () => {
       properties: { title: { type: "string" } },
       required: ["title"],
     } as const;
-    const resp = await client.extract({
+    const resp = await extractAndWait({
       urls: ["https://docs.firecrawl.dev"],
       schema,
       prompt: "Extract the main page title",
@@ -44,13 +69,13 @@ describe("v2.extract e2e", () => {
       expect(typeof resp.data).toBe("object");
       expect((resp.data as any).title).toBeTruthy();
     }
-  }, 180_000);
+  }, testTimeoutMs(333_000));
 
   test("extract with zod schema", async () => {
     const schema = z.object({
       title: z.string(),
     });
-    const resp = await client.extract({
+    const resp = await extractAndWait({
       urls: ["https://docs.firecrawl.dev"],
       schema: schema,
       prompt: "Extract the main page title",
@@ -65,6 +90,6 @@ describe("v2.extract e2e", () => {
       expect(typeof resp.data).toBe("object");
       expect(schema.safeParse(resp.data).success).toBe(true);
     }
-  }, 180_000);
+  }, testTimeoutMs(333_000));
 });
 

package/src/__tests__/e2e/v2/map.test.ts

@@ -4,6 +4,7 @@
 import Firecrawl from "../../../index";
 import { config } from "dotenv";
 import { getIdentity, getApiUrl } from "./utils/idmux";
+import { testTimeoutMs, withRateLimitRetry } from "./utils/rateLimit";
 import { describe, test, expect, beforeAll } from "@jest/globals";
 
 config();
@@ -13,7 +14,7 @@ let client: Firecrawl;
 
 beforeAll(async () => {
   const { apiKey } = await getIdentity({ name: "js-e2e-map" });
-  client = new Firecrawl({ apiKey, apiUrl: API_URL });
+  client = withRateLimitRetry(new Firecrawl({ apiKey, apiUrl: API_URL }));
 });
 
 describe("v2.map e2e", () => {
@@ -30,7 +31,7 @@ describe("v2.map e2e", () => {
       expect(typeof first.url).toBe("string");
       expect(first.url.startsWith("http")).toBe(true);
     }
-  }, 90_000);
+  }, testTimeoutMs(90_000));
 
   test.each(["only", "skip", "include"]) ("with options sitemap=%s", async (sitemap) => {
     if (!client) throw new Error();
@@ -50,6 +51,6 @@ describe("v2.map e2e", () => {
       expect(typeof link.url).toBe("string");
       expect(link.url.startsWith("http")).toBe(true);
     }
-  }, 120_000);
+  }, testTimeoutMs(120_000));
 });
 

package/src/__tests__/e2e/v2/parse.test.ts

@@ -1,6 +1,7 @@
 import Firecrawl from "../../../index";
 import { config } from "dotenv";
 import { getIdentity, getApiUrl } from "./utils/idmux";
+import { testTimeoutMs, withRateLimitRetry } from "./utils/rateLimit";
 import { describe, test, expect, beforeAll } from "@jest/globals";
 
 config();
@@ -10,7 +11,7 @@ let client: Firecrawl;
 
 beforeAll(async () => {
   const { apiKey } = await getIdentity({ name: "js-e2e-parse" });
-  client = new Firecrawl({ apiKey, apiUrl: API_URL });
+  client = withRateLimitRetry(new Firecrawl({ apiKey, apiUrl: API_URL }));
 });
 
 describe("v2.parse e2e", () => {
@@ -41,7 +42,7 @@ describe("v2.parse e2e", () => {
       expect(doc.markdown).toContain("JS SDK Parse E2E");
       expect(doc.metadata?.creditsUsed).toBe(1);
     },
-    60_000,
+    testTimeoutMs(60_000),
   );
 
   test(
@@ -62,6 +63,6 @@ describe("v2.parse e2e", () => {
         ),
       ).rejects.toThrow();
     },
-    60_000,
+    testTimeoutMs(60_000),
   );
 });

package/src/__tests__/e2e/v2/scrape.test.ts

@@ -5,6 +5,7 @@ import Firecrawl from "../../../index";
 import { z } from "zod";
 import { config } from "dotenv";
 import { getIdentity, getApiUrl } from "./utils/idmux";
+import { testTimeoutMs, withRateLimitRetry } from "./utils/rateLimit";
 import { describe, test, expect, beforeAll } from "@jest/globals";
 
 config();
@@ -14,7 +15,7 @@ let client: Firecrawl;
 
 beforeAll(async () => {
   const { apiKey } = await getIdentity({ name: "js-e2e-scrape" });
-  client = new Firecrawl({ apiKey, apiUrl: API_URL });
+  client = withRateLimitRetry(new Firecrawl({ apiKey, apiUrl: API_URL }));
 });
 
 describe("v2.scrape e2e", () => {
@@ -30,7 +31,7 @@ describe("v2.scrape e2e", () => {
     if (!client) throw new Error();
     const doc = await client.scrape("https://docs.firecrawl.dev");
     assertValidDocument(doc);
-  }, 60_000);
+  }, testTimeoutMs(60_000));
 
   test("maximal: scrape with all options", async () => {
     if (!client) throw new Error();
@@ -71,7 +72,7 @@ describe("v2.scrape e2e", () => {
       maxAge: 60_000,
     });
     assertValidDocument(doc);
-  }, 90_000);
+  }, testTimeoutMs(90_000));
 
   test("json format with zod schema (auto-converted internally)", async () => {
     if (!client) throw new Error();
@@ -90,14 +91,14 @@ describe("v2.scrape e2e", () => {
       ],
     });
     expect(doc).toBeTruthy();
-  }, 90_000);
+  }, testTimeoutMs(90_000));
 
   test("summary format returns summary string", async () => {
     if (!client) throw new Error();
     const doc = await client.scrape("https://firecrawl.dev", { formats: ["summary"] });
     expect(typeof doc.summary).toBe("string");
     expect((doc.summary || "").length).toBeGreaterThan(10);
-  }, 90_000);
+  }, testTimeoutMs(90_000));
 
   test.each([
     ["markdown", "markdown"],
@@ -119,7 +120,7 @@ describe("v2.scrape e2e", () => {
       expect(Array.isArray(doc.links)).toBe(true);
       expect((doc.links || []).length).toBeGreaterThan(0);
     }
-  }, 90_000);
+  }, testTimeoutMs(90_000));
 
   test("images format: extract all images from webpage", async () => {
     if (!client) throw new Error();
@@ -131,7 +132,7 @@ describe("v2.scrape e2e", () => {
     expect(doc.images?.length).toBeGreaterThan(0);
     // Should find firecrawl logo/branding images
     expect(doc.images?.some(img => img.includes("firecrawl") || img.includes("logo"))).toBe(true);
-  }, 60_000);
+  }, testTimeoutMs(60_000));
 
   test("images format: works with multiple formats", async () => {
     if (!client) throw new Error();
@@ -152,12 +153,12 @@ describe("v2.scrape e2e", () => {
     
     // Should discover additional images beyond those with obvious extensions
     expect(doc.images?.length).toBeGreaterThanOrEqual(linkImages.length);
-  }, 60_000);
+  }, testTimeoutMs(60_000));
 
   test("invalid url should throw", async () => {
     if (!client) throw new Error();
     await expect(client.scrape("")).rejects.toThrow("URL cannot be empty");
     await expect(client.scrape("   ")).rejects.toThrow("URL cannot be empty");
-  });
+  }, testTimeoutMs(151_000));
 });