fix(catalog): stream single imports and preserve response errors
This commit is contained in:
1 parent
f0dcbee162
commit
33b6d1520e
5 files changed
+217
-8
No files matched your search
@@ -39,6 +39,7 @@ import {
|
|||||||
} from "@/lib/services/furni-import";
|
} from "@/lib/services/furni-import";
|
||||||
import { getOfficialHabboFurnidata } from "@/lib/services/habbo-furnidata-cache";
|
import { getOfficialHabboFurnidata } from "@/lib/services/habbo-furnidata-cache";
|
||||||
import { listFurniture } from "@/lib/services/habbofurni";
|
import { listFurniture } from "@/lib/services/habbofurni";
|
||||||
|
import { streamImportResponse } from "@/lib/services/import/core/single-response";
|
||||||
import { rcon } from "@/lib/services/rcon";
|
import { rcon } from "@/lib/services/rcon";
|
||||||
import { convertSwfToNitro } from "@/lib/services/swf-to-nitro";
|
import { convertSwfToNitro } from "@/lib/services/swf-to-nitro";
|
||||||
|
|
||||||
@@ -682,6 +683,7 @@ export const POST = withAdmin(
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const runSingle = async () => {
|
||||||
// ── Single import ────────────────────────────────────────────────
|
// ── Single import ────────────────────────────────────────────────
|
||||||
const {
|
const {
|
||||||
id,
|
id,
|
||||||
@@ -695,7 +697,8 @@ export const POST = withAdmin(
|
|||||||
updateExisting,
|
updateExisting,
|
||||||
} = body;
|
} = body;
|
||||||
|
|
||||||
if (!classname || !name) return apiError("Missing classname or name", 400);
|
if (!classname || !name)
|
||||||
|
return apiError("Missing classname or name", 400);
|
||||||
|
|
||||||
let source: Awaited<ReturnType<typeof getSource>> | null = null;
|
let source: Awaited<ReturnType<typeof getSource>> | null = null;
|
||||||
if (sourceId) source = await getSource(sourceId);
|
if (sourceId) source = await getSource(sourceId);
|
||||||
@@ -820,6 +823,10 @@ export const POST = withAdmin(
|
|||||||
spriteCount: result.spriteCount,
|
spriteCount: result.spriteCount,
|
||||||
warnings: result.warnings,
|
warnings: result.warnings,
|
||||||
});
|
});
|
||||||
|
};
|
||||||
|
return request.headers.get("accept")?.includes("text/event-stream")
|
||||||
|
? streamImportResponse(runSingle)
|
||||||
|
: runSingle();
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|||||||
@@ -60,6 +60,7 @@ import {
|
|||||||
type AutoCatalogPreview,
|
type AutoCatalogPreview,
|
||||||
previewAutoCatalog,
|
previewAutoCatalog,
|
||||||
} from "@/lib/furni/auto-catalog";
|
} from "@/lib/furni/auto-catalog";
|
||||||
|
import { readImportResponse } from "@/lib/furni/import-response";
|
||||||
import type { FurniImportSource } from "@/lib/habbo-gamedata-hotel";
|
import type { FurniImportSource } from "@/lib/habbo-gamedata-hotel";
|
||||||
import { readSseStream } from "@/lib/sse-client";
|
import { readSseStream } from "@/lib/sse-client";
|
||||||
import { cn } from "@/lib/utils";
|
import { cn } from "@/lib/utils";
|
||||||
@@ -690,7 +691,10 @@ export function StudioClient({
|
|||||||
try {
|
try {
|
||||||
const res = await adminFetch("/api/admin/import/furni", {
|
const res = await adminFetch("/api/admin/import/furni", {
|
||||||
method: "POST",
|
method: "POST",
|
||||||
headers: { "Content-Type": "application/json" },
|
headers: {
|
||||||
|
"Content-Type": "application/json",
|
||||||
|
Accept: "text/event-stream",
|
||||||
|
},
|
||||||
body: JSON.stringify({
|
body: JSON.stringify({
|
||||||
repairExisting: true,
|
repairExisting: true,
|
||||||
id: item.id,
|
id: item.id,
|
||||||
@@ -706,8 +710,8 @@ export function StudioClient({
|
|||||||
translate && translateLangs.length > 0 ? translateLangs : undefined,
|
translate && translateLangs.length > 0 ? translateLangs : undefined,
|
||||||
}),
|
}),
|
||||||
});
|
});
|
||||||
const data = await res.json();
|
const { status, data } = await readImportResponse(res);
|
||||||
if (res.ok) {
|
if (status >= 200 && status < 300) {
|
||||||
setItems((prev) =>
|
setItems((prev) =>
|
||||||
prev.map((i) =>
|
prev.map((i) =>
|
||||||
i.classname === item.classname
|
i.classname === item.classname
|
||||||
@@ -727,15 +731,26 @@ export function StudioClient({
|
|||||||
`verified: ${data.offerIdsFixed} offer_id, ${data.furniDataFixedIds} furnidata id`,
|
`verified: ${data.offerIdsFixed} offer_id, ${data.furniDataFixedIds} furnidata id`,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
if (data.furniDataMissing > 0) {
|
if (
|
||||||
|
typeof data.furniDataMissing === "number" &&
|
||||||
|
data.furniDataMissing > 0
|
||||||
|
) {
|
||||||
parts.push(`${data.furniDataMissing} furnidata missing`);
|
parts.push(`${data.furniDataMissing} furnidata missing`);
|
||||||
}
|
}
|
||||||
toast.success(parts.join(" · "));
|
toast.success(parts.join(" · "));
|
||||||
} else {
|
} else {
|
||||||
toast.error(data.error || `Import failed for ${item.classname}`);
|
toast.error(
|
||||||
|
typeof data.error === "string"
|
||||||
|
? data.error
|
||||||
|
: `Import failed for ${item.classname}`,
|
||||||
|
);
|
||||||
}
|
}
|
||||||
} catch {
|
} catch (error) {
|
||||||
toast.error("Network error");
|
toast.error(
|
||||||
|
error instanceof Error
|
||||||
|
? error.message
|
||||||
|
: "Import connection failed. Check the furniture status before retrying.",
|
||||||
|
);
|
||||||
} finally {
|
} finally {
|
||||||
setImportingId(null);
|
setImportingId(null);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,52 @@
|
|||||||
|
import { readSseStream } from "@/lib/sse-client";
|
||||||
|
|
||||||
|
interface ImportResponse {
|
||||||
|
status: number;
|
||||||
|
data: Record<string, unknown>;
|
||||||
|
}
|
||||||
|
export async function readImportResponse(
|
||||||
|
response: Response,
|
||||||
|
): Promise<ImportResponse> {
|
||||||
|
if (
|
||||||
|
response.ok &&
|
||||||
|
response.headers.get("content-type")?.includes("text/event-stream")
|
||||||
|
) {
|
||||||
|
if (!response.body)
|
||||||
|
throw Error(
|
||||||
|
"Import response is empty. Check the furniture status before retrying.",
|
||||||
|
);
|
||||||
|
let result: ImportResponse | undefined;
|
||||||
|
await readSseStream(response.body, (event) => {
|
||||||
|
if (
|
||||||
|
event.type === "result" &&
|
||||||
|
typeof event.status === "number" &&
|
||||||
|
event.data &&
|
||||||
|
typeof event.data === "object"
|
||||||
|
)
|
||||||
|
result = {
|
||||||
|
status: event.status,
|
||||||
|
data: event.data as Record<string, unknown>,
|
||||||
|
};
|
||||||
|
});
|
||||||
|
if (!result)
|
||||||
|
throw Error(
|
||||||
|
"Import connection ended before confirmation. Some changes may already be saved. Check the furniture status before retrying.",
|
||||||
|
);
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
const text = await response.text();
|
||||||
|
let data: Record<string, unknown>;
|
||||||
|
try {
|
||||||
|
data = JSON.parse(text);
|
||||||
|
} catch {
|
||||||
|
const reason = [502, 503, 504, 524].includes(response.status)
|
||||||
|
? "Server or proxy unavailable, or request timed out"
|
||||||
|
: "Server returned an unexpected response";
|
||||||
|
throw Error(
|
||||||
|
`${reason} (HTTP ${response.status}). Check the furniture status before retrying.`,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
if (!data || typeof data !== "object")
|
||||||
|
throw Error(`Invalid import response (HTTP ${response.status}).`);
|
||||||
|
return { status: response.status, data };
|
||||||
|
}
|
||||||
@@ -0,0 +1,73 @@
|
|||||||
|
import { afterEach, expect, it, vi } from "vitest";
|
||||||
|
import { readImportResponse } from "@/lib/furni/import-response";
|
||||||
|
import { streamImportResponse } from "./single-response";
|
||||||
|
|
||||||
|
vi.mock("@/lib/server-log", () => ({ logServerError: vi.fn() }));
|
||||||
|
afterEach(() => vi.useRealTimers());
|
||||||
|
it("sends headers and heartbeats before a slow operation finishes", async () => {
|
||||||
|
vi.useFakeTimers();
|
||||||
|
let finish!: (response: Response) => void;
|
||||||
|
const operation = vi.fn(
|
||||||
|
() =>
|
||||||
|
new Promise<Response>((resolve) => {
|
||||||
|
finish = resolve;
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
const response = streamImportResponse(operation);
|
||||||
|
expect(response.headers.get("X-Accel-Buffering")).toBe("no");
|
||||||
|
if (!response.body) throw Error("Missing stream");
|
||||||
|
const reader = response.body.getReader();
|
||||||
|
const decoder = new TextDecoder();
|
||||||
|
expect(decoder.decode((await reader.read()).value)).toContain('"started"');
|
||||||
|
await vi.advanceTimersByTimeAsync(10000);
|
||||||
|
expect(decoder.decode((await reader.read()).value)).toContain('"processing"');
|
||||||
|
finish(Response.json({ ok: true, id: 42 }));
|
||||||
|
expect(decoder.decode((await reader.read()).value)).toContain('"id":42');
|
||||||
|
expect((await reader.read()).done).toBe(true);
|
||||||
|
expect(operation).toHaveBeenCalledTimes(1);
|
||||||
|
expect(vi.getTimerCount()).toBe(0);
|
||||||
|
});
|
||||||
|
it("preserves failure status and the importer error", async () => {
|
||||||
|
const result = await readImportResponse(
|
||||||
|
streamImportResponse(async () =>
|
||||||
|
Response.json({ error: "Missing source asset" }, { status: 409 }),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
expect(result).toEqual({
|
||||||
|
status: 409,
|
||||||
|
data: { error: "Missing source asset" },
|
||||||
|
});
|
||||||
|
});
|
||||||
|
it("delivers caught server failures instead of abruptly closing", async () => {
|
||||||
|
const result = await readImportResponse(
|
||||||
|
streamImportResponse(async () => {
|
||||||
|
throw Error("private database details");
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
expect(result.status).toBe(500);
|
||||||
|
expect(result.data.error).toContain("Some changes may already be saved");
|
||||||
|
expect(result.data.error).not.toContain("private database");
|
||||||
|
});
|
||||||
|
it("reports proxy timeout status without rendering proxy HTML", async () => {
|
||||||
|
await expect(
|
||||||
|
readImportResponse(
|
||||||
|
new Response("<html>gateway error</html>", { status: 524 }),
|
||||||
|
),
|
||||||
|
).rejects.toThrow("HTTP 524");
|
||||||
|
});
|
||||||
|
it("does not treat a truncated stream as successful", async () => {
|
||||||
|
await expect(
|
||||||
|
readImportResponse(
|
||||||
|
new Response('data: {"type":"progress"}\n\n', {
|
||||||
|
headers: { "Content-Type": "text/event-stream" },
|
||||||
|
}),
|
||||||
|
),
|
||||||
|
).rejects.toThrow("before confirmation");
|
||||||
|
});
|
||||||
|
it("preserves JSON authentication failures", async () => {
|
||||||
|
expect(
|
||||||
|
await readImportResponse(
|
||||||
|
Response.json({ error: "Unauthorized" }, { status: 401 }),
|
||||||
|
),
|
||||||
|
).toEqual({ status: 401, data: { error: "Unauthorized" } });
|
||||||
|
});
|
||||||
@@ -0,0 +1,62 @@
|
|||||||
|
import { logServerError } from "@/lib/server-log";
|
||||||
|
|
||||||
|
/** Return headers immediately and keep proxies alive while one import completes. */
|
||||||
|
export function streamImportResponse(
|
||||||
|
operation: () => Promise<Response>,
|
||||||
|
): Response {
|
||||||
|
const encoder = new TextEncoder();
|
||||||
|
let closed = false;
|
||||||
|
let timer: ReturnType<typeof setInterval> | undefined;
|
||||||
|
const body = new ReadableStream<Uint8Array>({
|
||||||
|
start(controller) {
|
||||||
|
const send = (data: unknown) => {
|
||||||
|
if (!closed)
|
||||||
|
controller.enqueue(
|
||||||
|
encoder.encode(`data: ${JSON.stringify(data)}\n\n`),
|
||||||
|
);
|
||||||
|
};
|
||||||
|
send({ type: "progress", stage: "started" });
|
||||||
|
timer = setInterval(
|
||||||
|
() => send({ type: "progress", stage: "processing" }),
|
||||||
|
10000,
|
||||||
|
);
|
||||||
|
void (async () => {
|
||||||
|
try {
|
||||||
|
const response = await operation();
|
||||||
|
send({
|
||||||
|
type: "result",
|
||||||
|
status: response.status,
|
||||||
|
data: await response.json(),
|
||||||
|
});
|
||||||
|
} catch (error) {
|
||||||
|
logServerError("furni.import_stream_failed", error);
|
||||||
|
send({
|
||||||
|
type: "result",
|
||||||
|
status: 500,
|
||||||
|
data: {
|
||||||
|
error:
|
||||||
|
"Import interrupted on the server. Some changes may already be saved. Check the furniture status before retrying.",
|
||||||
|
},
|
||||||
|
});
|
||||||
|
} finally {
|
||||||
|
clearInterval(timer);
|
||||||
|
if (!closed) {
|
||||||
|
closed = true;
|
||||||
|
controller.close();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
})();
|
||||||
|
},
|
||||||
|
cancel() {
|
||||||
|
closed = true;
|
||||||
|
clearInterval(timer);
|
||||||
|
},
|
||||||
|
});
|
||||||
|
return new Response(body, {
|
||||||
|
headers: {
|
||||||
|
"Content-Type": "text/event-stream",
|
||||||
|
"Cache-Control": "no-cache, no-transform",
|
||||||
|
"X-Accel-Buffering": "no",
|
||||||
|
},
|
||||||
|
});
|
||||||
|
}
|
||||||
Reference in new issue
Block a user