From 82ba5f1f135a497a09869f60f7dac655c233db0a Mon Sep 17 00:00:00 2001 From: Snarling <84951833+Snarling@users.noreply.github.com> Date: Thu, 10 Nov 2022 10:08:59 -0500 Subject: [PATCH] Ignore monaco cancellation errors (#208) Also updated monaco-editor and @monaco-editor/react to latest versions since there were no conflicts. --- package-lock.json | 48 +++++++++++++++---------------- package.json | 4 +-- src/Netscript/NetscriptHelpers.ts | 2 ++ 3 files changed, 28 insertions(+), 26 deletions(-) diff --git a/package-lock.json b/package-lock.json index e5160e759..259251ff7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,7 +13,7 @@ "@emotion/react": "^11.4.1", "@emotion/styled": "^11.3.0", "@material-ui/core": "^4.12.3", - "@monaco-editor/react": "^4.2.2", + "@monaco-editor/react": "^4.4.6", "@mui/icons-material": "^5.0.3", "@mui/material": "^5.0.3", "@mui/styles": "^5.0.1", @@ -33,7 +33,7 @@ "jszip": "^3.7.0", "material-ui-color": "^1.2.0", "material-ui-popup-state": "^1.5.3", - "monaco-editor": "^0.27.0", + "monaco-editor": "^0.34.1", "notistack": "^2.0.2", "numeral": "2.0.6", "prop-types": "^15.8.0", @@ -3212,9 +3212,9 @@ } }, "node_modules/@monaco-editor/loader": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@monaco-editor/loader/-/loader-1.2.0.tgz", - "integrity": "sha512-cJVCG/T/KxXgzYnjKqyAgsKDbH9mGLjcXxN6AmwumBwa2rVFkwvGcUj1RJtD0ko4XqLqJxwqsN/Z/KURB5f1OQ==", + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/@monaco-editor/loader/-/loader-1.3.2.tgz", + "integrity": "sha512-BTDbpHl3e47r3AAtpfVFTlAi7WXv4UQ/xZmz8atKl4q7epQV5e7+JbigFDViWF71VBi4IIBdcWP57Hj+OWuc9g==", "dependencies": { "state-local": "^1.0.6" }, @@ -3223,17 +3223,17 @@ } }, "node_modules/@monaco-editor/react": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/@monaco-editor/react/-/react-4.3.1.tgz", - "integrity": "sha512-f+0BK1PP/W5I50hHHmwf11+Ea92E5H1VZXs+wvKplWUWOfyMa1VVwqkJrXjRvbcqHL+XdIGYWhWNdi4McEvnZg==", + "version": "4.4.6", + "resolved": "https://registry.npmjs.org/@monaco-editor/react/-/react-4.4.6.tgz", + "integrity": "sha512-Gr3uz3LYf33wlFE3eRnta4RxP5FSNxiIV9ENn2D2/rN8KgGAD8ecvcITRtsbbyuOuNkwbuHYxfeaz2Vr+CtyFA==", "dependencies": { - "@monaco-editor/loader": "^1.2.0", + "@monaco-editor/loader": "^1.3.2", "prop-types": "^15.7.2" }, "peerDependencies": { "monaco-editor": ">= 0.25.0 < 1", - "react": "^16.8.0 || ^17.0.0", - "react-dom": "^16.8.0 || ^17.0.0" + "react": "^16.8.0 || ^17.0.0 || ^18.0.0", + "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0" } }, "node_modules/@mui/core": { @@ -15196,9 +15196,9 @@ } }, "node_modules/monaco-editor": { - "version": "0.27.0", - "resolved": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.27.0.tgz", - "integrity": "sha512-UhwP78Wb8w0ZSYoKXQNTV/0CHObp6NS3nCt51QfKE6sKyBo5PBsvuDOHoI2ooBakc6uIwByRLHVeT7+yXQe2fQ==" + "version": "0.34.1", + "resolved": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.34.1.tgz", + "integrity": "sha512-FKc80TyiMaruhJKKPz5SpJPIjL+dflGvz4CpuThaPMc94AyN7SeC9HQ8hrvaxX7EyHdJcUY5i4D0gNyJj1vSZQ==" }, "node_modules/move-concurrently": { "version": "1.0.1", @@ -24647,19 +24647,19 @@ } }, "@monaco-editor/loader": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@monaco-editor/loader/-/loader-1.2.0.tgz", - "integrity": "sha512-cJVCG/T/KxXgzYnjKqyAgsKDbH9mGLjcXxN6AmwumBwa2rVFkwvGcUj1RJtD0ko4XqLqJxwqsN/Z/KURB5f1OQ==", + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/@monaco-editor/loader/-/loader-1.3.2.tgz", + "integrity": "sha512-BTDbpHl3e47r3AAtpfVFTlAi7WXv4UQ/xZmz8atKl4q7epQV5e7+JbigFDViWF71VBi4IIBdcWP57Hj+OWuc9g==", "requires": { "state-local": "^1.0.6" } }, "@monaco-editor/react": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/@monaco-editor/react/-/react-4.3.1.tgz", - "integrity": "sha512-f+0BK1PP/W5I50hHHmwf11+Ea92E5H1VZXs+wvKplWUWOfyMa1VVwqkJrXjRvbcqHL+XdIGYWhWNdi4McEvnZg==", + "version": "4.4.6", + "resolved": "https://registry.npmjs.org/@monaco-editor/react/-/react-4.4.6.tgz", + "integrity": "sha512-Gr3uz3LYf33wlFE3eRnta4RxP5FSNxiIV9ENn2D2/rN8KgGAD8ecvcITRtsbbyuOuNkwbuHYxfeaz2Vr+CtyFA==", "requires": { - "@monaco-editor/loader": "^1.2.0", + "@monaco-editor/loader": "^1.3.2", "prop-types": "^15.7.2" } }, @@ -34035,9 +34035,9 @@ } }, "monaco-editor": { - "version": "0.27.0", - "resolved": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.27.0.tgz", - "integrity": "sha512-UhwP78Wb8w0ZSYoKXQNTV/0CHObp6NS3nCt51QfKE6sKyBo5PBsvuDOHoI2ooBakc6uIwByRLHVeT7+yXQe2fQ==" + "version": "0.34.1", + "resolved": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.34.1.tgz", + "integrity": "sha512-FKc80TyiMaruhJKKPz5SpJPIjL+dflGvz4CpuThaPMc94AyN7SeC9HQ8hrvaxX7EyHdJcUY5i4D0gNyJj1vSZQ==" }, "move-concurrently": { "version": "1.0.1", diff --git a/package.json b/package.json index 25b89b2df..252bf1ecf 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,7 @@ "@emotion/react": "^11.4.1", "@emotion/styled": "^11.3.0", "@material-ui/core": "^4.12.3", - "@monaco-editor/react": "^4.2.2", + "@monaco-editor/react": "^4.4.6", "@mui/icons-material": "^5.0.3", "@mui/material": "^5.0.3", "@mui/styles": "^5.0.1", @@ -33,7 +33,7 @@ "jszip": "^3.7.0", "material-ui-color": "^1.2.0", "material-ui-popup-state": "^1.5.3", - "monaco-editor": "^0.27.0", + "monaco-editor": "^0.34.1", "notistack": "^2.0.2", "numeral": "2.0.6", "prop-types": "^15.8.0", diff --git a/src/Netscript/NetscriptHelpers.ts b/src/Netscript/NetscriptHelpers.ts index a9d657f14..dc918fe47 100644 --- a/src/Netscript/NetscriptHelpers.ts +++ b/src/Netscript/NetscriptHelpers.ts @@ -750,6 +750,8 @@ export function handleUnknownError(e: unknown, ws: WorkerScript | ScriptDeath | const msg = `${e.message} (sorry we can't be more helpful)`; e = ws ? makeBasicErrorMsg(ws, msg, "SYNTAX") : `SYNTAX ERROR:\n\n${msg}`; } else if (e instanceof Error) { + // Ignore any cancellation errors from Monaco that get here + if (e.name === "Canceled" && e.message === "Canceled") return; const msg = `${e.message}${e.stack ? `\nstack:\n${e.stack.toString()}` : ""}`; e = ws ? makeBasicErrorMsg(ws, msg) : `RUNTIME ERROR:\n\n${msg}`; }