Mirrors/mealie
1
0
Fork 0
mirror of https://github.com/mealie-recipes/mealie.git synced 2026-08-02 13:00:14 -04:00
Code Issues Packages Projects Releases Wiki Activity

feat: Add feedback for bad JSON in HTML-JSON page (#7956)

Browse Source
This commit is contained in:
Michael Genson
2026-07-26 17:16:31 -05:00
committed by GitHub
parent 318f05f2ab
commit 5e886b11a1
5 changed files with 144 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
frontend/app/lib/api/user/recipes/recipe.ts
View File

@@ -1,5 +1,5 @@
import { SSE } from "sse.js";
import type { SSEvent } from "sse.js";
import type { ReadyStateEvent, SSEvent } from "sse.js";
import { BaseCRUDAPI } from "../../base/base-clients";
import { route } from "../../base";
import { CommentsApi } from "./recipe-comments";
@@ -164,6 +164,16 @@ export class RecipeAPI extends BaseCRUDAPI<CreateRecipe, Recipe, Recipe> {
autoReconnect: false,
});
let settled = false;
const settle = (result: RequestResponse<string>) => {
if (settled) {
return;
}
settled = true;
sse.close();
resolve(result);
};
if (onProgress) {
sse.addEventListener(SSEDataEventStatus.Progress, (e: SSEvent) => {
const { message } = JSON.parse(e.data) as SSEDataEventMessage;
@@ -173,18 +183,26 @@ export class RecipeAPI extends BaseCRUDAPI<CreateRecipe, Recipe, Recipe> {
sse.addEventListener(SSEDataEventStatus.Done, (e: SSEvent) => {
const { slug } = JSON.parse(e.data) as SSEDataEventDone;
sse.close();
resolve({ response: { status: 201, data: slug } as any, data: slug, error: null });
settle({ response: { status: 201, data: slug } as any, data: slug, error: null });
});
sse.addEventListener(SSEDataEventStatus.Error, (e: SSEvent) => {
let message: string | undefined;
try {
const { message } = JSON.parse(e.data) as SSEDataEventMessage;
sse.close();
resolve({ response: null, data: null, error: new Error(message) });
({ message } = JSON.parse(e.data) as SSEDataEventMessage);
}
catch {
// Not a backend error payload (e.g. XHR connection-close event); ignore
// Not a backend error payload (e.g. an XHR failure carrying the raw response body)
}
settle({ response: null, data: null, error: new Error(message || "Recipe creation failed") });
});
// The stream can also close without ever emitting a done/error event, e.g. when the
// request fails before the route handler runs. Settle here so callers always get a
// response instead of waiting on a promise that never resolves.
sse.addEventListener("readystatechange", (e: ReadyStateEvent) => {
if (e.readyState === SSE.CLOSED) {
settle({ response: null, data: null, error: new Error("Recipe creation failed") });
}
});