From 34d1a34b10f4386865f3c241c5ae4026d2bfd8bd Mon Sep 17 00:00:00 2001 From: AAGaming Date: Sat, 5 Aug 2023 01:11:43 -0400 Subject: Migrate most of frontend callServerMethod usage over to websocket --- frontend/src/wsrouter.ts | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'frontend/src/wsrouter.ts') diff --git a/frontend/src/wsrouter.ts b/frontend/src/wsrouter.ts index 3a36b5b0..e50b06a7 100644 --- a/frontend/src/wsrouter.ts +++ b/frontend/src/wsrouter.ts @@ -1,5 +1,11 @@ import Logger from './logger'; +declare global { + interface Window { + DeckyBackend: WSRouter; + } +} + enum MessageType { // Call-reply CALL, @@ -94,7 +100,6 @@ export class WSRouter extends Logger { } async onMessage(msg: MessageEvent) { - this.debug('WS Message', msg); try { const data = JSON.parse(msg.data) as Message; switch (data.type) { @@ -108,7 +113,7 @@ export class WSRouter extends Logger { await this.write({ type: MessageType.ERROR, id: data.id, error: (e as Error)?.stack || e }); } } else { - await this.write({ type: MessageType.ERROR, id: data.id, error: 'Route does not exist.' }); + await this.write({ type: MessageType.ERROR, id: data.id, error: `Route ${data.route} does not exist.` }); } break; @@ -152,6 +157,10 @@ export class WSRouter extends Logger { return resolver.promise; } + callable(route: string): (...args: Args) => Promise { + return (...args) => this.call(route, ...args); + } + async onError(error: any) { this.error('WS DISCONNECTED', error); await this.connect(); -- cgit v1.2.3