Update map.ts

This commit is contained in:
Nicolas
2024-09-16 12:03:14 -04:00
parent af4804e13b
commit 9da3432596
+93 -16
View File
@@ -19,8 +19,15 @@ import { billTeam } from "../../services/billing/credit_billing";
import { logJob } from "../../services/logging/log_job"; import { logJob } from "../../services/logging/log_job";
import { performCosineSimilarity } from "../../lib/map-cosine"; import { performCosineSimilarity } from "../../lib/map-cosine";
import { Logger } from "../../lib/logger"; import { Logger } from "../../lib/logger";
import Redis from "ioredis";
configDotenv(); configDotenv();
const redis = new Redis(process.env.REDIS_URL);
// Max Links that /map can return
const MAX_MAP_LIMIT = 5000;
// Max Links that "Smart /map" can return
const MAX_FIRE_ENGINE_RESULTS = 1000;
export async function mapController( export async function mapController(
req: RequestWithAuth<{}, MapResponse, MapRequest>, req: RequestWithAuth<{}, MapResponse, MapRequest>,
@@ -30,8 +37,7 @@ export async function mapController(
req.body = mapRequestSchema.parse(req.body); req.body = mapRequestSchema.parse(req.body);
const limit: number = req.body.limit ?? MAX_MAP_LIMIT;
const limit : number = req.body.limit ?? 5000;
const id = uuidv4(); const id = uuidv4();
let links: string[] = [req.body.url]; let links: string[] = [req.body.url];
@@ -53,35 +59,54 @@ export async function mapController(
? `"${req.body.search}" site:${urlWithoutWww}` ? `"${req.body.search}" site:${urlWithoutWww}`
: `site:${req.body.url}`; : `site:${req.body.url}`;
const maxResults = 5000;
const resultsPerPage = 100; const resultsPerPage = 100;
const maxPages = Math.ceil(maxResults / resultsPerPage); const maxPages = Math.ceil(Math.min(MAX_FIRE_ENGINE_RESULTS, limit) / resultsPerPage);
const cacheKey = `fireEngineMap:${mapUrl}`;
const cachedResult = await redis.get(cacheKey);
let allResults: any[];
let pagePromises: Promise<any>[];
if (cachedResult) {
allResults = JSON.parse(cachedResult);
} else {
const fetchPage = async (page: number) => { const fetchPage = async (page: number) => {
return fireEngineMap(mapUrl, { return fireEngineMap(mapUrl, {
numResults: resultsPerPage, numResults: resultsPerPage,
page: page page: page,
}); });
}; };
const pagePromises = Array.from({ length: maxPages }, (_, i) => fetchPage(i + 1)); pagePromises = Array.from({ length: maxPages }, (_, i) => fetchPage(i + 1));
allResults = await Promise.all(pagePromises);
await redis.set(cacheKey, JSON.stringify(allResults), "EX", 24 * 60 * 60); // Cache for 24 hours
}
// Parallelize sitemap fetch with serper search // Parallelize sitemap fetch with serper search
const [sitemap, ...allResults] = await Promise.all([ const [sitemap, ...searchResults] = await Promise.all([
req.body.ignoreSitemap ? null : crawler.tryGetSitemap(), req.body.ignoreSitemap ? null : crawler.tryGetSitemap(),
...pagePromises ...(cachedResult ? [] : pagePromises),
]); ]);
if (!cachedResult) {
allResults = searchResults;
}
if (sitemap !== null) { if (sitemap !== null) {
sitemap.forEach((x) => { sitemap.forEach((x) => {
links.push(x.url); links.push(x.url);
}); });
} }
let mapResults = allResults.flat().filter(result => result !== null && result !== undefined); let mapResults = allResults
.flat()
.filter((result) => result !== null && result !== undefined);
if (mapResults.length > maxResults) { const minumumCutoff = Math.min(MAX_MAP_LIMIT, limit);
mapResults = mapResults.slice(0, maxResults); if (mapResults.length > minumumCutoff) {
mapResults = mapResults.slice(0, minumumCutoff);
} }
if (mapResults.length > 0) { if (mapResults.length > 0) {
@@ -106,13 +131,15 @@ export async function mapController(
links = performCosineSimilarity(links, searchQuery); links = performCosineSimilarity(links, searchQuery);
} }
links = links.map((x) => { links = links
.map((x) => {
try { try {
return checkAndUpdateURLForMap(x).url.trim() return checkAndUpdateURLForMap(x).url.trim();
} catch (_) { } catch (_) {
return null; return null;
} }
}).filter(x => x !== null); })
.filter((x) => x !== null);
// allows for subdomains to be included // allows for subdomains to be included
links = links.filter((x) => isSameDomain(x, req.body.url)); links = links.filter((x) => isSameDomain(x, req.body.url));
@@ -125,8 +152,10 @@ export async function mapController(
// remove duplicates that could be due to http/https or www // remove duplicates that could be due to http/https or www
links = removeDuplicateUrls(links); links = removeDuplicateUrls(links);
billTeam(req.auth.team_id, 1).catch(error => { billTeam(req.auth.team_id, 1).catch((error) => {
Logger.error(`Failed to bill team ${req.auth.team_id} for 1 credit: ${error}`); Logger.error(
`Failed to bill team ${req.auth.team_id} for 1 credit: ${error}`
);
// Optionally, you could notify an admin or add to a retry queue here // Optionally, you could notify an admin or add to a retry queue here
}); });
@@ -158,3 +187,51 @@ export async function mapController(
scrape_id: req.body.origin?.includes("website") ? id : undefined, scrape_id: req.body.origin?.includes("website") ? id : undefined,
}); });
} }
// Subdomain sitemap url checking
// // For each result, check for subdomains, get their sitemaps and add them to the links
// const processedUrls = new Set();
// const processedSubdomains = new Set();
// for (const result of links) {
// let url;
// let hostParts;
// try {
// url = new URL(result);
// hostParts = url.hostname.split('.');
// } catch (e) {
// continue;
// }
// console.log("hostParts", hostParts);
// // Check if it's a subdomain (more than 2 parts, and not 'www')
// if (hostParts.length > 2 && hostParts[0] !== 'www') {
// const subdomain = hostParts[0];
// console.log("subdomain", subdomain);
// const subdomainUrl = `${url.protocol}//${subdomain}.${hostParts.slice(-2).join('.')}`;
// console.log("subdomainUrl", subdomainUrl);
// if (!processedSubdomains.has(subdomainUrl)) {
// processedSubdomains.add(subdomainUrl);
// const subdomainCrawl = crawlToCrawler(id, {
// originUrl: subdomainUrl,
// crawlerOptions: legacyCrawlerOptions(req.body),
// pageOptions: {},
// team_id: req.auth.team_id,
// createdAt: Date.now(),
// plan: req.auth.plan,
// });
// const subdomainSitemap = await subdomainCrawl.tryGetSitemap();
// if (subdomainSitemap) {
// subdomainSitemap.forEach((x) => {
// if (!processedUrls.has(x.url)) {
// processedUrls.add(x.url);
// links.push(x.url);
// }
// });
// }
// }
// }
// }