diff --git a/assets/js/common.ts b/assets/js/common.ts index 07f460b..46001bc 100644 --- a/assets/js/common.ts +++ b/assets/js/common.ts @@ -36,6 +36,7 @@ const appdata = { conf: {} as confdata, components: {}, output: '', + handle, poll, mounted(name: string) { console.log('app mounted: ', name) @@ -70,6 +71,13 @@ function poll() { dopoll(this) } +function handle(msg) { + const data = JSON.parse(msg.payload) + for (const k of Object.keys(data)) { + this.components.data.data[k] = data[k] + } +} + // basic functions - move to api.ts function createSid(): string { @@ -100,8 +108,9 @@ async function dopoll(app: typeof appdata) { let res = await fetch(app.conf.pollurl) let msg = await res.json() console.log(msg) - //app.handle(msg) - //app.newdata = data['status'] + if (msg.status === 'data') { + app.handle(msg) + } } catch (error) { console.log(error) await new Promise(r => setTimeout(r, 10000)) diff --git a/assets/js/settings.ts b/assets/js/settings.ts index cc71291..a4c5fae 100644 --- a/assets/js/settings.ts +++ b/assets/js/settings.ts @@ -2,9 +2,9 @@ export const api = { path: '/api' } -export const polling = null // suppress polling +//export const polling = null // suppress polling -export const xpolling = { +export const polling = { msgbase: ['system', 'poll', 'service', 'pclt-0001'] //msgbase: ['system', 'poll', 'session'] //msgbase: ['system', 'poll', 'interaction']