Nick: fixes

apps/api/package.json

@@ -6,7 +6,7 @@
   "scripts": {
     "start": "nodemon --exec ts-node src/index.ts",
     "start:production": "tsc && node dist/src/index.js",
-    "format": "npx prettier --write \"src/**/*.(js|ts)\"",
+    "format": "prettier --write \"src/**/*.(js|ts)\"",
     "flyio": "node dist/src/index.js",
     "start:dev": "nodemon --exec ts-node src/index.ts",
     "build": "tsc && pnpm sentry:sourcemaps",
@@ -102,6 +102,7 @@
     "pdf-parse": "^1.1.1",
     "pos": "^0.4.2",
     "posthog-node": "^4.0.1",
+    "prettier": "^3.4.2",
     "promptable": "^0.0.10",
     "puppeteer": "^22.12.1",
     "rate-limiter-flexible": "2.4.2",

apps/api/pnpm-lock.yaml

@@ -164,6 +164,9 @@ importers:
       posthog-node:
         specifier: ^4.0.1
         version: 4.0.1
+      prettier:
+        specifier: ^3.4.2
+        version: 3.4.2
       promptable:
         specifier: ^0.0.10
         version: 0.0.10
@@ -3756,6 +3759,11 @@ packages:
     resolution: {integrity: sha512-rtqm2h22QxLGBrW2bLYzbRhliIrqgZ0k+gF0LkQ1SNdeD06YE5eilV0MxZppFSxC8TfH0+B0cWCuebEnreIDgQ==}
     engines: {node: '>=15.0.0'}
 
+  prettier@3.4.2:
+    resolution: {integrity: sha512-e9MewbtFo+Fevyuxn/4rrcDAaq0IYxPGLvObpQjiZBMAzB9IGmzlnG9RZy3FFas+eBMu2vA0CszMeduow5dIuQ==}
+    engines: {node: '>=14'}
+    hasBin: true
+
   pretty-format@29.7.0:
     resolution: {integrity: sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
@@ -4321,8 +4329,8 @@ packages:
     engines: {node: '>=14.17'}
     hasBin: true
 
-  typescript@5.6.3:
+  typescript@5.7.2:
-    resolution: {integrity: sha512-hjcS1mhfuyi4WW8IWtjP7brDrG2cuDZukyrYrSauoXGNgx0S7zceP07adYkJycEr56BOUTNPzbInooiN3fn1qw==}
+    resolution: {integrity: sha512-i5t66RHxDvVN40HfDd1PsEThGNnlMCMT3jMUuoh9/0TaqWevNontacunWyN02LA9/fIbEWlcHZcgTKb9QoaLfg==}
     engines: {node: '>=14.17'}
     hasBin: true
 
@@ -8978,6 +8986,8 @@ snapshots:
     transitivePeerDependencies:
       - debug
 
+  prettier@3.4.2: {}
+
   pretty-format@29.7.0:
     dependencies:
       '@jest/schemas': 29.6.3
@@ -9000,7 +9010,7 @@ snapshots:
       csv-parse: 5.5.6
       gpt3-tokenizer: 1.1.5
       openai: 3.3.0
-      typescript: 5.6.3
+      typescript: 5.7.2
       uuid: 9.0.1
       zod: 3.23.8
     transitivePeerDependencies:
@@ -9584,7 +9594,7 @@ snapshots:
 
   typescript@5.4.5: {}
 
-  typescript@5.6.3: {}
+  typescript@5.7.2: {}
 
   typesense@1.8.2(@babel/runtime@7.24.6):
     dependencies:

apps/api/src/controllers/v0/crawl.ts

@@ -86,12 +86,10 @@ export async function crawlController(req: Request, res: Response) {
     } = await checkTeamCredits(chunk, team_id, limitCheck);
 
     if (!creditsCheckSuccess) {
-      return res
+      return res.status(402).json({
-        .status(402)
+        error:
-        .json({
+          "Insufficient credits. You may be requesting with a higher limit than the amount of credits you have left. If not, upgrade your plan at https://firecrawl.dev/pricing or contact us at help@firecrawl.com"
-          error:
+      });
-            "Insufficient credits. You may be requesting with a higher limit than the amount of credits you have left. If not, upgrade your plan at https://firecrawl.dev/pricing or contact us at help@firecrawl.com"
-        });
     }
 
     // TODO: need to do this to v1
@@ -259,10 +257,8 @@ export async function crawlController(req: Request, res: Response) {
   } catch (error) {
     Sentry.captureException(error);
     logger.error(error);
-    return res
+    return res.status(500).json({
-      .status(500)
+      error: error instanceof ZodError ? "Invalid URL" : error.message
-      .json({
+    });
-        error: error instanceof ZodError ? "Invalid URL" : error.message
-      });
   }
 }

apps/api/src/controllers/v0/scrape.ts

@@ -211,12 +211,10 @@ export async function scrapeController(req: Request, res: Response) {
         await checkTeamCredits(chunk, team_id, 1);
       if (!creditsCheckSuccess) {
         earlyReturn = true;
-        return res
+        return res.status(402).json({
-          .status(402)
+          error:
-          .json({
+            "Insufficient credits. For more credits, you can upgrade your plan at https://firecrawl.dev/pricing"
-            error:
+        });
-              "Insufficient credits. For more credits, you can upgrade your plan at https://firecrawl.dev/pricing"
-          });
       }
     } catch (error) {
       logger.error(error);

apps/api/src/index.ts

@@ -235,14 +235,12 @@ app.use(
         " -- " +
         verbose
     );
-    res
+    res.status(500).json({
-      .status(500)
+      success: false,
-      .json({
+      error:
-        success: false,
+        "An unexpected error occurred. Please contact help@firecrawl.com for help. Your exception ID is " +
-        error:
+        id
-          "An unexpected error occurred. Please contact help@firecrawl.com for help. Your exception ID is " +
+    });
-          id
-      });
   }
 );
 

apps/api/src/routes/v1.ts

@@ -54,13 +54,11 @@ function checkCreditsMiddleware(
           `Insufficient credits: ${JSON.stringify({ team_id: req.auth.team_id, minimum, remainingCredits })}`
         );
         if (!res.headersSent) {
-          return res
+          return res.status(402).json({
-            .status(402)
+            success: false,
-            .json({
+            error:
-              success: false,
+              "Insufficient credits to perform this request. For more credits, you can upgrade your plan at https://firecrawl.dev/pricing or try changing the request limit to a lower value."
-              error:
+          });
-                "Insufficient credits to perform this request. For more credits, you can upgrade your plan at https://firecrawl.dev/pricing or try changing the request limit to a lower value."
-            });
         }
       }
       req.account = { remainingCredits };
@@ -122,13 +120,11 @@ function idempotencyMiddleware(
 function blocklistMiddleware(req: Request, res: Response, next: NextFunction) {
   if (typeof req.body.url === "string" && isUrlBlocked(req.body.url)) {
     if (!res.headersSent) {
-      return res
+      return res.status(403).json({
-        .status(403)
+        success: false,
-        .json({
+        error:
-          success: false,
+          "URL is blocked intentionally. Firecrawl currently does not support social media scraping due to policy restrictions."
-          error:
+      });
-            "URL is blocked intentionally. Firecrawl currently does not support social media scraping due to policy restrictions."
-        });
     }
   }
   next();