From c305ca517a03288e000944a2839309ef79871756 Mon Sep 17 00:00:00 2001 From: Philipp Kunz Date: Mon, 10 Apr 2023 00:55:16 +0200 Subject: [PATCH] fix(core): update --- ts/00_commitinfo_data.ts | 2 +- ts/typedserver.classes.typedserver.ts | 2 +- ts_web/00_commitinfo_data.ts | 2 +- ts_web/index.ts | 23 ++++++++++++++++------- 4 files changed, 19 insertions(+), 10 deletions(-) diff --git a/ts/00_commitinfo_data.ts b/ts/00_commitinfo_data.ts index 0c8ff6e..e64e9c1 100644 --- a/ts/00_commitinfo_data.ts +++ b/ts/00_commitinfo_data.ts @@ -3,6 +3,6 @@ */ export const commitinfo = { name: '@apiglobal/typedserver', - version: '2.0.52', + version: '2.0.53', description: 'easy serving of static files' } diff --git a/ts/typedserver.classes.typedserver.ts b/ts/typedserver.classes.typedserver.ts index 57b7139..eb1aa4a 100644 --- a/ts/typedserver.classes.typedserver.ts +++ b/ts/typedserver.classes.typedserver.ts @@ -129,7 +129,7 @@ export class TypedServer { diff --git a/ts_web/00_commitinfo_data.ts b/ts_web/00_commitinfo_data.ts index 0c8ff6e..e64e9c1 100644 --- a/ts_web/00_commitinfo_data.ts +++ b/ts_web/00_commitinfo_data.ts @@ -3,6 +3,6 @@ */ export const commitinfo = { name: '@apiglobal/typedserver', - version: '2.0.52', + version: '2.0.53', description: 'easy serving of static files' } diff --git a/ts_web/index.ts b/ts_web/index.ts index 6c7edfd..566dc25 100644 --- a/ts_web/index.ts +++ b/ts_web/index.ts @@ -62,7 +62,10 @@ export class ReloadChecker { public async checkReload(lastServerChange: number) { let reloadJustified = false; let storedLastServerChange = await this.store.get(this.storeKey); - storedLastServerChange && storedLastServerChange !== lastServerChange ? (reloadJustified = true) : null; + if (storedLastServerChange && storedLastServerChange !== lastServerChange) { + reloadJustified = true; + } else { + } if (reloadJustified) { this.store.set(this.storeKey, lastServerChange); @@ -100,22 +103,28 @@ export class ReloadChecker { plugins.typedsocket.TypedSocket.useWindowLocationOriginUrl() ); this.typedsocket.addTag('typedserver_frontend', {}); - this.typedsocket.eventSubject.subscribe(async eventArg => { + this.typedsocket.eventSubject.subscribe(async (eventArg) => { console.log(`typedsocket event subscription: ${eventArg}`); - if (eventArg === 'disconnected' || eventArg === 'disconnecting' || eventArg === 'timedOut') { + if ( + eventArg === 'disconnected' || + eventArg === 'disconnecting' || + eventArg === 'timedOut' + ) { this.backendConnectionLost = true; - this.infoscreen.setText(`typedsocket ${eventArg}!`) + this.infoscreen.setText(`typedsocket ${eventArg}!`); } else if (eventArg === 'connected' && this.backendConnectionLost) { this.backendConnectionLost = false; this.infoscreen.setSuccess('typedsocket connected!'); // lets check if a reload is necessary - const getLatestServerChangeTime = this.typedsocket.createTypedRequest('getLatestServerChangeTime'); + const getLatestServerChangeTime = + this.typedsocket.createTypedRequest( + 'getLatestServerChangeTime' + ); const response = await getLatestServerChangeTime.fire({}); this.checkReload(response.time); } - }); - logger.log('success', `ReloadChecker connected through typedsocket!`) + logger.log('success', `ReloadChecker connected through typedsocket!`); } }