Skip to content
Merged
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
39 changes: 38 additions & 1 deletion src/app/common/monaco.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,36 @@ declare global {

let loading: Promise<void> | undefined;

/**
* Stop errors from editor workers that Monaco already stopped.
* Monaco stops its worker when the last model closes, for example when the
* user leaves a page with an editor. If the worker script is still loading,
* the browser then reports a failed `importScripts` on the window. Monaco
* removed its own listener first, so the error was unhandled. Errors from
* workers that still run are not changed.
*/
export function ignoreStoppedWorkerErrors(
environment: monaco.Environment | undefined,
) {
const getWorker = environment?.getWorker;
if (!getWorker) return;
environment.getWorker = (worker_id, label) => {
const worker = getWorker.call(environment, worker_id, label);
void Promise.resolve(worker).then((created) => {
let stopped = false;
const terminate = created.terminate.bind(created);
created.terminate = () => {
stopped = true;
terminate();
};
created.addEventListener('error', (event) => {
if (stopped) event.preventDefault();
});
});
return worker;
};
}

/** Share one editor download across fields and allow retry after a failed load. */
export function loadMonaco(): Promise<void> {
if (loading) return loading;
Expand Down Expand Up @@ -51,7 +81,14 @@ export function loadMonaco(): Promise<void> {
vs: new URL('assets/monaco/min/vs', document.baseURI).href,
},
});
loader(['vs/editor/editor.main'], () => finish(), finish);
loader(
['vs/editor/editor.main'],
() => {
ignoreStoppedWorkerErrors(globalThis.MonacoEnvironment);
finish();
},
finish,
);
};
if (window.require) return loadEditor();
script.src = new URL(
Expand Down
21 changes: 21 additions & 0 deletions src/tests/common/monaco.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,27 @@ describe('Monaco loading', () => {
await second;
});

it('only stops errors from workers that Monaco stopped', async () => {
const { ignoreStoppedWorkerErrors } =
await import('../../app/common/monaco');
const terminate = vi.fn();
const worker = Object.assign(new EventTarget(), {
terminate,
}) as unknown as Worker;
const environment = { getWorker: () => worker };
ignoreStoppedWorkerErrors(environment);
expect(environment.getWorker()).toBe(worker);
await Promise.resolve();
const running = new Event('error', { cancelable: true });
worker.dispatchEvent(running);
expect(running.defaultPrevented).toBe(false);
worker.terminate();
expect(terminate).toHaveBeenCalledOnce();
const stopped = new Event('error', { cancelable: true });
worker.dispatchEvent(stopped);
expect(stopped.defaultPrevented).toBe(true);
});

it('stops waiting when the editor does not respond', async () => {
const { loadMonaco } = await import('../../app/common/monaco');
const failure = expect(loadMonaco()).rejects.toThrow(
Expand Down
Loading