amikhalev/sprinklers3
1
1
Fork 0
Code Issues 9 Pull Requests 1 Releases Wiki Activity

Progress

Browse Source
This commit is contained in:
Alex Mikhalev 2017-09-11 14:45:52 -06:00
parent 8cb7d454a4
commit 875f200c39
1 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
app/mqtt.ts
View File

@ -100,6 +100,16 @@ export class MqttApiClient implements ISprinklersApi {
} }
} }
const subscriptions = [
"/connected",
"/sections",
"/sections/+/#",
"/programs",
"/programs/+/#",
"/responses/+",
"/section_runner",
];
class MqttSprinklersDevice extends SprinklersDevice { class MqttSprinklersDevice extends SprinklersDevice {
readonly apiClient: MqttApiClient; readonly apiClient: MqttApiClient;
readonly prefix: string; readonly prefix: string;
@ -119,28 +129,16 @@ class MqttSprinklersDevice extends SprinklersDevice {
return this.prefix; return this.prefix;
} }
private get subscriptions() {
return [
`${this.prefix}/connected`,
`${this.prefix}/sections`,
`${this.prefix}/sections/+/#`,
`${this.prefix}/programs`,
`${this.prefix}/programs/+/#`,
`${this.prefix}/responses/+`,
`${this.prefix}/section_runner`,
];
}
doSubscribe() { doSubscribe() {
const c = this.apiClient.client; const c = this.apiClient.client;
this.subscriptions subscriptions
.forEach((filter) => c.subscribe(filter, { qos: 1 })); .forEach((filter) => c.subscribe(this.prefix + filter, { qos: 1 }));
} }
doUnsubscribe() { doUnsubscribe() {
const c = this.apiClient.client; const c = this.apiClient.client;
this.subscriptions subscriptions
.forEach((filter) => c.unsubscribe(filter)); .forEach((filter) => c.unsubscribe(this.prefix + filter));
} }
/** /**
@ -200,7 +198,7 @@ class MqttSprinklersDevice extends SprinklersDevice {
//noinspection JSUnusedLocalSymbols //noinspection JSUnusedLocalSymbols
/* tslint:disable-next-line:no-unused-variable */ /* tslint:disable-next-line:no-unused-variable */
const [_topic, respIdStr] = matches; const [_topic, respIdStr] = matches;
console.log(`response: ${respIdStr}`); // console.log(`response: ${respIdStr}`);
const respId = parseInt(respIdStr, 10); const respId = parseInt(respIdStr, 10);
const data = JSON.parse(payload) as IResponseData; const data = JSON.parse(payload) as IResponseData;
const cb = this.responseCallbacks[respId]; const cb = this.responseCallbacks[respId];