From 831c61706d7b1ef9da525b2e1602913bc4f678e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gerg=C5=91=20M=C3=B3ricz?= <mo.geryy@gmail.com>
Date: Tue, 28 Jan 2025 16:45:47 +0100
Subject: [PATCH] Revert "feat(v1/map): timeout"

This reverts commit 57e98e83d7ab43249963b0a14c157aaec7fd4ec7.
---
 apps/api/src/__tests__/snips/map.test.ts | 42 ------------------------
 apps/api/src/controllers/v1/map.ts       | 39 +++++++---------------
 apps/api/src/controllers/v1/types.ts     |  2 --
 apps/js-sdk/firecrawl/src/index.ts       |  1 -
 4 files changed, 11 insertions(+), 73 deletions(-)
 delete mode 100644 apps/api/src/__tests__/snips/map.test.ts

diff --git a/apps/api/src/__tests__/snips/map.test.ts b/apps/api/src/__tests__/snips/map.test.ts
deleted file mode 100644
index f2827fd4..00000000
--- a/apps/api/src/__tests__/snips/map.test.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-import request from "supertest";
-import { configDotenv } from "dotenv";
-import { MapRequestInput } from "../../controllers/v1/types";
-
-configDotenv();
-const TEST_URL = "http://127.0.0.1:3002";
-
-async function map(body: MapRequestInput) {
-  return await request(TEST_URL)
-    .post("/v1/map")
-    .set("Authorization", `Bearer ${process.env.TEST_API_KEY}`)
-    .set("Content-Type", "application/json")
-    .send(body);
-}
-
-function expectMapToSucceed(response: Awaited<ReturnType<typeof map>>) {
-  expect(response.statusCode).toBe(200);
-  expect(response.body.success).toBe(true);
-  expect(Array.isArray(response.body.links)).toBe(true);
-  expect(response.body.links.length).toBeGreaterThan(0);
-}
-
-describe("Map tests", () => {
-  it("basic map succeeds", async () => {
-    const response = await map({
-      url: "http://firecrawl.dev",
-    });
-
-    expectMapToSucceed(response);
-  });
-
-  it("times out properly", async () => {
-    const response = await map({
-      url: "http://firecrawl.dev",
-      timeout: 1
-    });
-
-    expect(response.statusCode).toBe(408);
-    expect(response.body.success).toBe(false);
-    expect(response.body.error).toBe("Request timed out");
-});
-});
diff --git a/apps/api/src/controllers/v1/map.ts b/apps/api/src/controllers/v1/map.ts
index f42b57ea..c34f0220 100644
--- a/apps/api/src/controllers/v1/map.ts
+++ b/apps/api/src/controllers/v1/map.ts
@@ -276,34 +276,17 @@ export async function mapController(
 ) {
   req.body = mapRequestSchema.parse(req.body);
 
-  let result: Awaited<ReturnType<typeof getMapResults>>;
-  try {
-    result = await Promise.race([
-      getMapResults({
-        url: req.body.url,
-        search: req.body.search,
-        limit: req.body.limit,
-        ignoreSitemap: req.body.ignoreSitemap,
-        includeSubdomains: req.body.includeSubdomains,
-        crawlerOptions: req.body,
-        origin: req.body.origin,
-        teamId: req.auth.team_id,
-        plan: req.auth.plan,
-      }),
-      ...(req.body.timeout !== undefined ? [
-        new Promise((resolve, reject) => setTimeout(() => reject("timeout"), req.body.timeout))
-      ] : []),
-    ]) as any;
-  } catch (error) {
-    if (error === "timeout") {
-      return res.status(408).json({
-        success: false,
-        error: "Request timed out",
-      });
-    } else {
-      throw error;
-    }
-  }
+  const result = await getMapResults({
+    url: req.body.url,
+    search: req.body.search,
+    limit: req.body.limit,
+    ignoreSitemap: req.body.ignoreSitemap,
+    includeSubdomains: req.body.includeSubdomains,
+    crawlerOptions: req.body,
+    origin: req.body.origin,
+    teamId: req.auth.team_id,
+    plan: req.auth.plan,
+  });
 
   // Bill the team
   billTeam(req.auth.team_id, req.acuc?.sub_id, 1).catch((error) => {
diff --git a/apps/api/src/controllers/v1/types.ts b/apps/api/src/controllers/v1/types.ts
index cb2526ce..0f8d00e2 100644
--- a/apps/api/src/controllers/v1/types.ts
+++ b/apps/api/src/controllers/v1/types.ts
@@ -429,7 +429,6 @@ export const mapRequestSchema = crawlerOptions
     ignoreSitemap: z.boolean().default(false),
     sitemapOnly: z.boolean().default(false),
     limit: z.number().min(1).max(5000).default(5000),
-    timeout: z.number().positive().finite().optional(),
   })
   .strict(strictMessage);
 
@@ -439,7 +438,6 @@ export const mapRequestSchema = crawlerOptions
 // };
 
 export type MapRequest = z.infer<typeof mapRequestSchema>;
-export type MapRequestInput = z.input<typeof mapRequestSchema>;
 
 export type Document = {
   title?: string;
diff --git a/apps/js-sdk/firecrawl/src/index.ts b/apps/js-sdk/firecrawl/src/index.ts
index 3fe7a8b9..58f77211 100644
--- a/apps/js-sdk/firecrawl/src/index.ts
+++ b/apps/js-sdk/firecrawl/src/index.ts
@@ -235,7 +235,6 @@ export interface MapParams {
   includeSubdomains?: boolean;
   sitemapOnly?: boolean;
   limit?: number;
-  timeout?: number;
 }
 
 /**