Show a crash dialog when the editor panics (#362)
* Show a crash dialog when the editor panics Closes #357 * Suppress console usage lints * Proxy cleanup and comments
This commit is contained in:
parent
c8389bbae1
commit
d290aaf712
|
|
@ -202,7 +202,13 @@ impl MessageHandler<DocumentsMessage, &InputPreprocessor> for DocumentsMessageHa
|
||||||
Ok(document) => {
|
Ok(document) => {
|
||||||
self.load_document(document, responses);
|
self.load_document(document, responses);
|
||||||
}
|
}
|
||||||
Err(e) => responses.push_back(FrontendMessage::DisplayError { description: e.to_string() }.into()),
|
Err(e) => responses.push_back(
|
||||||
|
FrontendMessage::DisplayError {
|
||||||
|
title: "Failed to open document".to_string(),
|
||||||
|
description: e.to_string(),
|
||||||
|
}
|
||||||
|
.into(),
|
||||||
|
),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
GetOpenDocumentsList => {
|
GetOpenDocumentsList => {
|
||||||
|
|
|
||||||
|
|
@ -12,7 +12,8 @@ pub enum FrontendMessage {
|
||||||
SetActiveTool { tool_name: String, tool_options: Option<ToolOptions> },
|
SetActiveTool { tool_name: String, tool_options: Option<ToolOptions> },
|
||||||
SetActiveDocument { document_index: usize },
|
SetActiveDocument { document_index: usize },
|
||||||
UpdateOpenDocumentsList { open_documents: Vec<String> },
|
UpdateOpenDocumentsList { open_documents: Vec<String> },
|
||||||
DisplayError { description: String },
|
DisplayError { title: String, description: String },
|
||||||
|
DisplayPanic { title: String, description: String },
|
||||||
DisplayConfirmationToCloseDocument { document_index: usize },
|
DisplayConfirmationToCloseDocument { document_index: usize },
|
||||||
DisplayConfirmationToCloseAllDocuments,
|
DisplayConfirmationToCloseAllDocuments,
|
||||||
UpdateCanvas { document: String },
|
UpdateCanvas { document: String },
|
||||||
|
|
|
||||||
|
|
@ -41,8 +41,10 @@ impl Editor {
|
||||||
|
|
||||||
pub fn handle_message<T: Into<Message>>(&mut self, message: T) -> Vec<FrontendMessage> {
|
pub fn handle_message<T: Into<Message>>(&mut self, message: T) -> Vec<FrontendMessage> {
|
||||||
self.dispatcher.handle_message(message);
|
self.dispatcher.handle_message(message);
|
||||||
|
|
||||||
let mut responses = Vec::new();
|
let mut responses = Vec::new();
|
||||||
std::mem::swap(&mut responses, &mut self.dispatcher.responses);
|
std::mem::swap(&mut responses, &mut self.dispatcher.responses);
|
||||||
|
|
||||||
responses
|
responses
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -227,6 +227,7 @@ import { defineComponent } from "vue";
|
||||||
import { ResponseType, registerResponseHandler, Response, UpdateCanvas, UpdateScrollbars, SetActiveTool, SetCanvasZoom, SetCanvasRotation } from "@/utilities/response-handler";
|
import { ResponseType, registerResponseHandler, Response, UpdateCanvas, UpdateScrollbars, SetActiveTool, SetCanvasZoom, SetCanvasRotation } from "@/utilities/response-handler";
|
||||||
import { SeparatorDirection, SeparatorType } from "@/components/widgets/widgets";
|
import { SeparatorDirection, SeparatorType } from "@/components/widgets/widgets";
|
||||||
import { comingSoon } from "@/utilities/errors";
|
import { comingSoon } from "@/utilities/errors";
|
||||||
|
import { panicProxy } from "@/utilities/panic";
|
||||||
|
|
||||||
import LayoutRow from "@/components/layout/LayoutRow.vue";
|
import LayoutRow from "@/components/layout/LayoutRow.vue";
|
||||||
import LayoutCol from "@/components/layout/LayoutCol.vue";
|
import LayoutCol from "@/components/layout/LayoutCol.vue";
|
||||||
|
|
@ -245,7 +246,7 @@ import OptionalInput from "@/components/widgets/inputs/OptionalInput.vue";
|
||||||
import ToolOptions from "@/components/widgets/options/ToolOptions.vue";
|
import ToolOptions from "@/components/widgets/options/ToolOptions.vue";
|
||||||
import { SectionsOfMenuListEntries } from "@/components/widgets/floating-menus/MenuList.vue";
|
import { SectionsOfMenuListEntries } from "@/components/widgets/floating-menus/MenuList.vue";
|
||||||
|
|
||||||
const wasm = import("@/../wasm/pkg");
|
const wasm = import("@/../wasm/pkg").then(panicProxy);
|
||||||
|
|
||||||
const documentModeEntries: SectionsOfMenuListEntries = [
|
const documentModeEntries: SectionsOfMenuListEntries = [
|
||||||
[
|
[
|
||||||
|
|
|
||||||
|
|
@ -182,6 +182,7 @@
|
||||||
import { defineComponent } from "vue";
|
import { defineComponent } from "vue";
|
||||||
|
|
||||||
import { ResponseType, registerResponseHandler, Response, BlendMode, ExpandFolder, CollapseFolder, UpdateLayer, LayerPanelEntry, LayerType } from "@/utilities/response-handler";
|
import { ResponseType, registerResponseHandler, Response, BlendMode, ExpandFolder, CollapseFolder, UpdateLayer, LayerPanelEntry, LayerType } from "@/utilities/response-handler";
|
||||||
|
import { panicProxy } from "@/utilities/panic";
|
||||||
import { SeparatorType } from "@/components/widgets/widgets";
|
import { SeparatorType } from "@/components/widgets/widgets";
|
||||||
|
|
||||||
import LayoutRow from "@/components/layout/LayoutRow.vue";
|
import LayoutRow from "@/components/layout/LayoutRow.vue";
|
||||||
|
|
@ -195,7 +196,7 @@ import IconLabel from "@/components/widgets/labels/IconLabel.vue";
|
||||||
import DropdownInput from "@/components/widgets/inputs/DropdownInput.vue";
|
import DropdownInput from "@/components/widgets/inputs/DropdownInput.vue";
|
||||||
import { SectionsOfMenuListEntries } from "@/components/widgets/floating-menus/MenuList.vue";
|
import { SectionsOfMenuListEntries } from "@/components/widgets/floating-menus/MenuList.vue";
|
||||||
|
|
||||||
const wasm = import("@/../wasm/pkg");
|
const wasm = import("@/../wasm/pkg").then(panicProxy);
|
||||||
|
|
||||||
const blendModeEntries: SectionsOfMenuListEntries = [
|
const blendModeEntries: SectionsOfMenuListEntries = [
|
||||||
[{ label: "Normal", value: BlendMode.Normal }],
|
[{ label: "Normal", value: BlendMode.Normal }],
|
||||||
|
|
|
||||||
|
|
@ -57,12 +57,14 @@
|
||||||
|
|
||||||
.main-column {
|
.main-column {
|
||||||
.heading {
|
.heading {
|
||||||
white-space: pre;
|
white-space: pre-wrap;
|
||||||
|
max-width: 400px;
|
||||||
margin-bottom: 4px;
|
margin-bottom: 4px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.details {
|
.details {
|
||||||
white-space: pre;
|
white-space: pre-wrap;
|
||||||
|
max-width: 400px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.buttons-row {
|
.buttons-row {
|
||||||
|
|
|
||||||
|
|
@ -54,13 +54,14 @@
|
||||||
import { defineComponent } from "vue";
|
import { defineComponent } from "vue";
|
||||||
|
|
||||||
import { comingSoon } from "@/utilities/errors";
|
import { comingSoon } from "@/utilities/errors";
|
||||||
|
import { panicProxy } from "@/utilities/panic";
|
||||||
|
|
||||||
import IconLabel from "@/components/widgets/labels/IconLabel.vue";
|
import IconLabel from "@/components/widgets/labels/IconLabel.vue";
|
||||||
import { ApplicationPlatform } from "@/components/window/MainWindow.vue";
|
import { ApplicationPlatform } from "@/components/window/MainWindow.vue";
|
||||||
import MenuList, { MenuListEntry, MenuListEntries } from "@/components/widgets/floating-menus/MenuList.vue";
|
import MenuList, { MenuListEntry, MenuListEntries } from "@/components/widgets/floating-menus/MenuList.vue";
|
||||||
import { MenuDirection } from "@/components/widgets/floating-menus/FloatingMenu.vue";
|
import { MenuDirection } from "@/components/widgets/floating-menus/FloatingMenu.vue";
|
||||||
|
|
||||||
const wasm = import("@/../wasm/pkg");
|
const wasm = import("@/../wasm/pkg").then(panicProxy);
|
||||||
|
|
||||||
const menuEntries: MenuListEntries = [
|
const menuEntries: MenuListEntries = [
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -69,12 +69,13 @@
|
||||||
import { defineComponent } from "vue";
|
import { defineComponent } from "vue";
|
||||||
|
|
||||||
import { rgbToDecimalRgb, RGB } from "@/utilities/color";
|
import { rgbToDecimalRgb, RGB } from "@/utilities/color";
|
||||||
|
import { panicProxy } from "@/utilities/panic";
|
||||||
import { ResponseType, registerResponseHandler, Response, UpdateWorkingColors } from "@/utilities/response-handler";
|
import { ResponseType, registerResponseHandler, Response, UpdateWorkingColors } from "@/utilities/response-handler";
|
||||||
|
|
||||||
import ColorPicker from "@/components/widgets/floating-menus/ColorPicker.vue";
|
import ColorPicker from "@/components/widgets/floating-menus/ColorPicker.vue";
|
||||||
import FloatingMenu, { MenuDirection, MenuType } from "@/components/widgets/floating-menus/FloatingMenu.vue";
|
import FloatingMenu, { MenuDirection, MenuType } from "@/components/widgets/floating-menus/FloatingMenu.vue";
|
||||||
|
|
||||||
const wasm = import("@/../wasm/pkg");
|
const wasm = import("@/../wasm/pkg").then(panicProxy);
|
||||||
|
|
||||||
export default defineComponent({
|
export default defineComponent({
|
||||||
components: {
|
components: {
|
||||||
|
|
|
||||||
|
|
@ -32,6 +32,7 @@
|
||||||
import { defineComponent, PropType } from "vue";
|
import { defineComponent, PropType } from "vue";
|
||||||
|
|
||||||
import { comingSoon } from "@/utilities/errors";
|
import { comingSoon } from "@/utilities/errors";
|
||||||
|
import { panicProxy } from "@/utilities/panic";
|
||||||
import { WidgetRow, SeparatorType, IconButtonWidget } from "@/components/widgets/widgets";
|
import { WidgetRow, SeparatorType, IconButtonWidget } from "@/components/widgets/widgets";
|
||||||
|
|
||||||
import Separator from "@/components/widgets/separators/Separator.vue";
|
import Separator from "@/components/widgets/separators/Separator.vue";
|
||||||
|
|
@ -39,7 +40,7 @@ import IconButton from "@/components/widgets/buttons/IconButton.vue";
|
||||||
import PopoverButton from "@/components/widgets/buttons/PopoverButton.vue";
|
import PopoverButton from "@/components/widgets/buttons/PopoverButton.vue";
|
||||||
import NumberInput from "@/components/widgets/inputs/NumberInput.vue";
|
import NumberInput from "@/components/widgets/inputs/NumberInput.vue";
|
||||||
|
|
||||||
const wasm = import("@/../wasm/pkg");
|
const wasm = import("@/../wasm/pkg").then(panicProxy);
|
||||||
|
|
||||||
export default defineComponent({
|
export default defineComponent({
|
||||||
props: {
|
props: {
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
<template>
|
<template>
|
||||||
<div class="window-buttons-web" @click="handleClick" :title="fullscreen.windowFullscreen ? 'Exit Fullscreen (F11)' : 'Enter Fullscreen (F11)'">
|
<div class="window-buttons-web" @click="handleClick" :title="fullscreen.windowFullscreen ? 'Exit Fullscreen (F11)' : 'Enter Fullscreen (F11)'">
|
||||||
<TextLabel v-if="requestFullscreenHotkeys" :italic="true">Click to access all hotkeys</TextLabel>
|
<TextLabel v-if="requestFullscreenHotkeys" :italic="true">Go fullscreen to access all hotkeys</TextLabel>
|
||||||
<IconLabel :icon="fullscreen.windowFullscreen ? 'FullscreenExit' : 'FullscreenEnter'" />
|
<IconLabel :icon="fullscreen.windowFullscreen ? 'FullscreenExit' : 'FullscreenEnter'" />
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
|
||||||
|
|
@ -11,9 +11,10 @@ import {
|
||||||
ExportDocument,
|
ExportDocument,
|
||||||
SaveDocument,
|
SaveDocument,
|
||||||
} from "@/utilities/response-handler";
|
} from "@/utilities/response-handler";
|
||||||
import { download, upload } from "./files";
|
import { download, upload } from "@/utilities/files";
|
||||||
|
import { panicProxy } from "@/utilities/panic";
|
||||||
|
|
||||||
const wasm = import("@/../wasm/pkg");
|
const wasm = import("@/../wasm/pkg").then(panicProxy);
|
||||||
|
|
||||||
const state = reactive({
|
const state = reactive({
|
||||||
title: "",
|
title: "",
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,7 @@
|
||||||
import { createDialog, dismissDialog } from "@/utilities/dialog";
|
import { createDialog, dismissDialog } from "@/utilities/dialog";
|
||||||
import { TextButtonWidget } from "@/components/widgets/widgets";
|
import { TextButtonWidget } from "@/components/widgets/widgets";
|
||||||
import { ResponseType, registerResponseHandler, Response, DisplayError } from "@/utilities/response-handler";
|
import { getPanicDetails } from "@/utilities/panic";
|
||||||
|
import { ResponseType, registerResponseHandler, Response, DisplayError, DisplayPanic } from "@/utilities/response-handler";
|
||||||
|
|
||||||
export function comingSoon(issueNumber?: number) {
|
export function comingSoon(issueNumber?: number) {
|
||||||
const bugMessage = `— but you can help add it!\nSee issue #${issueNumber} on GitHub.`;
|
const bugMessage = `— but you can help add it!\nSee issue #${issueNumber} on GitHub.`;
|
||||||
|
|
@ -32,5 +33,74 @@ registerResponseHandler(ResponseType.DisplayError, (responseData: Response) => {
|
||||||
};
|
};
|
||||||
const buttons = [okButton];
|
const buttons = [okButton];
|
||||||
|
|
||||||
createDialog("Warning", "Editor error", data.description, buttons);
|
createDialog("Warning", data.title, data.description, buttons);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
registerResponseHandler(ResponseType.DisplayPanic, (responseData: Response) => {
|
||||||
|
const data = responseData as DisplayPanic;
|
||||||
|
|
||||||
|
const reloadButton: TextButtonWidget = {
|
||||||
|
kind: "TextButton",
|
||||||
|
callback: async () => window.location.reload(),
|
||||||
|
props: { label: "Reload", emphasized: true, minWidth: 96 },
|
||||||
|
};
|
||||||
|
const copyErrorLogButton: TextButtonWidget = {
|
||||||
|
kind: "TextButton",
|
||||||
|
callback: async () => navigator.clipboard.writeText(getPanicDetails()),
|
||||||
|
props: { label: "Copy Error Log", emphasized: false, minWidth: 96 },
|
||||||
|
};
|
||||||
|
const reportOnGithubButton: TextButtonWidget = {
|
||||||
|
kind: "TextButton",
|
||||||
|
callback: async () => window.open(githubUrl(), "_blank"),
|
||||||
|
props: { label: "Report Bug", emphasized: false, minWidth: 96 },
|
||||||
|
};
|
||||||
|
const buttons = [reloadButton, copyErrorLogButton, reportOnGithubButton];
|
||||||
|
|
||||||
|
createDialog("Warning", data.title, data.description, buttons);
|
||||||
|
});
|
||||||
|
|
||||||
|
function githubUrl() {
|
||||||
|
const url = new URL("https://github.com/GraphiteEditor/Graphite/issues/new");
|
||||||
|
|
||||||
|
const body = `
|
||||||
|
**Describe the Crash**
|
||||||
|
Explain clearly what you were doing when the crash occurred.
|
||||||
|
|
||||||
|
**Steps To Reproduce**
|
||||||
|
Describe precisely how the crash occurred, step by step, starting with a new editor window.
|
||||||
|
1. Open the Graphite Editor at https://editor.graphite.design
|
||||||
|
2.
|
||||||
|
3.
|
||||||
|
4.
|
||||||
|
5.
|
||||||
|
|
||||||
|
**Browser and OS*
|
||||||
|
List of your browser and its version, as well as your operating system.
|
||||||
|
|
||||||
|
**Additional Details**
|
||||||
|
Provide any further information or context that you think would be helpful in fixing the issue. Screenshots or video can be linked or attached to this issue.
|
||||||
|
|
||||||
|
**Stack Trace**
|
||||||
|
Copied from the crash dialog in the Graphite Editor:
|
||||||
|
|
||||||
|
\`\`\`
|
||||||
|
${getPanicDetails()}
|
||||||
|
\`\`\`
|
||||||
|
`.trim();
|
||||||
|
|
||||||
|
const fields = {
|
||||||
|
title: "[Crash Report] ",
|
||||||
|
body,
|
||||||
|
labels: ["Crash"].join(","),
|
||||||
|
projects: [].join(","),
|
||||||
|
milestone: "",
|
||||||
|
assignee: "",
|
||||||
|
template: "",
|
||||||
|
};
|
||||||
|
|
||||||
|
Object.entries(fields).forEach(([field, value]) => {
|
||||||
|
if (value) url.searchParams.set(field, value);
|
||||||
|
});
|
||||||
|
|
||||||
|
return url.toString();
|
||||||
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,8 @@
|
||||||
import { toggleFullscreen } from "@/utilities/fullscreen";
|
import { toggleFullscreen } from "@/utilities/fullscreen";
|
||||||
import { dialogIsVisible, dismissDialog, submitDialog } from "@/utilities/dialog";
|
import { dialogIsVisible, dismissDialog, submitDialog } from "@/utilities/dialog";
|
||||||
|
import { panicProxy } from "@/utilities/panic";
|
||||||
|
|
||||||
const wasm = import("@/../wasm/pkg");
|
const wasm = import("@/../wasm/pkg").then(panicProxy);
|
||||||
|
|
||||||
let viewportMouseInteractionOngoing = false;
|
let viewportMouseInteractionOngoing = false;
|
||||||
|
|
||||||
|
|
@ -45,10 +46,12 @@ export async function onKeyDown(e: KeyboardEvent) {
|
||||||
|
|
||||||
if (dialogIsVisible()) {
|
if (dialogIsVisible()) {
|
||||||
if (e.key === "Escape") dismissDialog();
|
if (e.key === "Escape") dismissDialog();
|
||||||
if (e.key === "Enter") submitDialog();
|
if (e.key === "Enter") {
|
||||||
|
submitDialog();
|
||||||
|
|
||||||
// Prevent the Enter key from acting like a click on the last clicked button, which might reopen the dialog
|
// Prevent the Enter key from acting like a click on the last clicked button, which might reopen the dialog
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,50 @@
|
||||||
|
// Import this function and chain it on all `wasm` imports like: const wasm = import("@/../wasm/pkg").then(panicProxy);
|
||||||
|
// This works by proxying every function call wrapping a try-catch block to filter out redundant and confusing `RuntimeError: unreachable` exceptions sent to the console
|
||||||
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||||
|
export function panicProxy(module: any) {
|
||||||
|
const proxyHandler = {
|
||||||
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||||
|
get(target: any, propKey: any, receiver: any) {
|
||||||
|
const targetValue = Reflect.get(target, propKey, receiver);
|
||||||
|
|
||||||
|
// Keep the original value being accessed if it isn't a function or it is a class
|
||||||
|
// TODO: Figure out how to also wrap (class) constructor functions instead of skipping them for now
|
||||||
|
const isFunction = typeof targetValue === "function";
|
||||||
|
const isClass = isFunction && /^\s*class\s+/.test(targetValue.toString());
|
||||||
|
if (!isFunction || isClass) return targetValue;
|
||||||
|
|
||||||
|
// Replace the original function with a wrapper function that runs the original in a try-catch block
|
||||||
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any, func-names
|
||||||
|
return function (...args: any) {
|
||||||
|
let result;
|
||||||
|
try {
|
||||||
|
// @ts-expect-error
|
||||||
|
result = targetValue.apply(this, args);
|
||||||
|
} catch (err: any) {
|
||||||
|
// Suppress `unreachable` WebAssembly.RuntimeError exceptions
|
||||||
|
if (!`${err}`.startsWith("RuntimeError: unreachable")) throw err;
|
||||||
|
}
|
||||||
|
return result;
|
||||||
|
};
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
return new Proxy(module, proxyHandler);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Intercept console.error() for panic messages sent by code in the WASM toolchain
|
||||||
|
let panicDetails = "";
|
||||||
|
// eslint-disable-next-line no-console
|
||||||
|
const error = console.error.bind(console);
|
||||||
|
// eslint-disable-next-line no-console
|
||||||
|
console.error = (...args) => {
|
||||||
|
const details = "".concat(...args).trim();
|
||||||
|
if (details.startsWith("panicked at")) panicDetails = details;
|
||||||
|
|
||||||
|
error(...args);
|
||||||
|
};
|
||||||
|
|
||||||
|
// Get the body of the panic's exception that was printed in the console
|
||||||
|
export function getPanicDetails(): string {
|
||||||
|
return panicDetails;
|
||||||
|
}
|
||||||
|
|
@ -28,6 +28,7 @@ export enum ResponseType {
|
||||||
SetCanvasZoom = "SetCanvasZoom",
|
SetCanvasZoom = "SetCanvasZoom",
|
||||||
SetCanvasRotation = "SetCanvasRotation",
|
SetCanvasRotation = "SetCanvasRotation",
|
||||||
DisplayError = "DisplayError",
|
DisplayError = "DisplayError",
|
||||||
|
DisplayPanic = "DisplayPanic",
|
||||||
DisplayConfirmationToCloseDocument = "DisplayConfirmationToCloseDocument",
|
DisplayConfirmationToCloseDocument = "DisplayConfirmationToCloseDocument",
|
||||||
DisplayConfirmationToCloseAllDocuments = "DisplayConfirmationToCloseAllDocuments",
|
DisplayConfirmationToCloseAllDocuments = "DisplayConfirmationToCloseAllDocuments",
|
||||||
}
|
}
|
||||||
|
|
@ -43,8 +44,10 @@ export function handleResponse(responseType: string, responseData: any) {
|
||||||
if (callback && data) {
|
if (callback && data) {
|
||||||
callback(data);
|
callback(data);
|
||||||
} else if (data) {
|
} else if (data) {
|
||||||
|
// eslint-disable-next-line no-console
|
||||||
console.error(`Received a Response of type "${responseType}" but no handler was registered for it from the client.`);
|
console.error(`Received a Response of type "${responseType}" but no handler was registered for it from the client.`);
|
||||||
} else {
|
} else {
|
||||||
|
// eslint-disable-next-line no-console
|
||||||
console.error(`Received a Response of type "${responseType}" but but was not able to parse the data.`);
|
console.error(`Received a Response of type "${responseType}" but but was not able to parse the data.`);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -83,6 +86,8 @@ function parseResponse(responseType: string, data: any): Response {
|
||||||
return newUpdateWorkingColors(data.UpdateWorkingColors);
|
return newUpdateWorkingColors(data.UpdateWorkingColors);
|
||||||
case "DisplayError":
|
case "DisplayError":
|
||||||
return newDisplayError(data.DisplayError);
|
return newDisplayError(data.DisplayError);
|
||||||
|
case "DisplayPanic":
|
||||||
|
return newDisplayPanic(data.DisplayPanic);
|
||||||
case "DisplayConfirmationToCloseDocument":
|
case "DisplayConfirmationToCloseDocument":
|
||||||
return newDisplayConfirmationToCloseDocument(data.DisplayConfirmationToCloseDocument);
|
return newDisplayConfirmationToCloseDocument(data.DisplayConfirmationToCloseDocument);
|
||||||
case "DisplayConfirmationToCloseAllDocuments":
|
case "DisplayConfirmationToCloseAllDocuments":
|
||||||
|
|
@ -144,10 +149,23 @@ function newSetActiveDocument(input: any): SetActiveDocument {
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface DisplayError {
|
export interface DisplayError {
|
||||||
|
title: string;
|
||||||
description: string;
|
description: string;
|
||||||
}
|
}
|
||||||
function newDisplayError(input: any): DisplayError {
|
function newDisplayError(input: any): DisplayError {
|
||||||
return {
|
return {
|
||||||
|
title: input.title,
|
||||||
|
description: input.description,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface DisplayPanic {
|
||||||
|
title: string;
|
||||||
|
description: string;
|
||||||
|
}
|
||||||
|
function newDisplayPanic(input: any): DisplayPanic {
|
||||||
|
return {
|
||||||
|
title: input.title,
|
||||||
description: input.description,
|
description: input.description,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -5,6 +5,7 @@ pub mod wrappers;
|
||||||
|
|
||||||
use editor::{message_prelude::*, Editor};
|
use editor::{message_prelude::*, Editor};
|
||||||
use std::cell::RefCell;
|
use std::cell::RefCell;
|
||||||
|
use std::sync::atomic::AtomicBool;
|
||||||
use utils::WasmLog;
|
use utils::WasmLog;
|
||||||
use wasm_bindgen::prelude::*;
|
use wasm_bindgen::prelude::*;
|
||||||
|
|
||||||
|
|
@ -13,6 +14,7 @@ thread_local! {
|
||||||
pub static EDITOR_STATE: RefCell<Editor> = RefCell::new(Editor::new());
|
pub static EDITOR_STATE: RefCell<Editor> = RefCell::new(Editor::new());
|
||||||
}
|
}
|
||||||
static LOGGER: WasmLog = WasmLog;
|
static LOGGER: WasmLog = WasmLog;
|
||||||
|
static EDITOR_HAS_CRASHED: AtomicBool = AtomicBool::new(false);
|
||||||
|
|
||||||
#[wasm_bindgen(start)]
|
#[wasm_bindgen(start)]
|
||||||
pub fn init() {
|
pub fn init() {
|
||||||
|
|
@ -22,21 +24,41 @@ pub fn init() {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Sends FrontendMessages to JavaScript
|
// Sends FrontendMessages to JavaScript
|
||||||
pub fn dispatch<T: Into<Message>>(message: T) {
|
fn dispatch<T: Into<Message>>(message: T) {
|
||||||
let messages = EDITOR_STATE.with(|state| state.borrow_mut().handle_message(message.into()));
|
// Process no further messages after a crash to avoid spamming the console
|
||||||
|
if EDITOR_HAS_CRASHED.load(std::sync::atomic::Ordering::SeqCst) {
|
||||||
for message in messages.into_iter() {
|
return;
|
||||||
let message_type = message.to_discriminant().local_name();
|
|
||||||
let message_data = JsValue::from_serde(&message).expect("Failed to serialize response");
|
|
||||||
|
|
||||||
let _ = handleResponse(message_type, message_data).map_err(|error| {
|
|
||||||
log::error!(
|
|
||||||
"While handling FrontendMessage \"{:?}\", JavaScript threw an error: {:?}",
|
|
||||||
message.to_discriminant().local_name(),
|
|
||||||
error
|
|
||||||
)
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
match EDITOR_STATE.with(|state| state.try_borrow_mut().ok().map(|mut state| state.handle_message(message.into()))) {
|
||||||
|
Some(messages) => {
|
||||||
|
for message in messages.into_iter() {
|
||||||
|
handle_response(message);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
None => {
|
||||||
|
EDITOR_HAS_CRASHED.store(true, std::sync::atomic::Ordering::SeqCst);
|
||||||
|
|
||||||
|
let title = "The editor crashed — sorry about that".to_string();
|
||||||
|
let description = "An internal error occurred. Reload the editor to continue. Please report this by filing an issue on GitHub.".to_string();
|
||||||
|
|
||||||
|
handle_response(FrontendMessage::DisplayPanic { title, description });
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Sends a FrontendMessage to JavaScript
|
||||||
|
fn handle_response(message: FrontendMessage) {
|
||||||
|
let message_type = message.to_discriminant().local_name();
|
||||||
|
let message_data = JsValue::from_serde(&message).expect("Failed to serialize response");
|
||||||
|
|
||||||
|
let _ = handleResponse(message_type, message_data).map_err(|error| {
|
||||||
|
log::error!(
|
||||||
|
"While handling FrontendMessage \"{:?}\", JavaScript threw an error: {:?}",
|
||||||
|
message.to_discriminant().local_name(),
|
||||||
|
error
|
||||||
|
)
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
// The JavaScript function to call into
|
// The JavaScript function to call into
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue