Rename parseState to type

This commit is contained in:
uwap 2018-03-28 04:08:50 +02:00
parent 9dc14a3657
commit 52e825549d
4 changed files with 14 additions and 14 deletions

View file

@ -72,28 +72,28 @@ const config : Config = {
command: "/service/onkyo/command", command: "/service/onkyo/command",
defaultValue: "PWR00", defaultValue: "PWR00",
values: { off: "PWR00", on: "PWR01" }, values: { off: "PWR00", on: "PWR01" },
parseState: msg => JSON.parse(msg.toString()).onkyo_raw type: msg => JSON.parse(msg.toString()).onkyo_raw
}, },
onkyo_mute: { onkyo_mute: {
state: "/service/onkyo/status/audio-muting", state: "/service/onkyo/status/audio-muting",
command: "/service/onkyo/command", command: "/service/onkyo/command",
defaultValue: "AMT00", defaultValue: "AMT00",
values: { off: "AMT00", on: "AMT01" }, values: { off: "AMT00", on: "AMT01" },
parseState: msg => JSON.parse(msg.toString()).onkyo_raw type: msg => JSON.parse(msg.toString()).onkyo_raw
}, },
onkyo_volume: { onkyo_volume: {
state: "/service/onkyo/status/volume", state: "/service/onkyo/status/volume",
command: "/service/onkyo/set/volume", command: "/service/onkyo/set/volume",
defaultValue: 0, defaultValue: 0,
values: {}, values: {},
parseState: msg => JSON.parse(msg.toString()).val type: msg => JSON.parse(msg.toString()).val
}, },
onkyo_inputs: { onkyo_inputs: {
state: "/service/onkyo/status/input-selector", state: "/service/onkyo/status/input-selector",
command: "/service/onkyo/command", command: "/service/onkyo/command",
defaultValue: "SLI00", defaultValue: "SLI00",
values: { tisch: "SLI11", chromecast: "SLI01", pult: "SLI10", netzwerk: "SLI2B", front: "SLI03" }, values: { tisch: "SLI11", chromecast: "SLI01", pult: "SLI10", netzwerk: "SLI2B", front: "SLI03" },
parseState: msg => JSON.parse(msg.toString()).onkyo_raw type: msg => JSON.parse(msg.toString()).onkyo_raw
}, },
onkyo_radios: { onkyo_radios: {
state: "/service/onkyo/status/latest-NPR", state: "/service/onkyo/status/latest-NPR",
@ -120,7 +120,7 @@ const config : Config = {
command: "", command: "",
defaultValue: "", defaultValue: "",
values: {}, values: {},
parseState: msg => JSON.parse(msg.toString()).join(", ") type: msg => JSON.parse(msg.toString()).join(", ")
}, },
infoscreen: { infoscreen: {
state: "/service/openhab/out/pca301_infoscreen/state", state: "/service/openhab/out/pca301_infoscreen/state",
@ -133,7 +133,7 @@ const config : Config = {
command: "", command: "",
defaultValue: "unavailable", defaultValue: "unavailable",
values: {}, values: {},
parseState: msg => { type: msg => {
switch (msg.toString()) { switch (msg.toString()) {
case "unreachable": case "unreachable":
case "booting": case "booting":
@ -161,7 +161,7 @@ const config : Config = {
command: "", command: "",
defaultValue: "", defaultValue: "",
values: {}, values: {},
parseState: msg => JSON.parse(msg.toString()).progress || 0 type: msg => JSON.parse(msg.toString()).progress || 0
} }
}, },
esper_topics("afba40", "flyfry"), esper_topics("afba40", "flyfry"),

View file

@ -7,28 +7,28 @@ export const esper_topics = (chip_id: string, name: string) => ({
command: "", command: "",
defaultValue: "UNKNOWN", defaultValue: "UNKNOWN",
values: {}, values: {},
parseState: msg => JSON.parse(msg.toString()).version.esper type: msg => JSON.parse(msg.toString()).version.esper
}, },
[ `esper_${name}_ip` ]: { [ `esper_${name}_ip` ]: {
state: `/service/esper/${chip_id}/info`, state: `/service/esper/${chip_id}/info`,
command: "", command: "",
defaultValue: "UNKNOWN", defaultValue: "UNKNOWN",
values: {}, values: {},
parseState: msg => JSON.parse(msg.toString()).network.ip type: msg => JSON.parse(msg.toString()).network.ip
}, },
[ `esper_${name}_rssi` ]: { [ `esper_${name}_rssi` ]: {
state: `/service/esper/${chip_id}/info`, state: `/service/esper/${chip_id}/info`,
command: "", command: "",
defaultValue: "UNKNOWN", defaultValue: "UNKNOWN",
values: {}, values: {},
parseState: msg => JSON.parse(msg.toString()).wifi.rssi type: msg => JSON.parse(msg.toString()).wifi.rssi
}, },
[ `esper_${name}_uptime` ]: { [ `esper_${name}_uptime` ]: {
state: `/service/esper/${chip_id}/info`, state: `/service/esper/${chip_id}/info`,
command: "", command: "",
defaultValue: "UNKNOWN", defaultValue: "UNKNOWN",
values: {}, values: {},
parseState: msg => new Date(JSON.parse(msg.toString()).time.startup * 1000) type: msg => new Date(JSON.parse(msg.toString()).time.startup * 1000)
.toLocaleString() .toLocaleString()
}, },
[ `esper_${name}_device` ]: { [ `esper_${name}_device` ]: {
@ -36,7 +36,7 @@ export const esper_topics = (chip_id: string, name: string) => ({
command: "", command: "",
defaultValue: "UNKNOWN", defaultValue: "UNKNOWN",
values: {}, values: {},
parseState: msg => JSON.parse(msg.toString()).device type: msg => JSON.parse(msg.toString()).device
} }
}); });

View file

@ -87,7 +87,7 @@ class App extends React.Component<AppProps & Classes, AppState> {
} }
for (let i in topics) { for (let i in topics) {
const topic = topics[i]; const topic = topics[i];
const parseValue = this.topics[topic].parseState; const parseValue = this.topics[topic].type;
const val = parseValue == null ? message.toString() : parseValue(message); const val = parseValue == null ? message.toString() : parseValue(message);
this.setState({mqttState: merge(this.state.mqttState, this.setState({mqttState: merge(this.state.mqttState,
{ [topic]: { { [topic]: {

View file

@ -6,7 +6,7 @@ export type Topic = {
command: string, command: string,
defaultValue: Actual, defaultValue: Actual,
values: Map<Internal, Actual>, values: Map<Internal, Actual>,
parseState?: (msg: Object) => any type?: (msg: Buffer) => any
}; };
export type Topics = Map<string, Topic>; export type Topics = Map<string, Topic>;