[UPdate] Add error boundary.

This commit is contained in:
Sakamoto Shiina
2025-04-10 21:47:18 +09:00
parent 7e637b795d
commit 2157d5952c
11 changed files with 408 additions and 45 deletions

1
.gitignore vendored
View File

@@ -44,3 +44,4 @@ dist-ssr
# Customize # Customize
/build /build
error.txt

78
map-stack.js Normal file
View File

@@ -0,0 +1,78 @@
#!/usr/bin/env node
// 使用例: node map-stack.js
// カレントディレクトリの error.txt を読み込み、各エラーフレームから
// 対応するソースマップdist/assets/ 以下の *.js.mapを用いて元の位置情報を出力する
import fs from "fs";
import path from "path";
import { SourceMapConsumer } from "source-map";
// 各スタックフレームにマッチする正規表現
const FRAME_REGEX = /^\s*at\s+(.*?)\s+\((.*):(\d+):(\d+)\)$/;
// スタックトレースのパース関数
const parseStackTrace = (text) => {
return text
.split(/\r?\n/)
.map((line) => {
const match = line.match(FRAME_REGEX);
if (match) {
return {
original: line,
functionName: match[1],
file: match[2],
line: Number(match[3]),
column: Number(match[4])
};
} else {
return { original: line };
}
});
};
// エラースタックをソースマップから逆引きする関数(位置情報のみを表示)
const mapStackTrace = async () => {
const errorTxtPath = path.resolve(process.cwd(), "error.txt");
const stackTraceText = fs.readFileSync(errorTxtPath, "utf8");
const frames = parseStackTrace(stackTraceText);
const consumerMap = new Map();
const mappedFrames = await Promise.all(frames.map(async (frame) => {
if (frame.file && frame.line && frame.column) {
const relativeFile = frame.file.replace(/^\//, ""); // 例: "assets/main-Td8-sruo.js"
const mapFilePath = path.resolve(process.cwd(), "dist", relativeFile + ".map");
let consumer = consumerMap.get(mapFilePath);
if (!consumer) {
const rawSourceMap = fs.readFileSync(mapFilePath, "utf8");
consumer = await new SourceMapConsumer(rawSourceMap);
consumerMap.set(mapFilePath, consumer);
}
const pos = consumer.originalPositionFor({
line: frame.line,
column: frame.column
});
if (pos && pos.source && pos.line != null && pos.column != null) {
return ` at ${frame.functionName} (${pos.source}:${pos.line}:${pos.column})`;
} else {
return frame.original;
}
} else {
return frame.original;
}
}));
consumerMap.forEach((consumer) => consumer.destroy());
return mappedFrames.join("\n");
};
mapStackTrace()
.then((mapped) => {
console.log("--- Mapped Stack Trace ---");
console.log(mapped);
})
.catch((err) => {
console.error(err);
process.exit(1);
});

80
package-lock.json generated
View File

@@ -24,6 +24,7 @@
"jszip": "3.10.1", "jszip": "3.10.1",
"react": "18.2.0", "react": "18.2.0",
"react-dom": "18.2.0", "react-dom": "18.2.0",
"react-error-boundary": "5.0.0",
"react-i18next": "15.2.0", "react-i18next": "15.2.0",
"react-resizable-layout": "0.7.2", "react-resizable-layout": "0.7.2",
"semver": "7.7.1" "semver": "7.7.1"
@@ -32,7 +33,8 @@
"@tauri-apps/cli": "1.6.3", "@tauri-apps/cli": "1.6.3",
"npm-run-all": "4.1.5", "npm-run-all": "4.1.5",
"sass": "1.79.4", "sass": "1.79.4",
"vite": "6.2.1", "source-map": "^0.7.4",
"vite": "6.2.5",
"vite-plugin-svgr": "4.3.0" "vite-plugin-svgr": "4.3.0"
} }
}, },
@@ -210,23 +212,23 @@
} }
}, },
"node_modules/@babel/helpers": { "node_modules/@babel/helpers": {
"version": "7.26.0", "version": "7.27.0",
"resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.26.0.tgz", "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.27.0.tgz",
"integrity": "sha512-tbhNuIxNcVb21pInl3ZSjksLCvgdZy9KwJ8brv993QtIVKJBBkYXz4q4ZbAv31GdnC+R90np23L5FbEBlthAEw==", "integrity": "sha512-U5eyP/CTFPuNE3qk+WZMxFkp/4zUzdceQlfzf7DdGdhp+Fezd7HD+i8Y24ZuTMKX3wQBld449jijbGq6OdGNQg==",
"dependencies": { "dependencies": {
"@babel/template": "^7.25.9", "@babel/template": "^7.27.0",
"@babel/types": "^7.26.0" "@babel/types": "^7.27.0"
}, },
"engines": { "engines": {
"node": ">=6.9.0" "node": ">=6.9.0"
} }
}, },
"node_modules/@babel/parser": { "node_modules/@babel/parser": {
"version": "7.26.3", "version": "7.27.0",
"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.26.3.tgz", "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.27.0.tgz",
"integrity": "sha512-WJ/CvmY8Mea8iDXo6a7RK2wbmJITT5fN3BEkRuFlxVyNx8jOKIIhmC4fSkTcPcf8JyavbBwIe6OpiCOBXt/IcA==", "integrity": "sha512-iaepho73/2Pz7w2eMS0Q5f83+0RKI7i4xmiYeBmDzfRVbQtTOG7Ts0S4HzJVsTMGI9keU8rNfuZr8DKfSt7Yyg==",
"dependencies": { "dependencies": {
"@babel/types": "^7.26.3" "@babel/types": "^7.27.0"
}, },
"bin": { "bin": {
"parser": "bin/babel-parser.js" "parser": "bin/babel-parser.js"
@@ -264,9 +266,9 @@
} }
}, },
"node_modules/@babel/runtime": { "node_modules/@babel/runtime": {
"version": "7.26.0", "version": "7.27.0",
"resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.26.0.tgz", "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.27.0.tgz",
"integrity": "sha512-FDSOghenHTiToteC/QRlv2q3DhPZ/oOXTBoirfWNx1Cx3TMVcGWQtMMmQcSvb/JjpNeGzx8Pq/b4fKEJuWm1sw==", "integrity": "sha512-VtPOkrdPHZsKc/clNqyi9WUA8TINkZ4cGk63UUE3u4pmB2k+ZMQRDuIOagv8UVd6j7k0T3+RRIb7beKTebNbcw==",
"dependencies": { "dependencies": {
"regenerator-runtime": "^0.14.0" "regenerator-runtime": "^0.14.0"
}, },
@@ -283,13 +285,13 @@
} }
}, },
"node_modules/@babel/template": { "node_modules/@babel/template": {
"version": "7.25.9", "version": "7.27.0",
"resolved": "https://registry.npmjs.org/@babel/template/-/template-7.25.9.tgz", "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.27.0.tgz",
"integrity": "sha512-9DGttpmPvIxBb/2uwpVo3dqJ+O6RooAFOS+lB+xDqoE2PVCE8nfoHMdZLpfCQRLwvohzXISPZcgxt80xLfsuwg==", "integrity": "sha512-2ncevenBqXI6qRMukPlXwHKHchC7RyMuu4xv5JBXRfOGVcTy1mXCD12qrp7Jsoxll1EV3+9sE4GugBVRjT2jFA==",
"dependencies": { "dependencies": {
"@babel/code-frame": "^7.25.9", "@babel/code-frame": "^7.26.2",
"@babel/parser": "^7.25.9", "@babel/parser": "^7.27.0",
"@babel/types": "^7.25.9" "@babel/types": "^7.27.0"
}, },
"engines": { "engines": {
"node": ">=6.9.0" "node": ">=6.9.0"
@@ -313,9 +315,9 @@
} }
}, },
"node_modules/@babel/types": { "node_modules/@babel/types": {
"version": "7.26.3", "version": "7.27.0",
"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.26.3.tgz", "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.27.0.tgz",
"integrity": "sha512-vN5p+1kl59GVKMvTHt55NzzmYVxprfJD+ql7U9NFIfKCBkYE55LYtS+WtPlaYOyzydrKI8Nezd+aZextrd+FMA==", "integrity": "sha512-H45s8fVLYjbhFH62dIJ3WtmJ6RSPt/3DRO0ZcT2SUiYiQyz3BLVb9ADEnLl91m74aQPS3AzzeajZHYOalWe3bg==",
"dependencies": { "dependencies": {
"@babel/helper-string-parser": "^7.25.9", "@babel/helper-string-parser": "^7.25.9",
"@babel/helper-validator-identifier": "^7.25.9" "@babel/helper-validator-identifier": "^7.25.9"
@@ -342,6 +344,14 @@
"stylis": "4.2.0" "stylis": "4.2.0"
} }
}, },
"node_modules/@emotion/babel-plugin/node_modules/source-map": {
"version": "0.5.7",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
"integrity": "sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==",
"engines": {
"node": ">=0.10.0"
}
},
"node_modules/@emotion/cache": { "node_modules/@emotion/cache": {
"version": "11.14.0", "version": "11.14.0",
"resolved": "https://registry.npmjs.org/@emotion/cache/-/cache-11.14.0.tgz", "resolved": "https://registry.npmjs.org/@emotion/cache/-/cache-11.14.0.tgz",
@@ -4677,6 +4687,17 @@
"react": "^18.2.0" "react": "^18.2.0"
} }
}, },
"node_modules/react-error-boundary": {
"version": "5.0.0",
"resolved": "https://registry.npmjs.org/react-error-boundary/-/react-error-boundary-5.0.0.tgz",
"integrity": "sha512-tnjAxG+IkpLephNcePNA7v6F/QpWLH8He65+DmedchDwg162JZqx4NmbXj0mlAYVVEd81OW7aFhmbsScYfiAFQ==",
"dependencies": {
"@babel/runtime": "^7.12.5"
},
"peerDependencies": {
"react": ">=16.13.1"
}
},
"node_modules/react-i18next": { "node_modules/react-i18next": {
"version": "15.2.0", "version": "15.2.0",
"resolved": "https://registry.npmjs.org/react-i18next/-/react-i18next-15.2.0.tgz", "resolved": "https://registry.npmjs.org/react-i18next/-/react-i18next-15.2.0.tgz",
@@ -5108,11 +5129,12 @@
} }
}, },
"node_modules/source-map": { "node_modules/source-map": {
"version": "0.5.7", "version": "0.7.4",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz",
"integrity": "sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==", "integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==",
"dev": true,
"engines": { "engines": {
"node": ">=0.10.0" "node": ">= 8"
} }
}, },
"node_modules/source-map-js": { "node_modules/source-map-js": {
@@ -5495,9 +5517,9 @@
} }
}, },
"node_modules/vite": { "node_modules/vite": {
"version": "6.2.1", "version": "6.2.5",
"resolved": "https://registry.npmjs.org/vite/-/vite-6.2.1.tgz", "resolved": "https://registry.npmjs.org/vite/-/vite-6.2.5.tgz",
"integrity": "sha512-n2GnqDb6XPhlt9B8olZPrgMD/es/Nd1RdChF6CBD/fHW6pUyUTt2sQW2fPRX5GiD9XEa6+8A6A4f2vT6pSsE7Q==", "integrity": "sha512-j023J/hCAa4pRIUH6J9HemwYfjB5llR2Ps0CWeikOtdR8+pAURAk0DoJC5/mm9kd+UgdnIy7d6HE4EAvlYhPhA==",
"dependencies": { "dependencies": {
"esbuild": "^0.25.0", "esbuild": "^0.25.0",
"postcss": "^8.5.3", "postcss": "^8.5.3",

View File

@@ -39,6 +39,7 @@
"jszip": "3.10.1", "jszip": "3.10.1",
"react": "18.2.0", "react": "18.2.0",
"react-dom": "18.2.0", "react-dom": "18.2.0",
"react-error-boundary": "5.0.0",
"react-i18next": "15.2.0", "react-i18next": "15.2.0",
"react-resizable-layout": "0.7.2", "react-resizable-layout": "0.7.2",
"semver": "7.7.1" "semver": "7.7.1"
@@ -47,7 +48,8 @@
"@tauri-apps/cli": "1.6.3", "@tauri-apps/cli": "1.6.3",
"npm-run-all": "4.1.5", "npm-run-all": "4.1.5",
"sass": "1.79.4", "sass": "1.79.4",
"vite": "6.2.1", "source-map": "0.7.4",
"vite": "6.2.5",
"vite-plugin-svgr": "4.3.0" "vite-plugin-svgr": "4.3.0"
} }
} }

View File

@@ -22,6 +22,7 @@ import { ModalController } from "./modal_controller/ModalController";
import { SnackbarController } from "./snackbar_controller/SnackbarController"; import { SnackbarController } from "./snackbar_controller/SnackbarController";
import styles from "./App.module.scss"; import styles from "./App.module.scss";
import { useIsBackendReady, useIsSoftwareUpdating, useIsVrctAvailable, useWindow } from "@logics_common"; import { useIsBackendReady, useIsSoftwareUpdating, useIsVrctAvailable, useWindow } from "@logics_common";
import { AppErrorBoundary } from "./error_boundary/AppErrorBoundary";
export const App = () => { export const App = () => {
const { currentIsVrctAvailable } = useIsVrctAvailable(); const { currentIsVrctAvailable } = useIsVrctAvailable();
@@ -32,6 +33,7 @@ export const App = () => {
return ( return (
<div className={styles.container}> <div className={styles.container}>
<AppErrorBoundary >
<KeyEventController /> <KeyEventController />
<StartPythonController /> <StartPythonController />
<GlobalHotKeyController /> <GlobalHotKeyController />
@@ -48,6 +50,7 @@ export const App = () => {
} }
<SnackbarController /> <SnackbarController />
</AppErrorBoundary>
</div> </div>
); );
}; };

View File

@@ -0,0 +1,89 @@
import { useState } from "react";
import { appWindow } from "@tauri-apps/api/window";
import { ErrorBoundary } from "react-error-boundary";
import XMarkSvg from "@images/cancel.svg?react";
import CopySvg from "@images/copy.svg?react";
import CheckMarkSvg from "@images/check_mark.svg?react";
import { ContactsContainer } from "./contacts_container/ContactsContainer";
import styles from "./AppErrorBoundary.module.scss";
export const AppErrorBoundary = ({children}) => {
return (
<ErrorBoundary
fallbackRender={({ error }) => (
<ErrorContainer error={error} />
)
}>
{children}
</ErrorBoundary>
);
};
const ErrorContainer = ({error}) => {
const [is_copied, setIsCopied] = useState(false);
const formatted_stack = error ? formatStackTrace(error.stack) : "Unknown error";
const copyToClipboard = async () => {
if (is_copied) return;
await navigator.clipboard.writeText(formatted_stack);
setIsCopied(true);
setTimeout(() => {
setIsCopied(false);
}, 1000);
};
return (
<div className={styles.container}>
<CloseButtonContainer />
<div className={styles.wrapper}>
<p className={styles.error_message}>An error occurred. Please restart VRCT or contact the developers.</p>
{error ?
<div className={styles.error_detail_container}>
<div className={styles.error_stack_container}>
<p className={styles.error_stack}>
{formatted_stack}
</p>
</div>
<button className={styles.copy_error_message_button} onClick={copyToClipboard}>
<p className={styles.copy_text}>Copy</p>
{is_copied
? <CheckMarkSvg className={styles.check_mark_svg}/>
: <CopySvg className={styles.copy_svg}/>
}
</button>
</div>
: null}
<ContactsContainer />
</div>
</div>
);
};
const CloseButtonContainer = () => {
const close = () => {
appWindow.close();
};
return (
<button className={styles.close_button_wrapper} onClick={close}>
<div className={styles.close_button}>
<XMarkSvg className={styles.x_mark_svg}/>
</div>
</button>
);
};
const formatStackTrace = (stack) => {
if (!stack) return "";
// フルパスの除去(例として window.location.origin や絶対パス部分を削除)
// ※必要に応じて正規表現を調整してください
const formatted = stack.replace(new RegExp(window.location.origin, "g"), "");
return formatted;
};

View File

@@ -0,0 +1,110 @@
.container {
width: 100%;
height: 100%;
position: relative;
}
.wrapper {
width: 100%;
height: 100vh;
display: flex;
justify-content: safe center;
align-items: center;
flex-direction: column;
padding: 2rem;
overflow-y: auto;
}
.error_message {
font-size: 2rem;
text-align: center;
user-select: text;
margin-bottom: 3.2rem;
}
.error_detail_container {
display: flex;
flex-direction: column;
align-items: end;
gap: 1rem;
}
.error_stack_container {
max-height: 10rem;
width: 100%;
overflow-y: scroll;
padding: 1rem;
background-color: var(--dark_950_color);
border-radius: 0.4rem;
}
.error_stack {
font-size: 1rem;
user-select: text;
}
.copy_error_message_button {
// background-color: var(--dark_800_color);
padding: 0.8rem 1rem;
font-size: 1.4rem;
display: flex;
gap: 1rem;
justify-content: center;
align-items: center;
border-radius: 0.4rem;
background-color: var(--dark_825_color);
&:hover {
background-color: var(--dark_800_color);
}
&:active {
background-color: var(--dark_850_color);
}
}
.copy_svg {
width: 1.4rem;
color: var(--dark_500_color);
}
.check_mark_svg {
width: 1.4rem;
color: var(--primary_300_color);
}
.close_button_wrapper {
position: absolute;
top: 0;
left: 100%;
transform: translate(-50%, -50%) rotate(45deg);
display: flex;
justify-content: center;
align-items: end;
width: 68px;
aspect-ratio: 1 / 1;
background-color: var(--error_bc_color);
& .x_mark_svg {
color: var(--dark_200_color);
}
&:hover {
& .x_mark_svg {
transform: rotate(45deg);
}
}
&:active {
background-color: var(--error_bc_active_color);
}
transition: all 0.1s ease;
}
.close_button {
// width: 100%;
// height: 100%;
}
.x_mark_svg {
width: 24px;
transform: rotate(-45deg);
color: var(--dark_700_color);
transition: transform 0.3s ease;
}

View File

@@ -0,0 +1,29 @@
import styles from "./ContactsContainer.module.scss";
export const ContactsContainer = () => {
return (
<div className={styles.container}>
<OpenLinkContainer className={styles.github_issues} href_id="github_issues" text="Github Issues"/>
<OpenLinkContainer className={styles.google_forms} href_id="google_forms" text="Google Forms"/>
</div>
);
};
import dev_github_icon from "@images/about_vrct/dev_github_icon.png";
import document from "@images/document.png";
const contacts_links = {
github_issues: { img: dev_github_icon, href: "https://github.com/misyaguziya/VRCT/issues" },
google_forms: { img: document, href: "https://docs.google.com/forms/d/e/1FAIpQLSei-xoydOY60ivXqhOjaTzNN8PiBQIDcNhzfy6cw2sjYkcg_g/viewform" },
};
const OpenLinkContainer = ({className, href_id, text}) => {
const href = contacts_links[href_id].href;
const img = contacts_links[href_id].img;
return (
<a className={className} href={href} target="_blank" rel="noreferrer" >
<img className={styles.contact_button_icon} src={img} />
<p className={styles.contact_button_label}>{text}</p>
</a>
);
};

View File

@@ -0,0 +1,28 @@
.container {
display: flex;
gap: 3.2rem;
}
.github_issues, .google_forms {
display: flex;
flex-direction: column;
align-items: center;
width: 100%;
height: 100%;
padding: 1rem;
border-radius: 0.4rem;
gap: 1rem;
&:hover {
background-color: var(--dark_800_color);
}
&:active {
background-color: var(--dark_900_color)
}
}
.contact_button_icon {
width: 5.2rem;
}
.contact_button_label {
font-size: 1.4rem;
white-space: nowrap;
}

BIN
src-ui/assets/document.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

View File

@@ -35,6 +35,7 @@ export default defineConfig(async () => {
main: path.resolve(__dirname, "index.html"), main: path.resolve(__dirname, "index.html"),
}, },
}, },
sourcemap: true,
}, },
resolve: { resolve: {