Upstream/waveterm
1
0
Fork 0
mirror of https://github.com/wavetermdev/waveterm.git synced 2025-01-02 18:39:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add helpview callback to resolve failed webview loads (#1057)

Browse Source
This commit is contained in:
Evan Simkowitz 2024-10-17 16:03:17 -07:00 committed by GitHub
parent 5d8070b9d8
commit 70811cb730
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
frontend/app/view/helpview/helpview.tsx
View File

@ -6,7 +6,7 @@ import { WebView, WebViewModel } from "@/app/view/webview/webview";
import { NodeModel } from "@/layout/index";
import { fireAndForget } from "@/util/util";
import { atom, useAtomValue } from "jotai";
import { useEffect } from "react";
import { useCallback } from "react";
import "./helpview.less";
class HelpViewModel extends WebViewModel {
@ -48,25 +48,35 @@ function makeHelpViewModel(blockId: string, nodeModel: NodeModel) {
return new HelpViewModel(blockId, nodeModel);
}
const baseUrlRegex = /http[s]?:\/\/([^:\/])+(:\d+)?/;
function HelpView({ model }: { model: HelpViewModel }) {
const homepageUrl = useAtomValue(model.homepageUrl);
const url = useAtomValue(model.url);
// Effect to update the docsite base url when the app restarts, since the webserver port is dynamic
useEffect(
() =>
const onFailLoad = useCallback(
(url: string) =>
fireAndForget(async () => {
const curDocsiteUrl = getApi().getDocsiteUrl();
if (curDocsiteUrl !== homepageUrl) {
await model.setHomepageUrl(curDocsiteUrl, "block");
model.loadUrl(url.replace(homepageUrl, curDocsiteUrl), "new-base-url");
const newDocsiteUrl = getApi().getDocsiteUrl();
// Correct the homepage URL, if necessary
if (newDocsiteUrl !== homepageUrl) {
await model.setHomepageUrl(newDocsiteUrl, "block");
}
// Correct the base URL of the current page, if necessary
const newBaseUrl = baseUrlRegex.exec(newDocsiteUrl)?.[0];
const curBaseUrl = baseUrlRegex.exec(url)?.[0];
console.log("fix-docsite-url", url, newDocsiteUrl, homepageUrl, curBaseUrl, newBaseUrl);
if (curBaseUrl && newBaseUrl && curBaseUrl !== newBaseUrl) {
model.loadUrl(url.replace(curBaseUrl, newBaseUrl), "fix-fail-load");
}
}),
[]
[homepageUrl]
);
return (
<div className="help-view">
<WebView blockId={model.blockId} model={model} />
<WebView blockId={model.blockId} model={model} onFailLoad={onFailLoad} />
</div>
);
}

7
frontend/app/view/webview/webview.tsx
View File

@ -468,9 +468,10 @@ function makeWebViewModel(blockId: string, nodeModel: NodeModel): WebViewModel {
interface WebViewProps {
blockId: string;
model: WebViewModel;
onFailLoad?: (url: string) => void;
}
const WebView = memo(({ model }: WebViewProps) => {
const WebView = memo(({ model, onFailLoad }: WebViewProps) => {
const blockData = useAtomValue(model.blockAtom);
const defaultUrl = useAtomValue(model.homepageUrl);
const defaultSearchAtom = getSettingsKeyAtom("web:defaultsearch");
@ -555,6 +556,10 @@ const WebView = memo(({ model }: WebViewProps) => {
console.warn("Suppressed ERR_ABORTED error", e);
} else {
console.error(`Failed to load ${e.validatedURL}: ${e.errorDescription}`);
if (onFailLoad) {
const curUrl = model.webviewRef?.current.getURL();
onFailLoad(curUrl);
}
}
};
const webviewFocus = () => {