cswimr/revite
1
0
Fork 0
mirror of https://github.com/revoltchat/revite.git synced 2024-12-01 19:30:59 -05:00
Code Issues Projects Releases Packages Wiki Activity

fix: catch errors from redux migration

Browse source
This commit is contained in:
Paul 2021-12-25 16:37:39 +00:00
parent 028a8660c1
commit 064f223c78
3 changed files with 36 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/context/revoltjs/SyncManager.tsx
View file

@ -5,6 +5,8 @@ import { ClientboundNotification } from "revolt.js/dist/websocket/notifications"
import { useEffect } from "preact/hooks"; import { useEffect } from "preact/hooks";
import { reportError } from "../../lib/ErrorBoundary";
import { useApplicationState } from "../../mobx/State"; import { useApplicationState } from "../../mobx/State";
import { useClient } from "./RevoltClient"; import { useClient } from "./RevoltClient";
@ -28,7 +30,11 @@ export default function SyncManager() {
if (!client) return; if (!client) return;
function onPacket(packet: ClientboundNotification) { function onPacket(packet: ClientboundNotification) {
if (packet.type === "UserSettingsUpdate") { if (packet.type === "UserSettingsUpdate") {
state.sync.apply(packet.update); try {
state.sync.apply(packet.update);
} catch (err) {
reportError(err, "failed_sync_apply");
}
} }
} }

24
src/lib/ErrorBoundary.tsx
View file

@ -27,21 +27,25 @@ interface Props {
const ERROR_URL = "https://reporting.revolt.chat"; const ERROR_URL = "https://reporting.revolt.chat";
export function reportError(error: Error, section: string) {
stackTrace.fromError(error).then((stackframes) =>
axios.post(ERROR_URL, {
stackframes,
rawStackTrace: error.stack,
origin: window.origin,
commitSHA: GIT_REVISION,
userAgent: navigator.userAgent,
section,
}),
);
}
export default function ErrorBoundary({ children, section }: Props) { export default function ErrorBoundary({ children, section }: Props) {
const [error, ignoreError] = useErrorBoundary(); const [error, ignoreError] = useErrorBoundary();
useEffect(() => { useEffect(() => {
if (error) { if (error) {
stackTrace.fromError(error).then((stackframes) => reportError(error, section);
axios.post(ERROR_URL, {
stackframes,
rawStackTrace: error.stack,
origin: window.origin,
commitSHA: GIT_REVISION,
userAgent: navigator.userAgent,
section,
}),
);
} }
}, [error]); }, [error]);

24
src/mobx/State.ts
View file

@ -4,6 +4,8 @@ import localforage from "localforage";
import { makeAutoObservable, reaction } from "mobx"; import { makeAutoObservable, reaction } from "mobx";
import { Client } from "revolt.js"; import { Client } from "revolt.js";
import { reportError } from "../lib/ErrorBoundary";
import { legacyMigrateForwards, LegacyState } from "./legacy/redux"; import { legacyMigrateForwards, LegacyState } from "./legacy/redux";
import Persistent from "./interfaces/Persistent"; import Persistent from "./interfaces/Persistent";
@ -197,16 +199,20 @@ export default class State {
*/ */
async hydrate() { async hydrate() {
// Migrate legacy Redux store. // Migrate legacy Redux store.
let legacy = await localforage.getItem("state"); try {
if (legacy) { let legacy = await localforage.getItem("state");
if (typeof legacy === "string") {
legacy = JSON.parse(legacy);
}
legacyMigrateForwards(legacy as Partial<LegacyState>, this);
await localforage.removeItem("state"); await localforage.removeItem("state");
await this.save(); if (legacy) {
return; if (typeof legacy === "string") {
legacy = JSON.parse(legacy);
}
legacyMigrateForwards(legacy as Partial<LegacyState>, this);
await this.save();
return;
}
} catch (err) {
reportError(err, "redux_migration");
} }
// Load MobX store. // Load MobX store.