Skip to content

Supercharge your AI agents with data from the web and beyond. Building the library for superintelligence. 🔥

fix(crawl-status): move count_jobs_of_crawl_team after checks (#1875)

Gergő Móricz327af5203636
diff --git a/apps/api/src/controllers/v1/crawl-status.ts b/apps/api/src/controllers/v1/crawl-status.ts
index 9595f853b..b22d97485 100644
--- a/apps/api/src/controllers/v1/crawl-status.ts
+++ b/apps/api/src/controllers/v1/crawl-status.ts
@@ -276,17 +276,6 @@ export async function crawlStatusController(
)
}
} else if (process.env.USE_DB_AUTHENTICATION === "true") {
-
- const { data: scrapeJobCounts, error: scrapeJobError } = await supabase_rr_service
- .rpc("count_jobs_of_crawl_team", { i_crawl_id: req.params.jobId, i_team_id: req.auth.team_id });
-
- if (scrapeJobError || !scrapeJobCounts || scrapeJobCounts.length === 0) {
- logger.error("Error getting scrape job count", { error: scrapeJobError });
- throw scrapeJobError;
- }
-
- const scrapeJobCount: number = scrapeJobCounts[0].count ?? 0;
-
const { data: crawlJobs, error: crawlJobError } = await supabase_rr_service
.from("firecrawl_jobs")
.select("*")
@@ -299,16 +288,6 @@ export async function crawlStatusController(
throw crawlJobError;
}
- if (!crawlJobs || crawlJobs.length === 0) {
- if (scrapeJobCount === 0) {
- return res.status(404).json({ success: false, error: "Job not found" });
- } else {
- status = "completed"; // fake completed to cut the losses
- }
- } else {
- status = crawlJobs[0].success ? "completed" : "failed";
- }
-
const crawlJob = crawlJobs[0];
if (crawlJob && crawlJob.team_id !== req.auth.team_id) {
@@ -328,6 +307,26 @@ export async function crawlStatusController(
return res.status(404).json({ success: false, error: "Job expired" });
}
+ const { data: scrapeJobCounts, error: scrapeJobError } = await supabase_rr_service
+ .rpc("count_jobs_of_crawl_team", { i_crawl_id: req.params.jobId, i_team_id: req.auth.team_id });
+
+ if (scrapeJobError || !scrapeJobCounts || scrapeJobCounts.length === 0) {
+ logger.error("Error getting scrape job count", { error: scrapeJobError });
+ throw (scrapeJobError ?? new Error("Unknown error getting scrape job count"));
+ }
+
+ const scrapeJobCount: number = scrapeJobCounts[0].count ?? 0;
+
+ if (!crawlJobs || crawlJobs.length === 0) {
+ if (scrapeJobCount === 0) {
+ return res.status(404).json({ success: false, error: "Job not found" });
+ } else {
+ status = "completed"; // fake completed to cut the losses
+ }
+ } else {
+ status = crawlJobs[0].success ? "completed" : "failed";
+ }
+
doneJobsLength = scrapeJobCount!;
doneJobsOrder = [];