aljaz/mutiny-web
1
0
Fork 0
mirror of https://github.com/aljazceru/mutiny-web.git synced 2026-02-01 04:24:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

timeout if load fails

Browse Source
This commit is contained in:
Paul Miller
2024-04-18 15:07:51 -05:00
committed by Tony Giorgio
parent 713c1a6be3
commit 33ffdd328c
2 changed files with 36 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/logic/mutinyWalletSetup.ts
View File

@@ -233,7 +233,7 @@ export async function setupMutinyWallet(
password?: string,
safeMode?: boolean,
shouldZapHodl?: boolean
): Promise<MutinyWallet> {
): Promise<MutinyWallet | undefined> {
console.log("Starting setup...");
// https://developer.mozilla.org/en-US/docs/Web/API/Storage_API
@@ -350,5 +350,9 @@ export async function setupMutinyWallet(
sessionStorage.setItem("MUTINY_WALLET_INITIALIZED", Date.now().toString());
return mutinyWallet;
if (mutinyWallet) {
return mutinyWallet;
} else {
return undefined;
}
}

30
src/state/megaStore.tsx
View File

@@ -204,6 +204,23 @@ export const Provider: ParentComponent = (props) => {
await setSettings(settings);
}
// 60 seconds to load or we bail
const start = Date.now();
const MAX_LOAD_TIME = 60000;
const interval = setInterval(() => {
console.log("Running setup", Date.now() - start);
if (Date.now() - start > MAX_LOAD_TIME) {
clearInterval(interval);
// Have to set state error here because throwing doesn't work if WASM panics
setState({
setup_error: new Error(
"Load timed out, please try again"
)
});
return;
}
}, 1000);
const mutinyWallet = await setupMutinyWallet(
settings,
password,
@@ -211,6 +228,19 @@ export const Provider: ParentComponent = (props) => {
state.should_zap_hodl
);
// Done with the timeout shenanigans
clearInterval(interval);
// I've never managed to trigger this but it's just some extra safety I guess
if (!mutinyWallet) {
setState({
setup_error: new Error(
"Failed to initialize Mutiny Wallet"
)
});
return;
}
// Give other components access to settings via the store
setState({ settings: settings });