From d6590c551d1b2f0abec2933586c5aeb07ef98b0d Mon Sep 17 00:00:00 2001 From: Alex Mikhalev Date: Sat, 30 Jun 2018 14:49:13 -0600 Subject: [PATCH] fixed warnings --- app/components/DeviceView.tsx | 2 +- app/index.tsx | 3 --- app/sprinklers/websocket.ts | 10 +++++----- common/sprinklers/SprinklersDevice.ts | 2 +- common/sprinklers/mqtt/index.ts | 2 +- common/sprinklers/websocketData.ts | 9 +++++++-- server/websocket/index.ts | 2 +- 7 files changed, 16 insertions(+), 14 deletions(-) diff --git a/app/components/DeviceView.tsx b/app/components/DeviceView.tsx index b9b12e4..4647b1c 100644 --- a/app/components/DeviceView.tsx +++ b/app/components/DeviceView.tsx @@ -4,7 +4,7 @@ import * as React from "react"; import { Grid, Header, Icon, Item, SemanticICONS } from "semantic-ui-react"; import { injectState, StateBase } from "@app/state"; -import { ConnectionState as ConState, SprinklersDevice } from "@common/sprinklers"; +import { ConnectionState as ConState } from "@common/sprinklers"; import { ProgramTable, RunSectionForm, SectionRunnerView, SectionTable } from "."; import "./DeviceView.scss"; diff --git a/app/index.tsx b/app/index.tsx index 792d86d..2c237b1 100644 --- a/app/index.tsx +++ b/app/index.tsx @@ -5,9 +5,6 @@ import { AppContainer } from "react-hot-loader"; import App from "@app/components/App"; import { ProvideState, StateBase } from "@app/state"; import { WebApiState as StateClass } from "@app/state/web"; -// import log from "@common/logger"; - -// Object.assign(log, { name: "sprinklers3/app", level: "debug" }); const state: StateBase = new StateClass(); state.start(); diff --git a/app/sprinklers/websocket.ts b/app/sprinklers/websocket.ts index 810625f..c5d17da 100644 --- a/app/sprinklers/websocket.ts +++ b/app/sprinklers/websocket.ts @@ -1,5 +1,5 @@ +import { action, observable, when } from "mobx"; import { update } from "serializr"; -import { action, autorun, observable, when } from "mobx"; import logger from "@common/logger"; import { ErrorCode } from "@common/sprinklers/ErrorCode"; @@ -23,7 +23,7 @@ export class WSSprinklersDevice extends s.SprinklersDevice { super(); this.api = api; this._id = id; - when(() => api.connectionState.isConnected, () => { + when(() => api.connectionState.isConnected || false, () => { this.subscribe(); }); } @@ -73,7 +73,7 @@ export class WebSocketApiClient implements s.ISprinklersApi { private reconnectTimer: number | null = null; get connected(): boolean { - return this.connectionState.isConnected; + return this.connectionState.isConnected || false; } constructor(webSocketUrl: string) { @@ -126,7 +126,7 @@ export class WebSocketApiClient implements s.ISprinklersApi { const id = this.nextDeviceRequestId++; const data: ws.IDeviceCallRequest = { type: "deviceCallRequest", - id, deviceId, data: requestData, + requestId: id, deviceId, data: requestData, }; const promise = new Promise((resolve, reject) => { let timeoutHandle: number; @@ -236,7 +236,7 @@ export class WebSocketApiClient implements s.ISprinklersApi { } private onDeviceCallResponse(data: ws.IDeviceCallResponse) { - const cb = this.deviceResponseCallbacks[data.id]; + const cb = this.deviceResponseCallbacks[data.requestId]; if (typeof cb === "function") { cb(data); } diff --git a/common/sprinklers/SprinklersDevice.ts b/common/sprinklers/SprinklersDevice.ts index cfeb150..4be42a4 100644 --- a/common/sprinklers/SprinklersDevice.ts +++ b/common/sprinklers/SprinklersDevice.ts @@ -12,7 +12,7 @@ export abstract class SprinklersDevice { @observable sectionRunner: SectionRunner; @computed get connected(): boolean { - return this.connectionState.isConnected; + return this.connectionState.isConnected || false; } sectionConstructor: typeof Section = Section; diff --git a/common/sprinklers/mqtt/index.ts b/common/sprinklers/mqtt/index.ts index d449bc3..3a914e9 100644 --- a/common/sprinklers/mqtt/index.ts +++ b/common/sprinklers/mqtt/index.ts @@ -21,7 +21,7 @@ export class MqttApiClient implements s.ISprinklersApi { devices: Map = new Map(); get connected(): boolean { - return this.connectionState.isConnected; + return this.connectionState.isConnected || false; } constructor(mqttUri: string) { diff --git a/common/sprinklers/websocketData.ts b/common/sprinklers/websocketData.ts index 3c8cbab..d223ca0 100644 --- a/common/sprinklers/websocketData.ts +++ b/common/sprinklers/websocketData.ts @@ -20,7 +20,7 @@ export interface IDeviceUpdate { export interface IDeviceCallResponse { type: "deviceCallResponse"; - id: number; + requestId: number; data: ResponseData; } @@ -32,6 +32,11 @@ export interface IBrokerConnectionUpdate { export type IServerMessage = IError | IDeviceSubscribeResponse | IDeviceUpdate | IDeviceCallResponse | IBrokerConnectionUpdate; +export interface IAuthenticateRequest { + type: "authenticateRequest"; + accessToken: string; +} + export interface IDeviceSubscribeRequest { type: "deviceSubscribeRequest"; deviceId: string; @@ -39,7 +44,7 @@ export interface IDeviceSubscribeRequest { export interface IDeviceCallRequest { type: "deviceCallRequest"; - id: number; + requestId: number; deviceId: string; data: any; } diff --git a/server/websocket/index.ts b/server/websocket/index.ts index f3bbd0f..e6d31de 100644 --- a/server/websocket/index.ts +++ b/server/websocket/index.ts @@ -117,7 +117,7 @@ export class WebSocketClient { if (response) { const resData: ws.IDeviceCallResponse = { type: "deviceCallResponse", - id: data.id, + requestId: data.requestId, data: response, }; this.socket.send(JSON.stringify(resData));