liangsheng8708
/
ruffle
mirror of https://mirror.ghproxy.com/https://github.com/ruffle-rs/ruffle.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

web: Add better error information about wasm CompileErrors

This commit is contained in:
Daniel Jacobs 2021-06-05 13:15:34 -04:00 committed by GitHub
parent cb601255d9
commit bd2db4cca3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
web/packages/core/src/ruffle-player.ts
View File

@ -28,6 +28,7 @@ enum PanicError {
Unknown,
CSPConflict,
FileProtocol,
InvalidWasm,
JavascriptConfiguration,
JavascriptConflict,
WasmCors,
@ -390,6 +391,11 @@ export class RufflePlayer extends HTMLElement {
e.ruffleIndexError = PanicError.WasmCors;
} else if (message.includes("disallowed by embedder")) {
e.ruffleIndexError = PanicError.CSPConflict;
} else if (
message.includes("WebAssembly.instantiate") &&
e.name === "CompileError"
) {
e.ruffleIndexError = PanicError.InvalidWasm;
} else if (
!message.includes("magic") &&
(e.name === "CompileError" || e.name === "TypeError")
@ -1053,6 +1059,18 @@ export class RufflePlayer extends HTMLElement {
<li><a href="#" id="panic-view-details">View Error Details</a></li>
`;
break;
case PanicError.InvalidWasm:
// Self hosted: Cannot load `.wasm` file - incorrect configuration or missing files
errorBody = `
<p>Ruffle has encountered a major issue whilst trying to initialize.</p>
<p>It seems like this page has missing or invalid files for running Ruffle.</p>
<p>If you are the server administrator, please consult the Ruffle wiki for help.</p>
`;
errorFooter = `
<li><a target="_top" href="https://github.com/ruffle-rs/ruffle/wiki/Using-Ruffle#addressing-a-compileerror">View Ruffle Wiki</a></li>
<li><a href="#" id="panic-view-details">View Error Details</a></li>
`;
break;
case PanicError.JavascriptConflict:
// Self hosted: Cannot load `.wasm` file - a native object / function is overriden
errorBody = `