Nick:
This commit is contained in:
@@ -0,0 +1,32 @@
|
|||||||
|
import { Response } from "express";
|
||||||
|
import { supabaseGetJobByIdOnlyData } from "../../lib/supabase-jobs";
|
||||||
|
import { scrapeStatusRateLimiter } from "../../services/rate-limiter";
|
||||||
|
|
||||||
|
export async function scrapeStatusController(req: any, res: any) {
|
||||||
|
try {
|
||||||
|
const rateLimiter = scrapeStatusRateLimiter;
|
||||||
|
const incomingIP = (req.headers["x-forwarded-for"] ||
|
||||||
|
req.socket.remoteAddress) as string;
|
||||||
|
const iptoken = incomingIP;
|
||||||
|
await rateLimiter.consume(iptoken);
|
||||||
|
|
||||||
|
const job = await supabaseGetJobByIdOnlyData(req.params.jobId);
|
||||||
|
|
||||||
|
return res.status(200).json({
|
||||||
|
success: true,
|
||||||
|
data: job?.docs[0],
|
||||||
|
});
|
||||||
|
} catch (error) {
|
||||||
|
if (error instanceof Error && error.message == "Too Many Requests") {
|
||||||
|
return res.status(429).json({
|
||||||
|
success: false,
|
||||||
|
error: "Rate limit exceeded. Please try again later.",
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
return res.status(500).json({
|
||||||
|
success: false,
|
||||||
|
error: "An unexpected error occurred.",
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -37,3 +37,22 @@ export const supabaseGetJobsById = async (jobIds: string[]) => {
|
|||||||
|
|
||||||
return data;
|
return data;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
export const supabaseGetJobByIdOnlyData = async (jobId: string) => {
|
||||||
|
const { data, error } = await supabase_service
|
||||||
|
.from("firecrawl_jobs")
|
||||||
|
.select("docs")
|
||||||
|
.eq("job_id", jobId)
|
||||||
|
.single();
|
||||||
|
|
||||||
|
if (error) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!data) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
return data;
|
||||||
|
};
|
||||||
@@ -15,6 +15,7 @@ import { crawlStatusWSController } from "../controllers/v1/crawl-status-ws";
|
|||||||
import { isUrlBlocked } from "../scraper/WebScraper/utils/blocklist";
|
import { isUrlBlocked } from "../scraper/WebScraper/utils/blocklist";
|
||||||
import { crawlCancelController } from "../controllers/v1/crawl-cancel";
|
import { crawlCancelController } from "../controllers/v1/crawl-cancel";
|
||||||
import { Logger } from "../lib/logger";
|
import { Logger } from "../lib/logger";
|
||||||
|
import { scrapeStatusController } from "../controllers/v1/scrape-status";
|
||||||
// import { crawlPreviewController } from "../../src/controllers/v1/crawlPreview";
|
// import { crawlPreviewController } from "../../src/controllers/v1/crawlPreview";
|
||||||
// import { crawlJobStatusPreviewController } from "../../src/controllers/v1/status";
|
// import { crawlJobStatusPreviewController } from "../../src/controllers/v1/status";
|
||||||
// import { searchController } from "../../src/controllers/v1/search";
|
// import { searchController } from "../../src/controllers/v1/search";
|
||||||
@@ -124,6 +125,11 @@ v1Router.get(
|
|||||||
wrap(crawlStatusController)
|
wrap(crawlStatusController)
|
||||||
);
|
);
|
||||||
|
|
||||||
|
v1Router.get(
|
||||||
|
"/scrape/:jobId",
|
||||||
|
wrap(scrapeStatusController)
|
||||||
|
);
|
||||||
|
|
||||||
v1Router.ws(
|
v1Router.ws(
|
||||||
"/crawl/:jobId",
|
"/crawl/:jobId",
|
||||||
crawlStatusWSController
|
crawlStatusWSController
|
||||||
|
|||||||
@@ -104,6 +104,14 @@ export const devBRateLimiter = new RateLimiterRedis({
|
|||||||
duration: 60, // Duration in seconds
|
duration: 60, // Duration in seconds
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
|
export const scrapeStatusRateLimiter = new RateLimiterRedis({
|
||||||
|
storeClient: redisRateLimitClient,
|
||||||
|
keyPrefix: "scrape-status",
|
||||||
|
points: 200,
|
||||||
|
duration: 60, // Duration in seconds
|
||||||
|
});
|
||||||
|
|
||||||
export function getRateLimiter(
|
export function getRateLimiter(
|
||||||
mode: RateLimiterMode,
|
mode: RateLimiterMode,
|
||||||
token: string,
|
token: string,
|
||||||
|
|||||||
Reference in New Issue
Block a user