Skip to content

Don't let it die on plugin failure. #84

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 6, 2022
Merged

Don't let it die on plugin failure. #84

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1284ac6
Don't let it die on plugin failure.
StevenDufresne Nov 29, 2022
4e8c8e4
Report plugins and themes errors in the console, continue gracefully
adamziel Dec 6, 2022
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
45 changes: 41 additions & 4 deletions src/wordpress-wasm/example-app.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,13 @@ async function main() {
await fetch('/plugin-proxy?plugin=' + preinstallPlugin),
progress.partialObserver(progressBudgetPerPlugin * 0.66)
);
if (response.status !== 200) {
console.error(
`Proceeding without the ${preinstallPlugin} plugin. Could not download the zip bundle from https://downloads.wordpress.org/plugin/${preinstallPlugin} – ` +
`Is the file name correct?`
);
return null;
}
return new File([await response.blob()], preinstallPlugin);
};

Expand All @@ -81,8 +88,19 @@ async function main() {
}
downloads.addEventListener('resolved', (e: any) => {
installations.enqueue(async () => {
if (!e.detail) {
return;
}
progress.slowlyIncrementBy(progressBudgetPerPlugin * 0.33);
await installPlugin(workerThread, e.detail as File);
try {
await installPlugin(workerThread, e.detail as File);
} catch (error) {
console.error(
`Proceeding without the ${e.detail.name} plugin. Could not install it in wp-admin. ` +
`The original error was: ${error}`
);
console.error(error);
}
});
});
installations.addEventListener('empty', () => {
Expand All @@ -99,10 +117,29 @@ async function main() {
await fetch('/plugin-proxy?theme=' + preinstallTheme),
progress.partialObserver(installThemeProgress - 10)
);
const themeFile = new File([await response.blob()], preinstallTheme);

progress.slowlyIncrementBy(10);
await installTheme(workerThread, themeFile);

if (response.status === 200) {
const themeFile = new File(
[await response.blob()],
preinstallTheme
);

try {
await installTheme(workerThread, themeFile);
} catch (error) {
console.error(
`Proceeding without the ${preinstallTheme} theme. Could not install it in wp-admin. ` +
`The original error was: ${error}`
);
console.error(error);
}
} else {
console.error(
`Proceeding without the ${preinstallTheme} theme. Could not download the zip bundle from https://downloads.wordpress.org/themes/${preinstallTheme} – ` +
`Is the file name correct?`
);
}
}

if (query.get('rpc')) {
Expand Down