github/v-firecrawl
github/v-firecrawl
0
Fork 0
Code Actions

Update crawl-cancel.ts

Browse Source
This commit is contained in:
Nicolas 2024-05-06 17:22:16 -07:00
parent 6d5da358cc
commit 2e3ff85509
1 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
apps/api/src/controllers/crawl-cancel.ts
View File

@ -4,6 +4,7 @@ import { RateLimiterMode } from "../../src/types";
import { addWebScraperJob } from "../../src/services/queue-jobs"; import { addWebScraperJob } from "../../src/services/queue-jobs";
import { getWebScraperQueue } from "../../src/services/queue-service"; import { getWebScraperQueue } from "../../src/services/queue-service";
import { supabase_service } from "../../src/services/supabase"; import { supabase_service } from "../../src/services/supabase";
import { billTeam } from "../../src/services/billing/credit_billing";
export async function crawlCancelController(req: Request, res: Response) { export async function crawlCancelController(req: Request, res: Response) {
try { try {
@ -21,7 +22,11 @@ export async function crawlCancelController(req: Request, res: Response) {
} }
// check if the job belongs to the team // check if the job belongs to the team
const {data, error: supaError}= await supabase_service.from("bulljobs_teams").select("*").eq("job_id", req.params.jobId).eq("team_id", team_id); const { data, error: supaError } = await supabase_service
.from("bulljobs_teams")
.select("*")
.eq("job_id", req.params.jobId)
.eq("team_id", team_id);
if (supaError) { if (supaError) {
return res.status(500).json({ error: supaError.message }); return res.status(500).json({ error: supaError.message });
} }
@ -29,19 +34,26 @@ export async function crawlCancelController(req: Request, res: Response) {
if (data.length === 0) { if (data.length === 0) {
return res.status(403).json({ error: "Unauthorized" }); return res.status(403).json({ error: "Unauthorized" });
} }
const jobState = await job.getState();
const { partialDocs } = await job.progress();
try { if (partialDocs && partialDocs.length > 0 && jobState === "active") {
await job.moveToFailed(Error("Job cancelled by user"), true); console.log("Billing team for partial docs...");
// Note: the credits that we will bill them here might be lower than the actual
} catch (error) { // due to promises that are not yet resolved
console.error(error); await billTeam(team_id, partialDocs.length);
} }
const jobState = await job.getState(); try {
await job.moveToFailed(Error("Job cancelled by user"), true);
} catch (error) {
console.error(error);
}
const newJobState = await job.getState();
res.json({ res.json({
status: jobState === "failed" ? "cancelled" : "Cancelling...", status: newJobState === "failed" ? "cancelled" : "Cancelling...",
}); });
} catch (error) { } catch (error) {
console.error(error); console.error(error);