@mendable/firecrawl-js 4.42.2 → 4.42.4

package/dist/{chunk-XZ5XI5DK.js → chunk-TALYWLKJ.js}

@@ -12,7 +12,7 @@ var require_package = __commonJS({
   "package.json"(exports, module) {
     module.exports = {
       name: "@mendable/firecrawl-js",
-      version: "4.42.2",
+      version: "4.42.4",
       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",
@@ -29,7 +29,7 @@ var require_package = __commonJS({
         "build-and-publish": "pnpm run build && pnpm publish --access public",
         "publish-beta": "pnpm run build && pnpm publish --access public --tag beta",
         test: "NODE_OPTIONS=--experimental-vm-modules jest --verbose src/__tests__/e2e/v2/*.test.ts --detectOpenHandles",
-        "test:unit": "NODE_OPTIONS=--experimental-vm-modules jest --verbose src/__tests__/unit/v2/*.test.ts"
+        "test:unit": "NODE_OPTIONS=--experimental-vm-modules jest --verbose src/__tests__/unit"
       },
       repository: {
         type: "git",

package/dist/index.cjs

@@ -39,7 +39,7 @@ var require_package = __commonJS({
   "package.json"(exports2, module2) {
     module2.exports = {
       name: "@mendable/firecrawl-js",
-      version: "4.42.2",
+      version: "4.42.4",
       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",
@@ -56,7 +56,7 @@ var require_package = __commonJS({
         "build-and-publish": "pnpm run build && pnpm publish --access public",
         "publish-beta": "pnpm run build && pnpm publish --access public --tag beta",
         test: "NODE_OPTIONS=--experimental-vm-modules jest --verbose src/__tests__/e2e/v2/*.test.ts --detectOpenHandles",
-        "test:unit": "NODE_OPTIONS=--experimental-vm-modules jest --verbose src/__tests__/unit/v2/*.test.ts"
+        "test:unit": "NODE_OPTIONS=--experimental-vm-modules jest --verbose src/__tests__/unit"
       },
       repository: {
         type: "git",
@@ -2875,7 +2875,7 @@ var FirecrawlApp = class {
       "Content-Type": "application/json",
       Authorization: `Bearer ${this.apiKey}`
     };
-    let jsonData = { url, ...params, origin: typeof params.origin === "string" && params.origin.includes("mcp") ? params.origin : `js-sdk@${this.version}` };
+    let jsonData = { url, ...params, origin: typeof params?.origin === "string" && params.origin.includes("mcp") ? params.origin : `js-sdk@${this.version}` };
     if (jsonData?.extract?.schema) {
       jsonData = {
         ...jsonData,
@@ -2939,7 +2939,7 @@ var FirecrawlApp = class {
       lang: params?.lang ?? "en",
       country: params?.country ?? "us",
       location: params?.location,
-      origin: typeof params.origin === "string" && params.origin.includes("mcp") ? params.origin : `js-sdk@${this.version}`,
+      origin: typeof params?.origin === "string" && params.origin.includes("mcp") ? params.origin : `js-sdk@${this.version}`,
       timeout: params?.timeout ?? 6e4,
       scrapeOptions: params?.scrapeOptions ?? { formats: [] }
     };
@@ -2994,7 +2994,7 @@ var FirecrawlApp = class {
    */
   async crawlUrl(url, params, pollInterval = 2, idempotencyKey) {
     const headers = this.prepareHeaders(idempotencyKey);
-    let jsonData = { url, ...params, origin: typeof params.origin === "string" && params.origin.includes("mcp") ? params.origin : `js-sdk@${this.version}` };
+    let jsonData = { url, ...params, origin: typeof params?.origin === "string" && params.origin.includes("mcp") ? params.origin : `js-sdk@${this.version}` };
     try {
       const response = await this.postRequest(
         this.apiUrl + `/v1/crawl`,
@@ -3018,7 +3018,7 @@ var FirecrawlApp = class {
   }
   async asyncCrawlUrl(url, params, idempotencyKey) {
     const headers = this.prepareHeaders(idempotencyKey);
-    let jsonData = { url, ...params, origin: typeof params.origin === "string" && params.origin.includes("mcp") ? params.origin : `js-sdk@${this.version}` };
+    let jsonData = { url, ...params, origin: typeof params?.origin === "string" && params.origin.includes("mcp") ? params.origin : `js-sdk@${this.version}` };
     try {
       const response = await this.postRequest(
         this.apiUrl + `/v1/crawl`,
@@ -3177,7 +3177,7 @@ var FirecrawlApp = class {
    */
   async mapUrl(url, params) {
     const headers = this.prepareHeaders();
-    let jsonData = { url, ...params, origin: typeof params.origin === "string" && params.origin.includes("mcp") ? params.origin : `js-sdk@${this.version}` };
+    let jsonData = { url, ...params, origin: typeof params?.origin === "string" && params.origin.includes("mcp") ? params.origin : `js-sdk@${this.version}` };
     try {
       const response = await this.postRequest(
         this.apiUrl + `/v1/map`,
@@ -3206,7 +3206,7 @@ var FirecrawlApp = class {
    */
   async batchScrapeUrls(urls, params, pollInterval = 2, idempotencyKey, webhook, ignoreInvalidURLs, maxConcurrency) {
     const headers = this.prepareHeaders(idempotencyKey);
-    let jsonData = { urls, webhook, ignoreInvalidURLs, maxConcurrency, ...params, origin: typeof params.origin === "string" && params.origin.includes("mcp") ? params.origin : `js-sdk@${this.version}` };
+    let jsonData = { urls, webhook, ignoreInvalidURLs, maxConcurrency, ...params, origin: typeof params?.origin === "string" && params.origin.includes("mcp") ? params.origin : `js-sdk@${this.version}` };
     if (jsonData?.extract?.schema) {
       jsonData = {
         ...jsonData,
@@ -3233,7 +3233,7 @@ var FirecrawlApp = class {
       );
       if (response.status === 200) {
         const id = response.data.id;
-        return this.monitorJobStatus(id, headers, pollInterval);
+        return this.monitorJobStatus(id, headers, pollInterval, "batch");
       } else {
         this.handleError(response, "start batch scrape job");
       }
@@ -3248,7 +3248,7 @@ var FirecrawlApp = class {
   }
   async asyncBatchScrapeUrls(urls, params, idempotencyKey, webhook, ignoreInvalidURLs) {
     const headers = this.prepareHeaders(idempotencyKey);
-    let jsonData = { urls, webhook, ignoreInvalidURLs, ...params, origin: typeof params.origin === "string" && params.origin.includes("mcp") ? params.origin : `js-sdk@${this.version}` };
+    let jsonData = { urls, webhook, ignoreInvalidURLs, ...params, origin: typeof params?.origin === "string" && params.origin.includes("mcp") ? params.origin : `js-sdk@${this.version}` };
     try {
       const response = await this.postRequest(
         this.apiUrl + `/v1/batch/scrape`,
@@ -3392,7 +3392,7 @@ var FirecrawlApp = class {
     try {
       const response = await this.postRequest(
         this.apiUrl + `/v1/extract`,
-        { ...jsonData, schema: jsonSchema, origin: typeof params.origin === "string" && params.origin.includes("mcp") ? params.origin : `js-sdk@${this.version}` },
+        { ...jsonData, schema: jsonSchema, origin: typeof params?.origin === "string" && params.origin.includes("mcp") ? params.origin : `js-sdk@${this.version}` },
         headers
       );
       if (response.status === 200) {
@@ -3445,7 +3445,7 @@ var FirecrawlApp = class {
     try {
       const response = await this.postRequest(
         this.apiUrl + `/v1/extract`,
-        { ...jsonData, schema: jsonSchema, origin: typeof params.origin === "string" && params.origin.includes("mcp") ? params.origin : `js-sdk@${this.version}` },
+        { ...jsonData, schema: jsonSchema, origin: typeof params?.origin === "string" && params.origin.includes("mcp") ? params.origin : `js-sdk@${this.version}` },
         headers
       );
       if (response.status === 200) {
@@ -3537,21 +3537,23 @@ var FirecrawlApp = class {
     }
   }
   /**
-   * Monitors the status of a crawl job until completion or failure.
-   * @param id - The ID of the crawl operation.
+   * Monitors the status of a crawl or batch scrape job until completion or failure.
+   * @param id - The ID of the crawl or batch scrape operation.
    * @param headers - The headers for the request.
    * @param checkInterval - Interval in seconds for job status checks.
-   * @param checkUrl - Optional URL to check the status (used for v1 API)
+   * @param jobType - Which status endpoint to poll. Defaults to `"crawl"`.
    * @returns The final job status or data.
    */
-  async monitorJobStatus(id, headers, checkInterval) {
+  async monitorJobStatus(id, headers, checkInterval, jobType = "crawl") {
+    const statusPath = jobType === "batch" ? "batch/scrape" : "crawl";
+    const jobLabel = jobType === "batch" ? "Batch scrape" : "Crawl";
     let failedTries = 0;
     let networkRetries = 0;
     const maxNetworkRetries = 3;
     while (true) {
       try {
         let statusResponse = await this.getRequest(
-          `${this.apiUrl}/v1/crawl/${id}`,
+          `${this.apiUrl}/v1/${statusPath}/${id}`,
           headers
         );
         if (statusResponse.status === 200) {
@@ -3572,7 +3574,7 @@ var FirecrawlApp = class {
               statusData.data = data;
               return statusData;
             } else {
-              throw new FirecrawlError("Crawl job completed but no data was returned", 500);
+              throw new FirecrawlError(`${jobLabel} job completed but no data was returned`, 500);
             }
           } else if (["active", "paused", "pending", "queued", "waiting", "scraping"].includes(statusData.status)) {
             checkInterval = Math.max(checkInterval, 2);
@@ -3581,14 +3583,14 @@ var FirecrawlApp = class {
             );
           } else {
             throw new FirecrawlError(
-              `Crawl job failed or was stopped. Status: ${statusData.status}`,
+              `${jobLabel} job failed or was stopped. Status: ${statusData.status}`,
               500
             );
           }
         } else {
           failedTries++;
           if (failedTries >= 3) {
-            this.handleError(statusResponse, "check crawl status");
+            this.handleError(statusResponse, `check ${jobLabel.toLowerCase()} status`);
           }
         }
       } catch (error) {
@@ -3725,7 +3727,7 @@ var FirecrawlApp = class {
    */
   async asyncDeepResearch(query, params) {
     const headers = this.prepareHeaders();
-    let jsonData = { query, ...params, origin: typeof params.origin === "string" && params.origin.includes("mcp") ? params.origin : `js-sdk@${this.version}` };
+    let jsonData = { query, ...params, origin: typeof params?.origin === "string" && params.origin.includes("mcp") ? params.origin : `js-sdk@${this.version}` };
     if (jsonData?.jsonOptions?.schema) {
       jsonData = {
         ...jsonData,
@@ -3844,7 +3846,7 @@ var FirecrawlApp = class {
   async __asyncDeepResearch(topic, params) {
     const headers = this.prepareHeaders();
     try {
-      let jsonData = { topic, ...params, origin: typeof params.origin === "string" && params.origin.includes("mcp") ? params.origin : `js-sdk@${this.version}` };
+      let jsonData = { topic, ...params, origin: typeof params?.origin === "string" && params.origin.includes("mcp") ? params.origin : `js-sdk@${this.version}` };
       const response = await this.postRequest(
         `${this.apiUrl}/v1/deep-research`,
         jsonData,
@@ -3944,7 +3946,7 @@ var FirecrawlApp = class {
    */
   async asyncGenerateLLMsText(url, params) {
     const headers = this.prepareHeaders();
-    let jsonData = { url, ...params, origin: typeof params.origin === "string" && params.origin.includes("mcp") ? params.origin : `js-sdk@${this.version}` };
+    let jsonData = { url, ...params, origin: typeof params?.origin === "string" && params.origin.includes("mcp") ? params.origin : `js-sdk@${this.version}` };
     try {
       const response = await this.postRequest(
         `${this.apiUrl}/v1/llmstxt`,

package/dist/index.d.cts

@@ -3388,14 +3388,14 @@ declare class FirecrawlApp {
      */
     deleteRequest(url: string, headers: AxiosRequestHeaders): Promise<AxiosResponse>;
     /**
-     * Monitors the status of a crawl job until completion or failure.
-     * @param id - The ID of the crawl operation.
+     * Monitors the status of a crawl or batch scrape job until completion or failure.
+     * @param id - The ID of the crawl or batch scrape operation.
      * @param headers - The headers for the request.
      * @param checkInterval - Interval in seconds for job status checks.
-     * @param checkUrl - Optional URL to check the status (used for v1 API)
+     * @param jobType - Which status endpoint to poll. Defaults to `"crawl"`.
      * @returns The final job status or data.
      */
-    monitorJobStatus(id: string, headers: AxiosRequestHeaders, checkInterval: number): Promise<CrawlStatusResponse | ErrorResponse>;
+    monitorJobStatus(id: string, headers: AxiosRequestHeaders, checkInterval: number, jobType?: "crawl" | "batch"): Promise<CrawlStatusResponse | ErrorResponse>;
     /**
      * Determines if an error is retryable (transient network error)
      * @param error - The error to check

package/dist/index.d.ts

@@ -3388,14 +3388,14 @@ declare class FirecrawlApp {
      */
     deleteRequest(url: string, headers: AxiosRequestHeaders): Promise<AxiosResponse>;
     /**
-     * Monitors the status of a crawl job until completion or failure.
-     * @param id - The ID of the crawl operation.
+     * Monitors the status of a crawl or batch scrape job until completion or failure.
+     * @param id - The ID of the crawl or batch scrape operation.
      * @param headers - The headers for the request.
      * @param checkInterval - Interval in seconds for job status checks.
-     * @param checkUrl - Optional URL to check the status (used for v1 API)
+     * @param jobType - Which status endpoint to poll. Defaults to `"crawl"`.
      * @returns The final job status or data.
      */
-    monitorJobStatus(id: string, headers: AxiosRequestHeaders, checkInterval: number): Promise<CrawlStatusResponse | ErrorResponse>;
+    monitorJobStatus(id: string, headers: AxiosRequestHeaders, checkInterval: number, jobType?: "crawl" | "batch"): Promise<CrawlStatusResponse | ErrorResponse>;
     /**
      * Determines if an error is retryable (transient network error)
      * @param error - The error to check

package/dist/index.js

@@ -1,6 +1,6 @@
 import {
   require_package
-} from "./chunk-XZ5XI5DK.js";
+} from "./chunk-TALYWLKJ.js";
 
 // src/v2/utils/httpClient.ts
 import axios from "axios";
@@ -2706,7 +2706,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-JVVNUZPT.js");
+      const packageJson = await import("./package-NTEZDZT4.js");
       return packageJson.default.version;
     } catch (error) {
       const isTest = typeof process !== "undefined" && (process.env.JEST_WORKER_ID != null || false);
@@ -2743,7 +2743,7 @@ var FirecrawlApp = class {
       "Content-Type": "application/json",
       Authorization: `Bearer ${this.apiKey}`
     };
-    let jsonData = { url, ...params, origin: typeof params.origin === "string" && params.origin.includes("mcp") ? params.origin : `js-sdk@${this.version}` };
+    let jsonData = { url, ...params, origin: typeof params?.origin === "string" && params.origin.includes("mcp") ? params.origin : `js-sdk@${this.version}` };
     if (jsonData?.extract?.schema) {
       jsonData = {
         ...jsonData,
@@ -2807,7 +2807,7 @@ var FirecrawlApp = class {
       lang: params?.lang ?? "en",
       country: params?.country ?? "us",
       location: params?.location,
-      origin: typeof params.origin === "string" && params.origin.includes("mcp") ? params.origin : `js-sdk@${this.version}`,
+      origin: typeof params?.origin === "string" && params.origin.includes("mcp") ? params.origin : `js-sdk@${this.version}`,
       timeout: params?.timeout ?? 6e4,
       scrapeOptions: params?.scrapeOptions ?? { formats: [] }
     };
@@ -2862,7 +2862,7 @@ var FirecrawlApp = class {
    */
   async crawlUrl(url, params, pollInterval = 2, idempotencyKey) {
     const headers = this.prepareHeaders(idempotencyKey);
-    let jsonData = { url, ...params, origin: typeof params.origin === "string" && params.origin.includes("mcp") ? params.origin : `js-sdk@${this.version}` };
+    let jsonData = { url, ...params, origin: typeof params?.origin === "string" && params.origin.includes("mcp") ? params.origin : `js-sdk@${this.version}` };
     try {
       const response = await this.postRequest(
         this.apiUrl + `/v1/crawl`,
@@ -2886,7 +2886,7 @@ var FirecrawlApp = class {
   }
   async asyncCrawlUrl(url, params, idempotencyKey) {
     const headers = this.prepareHeaders(idempotencyKey);
-    let jsonData = { url, ...params, origin: typeof params.origin === "string" && params.origin.includes("mcp") ? params.origin : `js-sdk@${this.version}` };
+    let jsonData = { url, ...params, origin: typeof params?.origin === "string" && params.origin.includes("mcp") ? params.origin : `js-sdk@${this.version}` };
     try {
       const response = await this.postRequest(
         this.apiUrl + `/v1/crawl`,
@@ -3045,7 +3045,7 @@ var FirecrawlApp = class {
    */
   async mapUrl(url, params) {
     const headers = this.prepareHeaders();
-    let jsonData = { url, ...params, origin: typeof params.origin === "string" && params.origin.includes("mcp") ? params.origin : `js-sdk@${this.version}` };
+    let jsonData = { url, ...params, origin: typeof params?.origin === "string" && params.origin.includes("mcp") ? params.origin : `js-sdk@${this.version}` };
     try {
       const response = await this.postRequest(
         this.apiUrl + `/v1/map`,
@@ -3074,7 +3074,7 @@ var FirecrawlApp = class {
    */
   async batchScrapeUrls(urls, params, pollInterval = 2, idempotencyKey, webhook, ignoreInvalidURLs, maxConcurrency) {
     const headers = this.prepareHeaders(idempotencyKey);
-    let jsonData = { urls, webhook, ignoreInvalidURLs, maxConcurrency, ...params, origin: typeof params.origin === "string" && params.origin.includes("mcp") ? params.origin : `js-sdk@${this.version}` };
+    let jsonData = { urls, webhook, ignoreInvalidURLs, maxConcurrency, ...params, origin: typeof params?.origin === "string" && params.origin.includes("mcp") ? params.origin : `js-sdk@${this.version}` };
     if (jsonData?.extract?.schema) {
       jsonData = {
         ...jsonData,
@@ -3101,7 +3101,7 @@ var FirecrawlApp = class {
       );
       if (response.status === 200) {
         const id = response.data.id;
-        return this.monitorJobStatus(id, headers, pollInterval);
+        return this.monitorJobStatus(id, headers, pollInterval, "batch");
       } else {
         this.handleError(response, "start batch scrape job");
       }
@@ -3116,7 +3116,7 @@ var FirecrawlApp = class {
   }
   async asyncBatchScrapeUrls(urls, params, idempotencyKey, webhook, ignoreInvalidURLs) {
     const headers = this.prepareHeaders(idempotencyKey);
-    let jsonData = { urls, webhook, ignoreInvalidURLs, ...params, origin: typeof params.origin === "string" && params.origin.includes("mcp") ? params.origin : `js-sdk@${this.version}` };
+    let jsonData = { urls, webhook, ignoreInvalidURLs, ...params, origin: typeof params?.origin === "string" && params.origin.includes("mcp") ? params.origin : `js-sdk@${this.version}` };
     try {
       const response = await this.postRequest(
         this.apiUrl + `/v1/batch/scrape`,
@@ -3260,7 +3260,7 @@ var FirecrawlApp = class {
     try {
       const response = await this.postRequest(
         this.apiUrl + `/v1/extract`,
-        { ...jsonData, schema: jsonSchema, origin: typeof params.origin === "string" && params.origin.includes("mcp") ? params.origin : `js-sdk@${this.version}` },
+        { ...jsonData, schema: jsonSchema, origin: typeof params?.origin === "string" && params.origin.includes("mcp") ? params.origin : `js-sdk@${this.version}` },
         headers
       );
       if (response.status === 200) {
@@ -3313,7 +3313,7 @@ var FirecrawlApp = class {
     try {
       const response = await this.postRequest(
         this.apiUrl + `/v1/extract`,
-        { ...jsonData, schema: jsonSchema, origin: typeof params.origin === "string" && params.origin.includes("mcp") ? params.origin : `js-sdk@${this.version}` },
+        { ...jsonData, schema: jsonSchema, origin: typeof params?.origin === "string" && params.origin.includes("mcp") ? params.origin : `js-sdk@${this.version}` },
         headers
       );
       if (response.status === 200) {
@@ -3405,21 +3405,23 @@ var FirecrawlApp = class {
     }
   }
   /**
-   * Monitors the status of a crawl job until completion or failure.
-   * @param id - The ID of the crawl operation.
+   * Monitors the status of a crawl or batch scrape job until completion or failure.
+   * @param id - The ID of the crawl or batch scrape operation.
    * @param headers - The headers for the request.
    * @param checkInterval - Interval in seconds for job status checks.
-   * @param checkUrl - Optional URL to check the status (used for v1 API)
+   * @param jobType - Which status endpoint to poll. Defaults to `"crawl"`.
    * @returns The final job status or data.
    */
-  async monitorJobStatus(id, headers, checkInterval) {
+  async monitorJobStatus(id, headers, checkInterval, jobType = "crawl") {
+    const statusPath = jobType === "batch" ? "batch/scrape" : "crawl";
+    const jobLabel = jobType === "batch" ? "Batch scrape" : "Crawl";
     let failedTries = 0;
     let networkRetries = 0;
     const maxNetworkRetries = 3;
     while (true) {
       try {
         let statusResponse = await this.getRequest(
-          `${this.apiUrl}/v1/crawl/${id}`,
+          `${this.apiUrl}/v1/${statusPath}/${id}`,
           headers
         );
         if (statusResponse.status === 200) {
@@ -3440,7 +3442,7 @@ var FirecrawlApp = class {
               statusData.data = data;
               return statusData;
             } else {
-              throw new FirecrawlError("Crawl job completed but no data was returned", 500);
+              throw new FirecrawlError(`${jobLabel} job completed but no data was returned`, 500);
             }
           } else if (["active", "paused", "pending", "queued", "waiting", "scraping"].includes(statusData.status)) {
             checkInterval = Math.max(checkInterval, 2);
@@ -3449,14 +3451,14 @@ var FirecrawlApp = class {
             );
           } else {
             throw new FirecrawlError(
-              `Crawl job failed or was stopped. Status: ${statusData.status}`,
+              `${jobLabel} job failed or was stopped. Status: ${statusData.status}`,
               500
             );
           }
         } else {
           failedTries++;
           if (failedTries >= 3) {
-            this.handleError(statusResponse, "check crawl status");
+            this.handleError(statusResponse, `check ${jobLabel.toLowerCase()} status`);
           }
         }
       } catch (error) {
@@ -3593,7 +3595,7 @@ var FirecrawlApp = class {
    */
   async asyncDeepResearch(query, params) {
     const headers = this.prepareHeaders();
-    let jsonData = { query, ...params, origin: typeof params.origin === "string" && params.origin.includes("mcp") ? params.origin : `js-sdk@${this.version}` };
+    let jsonData = { query, ...params, origin: typeof params?.origin === "string" && params.origin.includes("mcp") ? params.origin : `js-sdk@${this.version}` };
     if (jsonData?.jsonOptions?.schema) {
       jsonData = {
         ...jsonData,
@@ -3712,7 +3714,7 @@ var FirecrawlApp = class {
   async __asyncDeepResearch(topic, params) {
     const headers = this.prepareHeaders();
     try {
-      let jsonData = { topic, ...params, origin: typeof params.origin === "string" && params.origin.includes("mcp") ? params.origin : `js-sdk@${this.version}` };
+      let jsonData = { topic, ...params, origin: typeof params?.origin === "string" && params.origin.includes("mcp") ? params.origin : `js-sdk@${this.version}` };
       const response = await this.postRequest(
         `${this.apiUrl}/v1/deep-research`,
         jsonData,
@@ -3812,7 +3814,7 @@ var FirecrawlApp = class {
    */
   async asyncGenerateLLMsText(url, params) {
     const headers = this.prepareHeaders();
-    let jsonData = { url, ...params, origin: typeof params.origin === "string" && params.origin.includes("mcp") ? params.origin : `js-sdk@${this.version}` };
+    let jsonData = { url, ...params, origin: typeof params?.origin === "string" && params.origin.includes("mcp") ? params.origin : `js-sdk@${this.version}` };
     try {
       const response = await this.postRequest(
         `${this.apiUrl}/v1/llmstxt`,

package/dist/{package-JVVNUZPT.js → package-NTEZDZT4.js}

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mendable/firecrawl-js",
-  "version": "4.42.2",
+  "version": "4.42.4",
   "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",
@@ -74,6 +74,6 @@
     "build-and-publish": "pnpm run build && pnpm publish --access public",
     "publish-beta": "pnpm run build && pnpm publish --access public --tag beta",
     "test": "NODE_OPTIONS=--experimental-vm-modules jest --verbose src/__tests__/e2e/v2/*.test.ts --detectOpenHandles",
-    "test:unit": "NODE_OPTIONS=--experimental-vm-modules jest --verbose src/__tests__/unit/v2/*.test.ts"
+    "test:unit": "NODE_OPTIONS=--experimental-vm-modules jest --verbose src/__tests__/unit"
   }
 }

package/src/__tests__/unit/v1/batch-scrape-poll.test.ts

@@ -0,0 +1,91 @@
+import { describe, test, expect, jest, afterEach, beforeEach } from "@jest/globals";
+import axios from "axios";
+import FirecrawlApp from "../../../v1";
+
+const API_URL = "https://api.firecrawl.dev";
+const API_KEY = "fc-test";
+
+const scrapingPage = () => ({ success: true, status: "scraping", total: 2, completed: 0, data: [] });
+const completedPage = (next: string) => ({
+  success: true,
+  status: "completed",
+  total: 2,
+  completed: 2,
+  expiresAt: "2030-01-01T00:00:00Z",
+  data: [{ markdown: "a" }],
+  next,
+});
+const lastPage = () => ({ success: true, status: "completed", data: [{ markdown: "b" }] });
+
+function mockPoll(path: string, nextOrigin = API_URL) {
+  const sent: string[] = [];
+  let polls = 0;
+  jest.spyOn(axios, "get").mockImplementation(async (url: string) => {
+    sent.push(url);
+    if (new URL(url).searchParams.has("skip")) return { status: 200, data: lastPage() };
+    polls++;
+    return { status: 200, data: polls === 1 ? scrapingPage() : completedPage(`${nextOrigin}${path}?skip=1`) };
+  });
+  return sent;
+}
+
+describe("v1 batch scrape waits on the batch scrape status endpoint", () => {
+  const app = new FirecrawlApp({ apiKey: API_KEY, apiUrl: API_URL });
+
+  beforeEach(() => {
+    jest.spyOn(global, "setTimeout").mockImplementation(((fn: () => void) => {
+      fn();
+      return 0;
+    }) as any);
+  });
+
+  afterEach(() => {
+    jest.restoreAllMocks();
+  });
+
+  test("batchScrapeUrls polls /v1/batch/scrape/{id} and follows pinned next pages", async () => {
+    const post = jest.spyOn(axios, "post").mockResolvedValue({ status: 200, data: { success: true, id: "abc" } });
+    const path = "/v1/batch/scrape/abc";
+    const sent = mockPoll(path, "https://evil.example");
+
+    const res: any = await app.batchScrapeUrls(["https://example.com", "https://example.org"], {});
+
+    expect(post.mock.calls[0][0]).toBe(`${API_URL}/v1/batch/scrape`);
+    expect(sent).toEqual([`${API_URL}${path}`, `${API_URL}${path}`, `${API_URL}${path}?skip=1`]);
+    expect(sent.some(url => url.includes("/v1/crawl/"))).toBe(false);
+    expect(res.status).toBe("completed");
+    expect(res.data).toHaveLength(2);
+  });
+
+  test("batchScrapeUrls reports batch scrape failures as batch scrape errors", async () => {
+    jest.spyOn(axios, "post").mockResolvedValue({ status: 200, data: { success: true, id: "abc" } });
+    const sent: string[] = [];
+    jest.spyOn(axios, "get").mockImplementation(async (url: string) => {
+      sent.push(url);
+      return { status: 200, data: { success: true, status: "failed", data: [] } };
+    });
+
+    await expect(app.batchScrapeUrls(["https://example.com"], {})).rejects.toThrow("Batch scrape job failed or was stopped");
+    expect(sent.every(url => url === `${API_URL}/v1/batch/scrape/abc`)).toBe(true);
+  });
+
+  test("monitorJobStatus still polls /v1/crawl/{id} by default", async () => {
+    const path = "/v1/crawl/abc";
+    const sent = mockPoll(path);
+
+    const res: any = await app.monitorJobStatus("abc", app.prepareHeaders(), 0);
+
+    expect(sent).toEqual([`${API_URL}${path}`, `${API_URL}${path}`, `${API_URL}${path}?skip=1`]);
+    expect(res.data).toHaveLength(2);
+  });
+
+  test("monitorJobStatus polls /v1/batch/scrape/{id} for batch jobs", async () => {
+    const path = "/v1/batch/scrape/abc";
+    const sent = mockPoll(path);
+
+    const res: any = await app.monitorJobStatus("abc", app.prepareHeaders(), 0, "batch");
+
+    expect(sent).toEqual([`${API_URL}${path}`, `${API_URL}${path}`, `${API_URL}${path}?skip=1`]);
+    expect(res.data).toHaveLength(2);
+  });
+});

package/src/__tests__/unit/v1/monitor-job-status-retry.test.ts

@@ -1,154 +1,107 @@
-import FirecrawlApp from '../../../index';
+import FirecrawlApp from '../../../v1';
 import { describe, test, expect, jest, beforeEach, afterEach } from '@jest/globals';
 
+const successResponse = {
+  status: 200,
+  data: { status: 'completed', data: [{ url: 'test.com', markdown: 'test' }] },
+};
+
+function networkError(message: string, code: string) {
+  return Object.assign(new Error(message), { code });
+}
+
+function httpError(message: string, status: number) {
+  return Object.assign(new Error(message), { response: { status, data: { error: message } } });
+}
+
 describe('monitorJobStatus retry logic', () => {
   let app: FirecrawlApp;
-  let originalConsoleWarn: typeof console.warn;
-  
+  let delays: number[];
+
   beforeEach(() => {
     app = new FirecrawlApp({ apiKey: 'test-key', apiUrl: 'https://test.com' });
-    originalConsoleWarn = console.warn;
-    console.warn = jest.fn();
+    delays = [];
+    jest.useFakeTimers();
+    const fakeSetTimeout = globalThis.setTimeout;
+    jest.spyOn(globalThis, 'setTimeout').mockImplementation(((fn: () => void, ms?: number) => {
+      delays.push(ms ?? 0);
+      return fakeSetTimeout(fn, ms);
+    }) as any);
   });
 
   afterEach(() => {
-    console.warn = originalConsoleWarn;
-    jest.clearAllMocks();
+    jest.restoreAllMocks();
+    jest.useRealTimers();
   });
 
-  test('should retry on socket hang up error', async () => {
-    const socketHangUpError = new Error('socket hang up') as any;
-    socketHangUpError.code = 'ECONNRESET';
-    
-    const successResponse = {
-      status: 200,
-      data: { status: 'completed', data: [{ url: 'test.com', markdown: 'test' }] }
-    };
-
-    const originalGetRequest = app.getRequest;
-    let callCount = 0;
-    
-    app.getRequest = async function(url: string, headers: any) {
-      callCount++;
-      if (callCount === 1) {
-        throw socketHangUpError;
-      }
-      return successResponse;
-    };
-
-    const result = await app.monitorJobStatus('test-id', {}, 1);
-    
-    expect(callCount).toBe(2);
+  function failFirst(n: number, error: Error, statuses: string[] = []) {
+    let calls = 0;
+    app.getRequest = (async () => {
+      calls++;
+      if (calls <= n) throw error;
+      const status = statuses.shift();
+      return status ? { status: 200, data: { status } } : successResponse;
+    }) as any;
+    return () => calls;
+  }
+
+  async function monitor() {
+    const result = app.monitorJobStatus('test-id', {} as any, 1);
+    result.catch(() => {});
+    await jest.runAllTimersAsync();
+    return result;
+  }
+
+  test.each([
+    ['socket hang up', networkError('socket hang up', 'ECONNRESET')],
+    ['ETIMEDOUT', networkError('timeout', 'ETIMEDOUT')],
+    ['HTTP 408', httpError('Request timeout', 408)],
+    ['HTTP 504', httpError('Gateway timeout', 504)],
+  ])('retries once after a %s error and returns the job data', async (_label, error) => {
+    const calls = failFirst(1, error);
+
+    const result = await monitor();
+
+    expect(calls()).toBe(2);
     expect(result).toEqual(successResponse.data);
-    expect(console.warn).toHaveBeenCalledWith(
-      expect.stringContaining('Network error during job status check (attempt 1/3): socket hang up')
-    );
+    expect(delays).toEqual([1000]);
   });
 
-  test('should retry on ETIMEDOUT error', async () => {
-    const timeoutError = new Error('timeout') as any;
-    timeoutError.code = 'ETIMEDOUT';
-    
-    const successResponse = {
-      status: 200,
-      data: { status: 'completed', data: [{ url: 'test.com', markdown: 'test' }] }
-    };
-
-    const originalGetRequest = app.getRequest;
-    let callCount = 0;
-    
-    app.getRequest = async function(url: string, headers: any) {
-      callCount++;
-      if (callCount === 1) {
-        throw timeoutError;
-      }
-      return successResponse;
-    };
-
-    const result = await app.monitorJobStatus('test-id', {}, 1);
-    
-    expect(callCount).toBe(2);
+  test('uses exponential backoff between retries', async () => {
+    const calls = failFirst(2, networkError('socket hang up', 'ECONNRESET'));
+
+    const result = await monitor();
+
+    expect(calls()).toBe(3);
     expect(result).toEqual(successResponse.data);
+    expect(delays).toEqual([1000, 2000]);
   });
 
-  test('should fail after max retries exceeded', async () => {
-    const socketHangUpError = new Error('socket hang up') as any;
-    socketHangUpError.code = 'ECONNRESET';
-    
-    app.getRequest = async function(url: string, headers: any) {
-      throw socketHangUpError;
-    };
-
-    await expect(app.monitorJobStatus('test-id', {}, 1)).rejects.toThrow('socket hang up');
-    
-    expect(console.warn).toHaveBeenCalledTimes(3);
-  }, 15000);
-
-  test('should not retry on non-retryable errors', async () => {
-    const authError = new Error('Unauthorized') as any;
-    authError.response = { status: 401, data: { error: 'Unauthorized' } };
-    
-    app.getRequest = async function(url: string, headers: any) {
-      throw authError;
-    };
-
-    await expect(app.monitorJobStatus('test-id', {}, 1)).rejects.toThrow('Unauthorized');
-    
-    expect(console.warn).not.toHaveBeenCalled();
-  });
+  test('records both the retry backoff and the 2s poll wait for an active job', async () => {
+    const calls = failFirst(1, networkError('socket hang up', 'ECONNRESET'), ['active']);
+
+    const result = await monitor();
 
-  test('should retry on HTTP timeout status codes', async () => {
-    const timeoutError = new Error('Request timeout') as any;
-    timeoutError.response = { status: 408, data: { error: 'Request timeout' } };
-    
-    const successResponse = {
-      status: 200,
-      data: { status: 'completed', data: [{ url: 'test.com', markdown: 'test' }] }
-    };
-
-    const originalGetRequest = app.getRequest;
-    let callCount = 0;
-    
-    app.getRequest = async function(url: string, headers: any) {
-      callCount++;
-      if (callCount === 1) {
-        throw timeoutError;
-      }
-      return successResponse;
-    };
-
-    const result = await app.monitorJobStatus('test-id', {}, 1);
-    
-    expect(callCount).toBe(2);
+    expect(calls()).toBe(3);
     expect(result).toEqual(successResponse.data);
+    expect(delays).toEqual([1000, 2000]);
   });
 
-  test('should use exponential backoff for retries', async () => {
-    const socketHangUpError = new Error('socket hang up') as any;
-    socketHangUpError.code = 'ECONNRESET';
-    
-    const successResponse = {
-      status: 200,
-      data: { status: 'completed', data: [{ url: 'test.com', markdown: 'test' }] }
-    };
-
-    const originalGetRequest = app.getRequest;
-    let callCount = 0;
-    
-    app.getRequest = async function(url: string, headers: any) {
-      callCount++;
-      if (callCount <= 2) {
-        throw socketHangUpError;
-      }
-      return successResponse;
-    };
-
-    const startTime = Date.now();
-    const result = await app.monitorJobStatus('test-id', {}, 1);
-    const endTime = Date.now();
-    
-    expect(callCount).toBe(3);
-    expect(result).toEqual(successResponse.data);
-    expect(endTime - startTime).toBeGreaterThan(3000);
+  test('fails after max retries are exceeded', async () => {
+    const calls = failFirst(Infinity, networkError('socket hang up', 'ECONNRESET'));
+
+    await expect(monitor()).rejects.toThrow('socket hang up');
+
+    expect(calls()).toBe(4);
+    expect(delays).toEqual([1000, 2000, 4000]);
+  });
+
+  test('does not retry non-retryable errors', async () => {
+    const calls = failFirst(Infinity, httpError('Unauthorized', 401));
+
+    await expect(monitor()).rejects.toThrow('Unauthorized');
+
+    expect(calls()).toBe(1);
+    expect(delays).toEqual([]);
   });
 });

package/src/__tests__/unit/v1/optional-params.test.ts

@@ -0,0 +1,70 @@
+import { describe, test, expect, jest, beforeEach, afterEach } from "@jest/globals";
+import axios from "axios";
+import FirecrawlApp from "../../../v1";
+
+const API_URL = "https://api.firecrawl.dev";
+
+class FakeWebSocket {
+  onopen: unknown = null;
+  onmessage: unknown = null;
+  onerror: unknown = null;
+  onclose: unknown = null;
+  close() {}
+}
+
+describe("v1 methods work without params", () => {
+  let app: FirecrawlApp;
+  let posts: Array<{ url: string; data: any }>;
+  const originalWebSocket = (globalThis as any).WebSocket;
+
+  beforeEach(() => {
+    app = new FirecrawlApp({ apiKey: "fc-test", apiUrl: API_URL });
+    posts = [];
+    jest.spyOn(axios, "post").mockImplementation(async (url: string, data?: any) => {
+      posts.push({ url, data });
+      return { status: 200, data: { success: true, id: "job-1", data: [], links: [] } };
+    });
+    jest.spyOn(axios, "get").mockImplementation(async () => ({
+      status: 200,
+      data: { success: true, status: "completed", data: [{ markdown: "ok" }] },
+    }));
+    (globalThis as any).WebSocket = FakeWebSocket;
+  });
+
+  afterEach(() => {
+    jest.restoreAllMocks();
+    (globalThis as any).WebSocket = originalWebSocket;
+  });
+
+  const cases: Array<[string, string, (app: any) => Promise<unknown>]> = [
+    ["scrapeUrl", "/v1/scrape", app => app.scrapeUrl("https://example.com")],
+    ["search", "/v1/search", app => app.search("firecrawl")],
+    ["crawlUrl", "/v1/crawl", app => app.crawlUrl("https://example.com")],
+    ["asyncCrawlUrl", "/v1/crawl", app => app.asyncCrawlUrl("https://example.com")],
+    ["crawlUrlAndWatch", "/v1/crawl", app => app.crawlUrlAndWatch("https://example.com")],
+    ["mapUrl", "/v1/map", app => app.mapUrl("https://example.com")],
+    ["batchScrapeUrls", "/v1/batch/scrape", app => app.batchScrapeUrls(["https://example.com"])],
+    ["asyncBatchScrapeUrls", "/v1/batch/scrape", app => app.asyncBatchScrapeUrls(["https://example.com"])],
+    ["batchScrapeUrlsAndWatch", "/v1/batch/scrape", app => app.batchScrapeUrlsAndWatch(["https://example.com"])],
+    ["extract", "/v1/extract", app => app.extract(["https://example.com"])],
+    ["asyncExtract", "/v1/extract", app => app.asyncExtract(["https://example.com"])],
+    ["deepResearch", "/v1/deep-research", app => app.deepResearch("firecrawl")],
+    ["asyncDeepResearch", "/v1/deep-research", app => app.asyncDeepResearch("firecrawl")],
+    ["__deepResearch", "/v1/deep-research", app => app.__deepResearch("firecrawl")],
+    ["__asyncDeepResearch", "/v1/deep-research", app => app.__asyncDeepResearch("firecrawl")],
+    ["generateLLMsText", "/v1/llmstxt", app => app.generateLLMsText("https://example.com")],
+    ["asyncGenerateLLMsText", "/v1/llmstxt", app => app.asyncGenerateLLMsText("https://example.com")],
+  ];
+
+  test.each(cases)("%s sends the default origin", async (_method, path, call) => {
+    await expect(call(app)).resolves.toBeDefined();
+    expect(posts).toHaveLength(1);
+    expect(posts[0].url).toBe(`${API_URL}${path}`);
+    expect(posts[0].data.origin).toBe(`js-sdk@${app.version}`);
+  });
+
+  test("an mcp origin passed in params is still forwarded", async () => {
+    await app.batchScrapeUrls(["https://example.com"], { origin: "mcp-server" } as any);
+    expect(posts[0].data.origin).toBe("mcp-server");
+  });
+});

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

@@ -1,11 +1,60 @@
-/**
- * Minimal unit test for v2 scrape (no mocking; sanity check payload path)
- */
+import { describe, test, expect } from "@jest/globals";
+import axios, { type AxiosAdapter } from "axios";
 import { FirecrawlClient } from "../../../v2/client";
 
+const API_URL = "https://api.firecrawl.dev";
+
+function makeClient(apiKey: string) {
+  const client = new FirecrawlClient({ apiKey, apiUrl: API_URL });
+  const sent: Array<{ method?: string; url: string; authorization: unknown; body: unknown }> = [];
+  const adapter: AxiosAdapter = async config => {
+    sent.push({
+      method: config.method,
+      url: axios.getUri(config),
+      authorization: config.headers.Authorization,
+      body: JSON.parse(config.data),
+    });
+    return {
+      data: { success: true, data: { markdown: "# hello" } },
+      status: 200,
+      statusText: "OK",
+      headers: {},
+      config,
+    };
+  };
+  (client as any).http.instance.defaults.adapter = adapter;
+  return { client, sent };
+}
+
 describe("v2.scrape unit", () => {
-  test("constructor requires apiKey", () => {
-    expect(() => new FirecrawlClient({ apiKey: "", apiUrl: "https://api.firecrawl.dev" })).toThrow();
+  test("constructs without an API key and scrapes keyless, without an Authorization header", async () => {
+    const { client, sent } = makeClient("");
+    const doc = await client.scrape(" https://example.com ", { formats: ["markdown"] });
+
+    expect(doc.markdown).toBe("# hello");
+    expect(sent).toHaveLength(1);
+    expect(sent[0]!.method).toBe("post");
+    expect(sent[0]!.url).toBe(`${API_URL}/v2/scrape`);
+    expect(sent[0]!.authorization).toBeUndefined();
+    expect(sent[0]!.body).toEqual({
+      url: "https://example.com",
+      formats: ["markdown"],
+      origin: expect.stringMatching(/^js-sdk@/),
+    });
   });
-});
 
+  test("sends the API key as a bearer token when one is set", async () => {
+    const { client, sent } = makeClient("fc-test");
+    await client.scrape("https://example.com");
+
+    expect(sent).toHaveLength(1);
+    expect(sent[0]!.authorization).toBe("Bearer fc-test");
+  });
+
+  test("rejects an empty URL before sending a request", async () => {
+    const { client, sent } = makeClient("fc-test");
+
+    await expect(client.scrape("  ")).rejects.toThrow("URL cannot be empty");
+    expect(sent).toHaveLength(0);
+  });
+});

package/src/v1/index.ts

@@ -726,7 +726,7 @@ export default class FirecrawlApp {
       "Content-Type": "application/json",
       Authorization: `Bearer ${this.apiKey}`,
     } as AxiosRequestHeaders;
-    let jsonData: any = { url, ...params, origin: typeof (params as any).origin === "string" && (params as any).origin.includes("mcp") ? (params as any).origin : `js-sdk@${this.version}` };
+    let jsonData: any = { url, ...params, origin: typeof (params as any)?.origin === "string" && (params as any).origin.includes("mcp") ? (params as any).origin : `js-sdk@${this.version}` };
     if (jsonData?.extract?.schema) {
       jsonData = {
         ...jsonData,
@@ -793,7 +793,7 @@ export default class FirecrawlApp {
       lang: params?.lang ?? "en",
       country: params?.country ?? "us",
       location: params?.location,
-      origin: typeof (params as any).origin === "string" && (params as any).origin.includes("mcp") ? (params as any).origin : `js-sdk@${this.version}`,
+      origin: typeof (params as any)?.origin === "string" && (params as any).origin.includes("mcp") ? (params as any).origin : `js-sdk@${this.version}`,
       timeout: params?.timeout ?? 60000,
       scrapeOptions: params?.scrapeOptions ?? { formats: [] },
     };
@@ -857,7 +857,7 @@ export default class FirecrawlApp {
     idempotencyKey?: string
   ): Promise<CrawlStatusResponse | ErrorResponse> {
     const headers = this.prepareHeaders(idempotencyKey);
-    let jsonData: any = { url, ...params, origin: typeof (params as any).origin === "string" && (params as any).origin.includes("mcp") ? (params as any).origin : `js-sdk@${this.version}` };
+    let jsonData: any = { url, ...params, origin: typeof (params as any)?.origin === "string" && (params as any).origin.includes("mcp") ? (params as any).origin : `js-sdk@${this.version}` };
     try {
       const response: AxiosResponse = await this.postRequest(
         this.apiUrl + `/v1/crawl`,
@@ -886,7 +886,7 @@ export default class FirecrawlApp {
     idempotencyKey?: string
   ): Promise<CrawlResponse | ErrorResponse> {
     const headers = this.prepareHeaders(idempotencyKey);
-    let jsonData: any = { url, ...params, origin: typeof (params as any).origin === "string" && (params as any).origin.includes("mcp") ? (params as any).origin : `js-sdk@${this.version}` };
+    let jsonData: any = { url, ...params, origin: typeof (params as any)?.origin === "string" && (params as any).origin.includes("mcp") ? (params as any).origin : `js-sdk@${this.version}` };
     try {
       const response: AxiosResponse = await this.postRequest(
         this.apiUrl + `/v1/crawl`,
@@ -1062,7 +1062,7 @@ export default class FirecrawlApp {
    */
   async mapUrl(url: string, params?: MapParams): Promise<MapResponse | ErrorResponse> {
     const headers = this.prepareHeaders();
-    let jsonData: any = { url, ...params, origin: typeof (params as any).origin === "string" && (params as any).origin.includes("mcp") ? (params as any).origin : `js-sdk@${this.version}` };
+    let jsonData: any = { url, ...params, origin: typeof (params as any)?.origin === "string" && (params as any).origin.includes("mcp") ? (params as any).origin : `js-sdk@${this.version}` };
 
     try {
       const response: AxiosResponse = await this.postRequest(
@@ -1101,7 +1101,7 @@ export default class FirecrawlApp {
     maxConcurrency?: number,
   ): Promise<BatchScrapeStatusResponse | ErrorResponse> {
     const headers = this.prepareHeaders(idempotencyKey);
-    let jsonData: any = { urls, webhook, ignoreInvalidURLs, maxConcurrency, ...params, origin: typeof (params as any).origin === "string" && (params as any).origin.includes("mcp") ? (params as any).origin : `js-sdk@${this.version}` };
+    let jsonData: any = { urls, webhook, ignoreInvalidURLs, maxConcurrency, ...params, origin: typeof (params as any)?.origin === "string" && (params as any).origin.includes("mcp") ? (params as any).origin : `js-sdk@${this.version}` };
     if (jsonData?.extract?.schema) {
       jsonData = {
         ...jsonData,
@@ -1128,7 +1128,7 @@ export default class FirecrawlApp {
       );
       if (response.status === 200) {
         const id: string = response.data.id;
-        return this.monitorJobStatus(id, headers, pollInterval);
+        return this.monitorJobStatus(id, headers, pollInterval, "batch");
       } else {
         this.handleError(response, "start batch scrape job");
       }
@@ -1150,7 +1150,7 @@ export default class FirecrawlApp {
     ignoreInvalidURLs?: boolean,
   ): Promise<BatchScrapeResponse | ErrorResponse> {
     const headers = this.prepareHeaders(idempotencyKey);
-    let jsonData: any = { urls, webhook, ignoreInvalidURLs, ...params, origin: typeof (params as any).origin === "string" && (params as any).origin.includes("mcp") ? (params as any).origin : `js-sdk@${this.version}` };
+    let jsonData: any = { urls, webhook, ignoreInvalidURLs, ...params, origin: typeof (params as any)?.origin === "string" && (params as any).origin.includes("mcp") ? (params as any).origin : `js-sdk@${this.version}` };
     try {
       const response: AxiosResponse = await this.postRequest(
         this.apiUrl + `/v1/batch/scrape`,
@@ -1314,7 +1314,7 @@ export default class FirecrawlApp {
     try {
       const response: AxiosResponse = await this.postRequest(
         this.apiUrl + `/v1/extract`,
-        { ...jsonData, schema: jsonSchema, origin: typeof (params as any).origin === "string" && (params as any).origin.includes("mcp") ? (params as any).origin : `js-sdk@${this.version}` },
+        { ...jsonData, schema: jsonSchema, origin: typeof (params as any)?.origin === "string" && (params as any).origin.includes("mcp") ? (params as any).origin : `js-sdk@${this.version}` },
         headers
       );
 
@@ -1374,7 +1374,7 @@ export default class FirecrawlApp {
     try {
       const response: AxiosResponse = await this.postRequest(
         this.apiUrl + `/v1/extract`,
-        { ...jsonData, schema: jsonSchema, origin: typeof (params as any).origin === "string" && (params as any).origin.includes("mcp") ? (params as any).origin : `js-sdk@${this.version}` },
+        { ...jsonData, schema: jsonSchema, origin: typeof (params as any)?.origin === "string" && (params as any).origin.includes("mcp") ? (params as any).origin : `js-sdk@${this.version}` },
         headers
       );
 
@@ -1484,18 +1484,21 @@ export default class FirecrawlApp {
   }
 
   /**
-   * Monitors the status of a crawl job until completion or failure.
-   * @param id - The ID of the crawl operation.
+   * Monitors the status of a crawl or batch scrape job until completion or failure.
+   * @param id - The ID of the crawl or batch scrape operation.
    * @param headers - The headers for the request.
    * @param checkInterval - Interval in seconds for job status checks.
-   * @param checkUrl - Optional URL to check the status (used for v1 API)
+   * @param jobType - Which status endpoint to poll. Defaults to `"crawl"`.
    * @returns The final job status or data.
    */
   async monitorJobStatus(
     id: string,
     headers: AxiosRequestHeaders,
-    checkInterval: number
+    checkInterval: number,
+    jobType: "crawl" | "batch" = "crawl"
   ): Promise<CrawlStatusResponse | ErrorResponse> {
+    const statusPath = jobType === "batch" ? "batch/scrape" : "crawl";
+    const jobLabel = jobType === "batch" ? "Batch scrape" : "Crawl";
     let failedTries = 0;
     let networkRetries = 0;
     const maxNetworkRetries = 3;
@@ -1503,7 +1506,7 @@ export default class FirecrawlApp {
     while (true) {
       try {
         let statusResponse: AxiosResponse = await this.getRequest(
-          `${this.apiUrl}/v1/crawl/${id}`,
+          `${this.apiUrl}/v1/${statusPath}/${id}`,
           headers
         );
         
@@ -1526,7 +1529,7 @@ export default class FirecrawlApp {
               statusData.data = data;
               return statusData;
             } else {
-              throw new FirecrawlError("Crawl job completed but no data was returned", 500);
+              throw new FirecrawlError(`${jobLabel} job completed but no data was returned`, 500);
             }
           } else if (
             ["active", "paused", "pending", "queued", "waiting", "scraping"].includes(statusData.status)
@@ -1537,14 +1540,14 @@ export default class FirecrawlApp {
             );
           } else {
             throw new FirecrawlError(
-              `Crawl job failed or was stopped. Status: ${statusData.status}`,
+              `${jobLabel} job failed or was stopped. Status: ${statusData.status}`,
               500
             );
           }
         } else {
           failedTries++;
           if (failedTries >= 3) {
-            this.handleError(statusResponse, "check crawl status");
+            this.handleError(statusResponse, `check ${jobLabel.toLowerCase()} status`);
           }
         }
       } catch (error: any) {
@@ -1739,7 +1742,7 @@ export default class FirecrawlApp {
    */
   async asyncDeepResearch(query: string, params: DeepResearchParams<zt.ZodSchema>): Promise<DeepResearchResponse | ErrorResponse> {
     const headers = this.prepareHeaders();
-    let jsonData: any = { query, ...params, origin: typeof (params as any).origin === "string" && (params as any).origin.includes("mcp") ? (params as any).origin : `js-sdk@${this.version}` };
+    let jsonData: any = { query, ...params, origin: typeof (params as any)?.origin === "string" && (params as any).origin.includes("mcp") ? (params as any).origin : `js-sdk@${this.version}` };
 
     if (jsonData?.jsonOptions?.schema) {
       jsonData = {
@@ -1887,7 +1890,7 @@ export default class FirecrawlApp {
   async __asyncDeepResearch(topic: string, params: DeepResearchParams): Promise<DeepResearchResponse | ErrorResponse> {
     const headers = this.prepareHeaders();
     try {
-      let jsonData: any = { topic, ...params, origin: typeof (params as any).origin === "string" && (params as any).origin.includes("mcp") ? (params as any).origin : `js-sdk@${this.version}` };
+      let jsonData: any = { topic, ...params, origin: typeof (params as any)?.origin === "string" && (params as any).origin.includes("mcp") ? (params as any).origin : `js-sdk@${this.version}` };
       const response: AxiosResponse = await this.postRequest(
         `${this.apiUrl}/v1/deep-research`,
         jsonData,
@@ -2002,7 +2005,7 @@ export default class FirecrawlApp {
    */
   async asyncGenerateLLMsText(url: string, params?: GenerateLLMsTextParams): Promise<GenerateLLMsTextResponse | ErrorResponse> {
     const headers = this.prepareHeaders();
-    let jsonData: any = { url, ...params, origin: typeof (params as any).origin === "string" && (params as any).origin.includes("mcp") ? (params as any).origin : `js-sdk@${this.version}` };
+    let jsonData: any = { url, ...params, origin: typeof (params as any)?.origin === "string" && (params as any).origin.includes("mcp") ? (params as any).origin : `js-sdk@${this.version}` };
     try {
       const response: AxiosResponse = await this.postRequest(
         `${this.apiUrl}/v1/llmstxt`,