feat(ci): switch Cloudflare bypass from FlareSolverr to Byparr
This commit is contained in:
1 parent
fabd160250
commit
25f4d74209
10 files changed
+138
-131
No files matched your search
@@ -12,7 +12,7 @@ const {
|
||||
selectLimit,
|
||||
fsUnlink,
|
||||
fsReadFile,
|
||||
fetchWithFlareSolver,
|
||||
fetchWithByparr,
|
||||
curlFetchText,
|
||||
curlDownload,
|
||||
} = vi.hoisted(() => ({
|
||||
@@ -23,7 +23,7 @@ const {
|
||||
selectLimit: vi.fn<AnyFn>(async () => []),
|
||||
fsUnlink: vi.fn<AnyFn>(async () => {}),
|
||||
fsReadFile: vi.fn<AnyFn>(async () => Buffer.from("NITRO")),
|
||||
fetchWithFlareSolver: vi.fn<AnyFn>(async () => ""),
|
||||
fetchWithByparr: vi.fn<AnyFn>(async () => ""),
|
||||
curlFetchText: vi.fn<AnyFn>(async () => ""),
|
||||
curlDownload: vi.fn<AnyFn>(async () => ({ ok: true, size: 200 })),
|
||||
}));
|
||||
@@ -33,7 +33,7 @@ vi.mock("@/lib/services/import/core/curl-fetch", () => ({
|
||||
curlDownload,
|
||||
curlFetchText,
|
||||
}));
|
||||
vi.mock("@/lib/services/flare-solver", () => ({ fetchWithFlareSolver }));
|
||||
vi.mock("@/lib/services/byparr", () => ({ fetchWithByparr }));
|
||||
vi.mock("@/lib/services/furni-data", () => ({ appendFurniEntry }));
|
||||
vi.mock("@/lib/services/furni-import", () => ({
|
||||
ensureDirectories: vi.fn<AnyFn>(async () => {}),
|
||||
@@ -217,8 +217,8 @@ describe("fetchSourceFurnidata", () => {
|
||||
const HTML_WRAPPED = `<html><head><meta charset="utf-8"></head><body><pre>${JSON_BODY}</pre></body></html>`;
|
||||
|
||||
beforeEach(() => {
|
||||
fetchWithFlareSolver.mockReset();
|
||||
fetchWithFlareSolver.mockResolvedValue("");
|
||||
fetchWithByparr.mockReset();
|
||||
fetchWithByparr.mockResolvedValue("");
|
||||
vi.unstubAllGlobals();
|
||||
});
|
||||
|
||||
@@ -235,10 +235,10 @@ describe("fetchSourceFurnidata", () => {
|
||||
);
|
||||
const list = await fetchSourceFurnidata("https://a.test/fd.json", 1);
|
||||
expect(list.map((e) => e.classname)).toEqual(["bc_sofa", "wall_x"]);
|
||||
expect(fetchWithFlareSolver).not.toHaveBeenCalled();
|
||||
expect(fetchWithByparr).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it("extracts JSON from an HTML-wrapped furnidata (e.g. Leet via FlareSolverr)", async () => {
|
||||
it("extracts JSON from an HTML-wrapped furnidata (e.g. Leet via Byparr)", async () => {
|
||||
vi.stubGlobal(
|
||||
"fetch",
|
||||
vi.fn(
|
||||
@@ -249,13 +249,13 @@ describe("fetchSourceFurnidata", () => {
|
||||
}),
|
||||
),
|
||||
);
|
||||
fetchWithFlareSolver.mockResolvedValue(HTML_WRAPPED);
|
||||
fetchWithByparr.mockResolvedValue(HTML_WRAPPED);
|
||||
const list = await fetchSourceFurnidata("https://b.test/fd.json", 1);
|
||||
expect(list.map((e) => e.classname)).toEqual(["bc_sofa", "wall_x"]);
|
||||
expect(fetchWithFlareSolver).toHaveBeenCalledWith("https://b.test/fd.json");
|
||||
expect(fetchWithByparr).toHaveBeenCalledWith("https://b.test/fd.json");
|
||||
});
|
||||
|
||||
it("falls back to FlareSolverr on HTML body even when status is 200", async () => {
|
||||
it("falls back to Byparr on HTML body even when status is 200", async () => {
|
||||
vi.stubGlobal(
|
||||
"fetch",
|
||||
vi.fn(
|
||||
@@ -266,7 +266,7 @@ describe("fetchSourceFurnidata", () => {
|
||||
}),
|
||||
),
|
||||
);
|
||||
fetchWithFlareSolver.mockResolvedValue(HTML_WRAPPED);
|
||||
fetchWithByparr.mockResolvedValue(HTML_WRAPPED);
|
||||
const list = await fetchSourceFurnidata("https://c.test/fd.json", 1);
|
||||
expect(list.map((e) => e.classname)).toEqual(["bc_sofa", "wall_x"]);
|
||||
});
|
||||
@@ -284,7 +284,7 @@ describe("fetchSourceFurnidata", () => {
|
||||
);
|
||||
const list = await fetchSourceFurnidata("https://g.test/fd.json", 1);
|
||||
expect(list.map((e) => e.classname)).toEqual(["bc_sofa", "wall_x"]);
|
||||
expect(fetchWithFlareSolver).not.toHaveBeenCalled();
|
||||
expect(fetchWithByparr).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it("throws when HTML has no embedded JSON payload", async () => {
|
||||
@@ -298,7 +298,7 @@ describe("fetchSourceFurnidata", () => {
|
||||
}),
|
||||
),
|
||||
);
|
||||
fetchWithFlareSolver.mockResolvedValue("<html>still a challenge</html>");
|
||||
fetchWithByparr.mockResolvedValue("<html>still a challenge</html>");
|
||||
await expect(
|
||||
fetchSourceFurnidata("https://d.test/fd.json", 1),
|
||||
).rejects.toThrow(/Cloudflare challenge/);
|
||||
|
||||
Reference in new issue
Block a user