old4ever/ca-marketplace-scraper
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: validate route params and reduce duplication

Browse Source
This commit is contained in:
Dmytro Stanchiev
2026-04-27 09:45:47 -04:00
parent a802035ca4
commit 77b9fc9934
4 changed files with 103 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
packages/api-server/src/routes/ebay.ts
View File

@@ -37,32 +37,29 @@ export async function ebayRoute(req: Request): Promise<Response> {
const maxItemsParam = reqUrl.searchParams.get("maxItems");
const maxItems = maxItemsParam ? parseInt(maxItemsParam, 10) : undefined;
if (maxItemsParam && Number.isNaN(maxItems)) {
return Response.json(
{ message: "Invalid maxItems parameter" },
{ status: 400 },
);
}
const hideUnstableResults =
reqUrl.searchParams.get("unstableFilter") === "true";
const items = hideUnstableResults
? await fetchEbayItems(
const opts = {
minPrice,
maxPrice,
strictMode,
exclusions,
keywords,
buyItNowOnly,
canadaOnly,
};
const items = await fetchEbayItems(
SEARCH_QUERY,
1,
{
minPrice,
maxPrice,
strictMode,
exclusions,
keywords,
buyItNowOnly,
canadaOnly,
},
{ hideUnstableResults: true },
)
: await fetchEbayItems(SEARCH_QUERY, 1, {
minPrice,
maxPrice,
strictMode,
exclusions,
keywords,
buyItNowOnly,
canadaOnly,
});
opts,
...(hideUnstableResults ? [{ hideUnstableResults: true }] : []),
);
const isEmpty = hideUnstableResults
? items.results.length === 0 && items.unstableResults.length === 0

18
packages/api-server/src/routes/facebook.ts
View File

@@ -20,15 +20,23 @@ export async function facebookRoute(req: Request): Promise<Response> {
const LOCATION = reqUrl.searchParams.get("location") || "toronto";
const maxItemsParam = reqUrl.searchParams.get("maxItems");
const maxItems = maxItemsParam ? parseInt(maxItemsParam, 10) : 25;
if (maxItemsParam && Number.isNaN(maxItems)) {
return Response.json(
{ message: "Invalid maxItems parameter" },
{ status: 400 },
);
}
const hideUnstableResults =
reqUrl.searchParams.get("unstableFilter") === "true";
try {
const items = hideUnstableResults
? await fetchFacebookItems(SEARCH_QUERY, 1, LOCATION, maxItems, {
hideUnstableResults: true,
})
: await fetchFacebookItems(SEARCH_QUERY, 1, LOCATION, maxItems);
const items = await fetchFacebookItems(
SEARCH_QUERY,
1,
LOCATION,
maxItems,
...(hideUnstableResults ? [{ hideUnstableResults: true }] : []),
);
const isEmpty = hideUnstableResults
? items.results.length === 0 && items.unstableResults.length === 0

20
packages/api-server/src/routes/kijiji.ts
View File

@@ -30,16 +30,16 @@ export async function kijijiRoute(req: Request): Promise<Response> {
location: reqUrl.searchParams.get("location") || undefined,
category: reqUrl.searchParams.get("category") || undefined,
keywords: reqUrl.searchParams.get("keywords") || undefined,
sortBy: reqUrl.searchParams.get("sortBy") as
sortBy: (reqUrl.searchParams.get("sortBy") as
| "relevancy"
| "date"
| "price"
| "distance"
| undefined,
sortOrder: reqUrl.searchParams.get("sortOrder") as
| undefined) || undefined,
sortOrder: (reqUrl.searchParams.get("sortOrder") as
| "desc"
| "asc"
| undefined,
| undefined) || undefined,
maxPages,
priceMin,
priceMax,
@@ -47,21 +47,13 @@ export async function kijijiRoute(req: Request): Promise<Response> {
};
try {
const items = hideUnstableResults
? await fetchKijijiItems(
SEARCH_QUERY,
4, // 4 requests per second for faster scraping
"https://www.kijiji.ca",
searchOptions,
{},
{ hideUnstableResults: true },
)
: await fetchKijijiItems(
const items = await fetchKijijiItems(
SEARCH_QUERY,
4, // 4 requests per second for faster scraping
"https://www.kijiji.ca",
searchOptions,
{},
...(hideUnstableResults ? [{ hideUnstableResults: true }] : []),
);
const isEmpty = hideUnstableResults

71
packages/api-server/test/routes.test.ts
View File

@@ -26,12 +26,6 @@ describe("API routes", () => {
);
});
afterEach(() => {
fetchFacebookItems.mockClear();
fetchEbayItems.mockClear();
fetchKijijiItems.mockClear();
});
test("facebookRoute ignores cookies query parameter", async () => {
const { facebookRoute } = await import("../src/routes/facebook");
@@ -81,8 +75,8 @@ describe("API routes", () => {
location: undefined,
category: undefined,
keywords: undefined,
sortBy: null,
sortOrder: null,
sortBy: undefined,
sortOrder: undefined,
maxPages: 3,
priceMin: undefined,
priceMax: undefined,
@@ -166,8 +160,8 @@ describe("API routes", () => {
location: undefined,
category: undefined,
keywords: undefined,
sortBy: null,
sortOrder: null,
sortBy: undefined,
sortOrder: undefined,
maxPages: 5,
priceMin: undefined,
priceMax: undefined,
@@ -261,8 +255,8 @@ describe("API routes", () => {
location: undefined,
category: undefined,
keywords: undefined,
sortBy: null,
sortOrder: null,
sortBy: undefined,
sortOrder: undefined,
maxPages: 5,
priceMin: undefined,
priceMax: undefined,
@@ -289,8 +283,8 @@ describe("API routes", () => {
location: undefined,
category: undefined,
keywords: undefined,
sortBy: null,
sortOrder: null,
sortBy: undefined,
sortOrder: undefined,
maxPages: 5,
priceMin: undefined,
priceMax: undefined,
@@ -429,4 +423,53 @@ describe("API routes", () => {
expect(body.results[0].title).toBe("a");
expect(body.unstableResults[0].title).toBe("d");
});
test("ebayRoute returns 404 when unstable results are empty", async () => {
const { ebayRoute } = await import("../src/routes/ebay");
fetchEbayItems.mockImplementation(() =>
Promise.resolve({
results: [],
unstableResults: [],
}),
);
const response = await ebayRoute(
new Request(
"http://localhost/api/ebay?q=laptop&unstableFilter=true",
),
);
expect(response.status).toBe(404);
const body = await response.json();
expect(body.message).toBe("Search didn't return any results!");
});
test("ebayRoute returns 400 for invalid maxItems", async () => {
const { ebayRoute } = await import("../src/routes/ebay");
const response = await ebayRoute(
new Request(
"http://localhost/api/ebay?q=laptop&maxItems=abc",
),
);
expect(response.status).toBe(400);
const body = await response.json();
expect(body.message).toBe("Invalid maxItems parameter");
});
test("facebookRoute returns 400 for invalid maxItems", async () => {
const { facebookRoute } = await import("../src/routes/facebook");
const response = await facebookRoute(
new Request(
"http://localhost/api/facebook?q=laptop&maxItems=abc",
),
);
expect(response.status).toBe(400);
const body = await response.json();
expect(body.message).toBe("Invalid maxItems parameter");
});
});