Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions app/jsonDoc.server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,15 @@ export async function createFromUrlOrRawJson(
if (isXML(urlOrJson)) {
return createFromRawXml("Untitled", urlOrJson);
}

try {
JSON.parse(urlOrJson);
} catch (error) {
const errorMessage = error instanceof Error ? error.message : "Invalid JSON format";
throw new Error(`Invalid JSON syntax: ${errorMessage}`);
}

return undefined;
}

export async function createFromUrl(
Expand Down Expand Up @@ -158,7 +167,7 @@ function isJSON(possibleJson: string): boolean {
try {
JSON.parse(possibleJson);
return true;
} catch (e: any) {
throw new Error(e.message);
} catch {
return false;
}
}
6 changes: 5 additions & 1 deletion app/routes/actions/createFromUrl.ts
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,11 @@ export let action: ActionFunction = async ({ request, context }) => {
return redirect(`/j/${doc.id}`);
} catch (e) {
if (e instanceof Error) {
setErrorMessage(toastCookie, e.message, "Something went wrong");
if (e.message.includes("Invalid JSON syntax")) {
setErrorMessage(toastCookie, "Invalid JSON", e.message);
} else {
setErrorMessage(toastCookie, e.message, "Something went wrong");
}
} else {
setErrorMessage(toastCookie, "Unknown error", "Something went wrong");
}
Expand Down