make frontend -> backend errors actually work

This commit is contained in:
Party Wumpus
2024-02-22 16:38:50 +00:00
parent a449181802
commit 89a4a69f6d
4 changed files with 40 additions and 14 deletions
+1
View File
@@ -282,3 +282,4 @@ class Updater:
await self.download_decky_binary(down_link, f'PR-{pr_id}' , True)
else:
logger.error("workflow run not found", str(works))
raise Exception("Workflow run not found.")
+17 -9
View File
@@ -60,15 +60,25 @@ class WSRouter:
async def _call_route(self, route: str, args: ..., call_id: int):
instance_id = self.instance_id
res = await self.routes[route](*args)
error = None
try:
res = await self.routes[route](*args)
except Exception as err:
error = {"name":err.__class__.__name__, "message":str(err), "traceback":format_exc()}
res = None
if instance_id != self.instance_id:
try:
self.logger.warn("Ignoring %s reply from stale instance %d with args %s and response %s", route, instance_id, args, res)
except:
self.logger.warn("Ignoring %s reply from stale instance %d (failed to log event data)", route, instance_id)
finally:
return
await self.write({"type": MessageType.REPLY.value, "id": call_id, "result": res})
return
if error:
await self.write({"type": MessageType.ERROR.value, "id": call_id, "error": error})
else:
await self.write({"type": MessageType.REPLY.value, "id": call_id, "result": res})
async def handle(self, request: Request):
# Auth is a query param as JS WebSocket doesn't support headers
@@ -103,14 +113,12 @@ class WSRouter:
case MessageType.CALL.value:
# do stuff with the message
if data["route"] in self.routes:
try:
self.logger.debug(f'Started PY call {data["route"]} ID {data["id"]}')
create_task(self._call_route(data["route"], data["args"], data["id"]))
except:
create_task(self.write({"type": MessageType.ERROR.value, "id": data["id"], "error": format_exc()}))
self.logger.debug(f'Started PY call {data["route"]} ID {data["id"]}')
create_task(self._call_route(data["route"], data["args"], data["id"]))
else:
error = {"error":"Route " + data["route"] + " does not exist.", "name": "NameMeOrNoneIDK", "traceback": None}
# Dunno why but fstring doesnt work here
create_task(self.write({"type": MessageType.ERROR.value, "id": data["id"], "error": "Route " + data["route"] + " does not exist."}))
create_task(self.write({"type": MessageType.ERROR.value, "id": data["id"], "message": error}))
case _:
self.logger.error("Unknown message type", data)
finally:
@@ -70,8 +70,14 @@ export default function TestingVersionList() {
<Focusable style={{ height: '40px', marginLeft: 'auto', display: 'flex' }}>
<DialogButton
style={{ height: '40px', minWidth: '60px', marginRight: '10px' }}
onClick={() => {
downloadTestingVersion(version.id, version.head_sha);
onClick={async () => {
try {
await downloadTestingVersion(version.id, version.head_sha);
} catch (e) {
if (e instanceof Error) {
DeckyPluginLoader.toaster.toast({ title: 'Error Installing PR', body: e.message });
}
}
setSetting('branch', UpdateBranch.Testing);
}}
>
+14 -3
View File
@@ -30,10 +30,20 @@ interface ReplyMessage {
interface ErrorMessage {
type: MessageType.ERROR;
error: any;
error: { name: string; message: string; traceback: string | null };
id: number;
}
export class PyError extends Error {
pythonTraceback: string | null;
constructor(name: string, message: string, traceback: string | null) {
super(message);
this.name = `Python ${name}`;
this.pythonTraceback = traceback;
}
}
interface EventMessage {
type: MessageType.EVENT;
event: string;
@@ -45,7 +55,7 @@ type Message = CallMessage | ReplyMessage | ErrorMessage | EventMessage;
// Helper to resolve a promise from the outside
interface PromiseResolver<T> {
resolve: (res: T) => void;
reject: (error: string) => void;
reject: (error: PyError) => void;
promise: Promise<T>;
}
@@ -124,7 +134,8 @@ export class WSRouter extends Logger {
case MessageType.ERROR:
if (this.runningCalls.has(data.id)) {
this.runningCalls.get(data.id)!.reject(data.error);
let err = new PyError(data.error.name, data.error.message, data.error.traceback);
this.runningCalls.get(data.id)!.reject(err);
this.runningCalls.delete(data.id);
this.debug(`Rejected PY call ${data.id} with error`, data.error);
}