diff --git a/backend/src/Model/sparkplugb.ts b/backend/src/Model/sparkplugb.ts index 45e8a48..b5bbac5 100644 --- a/backend/src/Model/sparkplugb.ts +++ b/backend/src/Model/sparkplugb.ts @@ -10,7 +10,7 @@ export let SparkplugPayload = root.lookupType('com.cirruslink.sparkplug.protobuf export const SparkplugDecoder = { decode(input: Buffer): Base64Message | undefined { try { - let message = Base64Message.fromString( + const message = Base64Message.fromString( JSON.stringify(SparkplugPayload.toObject(SparkplugPayload.decode(new Uint8Array(input)))) ) message.decoder = Decoder.SPARKPLUG diff --git a/events/EventSystem/Rpc.ts b/events/EventSystem/Rpc.ts index 4cfa016..506d6ea 100644 --- a/events/EventSystem/Rpc.ts +++ b/events/EventSystem/Rpc.ts @@ -2,24 +2,25 @@ import { Event } from '../Events' import { EventBusInterface } from './EventBusInterface' import { v4 } from 'uuid' -export type RpcEvent = { +export type RpcEvent = { topic: string } export class Rpc { constructor(private participant: EventBusInterface) {} + // tslint:disable-next-line:member-access async call( event: RpcEvent, request: RpcRequest, timeout: number = 0 ): Promise { return new Promise((resolve, reject) => { - let id = v4() + const id = v4() - let responseEvent: Event = { topic: `${event.topic}/response/${id}` } - let requestEvent: Event = { topic: `${event.topic}/request` } - let callback = (result: { id: string; payload: RpcResponse; error: unknown }) => { + const responseEvent: Event = { topic: `${event.topic}/response/${id}` } + const requestEvent: Event = { topic: `${event.topic}/request` } + const callback = (result: { id: string; payload: RpcResponse; error: unknown }) => { this.participant.unsubscribe(responseEvent as any, callback) if (result.error) { reject(result.error) @@ -40,11 +41,12 @@ export class Rpc { }) } + // tslint:disable-next-line:member-access async on( event: RpcEvent, handler: (request: RpcRequest) => Promise ) { - this.participant.subscribe({ topic: `${event.topic}/request` } as RpcEvent, async request => { + this.participant.subscribe({ topic: `${event.topic}/request` }, async request => { let payload let error try { diff --git a/events/Events.ts b/events/Events.ts index 30adc04..69ce954 100644 --- a/events/Events.ts +++ b/events/Events.ts @@ -52,5 +52,5 @@ export function makeConnectionMessageEvent(connectionId: string): Event = { - topic: `getAppVersion`, + topic: 'getAppVersion', } diff --git a/events/OpenDialogRequest.ts b/events/OpenDialogRequest.ts index d7e0e42..6ef1254 100644 --- a/events/OpenDialogRequest.ts +++ b/events/OpenDialogRequest.ts @@ -3,6 +3,6 @@ import { RpcEvent } from './EventSystem/Rpc' export function makeOpenDialogRpc(): RpcEvent { return { - topic: `openDialog`, + topic: 'openDialog', } }