@uboness/homebridge-mqtt 0.2.4 → 0.2.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +9 -0
- package/README.md +108 -1
- package/dist/Future.d.ts +12 -0
- package/dist/Future.d.ts.map +1 -0
- package/dist/Future.js +39 -0
- package/dist/Future.js.map +1 -0
- package/dist/Mqtt.d.ts +24 -2
- package/dist/Mqtt.d.ts.map +1 -1
- package/dist/Mqtt.js +108 -13
- package/dist/Mqtt.js.map +1 -1
- package/dist/common.d.ts +1 -0
- package/dist/common.d.ts.map +1 -1
- package/dist/common.js.map +1 -1
- package/dist/service/WindowCovering.d.ts +1 -1
- package/dist/service/WindowCovering.d.ts.map +1 -1
- package/dist/service/WindowCovering.js +16 -13
- package/dist/service/WindowCovering.js.map +1 -1
- package/dist/service/characteristic/action/Action.d.ts +21 -0
- package/dist/service/characteristic/action/Action.d.ts.map +1 -0
- package/dist/service/characteristic/action/Action.js +39 -0
- package/dist/service/characteristic/action/Action.js.map +1 -0
- package/dist/service/characteristic/action/CommonAction.d.ts +10 -0
- package/dist/service/characteristic/action/CommonAction.d.ts.map +1 -0
- package/dist/service/characteristic/action/CommonAction.js +15 -0
- package/dist/service/characteristic/action/CommonAction.js.map +1 -0
- package/dist/service/characteristic/action/MqttAction.d.ts +17 -0
- package/dist/service/characteristic/action/MqttAction.d.ts.map +1 -0
- package/dist/service/characteristic/action/MqttAction.js +23 -0
- package/dist/service/characteristic/action/MqttAction.js.map +1 -0
- package/dist/service/characteristic/action/index.d.ts +1 -0
- package/dist/service/characteristic/action/index.d.ts.map +1 -0
- package/dist/service/characteristic/action/index.js +2 -0
- package/dist/service/characteristic/action/index.js.map +1 -0
- package/dist/service/characteristic/archetype/BooleanValue.d.ts +2 -0
- package/dist/service/characteristic/archetype/BooleanValue.d.ts.map +1 -1
- package/dist/service/characteristic/archetype/BooleanValue.js +8 -2
- package/dist/service/characteristic/archetype/BooleanValue.js.map +1 -1
- package/dist/service/characteristic/archetype/EnumValue.d.ts +2 -0
- package/dist/service/characteristic/archetype/EnumValue.d.ts.map +1 -1
- package/dist/service/characteristic/archetype/EnumValue.js +8 -2
- package/dist/service/characteristic/archetype/EnumValue.js.map +1 -1
- package/dist/service/characteristic/archetype/NumericValue.d.ts +2 -0
- package/dist/service/characteristic/archetype/NumericValue.d.ts.map +1 -1
- package/dist/service/characteristic/archetype/NumericValue.js +8 -2
- package/dist/service/characteristic/archetype/NumericValue.js.map +1 -1
- package/dist/service/characteristic/archetype/Signal.d.ts.map +1 -1
- package/dist/service/characteristic/archetype/Signal.js +0 -2
- package/dist/service/characteristic/archetype/Signal.js.map +1 -1
- package/dist/service/characteristic/archetype/ZeroOneValue.d.ts +2 -0
- package/dist/service/characteristic/archetype/ZeroOneValue.d.ts.map +1 -1
- package/dist/service/characteristic/archetype/ZeroOneValue.js +8 -2
- package/dist/service/characteristic/archetype/ZeroOneValue.js.map +1 -1
- package/dist/service/characteristic/stickyOn.js +5 -5
- package/dist/service/characteristic/stickyOn.js.map +1 -1
- package/package.json +10 -8
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WindowCovering.js","sourceRoot":"","sources":["../../src/service/WindowCovering.ts"],"names":[],"mappings":";;;AACA,sCAA8D;AAE9D,
|
|
1
|
+
{"version":3,"file":"WindowCovering.js","sourceRoot":"","sources":["../../src/service/WindowCovering.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
import { Mqtt } from '../../../Mqtt';
|
|
2
|
+
import { MqttPlatform } from '../../../MqttPlatform';
|
|
3
|
+
import { PlatformAccessory, Service } from 'homebridge';
|
|
4
|
+
import { MqttService } from '../../MqttService';
|
|
5
|
+
import { MqttAction } from './MqttAction';
|
|
6
|
+
import { CommonAction } from './CommonAction';
|
|
7
|
+
export type Action<Config extends Action.Config = Action.Config> = {
|
|
8
|
+
config: Config;
|
|
9
|
+
execute: (platform: MqttPlatform, mqtt: Mqtt, accessory: PlatformAccessory, service: Service, serviceCtx: MqttService.Context) => Promise<void>;
|
|
10
|
+
};
|
|
11
|
+
export declare namespace Action {
|
|
12
|
+
export type Config = MqttAction.Config | CommonAction.Config | ActionsConfig;
|
|
13
|
+
type ActionsConfig = {
|
|
14
|
+
type: 'actions';
|
|
15
|
+
configs: Config[];
|
|
16
|
+
};
|
|
17
|
+
export const parseAll: (phase: string, configs: Config[]) => Action<ActionsConfig>;
|
|
18
|
+
export const parse: (config: Config) => Action;
|
|
19
|
+
export {};
|
|
20
|
+
}
|
|
21
|
+
//# sourceMappingURL=Action.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"Action.d.ts","sourceRoot":"","sources":["../../../../src/service/characteristic/action/Action.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AACrC,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAE,iBAAiB,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAE9C,MAAM,MAAM,MAAM,CAAC,MAAM,SAAS,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,IAAI;IAC/D,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,CAAC,QAAQ,EAAE,YAAY,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,iBAAiB,EAAE,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,WAAW,CAAC,OAAO,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;CAClJ,CAAA;AAED,yBAAiB,MAAM,CAAC;IAEpB,MAAM,MAAM,MAAM,GACd,UAAU,CAAC,MAAM,GACjB,YAAY,CAAC,MAAM,GACnB,aAAa,CAAC;IAElB,KAAK,aAAa,GAAG;QACjB,IAAI,EAAE,SAAS,CAAC;QAChB,OAAO,EAAE,MAAM,EAAE,CAAA;KACpB,CAAA;IAED,MAAM,CAAC,MAAM,QAAQ,GAAI,OAAO,MAAM,EAAE,SAAS,MAAM,EAAE,KAAG,MAAM,CAAC,aAAa,CAkB/E,CAAA;IAED,MAAM,CAAC,MAAM,KAAK,GAAI,QAAQ,MAAM,KAAG,MAStC,CAAA;;CAEJ"}
|
|
@@ -0,0 +1,39 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.Action = void 0;
|
|
4
|
+
const MqttAction_1 = require("./MqttAction");
|
|
5
|
+
const CommonAction_1 = require("./CommonAction");
|
|
6
|
+
var Action;
|
|
7
|
+
(function (Action) {
|
|
8
|
+
Action.parseAll = (phase, configs) => {
|
|
9
|
+
const actions = [];
|
|
10
|
+
for (const config of configs) {
|
|
11
|
+
actions.push(Action.parse(config));
|
|
12
|
+
}
|
|
13
|
+
return {
|
|
14
|
+
config: { type: 'actions', configs },
|
|
15
|
+
execute: async (platform, mqtt, accessory, service, serviceCtx) => {
|
|
16
|
+
for (const action of actions) {
|
|
17
|
+
try {
|
|
18
|
+
await action.execute(platform, mqtt, accessory, service, serviceCtx);
|
|
19
|
+
}
|
|
20
|
+
catch (error) {
|
|
21
|
+
platform.logger.error(`Failed to execute [${mqtt.id}][${accessory.displayName}][${service.displayName}][${phase}] action [${action.config.type}]: ${error}`);
|
|
22
|
+
throw error;
|
|
23
|
+
}
|
|
24
|
+
}
|
|
25
|
+
}
|
|
26
|
+
};
|
|
27
|
+
};
|
|
28
|
+
Action.parse = (config) => {
|
|
29
|
+
switch (config.type) {
|
|
30
|
+
case 'mqtt-publish':
|
|
31
|
+
return MqttAction_1.MqttAction.publish(config);
|
|
32
|
+
case 'wait':
|
|
33
|
+
return CommonAction_1.CommonAction.wait(config);
|
|
34
|
+
default:
|
|
35
|
+
throw new Error(`Unknown mqtt action type [${config.type}]`);
|
|
36
|
+
}
|
|
37
|
+
};
|
|
38
|
+
})(Action || (exports.Action = Action = {}));
|
|
39
|
+
//# sourceMappingURL=Action.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"Action.js","sourceRoot":"","sources":["../../../../src/service/characteristic/action/Action.ts"],"names":[],"mappings":";;;AAIA,6CAA0C;AAC1C,iDAA8C;AAO9C,IAAiB,MAAM,CA2CtB;AA3CD,WAAiB,MAAM;IAYN,eAAQ,GAAG,CAAC,KAAa,EAAE,OAAiB,EAAyB,EAAE;QAChF,MAAM,OAAO,GAAa,EAAE,CAAC;QAC7B,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;YAC3B,OAAO,CAAC,IAAI,CAAC,OAAA,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC;QAChC,CAAC;QACD,OAAO;YACH,MAAM,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE;YACpC,OAAO,EAAE,KAAK,EAAE,QAAsB,EAAE,IAAU,EAAE,SAA4B,EAAE,OAAgB,EAAE,UAA+B,EAAE,EAAE;gBACnI,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;oBAC3B,IAAI,CAAC;wBACD,MAAM,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,UAAU,CAAC,CAAC;oBACzE,CAAC;oBAAC,OAAO,KAAK,EAAE,CAAC;wBACb,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,sBAAsB,IAAI,CAAC,EAAE,KAAK,SAAS,CAAC,WAAW,KAAK,OAAO,CAAC,WAAW,KAAK,KAAK,aAAa,MAAM,CAAC,MAAM,CAAC,IAAI,MAAM,KAAK,EAAE,CAAC,CAAC;wBAC7J,MAAM,KAAK,CAAC;oBAChB,CAAC;gBACL,CAAC;YACL,CAAC;SACJ,CAAA;IACL,CAAC,CAAA;IAEY,YAAK,GAAG,CAAC,MAAc,EAAU,EAAE;QAC5C,QAAQ,MAAM,CAAC,IAAI,EAAE,CAAC;YAClB,KAAK,cAAc;gBACf,OAAO,uBAAU,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;YACtC,KAAK,MAAM;gBACP,OAAO,2BAAY,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACrC;gBACI,MAAM,IAAI,KAAK,CAAC,6BAA6B,MAAM,CAAC,IAAI,GAAG,CAAC,CAAC;QACrE,CAAC;IACL,CAAC,CAAA;AAEL,CAAC,EA3CgB,MAAM,sBAAN,MAAM,QA2CtB"}
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
import { Action } from './Action';
|
|
2
|
+
export declare namespace CommonAction {
|
|
3
|
+
type Config = WaitConfig;
|
|
4
|
+
type WaitConfig = {
|
|
5
|
+
type: 'wait';
|
|
6
|
+
timeout: number;
|
|
7
|
+
};
|
|
8
|
+
const wait: (config: WaitConfig) => Action<WaitConfig>;
|
|
9
|
+
}
|
|
10
|
+
//# sourceMappingURL=CommonAction.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"CommonAction.d.ts","sourceRoot":"","sources":["../../../../src/service/characteristic/action/CommonAction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAMlC,yBAAiB,YAAY,CAAC;IAE1B,KAAY,MAAM,GAAG,UAAU,CAAC;IAEhC,KAAY,UAAU,GAAG;QACrB,IAAI,EAAE,MAAM,CAAC;QACb,OAAO,EAAE,MAAM,CAAA;KAClB,CAAA;IAEM,MAAM,IAAI,GAAI,QAAQ,UAAU,KAAG,MAAM,CAAC,UAAU,CAO1D,CAAA;CAEJ"}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.CommonAction = void 0;
|
|
4
|
+
var CommonAction;
|
|
5
|
+
(function (CommonAction) {
|
|
6
|
+
CommonAction.wait = (config) => {
|
|
7
|
+
return {
|
|
8
|
+
config,
|
|
9
|
+
execute: async (platform, mqtt, accessory, service, serviceCtx) => {
|
|
10
|
+
return new Promise(resolve => setTimeout(resolve, config.timeout));
|
|
11
|
+
}
|
|
12
|
+
};
|
|
13
|
+
};
|
|
14
|
+
})(CommonAction || (exports.CommonAction = CommonAction = {}));
|
|
15
|
+
//# sourceMappingURL=CommonAction.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"CommonAction.js","sourceRoot":"","sources":["../../../../src/service/characteristic/action/CommonAction.ts"],"names":[],"mappings":";;;AAMA,IAAiB,YAAY,CAkB5B;AAlBD,WAAiB,YAAY;IASZ,iBAAI,GAAG,CAAC,MAAkB,EAAsB,EAAE;QAC3D,OAAO;YACH,MAAM;YACN,OAAO,EAAE,KAAK,EAAE,QAAsB,EAAE,IAAU,EAAE,SAA4B,EAAE,OAAgB,EAAE,UAA+B,EAAE,EAAE;gBACnI,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;YACvE,CAAC;SACJ,CAAA;IACL,CAAC,CAAA;AAEL,CAAC,EAlBgB,YAAY,4BAAZ,YAAY,QAkB5B"}
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
import { Action } from './Action';
|
|
2
|
+
export type MqttAction = Action<MqttAction.Config>;
|
|
3
|
+
export declare namespace MqttAction {
|
|
4
|
+
type Config = PublishConfig;
|
|
5
|
+
type PublishConfig = {
|
|
6
|
+
type: 'mqtt-publish';
|
|
7
|
+
topic: string;
|
|
8
|
+
value: string;
|
|
9
|
+
feedback?: {
|
|
10
|
+
topic: string;
|
|
11
|
+
value: string;
|
|
12
|
+
timeout?: number;
|
|
13
|
+
};
|
|
14
|
+
};
|
|
15
|
+
const publish: (config: Config) => MqttAction;
|
|
16
|
+
}
|
|
17
|
+
//# sourceMappingURL=MqttAction.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"MqttAction.d.ts","sourceRoot":"","sources":["../../../../src/service/characteristic/action/MqttAction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAMlC,MAAM,MAAM,UAAU,GAAG,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;AAEnD,yBAAiB,UAAU,CAAC;IAExB,KAAY,MAAM,GAAG,aAAa,CAAA;IAElC,KAAY,aAAa,GAAG;QACxB,IAAI,EAAE,cAAc,CAAC;QACrB,KAAK,EAAE,MAAM,CAAC;QACd,KAAK,EAAE,MAAM,CAAC;QACd,QAAQ,CAAC,EAAE;YACP,KAAK,EAAE,MAAM,CAAC;YACd,KAAK,EAAE,MAAM,CAAC;YACd,OAAO,CAAC,EAAE,MAAM,CAAA;SACnB,CAAA;KACJ,CAAA;IAEM,MAAM,OAAO,GAAI,QAAQ,MAAM,KAAG,UAexC,CAAA;CAEJ"}
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.MqttAction = void 0;
|
|
4
|
+
var MqttAction;
|
|
5
|
+
(function (MqttAction) {
|
|
6
|
+
MqttAction.publish = (config) => {
|
|
7
|
+
return {
|
|
8
|
+
config,
|
|
9
|
+
execute: async (platform, mqtt, accessory, service, serviceCtx) => {
|
|
10
|
+
const waitForFeedback = async () => {
|
|
11
|
+
if (!config.feedback) {
|
|
12
|
+
return;
|
|
13
|
+
}
|
|
14
|
+
const { topic, value: expectedValue, timeout } = config.feedback;
|
|
15
|
+
await mqtt.subscribeValue(topic, expectedValue, timeout);
|
|
16
|
+
};
|
|
17
|
+
await mqtt.publish(config.topic, config.value);
|
|
18
|
+
await waitForFeedback();
|
|
19
|
+
}
|
|
20
|
+
};
|
|
21
|
+
};
|
|
22
|
+
})(MqttAction || (exports.MqttAction = MqttAction = {}));
|
|
23
|
+
//# sourceMappingURL=MqttAction.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"MqttAction.js","sourceRoot":"","sources":["../../../../src/service/characteristic/action/MqttAction.ts"],"names":[],"mappings":";;;AAQA,IAAiB,UAAU,CAgC1B;AAhCD,WAAiB,UAAU;IAeV,kBAAO,GAAG,CAAC,MAAc,EAAc,EAAE;QAClD,OAAO;YACH,MAAM;YACN,OAAO,EAAE,KAAK,EAAE,QAAsB,EAAE,IAAU,EAAE,SAA4B,EAAE,OAAgB,EAAE,UAA+B,EAAE,EAAE;gBACnI,MAAM,eAAe,GAAG,KAAK,IAAI,EAAE;oBAC/B,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;wBACnB,OAAO;oBACX,CAAC;oBACD,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,aAAa,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC,QAAQ,CAAC;oBACjE,MAAM,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,aAAa,EAAE,OAAO,CAAC,CAAC;gBAC7D,CAAC,CAAA;gBACD,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;gBAC/C,MAAM,eAAe,EAAE,CAAC;YAC5B,CAAC;SACJ,CAAA;IACL,CAAC,CAAA;AAEL,CAAC,EAhCgB,UAAU,0BAAV,UAAU,QAgC1B"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
//# sourceMappingURL=index.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/service/characteristic/action/index.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/service/characteristic/action/index.ts"],"names":[],"mappings":""}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { CharacteristicConfigurator } from '../index.js';
|
|
2
2
|
import { Converter } from './Converter.js';
|
|
3
3
|
import { CharTypeFactory } from './common.js';
|
|
4
|
+
import { Action } from '../action/Action';
|
|
4
5
|
export declare namespace BooleanValue {
|
|
5
6
|
type CommonConfig<ON extends string, OFF extends string> = {
|
|
6
7
|
converter?: Converter.Boolean.Type<ON, OFF>;
|
|
@@ -10,6 +11,7 @@ export declare namespace BooleanValue {
|
|
|
10
11
|
} & CommonConfig<ON, OFF>;
|
|
11
12
|
export type WriteOnlyConfig<ON extends string = 'on', OFF extends string = 'off'> = {
|
|
12
13
|
set: string;
|
|
14
|
+
preSet?: Array<Action.Config>;
|
|
13
15
|
} & CommonConfig<ON, OFF>;
|
|
14
16
|
export type ReadWriteConfig<ON extends string = 'on', OFF extends string = 'off'> = ReadOnlyConfig<ON, OFF> & WriteOnlyConfig<ON, OFF>;
|
|
15
17
|
type Config<ON extends string = 'on', OFF extends string = 'off'> = ReadOnlyConfig<ON, OFF> | WriteOnlyConfig<ON, OFF> | ReadWriteConfig<ON, OFF>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BooleanValue.d.ts","sourceRoot":"","sources":["../../../../src/service/characteristic/archetype/BooleanValue.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,0BAA0B,EAAE,MAAM,aAAa,CAAC;AACzD,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EACH,eAAe,EAKlB,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"BooleanValue.d.ts","sourceRoot":"","sources":["../../../../src/service/characteristic/archetype/BooleanValue.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,0BAA0B,EAAE,MAAM,aAAa,CAAC;AACzD,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EACH,eAAe,EAKlB,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAE1C,yBAAiB,YAAY,CAAC;IAE1B,KAAK,YAAY,CAAC,EAAE,SAAS,MAAM,EAAE,GAAG,SAAS,MAAM,IAAI;QAAE,SAAS,CAAC,EAAE,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,EAAE,GAAG,CAAC,CAAA;KAAE,CAAC;IAC3G,MAAM,MAAM,cAAc,CAAC,EAAE,SAAS,MAAM,GAAG,IAAI,EAAE,GAAG,SAAS,MAAM,GAAG,KAAK,IAAI;QAAE,GAAG,EAAE,MAAM,CAAA;KAAE,GAAG,YAAY,CAAC,EAAE,EAAE,GAAG,CAAC,CAAA;IAC1H,MAAM,MAAM,eAAe,CAAC,EAAE,SAAS,MAAM,GAAG,IAAI,EAAE,GAAG,SAAS,MAAM,GAAG,KAAK,IAC5E;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;KAAE,GAC5C,YAAY,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;IAC5B,MAAM,MAAM,eAAe,CAAC,EAAE,SAAS,MAAM,GAAG,IAAI,EAAE,GAAG,SAAS,MAAM,GAAG,KAAK,IAC5E,cAAc,CAAC,EAAE,EAAE,GAAG,CAAC,GACrB,eAAe,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;IAC/B,KAAK,MAAM,CAAC,EAAE,SAAS,MAAM,GAAG,IAAI,EAAE,GAAG,SAAS,MAAM,GAAG,KAAK,IAC5D,cAAc,CAAC,EAAE,EAAE,GAAG,CAAC,GACrB,eAAe,CAAC,EAAE,EAAE,GAAG,CAAC,GACxB,eAAe,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;IAE/B,MAAM,MAAM,OAAO,CAAC,EAAE,SAAS,MAAM,GAAG,IAAI,EAAE,GAAG,SAAS,MAAM,GAAG,KAAK,IAAI;QACxE,KAAK,CAAC,EAAE,EAAE,CAAC;QACX,MAAM,CAAC,EAAE,GAAG,CAAA;KACf,CAAA;IAED,MAAM,CAAC,MAAM,QAAQ,GAAI,EAAE,SAAS,MAAM,EAAE,GAAG,SAAS,MAAM,EAAE,MAAM,MAAM,EAAE,iBAAiB,eAAe,EAAE,UAAU,OAAO,CAAC,EAAE,EAAE,GAAG,CAAC,gDACjF,CAAC;IAE1D,MAAM,CAAC,MAAM,SAAS,GAAI,EAAE,SAAS,MAAM,EAAE,GAAG,SAAS,MAAM,EAAE,MAAM,MAAM,EAAE,iBAAiB,eAAe,EAAE,UAAU,OAAO,CAAC,EAAE,EAAE,GAAG,CAAC,gDAClF,CAAC;IAE1D,MAAM,CAAC,MAAM,SAAS,GAAI,EAAE,SAAS,MAAM,EAAE,GAAG,SAAS,MAAM,EAAE,MAAM,MAAM,EAAE,iBAAiB,eAAe,EAAE,UAAU,OAAO,CAAC,EAAE,EAAE,GAAG,CAAC,gDAClF,CAAC;;CAqE7D"}
|
|
@@ -4,6 +4,7 @@ exports.BooleanValue = void 0;
|
|
|
4
4
|
const common_1 = require("../../../common");
|
|
5
5
|
const Converter_js_1 = require("./Converter.js");
|
|
6
6
|
const common_js_1 = require("./common.js");
|
|
7
|
+
const Action_1 = require("../action/Action");
|
|
7
8
|
var BooleanValue;
|
|
8
9
|
(function (BooleanValue) {
|
|
9
10
|
BooleanValue.readOnly = (name, charTypeFactory, options) => configurator(name, charTypeFactory, options);
|
|
@@ -11,6 +12,7 @@ var BooleanValue;
|
|
|
11
12
|
BooleanValue.readWrite = (name, charTypeFactory, options) => configurator(name, charTypeFactory, options);
|
|
12
13
|
const isWrite = (config) => 'set' in config;
|
|
13
14
|
const isRead = (config) => 'get' in config;
|
|
15
|
+
const isPreSet = (config) => isWrite(config) && 'preSet' in config;
|
|
14
16
|
const configurator = (name, charTypeFactory, options) => {
|
|
15
17
|
var _a, _b;
|
|
16
18
|
const onKey = (_a = options === null || options === void 0 ? void 0 : options.onKey) !== null && _a !== void 0 ? _a : 'on';
|
|
@@ -19,6 +21,7 @@ var BooleanValue;
|
|
|
19
21
|
var _a, _b;
|
|
20
22
|
const [setTopic, setCodec, fullSetTopic] = isWrite(config) ? (0, common_js_1.parseTopic)(config.set, serviceCtx) : [undefined, undefined];
|
|
21
23
|
const [getTopic, getCodec, fullGetTopic] = isRead(config) ? (0, common_js_1.parseTopic)(config.get, serviceCtx) : [undefined, undefined];
|
|
24
|
+
const preSet = isPreSet(config) ? Action_1.Action.parseAll('preSet', config.preSet) : undefined;
|
|
22
25
|
const converter = Converter_js_1.Converter.Boolean.resolve((_a = config.converter) !== null && _a !== void 0 ? _a : 'homekit', onKey, offKey);
|
|
23
26
|
if (!converter) {
|
|
24
27
|
platform.logger.error(`Unknown converter [${JSON.stringify(config.converter)}] set for [${mqtt.id}][${accessory.displayName}][${service.displayName}][${name}]`);
|
|
@@ -28,13 +31,16 @@ var BooleanValue;
|
|
|
28
31
|
.setValue(false);
|
|
29
32
|
if (setTopic) {
|
|
30
33
|
const notify = (value, ctx) => setTimeout(() => serviceCtx.emitter.emit(`${name}.set`, value, ctx), 0);
|
|
31
|
-
char.onSet((value, ctx) => {
|
|
34
|
+
char.onSet(async (value, ctx) => {
|
|
32
35
|
var _a;
|
|
36
|
+
if (preSet && !(ctx === null || ctx === void 0 ? void 0 : ctx.fromMqtt)) {
|
|
37
|
+
await preSet.execute(platform, mqtt, accessory, service, serviceCtx);
|
|
38
|
+
}
|
|
33
39
|
if (!(ctx === null || ctx === void 0 ? void 0 : ctx.fromMqtt) && converter) {
|
|
34
40
|
const mqttValue = converter.fromHap(value);
|
|
35
41
|
const publishedValue = (_a = setCodec === null || setCodec === void 0 ? void 0 : setCodec.stringify(mqttValue)) !== null && _a !== void 0 ? _a : mqttValue;
|
|
36
42
|
platform.logger.debug(`Publishing [${mqtt.id}][${accessory.displayName}][${service.displayName}][${name}] value [${publishedValue}] to topic [${fullSetTopic}]`);
|
|
37
|
-
mqtt.publish(setTopic, publishedValue);
|
|
43
|
+
await mqtt.publish(setTopic, publishedValue);
|
|
38
44
|
}
|
|
39
45
|
notify(value, ctx);
|
|
40
46
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BooleanValue.js","sourceRoot":"","sources":["../../../../src/service/characteristic/archetype/BooleanValue.ts"],"names":[],"mappings":";;;AAAA,4CAA6C;AAE7C,iDAA2C;AAC3C,2CAMqB;
|
|
1
|
+
{"version":3,"file":"BooleanValue.js","sourceRoot":"","sources":["../../../../src/service/characteristic/archetype/BooleanValue.ts"],"names":[],"mappings":";;;AAAA,4CAA6C;AAE7C,iDAA2C;AAC3C,2CAMqB;AACrB,6CAA0C;AAE1C,IAAiB,YAAY,CAgG5B;AAhGD,WAAiB,YAAY;IAoBZ,qBAAQ,GAAG,CAAwC,IAAY,EAAE,eAAgC,EAAE,OAA0B,EAAE,EAAE,CAC1I,YAAY,CAAU,IAAI,EAAE,eAAe,EAAE,OAAO,CAAC,CAAC;IAE7C,sBAAS,GAAG,CAAwC,IAAY,EAAE,eAAgC,EAAE,OAA0B,EAAE,EAAE,CAC3I,YAAY,CAAU,IAAI,EAAE,eAAe,EAAE,OAAO,CAAC,CAAC;IAE7C,sBAAS,GAAG,CAAwC,IAAY,EAAE,eAAgC,EAAE,OAA0B,EAAE,EAAE,CAC3I,YAAY,CAAU,IAAI,EAAE,eAAe,EAAE,OAAO,CAAC,CAAC;IAE1D,MAAM,OAAO,GAAG,CAAC,MAA8B,EAA6C,EAAE,CAAC,KAAK,IAAI,MAAM,CAAC;IAC/G,MAAM,MAAM,GAAG,CAAC,MAA8B,EAA6C,EAAE,CAAC,KAAK,IAAI,MAAM,CAAC;IAC9G,MAAM,QAAQ,GAAG,CAAC,MAA8B,EAAuC,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,QAAQ,IAAI,MAAM,CAAC;IAEhI,MAAM,YAAY,GAAG,CAAoG,IAAY,EAAE,eAAgC,EAAE,OAA0B,EAAiC,EAAE;;QAClO,MAAM,KAAK,GAAG,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,KAAK,mCAAI,IAAU,CAAC;QAC3C,MAAM,MAAM,GAAG,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,MAAM,mCAAI,KAAY,CAAC;QAE/C,OAAO,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,EAAE,UAAU,EAAqC,EAAE;;YACvG,MAAM,CAAE,QAAQ,EAAE,QAAQ,EAAE,YAAY,CAAE,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAA,sBAAU,EAAC,MAAM,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,CAAE,SAAS,EAAE,SAAS,CAAE,CAAC;YAC7H,MAAM,CAAE,QAAQ,EAAE,QAAQ,EAAE,YAAY,CAAE,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAA,sBAAU,EAAC,MAAM,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,CAAE,SAAS,EAAE,SAAS,CAAE,CAAC;YAC5H,MAAM,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,eAAM,CAAC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;YAEvF,MAAM,SAAS,GAAG,wBAAS,CAAC,OAAO,CAAC,OAAO,CAAC,MAAA,MAAM,CAAC,SAAS,mCAAI,SAAS,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;YAC1F,IAAI,CAAC,SAAS,EAAE,CAAC;gBACb,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,sBAAsB,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,SAAS,CAAC,cAAc,IAAI,CAAC,EAAE,KAAK,SAAS,CAAC,WAAW,KAAK,OAAO,CAAC,WAAW,KAAK,IAAI,GAAG,CAAC,CAAC;YACrK,CAAC;YAED,MAAM,QAAQ,GAAG,eAAe,CAAC,QAAQ,CAAC,CAAC;YAC3C,MAAM,IAAI,GAAG,CAAC,MAAA,OAAO,CAAC,iBAAiB,CAAC,QAAQ,CAAC,mCAAI,OAAO,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC;iBACpF,QAAQ,CAAC,KAAK,CAAC,CAAC;YAErB,IAAI,QAAQ,EAAE,CAAC;gBAEX,MAAM,MAAM,GAAG,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE,CAAC,UAAU,CAAC,GAAG,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,MAAM,EAAE,KAAK,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC;gBAEvG,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE;;oBAC5B,IAAI,MAAM,IAAI,CAAC,CAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,QAAQ,CAAA,EAAE,CAAC;wBAC3B,MAAM,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,UAAU,CAAC,CAAC;oBACzE,CAAC;oBACD,IAAI,CAAC,CAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,QAAQ,CAAA,IAAI,SAAS,EAAE,CAAC;wBAC9B,MAAM,SAAS,GAAG,SAAS,CAAC,OAAO,CAAC,KAAgB,CAAC,CAAC;wBACtD,MAAM,cAAc,GAAG,MAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,SAAS,CAAC,SAAS,CAAC,mCAAI,SAAS,CAAC;wBACnE,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,eAAe,IAAI,CAAC,EAAE,KAAK,SAAS,CAAC,WAAW,KAAK,OAAO,CAAC,WAAW,KAAK,IAAI,YAAY,cAAc,eAAe,YAAY,GAAG,CAAC,CAAC;wBACjK,MAAM,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAC;oBACjD,CAAC;oBACD,MAAM,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;gBACvB,CAAC,CAAC,CAAC;YACP,CAAC;YAGD,MAAM,UAAU,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,mBAAU,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,KAAK,CAAC,EAAE;gBACpF,IAAI,SAAS,EAAE,CAAC;oBACZ,MAAM,SAAS,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAA,0BAAc,EAAC,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;oBAC5E,MAAM,IAAI,GAAG,SAAS,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;oBACxC,IAAI,IAAI,KAAK,IAAI,EAAE,CAAC;wBAChB,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,mCAAmC,YAAY,UAAU,IAAI,CAAC,EAAE,KAAK,SAAS,CAAC,WAAW,KAAK,OAAO,CAAC,WAAW,KAAK,IAAI,qBAAqB,SAAS,GAAG,CAAC,CAAC;wBACpL,OAAO;oBACX,CAAC;oBACD,IAAI,IAAI,CAAC,KAAK,KAAK,IAAI,EAAE,CAAC;wBACtB,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,YAAY,IAAI,CAAC,EAAE,KAAK,SAAS,CAAC,WAAW,KAAK,OAAO,CAAC,WAAW,KAAK,IAAI,SAAS,IAAI,sBAAsB,YAAY,GAAG,CAAC,CAAC;wBACxJ,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;oBAC5C,CAAC;gBACL,CAAC;YACL,CAAC,CAAC,CAAC;YAEH,MAAM,EAAE,GAA+B,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE;gBACtD,MAAM,SAAS,GAAG,GAAG,IAAI,IAAI,KAAK,EAAE,CAAC;gBACrC,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;gBAC1C,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,SAAS,EAAE,OAAO,CAAC,EAAE,CAAA;YACvE,CAAC,CAAC;YAEF,OAAO,oCAAwB,CAAC,KAAK,CAAC,IAAI,EAAE,UAAU,EAAE,EAAE,CAAC,CAAC;QAChE,CAAC,CAAC;IAEN,CAAC,CAAC;AAEN,CAAC,EAhGgB,YAAY,4BAAZ,YAAY,QAgG5B"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { MqttPlatform } from '../../../MqttPlatform.js';
|
|
2
2
|
import { CharacteristicConfigurator } from '../index.js';
|
|
3
3
|
import { CharTypeFactory } from './common.js';
|
|
4
|
+
import { Action } from '../action/Action';
|
|
4
5
|
export declare namespace EnumValue {
|
|
5
6
|
export type ValuesResolver = (platform: MqttPlatform) => Record<string, number>;
|
|
6
7
|
type CommonConfig<VR extends ValuesResolver> = {
|
|
@@ -14,6 +15,7 @@ export declare namespace EnumValue {
|
|
|
14
15
|
} & CommonConfig<VR>;
|
|
15
16
|
export type WriteOnlyConfig<VR extends ValuesResolver> = {
|
|
16
17
|
set: string;
|
|
18
|
+
preSet?: Array<Action.Config>;
|
|
17
19
|
} & CommonConfig<VR>;
|
|
18
20
|
export type ReadWriteConfig<VR extends ValuesResolver> = ReadOnlyConfig<VR> & WriteOnlyConfig<VR>;
|
|
19
21
|
export const readOnly: <VR extends ValuesResolver>(name: string, valuesResolver: VR, charTypeFactory: CharTypeFactory) => CharacteristicConfigurator<ReadOnlyConfig<VR>>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EnumValue.d.ts","sourceRoot":"","sources":["../../../../src/service/characteristic/archetype/EnumValue.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,EAAE,0BAA0B,EAAE,MAAM,aAAa,CAAC;AACzD,OAAO,EACH,eAAe,EAKlB,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"EnumValue.d.ts","sourceRoot":"","sources":["../../../../src/service/characteristic/archetype/EnumValue.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,EAAE,0BAA0B,EAAE,MAAM,aAAa,CAAC;AACzD,OAAO,EACH,eAAe,EAKlB,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAE1C,yBAAiB,SAAS,CAAC;IAEvB,MAAM,MAAM,cAAc,GAAG,CAAC,QAAQ,EAAE,YAAY,KAAK,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAGhF,KAAK,YAAY,CAAC,EAAE,SAAS,cAAc,IAAI;QAC3C,SAAS,CAAC,EAAE,SAAS,GAAG,OAAO,CAAC;aAAG,GAAG,IAAI,MAAM,UAAU,CAAC,EAAE,CAAC,GAAG,MAAM,GAAG,MAAM,EAAE;SAAE,CAAC,CAAC;QACtF,WAAW,CAAC,EAAE,MAAM,EAAE,CAAA;KACzB,CAAC;IAEF,MAAM,MAAM,cAAc,CAAC,EAAE,SAAS,cAAc,IAAI;QAAE,GAAG,EAAE,MAAM,CAAA;KAAE,GAAG,YAAY,CAAC,EAAE,CAAC,CAAC;IAC3F,MAAM,MAAM,eAAe,CAAC,EAAE,SAAS,cAAc,IAAI;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;KAAE,GAAG,YAAY,CAAC,EAAE,CAAC,CAAC;IAC3H,MAAM,MAAM,eAAe,CAAC,EAAE,SAAS,cAAc,IAAI,cAAc,CAAC,EAAE,CAAC,GAAG,eAAe,CAAC,EAAE,CAAC,CAAC;IAGlG,MAAM,CAAC,MAAM,QAAQ,GAAI,EAAE,SAAS,cAAc,EAAE,MAAM,MAAM,EAAE,gBAAgB,EAAE,EAAE,iBAAiB,eAAe,mDACvC,CAAC;IAEhF,MAAM,CAAC,MAAM,SAAS,GAAI,EAAE,SAAS,cAAc,EAAE,MAAM,MAAM,EAAE,gBAAgB,EAAE,EAAE,iBAAiB,eAAe,oDACvC,CAAC;IAEjF,MAAM,CAAC,MAAM,SAAS,GAAI,EAAE,SAAS,cAAc,EAAE,MAAM,MAAM,EAAE,gBAAgB,EAAE,EAAE,iBAAiB,eAAe,oDACvC,CAAC;;CAiGpF"}
|
|
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.EnumValue = void 0;
|
|
4
4
|
const common_1 = require("../../../common");
|
|
5
5
|
const common_js_1 = require("./common.js");
|
|
6
|
+
const Action_1 = require("../action/Action");
|
|
6
7
|
var EnumValue;
|
|
7
8
|
(function (EnumValue) {
|
|
8
9
|
EnumValue.readOnly = (name, valuesResolver, charTypeFactory) => configurator(name, valuesResolver, charTypeFactory);
|
|
@@ -10,12 +11,14 @@ var EnumValue;
|
|
|
10
11
|
EnumValue.readWrite = (name, valuesResolver, charTypeFactory) => configurator(name, valuesResolver, charTypeFactory);
|
|
11
12
|
const isWrite = (config) => 'set' in config;
|
|
12
13
|
const isRead = (config) => 'get' in config;
|
|
14
|
+
const isPreSet = (config) => isWrite(config) && 'preSet' in config;
|
|
13
15
|
const configurator = (name, valuesResolver, charTypeFactory) => {
|
|
14
16
|
return async (platform, mqtt, accessory, service, config, serviceCtx) => {
|
|
15
17
|
var _a;
|
|
16
18
|
const values = valuesResolver(platform);
|
|
17
19
|
const [setTopic, setCodec, fullSetTopic] = isWrite(config) ? (0, common_js_1.parseTopic)(config.set, serviceCtx) : [undefined, undefined];
|
|
18
20
|
const [getTopic, getCodec, fullGetTopic] = isRead(config) ? (0, common_js_1.parseTopic)(config.get, serviceCtx) : [undefined, undefined];
|
|
21
|
+
const preSet = isPreSet(config) ? Action_1.Action.parseAll('preSet', config.preSet) : undefined;
|
|
19
22
|
const _converter = config.converter === 'homekit' ? undefined : config.converter;
|
|
20
23
|
const mqttToHap = Object.keys(values).reduce((mqttToHap, key) => {
|
|
21
24
|
var _a;
|
|
@@ -50,12 +53,15 @@ var EnumValue;
|
|
|
50
53
|
}
|
|
51
54
|
if (setTopic) {
|
|
52
55
|
const notify = (value, ctx) => setTimeout(() => serviceCtx.emitter.emit(`${name}.set`, value, ctx), 0);
|
|
53
|
-
char.onSet((value, ctx) => {
|
|
56
|
+
char.onSet(async (value, ctx) => {
|
|
54
57
|
var _a;
|
|
55
58
|
if (ctx === null || ctx === void 0 ? void 0 : ctx.fromMqtt) {
|
|
56
59
|
notify(value, ctx);
|
|
57
60
|
return;
|
|
58
61
|
}
|
|
62
|
+
if (preSet) {
|
|
63
|
+
await preSet.execute(platform, mqtt, accessory, service, serviceCtx);
|
|
64
|
+
}
|
|
59
65
|
const mqttValue = hapToMqtt[value];
|
|
60
66
|
if (mqttValue === undefined) {
|
|
61
67
|
platform.logger.error(`Cannot publish [${mqtt.id}][${accessory.displayName}][${service.displayName}][${name}] value to topic [${fullSetTopic}]. Unknown HAP value [${value}]`);
|
|
@@ -64,7 +70,7 @@ var EnumValue;
|
|
|
64
70
|
}
|
|
65
71
|
const publishedValue = (_a = setCodec === null || setCodec === void 0 ? void 0 : setCodec.stringify(mqttValue)) !== null && _a !== void 0 ? _a : mqttValue;
|
|
66
72
|
platform.logger.debug(`Publishing [${mqtt.id}][${accessory.displayName}][${service.displayName}][${name}] value [${publishedValue}] to topic [${fullSetTopic}]`);
|
|
67
|
-
mqtt.publish(setTopic, publishedValue);
|
|
73
|
+
await mqtt.publish(setTopic, publishedValue);
|
|
68
74
|
notify(value, ctx);
|
|
69
75
|
});
|
|
70
76
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EnumValue.js","sourceRoot":"","sources":["../../../../src/service/characteristic/archetype/EnumValue.ts"],"names":[],"mappings":";;;AAAA,4CAAsD;AAGtD,2CAMqB;
|
|
1
|
+
{"version":3,"file":"EnumValue.js","sourceRoot":"","sources":["../../../../src/service/characteristic/archetype/EnumValue.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,12 +3,14 @@ import { Optional } from '../../../common.js';
|
|
|
3
3
|
import { CharacteristicConfigurator } from '../index.js';
|
|
4
4
|
import { CharTypeFactory } from './common.js';
|
|
5
5
|
import { Converter } from './Converter.js';
|
|
6
|
+
import { Action } from '../action/Action';
|
|
6
7
|
export declare namespace NumericValue {
|
|
7
8
|
type ReadOnlyConfig = {
|
|
8
9
|
get: string;
|
|
9
10
|
};
|
|
10
11
|
type WriteOnlyConfig = {
|
|
11
12
|
set: string;
|
|
13
|
+
preSet?: Array<Action.Config>;
|
|
12
14
|
};
|
|
13
15
|
type ReadMaybeWriteConfig = ReadOnlyConfig & Partial<WriteOnlyConfig>;
|
|
14
16
|
type WriteMaybeReadConfig = WriteOnlyConfig & Partial<ReadOnlyConfig>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NumericValue.d.ts","sourceRoot":"","sources":["../../../../src/service/characteristic/archetype/NumericValue.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AACtE,OAAO,EAAiC,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC7E,OAAO,EAAE,0BAA0B,EAAE,MAAM,aAAa,CAAC;AACzD,OAAO,EAEH,eAAe,EAIlB,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"NumericValue.d.ts","sourceRoot":"","sources":["../../../../src/service/characteristic/archetype/NumericValue.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,6 +4,7 @@ exports.NumericValue = void 0;
|
|
|
4
4
|
const common_js_1 = require("../../../common.js");
|
|
5
5
|
const common_js_2 = require("./common.js");
|
|
6
6
|
const Converter_js_1 = require("./Converter.js");
|
|
7
|
+
const Action_1 = require("../action/Action");
|
|
7
8
|
var NumericValue;
|
|
8
9
|
(function (NumericValue) {
|
|
9
10
|
const defaultConverterResolver = () => Converter_js_1.Converter.HomekitNumber;
|
|
@@ -14,6 +15,7 @@ var NumericValue;
|
|
|
14
15
|
NumericValue.readWrite = (name, charTypeFactory, options) => configurator(name, charTypeFactory, options);
|
|
15
16
|
const isRead = (config) => 'get' in config;
|
|
16
17
|
const isWrite = (config) => 'set' in config;
|
|
18
|
+
const isPreSet = (config) => isWrite(config) && 'preSet' in config;
|
|
17
19
|
const configurator = (name, charTypeFactory, options) => {
|
|
18
20
|
var _a;
|
|
19
21
|
const converterResolver = (_a = options === null || options === void 0 ? void 0 : options.converterResolver) !== null && _a !== void 0 ? _a : defaultConverterResolver;
|
|
@@ -21,6 +23,7 @@ var NumericValue;
|
|
|
21
23
|
var _a, _b;
|
|
22
24
|
const [setTopic, setCodec, fullSetTopic] = isWrite(config) ? (0, common_js_2.parseTopic)(config.set, serviceCtx) : [undefined, undefined];
|
|
23
25
|
const [getTopic, getCodec, fullGetTopic] = isRead(config) ? (0, common_js_2.parseTopic)(config.get, serviceCtx) : [undefined, undefined];
|
|
26
|
+
const preSet = isPreSet(config) ? Action_1.Action.parseAll('preSet', config.preSet) : undefined;
|
|
24
27
|
const converter = converterResolver(config);
|
|
25
28
|
if (!converter) {
|
|
26
29
|
platform.logger.error(`Could not resolve converter [${JSON.stringify(config)}] set for [${mqtt.id}][${accessory.displayName}][${service.displayName}][${name}]`);
|
|
@@ -36,8 +39,11 @@ var NumericValue;
|
|
|
36
39
|
}
|
|
37
40
|
const quantize = (_b = converter === null || converter === void 0 ? void 0 : converter.quantize) !== null && _b !== void 0 ? _b : ((value) => value);
|
|
38
41
|
const notify = (value, ctx) => setTimeout(() => serviceCtx.emitter.emit(`${name}.set`, value, ctx), 0);
|
|
39
|
-
char.onSet((value, ctx) => {
|
|
42
|
+
char.onSet(async (value, ctx) => {
|
|
40
43
|
var _a;
|
|
44
|
+
if (preSet && !(ctx === null || ctx === void 0 ? void 0 : ctx.fromMqtt)) {
|
|
45
|
+
await preSet.execute(platform, mqtt, accessory, service, serviceCtx);
|
|
46
|
+
}
|
|
41
47
|
if (setTopic && !(ctx === null || ctx === void 0 ? void 0 : ctx.fromMqtt) && converter) {
|
|
42
48
|
const quantized = quantize(value);
|
|
43
49
|
if (value !== quantized) {
|
|
@@ -48,7 +54,7 @@ var NumericValue;
|
|
|
48
54
|
const mqttValue = converter.fromHap(value);
|
|
49
55
|
const publishedValue = (_a = setCodec === null || setCodec === void 0 ? void 0 : setCodec.stringify(mqttValue)) !== null && _a !== void 0 ? _a : mqttValue;
|
|
50
56
|
platform.logger.debug(`Publishing [${mqtt.id}][${accessory.displayName}][${service.displayName}][${name}] value [${publishedValue}] to topic [${fullSetTopic}]`);
|
|
51
|
-
mqtt.publish(setTopic, publishedValue);
|
|
57
|
+
await mqtt.publish(setTopic, publishedValue);
|
|
52
58
|
}
|
|
53
59
|
notify(value, ctx);
|
|
54
60
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NumericValue.js","sourceRoot":"","sources":["../../../../src/service/characteristic/archetype/NumericValue.ts"],"names":[],"mappings":";;;AACA,kDAA6E;AAE7E,2CAMqB;AACrB,iDAA2C;
|
|
1
|
+
{"version":3,"file":"NumericValue.js","sourceRoot":"","sources":["../../../../src/service/characteristic/archetype/NumericValue.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Signal.d.ts","sourceRoot":"","sources":["../../../../src/service/characteristic/archetype/Signal.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAwC,MAAM,SAAS,CAAC;AAC1E,OAAO,EAAE,0BAA0B,EAAE,MAAM,UAAU,CAAC;AAGtD,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"Signal.d.ts","sourceRoot":"","sources":["../../../../src/service/characteristic/archetype/Signal.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAwC,MAAM,SAAS,CAAC;AAC1E,OAAO,EAAE,0BAA0B,EAAE,MAAM,UAAU,CAAC;AAGtD,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErD,MAAM,MAAM,OAAO,CAAC,EAAE,SAAS,MAAM,GAAG,IAAI,IAAI;IAC5C,KAAK,CAAC,EAAE,EAAE,CAAC;IACX,OAAO,CAAC,EAAE,MAAM,CAAA;CACnB,CAAA;AAED,yBAAiB,MAAM,CAAC;IAEb,MAAM,MAAM,GAAI,UAAU,YAAY,EAAE,IAAI,MAAM,wCAGvD,CAAC;IAEH,KAAY,MAAM,CAAC,EAAE,SAAS,MAAM,GAAG,IAAI,IAAI;QAC3C,GAAG,EAAE,MAAM,CAAC;QACZ,SAAS,CAAC,EAAE,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;KACzC,CAAA;IAEM,MAAM,YAAY,GAAK,EAAE,SAAS,MAAM,GAAG,IAAI,EAAE,MAAM,MAAM,EAAE,UAAU,OAAO,CAAC,EAAE,CAAC,KAAG,0BAA0B,CAAC,MAAM,CAAC,EAAE,CAAC,CAqBlI,CAAA;CAEJ"}
|
|
@@ -3,8 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.Signal = void 0;
|
|
4
4
|
const index_1 = require("./index");
|
|
5
5
|
const common_1 = require("../../../common");
|
|
6
|
-
const DISPLAY_NAME = 'Signal';
|
|
7
|
-
const UUID = '7996a7cd-19e5-4d8b-a39a-9b5e5d2abf2e';
|
|
8
6
|
var Signal;
|
|
9
7
|
(function (Signal) {
|
|
10
8
|
Signal.create = (platform, id) => new platform.Characteristic(id, platform.api.hap.uuid.generate(`signal-char-${id}`), {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Signal.js","sourceRoot":"","sources":["../../../../src/service/characteristic/archetype/Signal.ts"],"names":[],"mappings":";;;AAAA,mCAA0E;AAG1E,4CAA6C;
|
|
1
|
+
{"version":3,"file":"Signal.js","sourceRoot":"","sources":["../../../../src/service/characteristic/archetype/Signal.ts"],"names":[],"mappings":";;;AAAA,mCAA0E;AAG1E,4CAA6C;AAQ7C,IAAiB,MAAM,CAmCtB;AAnCD,WAAiB,MAAM;IAEN,aAAM,GAAG,CAAC,QAAsB,EAAE,EAAU,EAAE,EAAE,CAAC,IAAI,QAAQ,CAAC,cAAc,CAAC,EAAE,EAAE,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,eAAe,EAAE,EAAE,CAAC,EAAE;QAC/I,MAAM,2BAAc;QACpB,KAAK,EAAE,wDAAoC;KAC9C,CAAC,CAAC;IAOU,mBAAY,GAAI,CAA2B,IAAY,EAAE,OAAqB,EAA0C,EAAE;;QACnI,MAAM,KAAK,GAAG,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,KAAK,mCAAI,IAAU,CAAC;QAC3C,OAAO,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,MAAkB,EAAE,UAAU,EAAE,EAAE;;YAChF,MAAM,CAAE,QAAQ,EAAE,QAAQ,EAAE,YAAY,CAAE,GAAG,IAAA,kBAAU,EAAC,MAAM,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC;YAChF,MAAM,SAAS,GAAG,iBAAS,CAAC,OAAO,CAAC,OAAO,CAAY,MAAA,MAAM,CAAC,SAAS,mCAAI,SAAS,EAAE,KAAK,EAAE,KAAK,CAAC,CAAA;YAEnG,MAAM,IAAI,GAAG,CAAC,MAAA,OAAO,CAAC,iBAAiB,CAAC,IAAI,CAAC,mCAAI,OAAO,CAAC,iBAAiB,CAAC,OAAA,MAAM,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC;YAEpG,IAAI,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE;gBACtB,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,gBAAgB,EAAE,KAAK,EAAE,GAAG,CAAC,CAAC;gBACtD,MAAM,QAAQ,GAAG,CAAC,CAAC,KAAK,CAAC;gBACzB,IAAI,QAAQ,EAAE,CAAC;oBACX,MAAM,SAAS,GAAG,SAAU,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;oBAC9C,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,eAAe,IAAI,CAAC,EAAE,KAAK,SAAS,CAAC,WAAW,KAAK,OAAO,CAAC,WAAW,wBAAwB,SAAS,eAAe,YAAY,GAAG,CAAC,CAAC;oBAC/J,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,SAAS,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;gBACzD,CAAC;YACL,CAAC,CAAC,CAAC;YAEH,OAAO,gCAAwB,CAAC,KAAK,CAAC,IAAI,EAAE,mBAAU,CAAC,IAAI,CAAC,CAAC;QAEjE,CAAC,CAAC;IACN,CAAC,CAAA;AAEL,CAAC,EAnCgB,MAAM,sBAAN,MAAM,QAmCtB"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { CharacteristicConfigurator } from '../index.js';
|
|
2
2
|
import { CharTypeFactory } from './common.js';
|
|
3
3
|
import { Converter } from './Converter.js';
|
|
4
|
+
import { Action } from '../action/Action';
|
|
4
5
|
export declare namespace ZeroOneValue {
|
|
5
6
|
type CommonConfig<ON extends string, OFF extends string> = {
|
|
6
7
|
converter?: Converter.Boolean.Type<ON, OFF>;
|
|
@@ -10,6 +11,7 @@ export declare namespace ZeroOneValue {
|
|
|
10
11
|
} & CommonConfig<ON, OFF>;
|
|
11
12
|
export type WriteOnlyConfig<ON extends string = 'on', OFF extends string = 'off'> = {
|
|
12
13
|
set: string;
|
|
14
|
+
preSet?: Array<Action.Config>;
|
|
13
15
|
} & CommonConfig<ON, OFF>;
|
|
14
16
|
export type ReadWriteConfig<ON extends string = 'on', OFF extends string = 'off'> = ReadOnlyConfig<ON, OFF> & WriteOnlyConfig<ON, OFF>;
|
|
15
17
|
type Config<ON extends string = 'on', OFF extends string = 'off'> = ReadOnlyConfig<ON, OFF> | WriteOnlyConfig<ON, OFF> | ReadWriteConfig<ON, OFF>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ZeroOneValue.d.ts","sourceRoot":"","sources":["../../../../src/service/characteristic/archetype/ZeroOneValue.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,0BAA0B,EAAE,MAAM,aAAa,CAAC;AACzD,OAAO,EAEH,eAAe,EAIlB,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"ZeroOneValue.d.ts","sourceRoot":"","sources":["../../../../src/service/characteristic/archetype/ZeroOneValue.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,0BAA0B,EAAE,MAAM,aAAa,CAAC;AACzD,OAAO,EAEH,eAAe,EAIlB,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAE1C,yBAAiB,YAAY,CAAC;IAE1B,KAAK,YAAY,CAAC,EAAE,SAAS,MAAM,EAAE,GAAG,SAAS,MAAM,IAAI;QAAE,SAAS,CAAC,EAAE,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,EAAE,GAAG,CAAC,CAAA;KAAE,CAAC;IAC3G,MAAM,MAAM,cAAc,CAAC,EAAE,SAAS,MAAM,GAAG,IAAI,EAAE,GAAG,SAAS,MAAM,GAAG,KAAK,IAC3E;QAAE,GAAG,EAAE,MAAM,CAAA;KAAE,GACb,YAAY,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;IAC5B,MAAM,MAAM,eAAe,CAAC,EAAE,SAAS,MAAM,GAAG,IAAI,EAAE,GAAG,SAAS,MAAM,GAAG,KAAK,IAC5E;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;KAAE,GAC5C,YAAY,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;IAC5B,MAAM,MAAM,eAAe,CAAC,EAAE,SAAS,MAAM,GAAG,IAAI,EAAE,GAAG,SAAS,MAAM,GAAG,KAAK,IAC5E,cAAc,CAAC,EAAE,EAAE,GAAG,CAAC,GACrB,eAAe,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;IAC/B,KAAK,MAAM,CAAC,EAAE,SAAS,MAAM,GAAG,IAAI,EAAE,GAAG,SAAS,MAAM,GAAG,KAAK,IAC5D,cAAc,CAAC,EAAE,EAAE,GAAG,CAAC,GACrB,eAAe,CAAC,EAAE,EAAE,GAAG,CAAC,GACxB,eAAe,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;IAE/B,MAAM,MAAM,OAAO,CAAC,EAAE,SAAS,MAAM,EAAE,GAAG,SAAS,MAAM,IAAI;QACzD,KAAK,CAAC,EAAE,EAAE,CAAC;QACX,MAAM,CAAC,EAAE,GAAG,CAAA;KACf,CAAA;IAED,MAAM,CAAC,MAAM,QAAQ,GAAI,EAAE,SAAS,MAAM,EAAE,GAAG,SAAS,MAAM,EAAE,MAAM,MAAM,EAAE,iBAAiB,eAAe,EAAE,UAAU,OAAO,CAAC,EAAE,EAAE,GAAG,CAAC,gDACjF,CAAC;IAE1D,MAAM,CAAC,MAAM,SAAS,GAAI,EAAE,SAAS,MAAM,EAAE,GAAG,SAAS,MAAM,EAAE,MAAM,MAAM,EAAE,iBAAiB,eAAe,EAAE,UAAU,OAAO,CAAC,EAAE,EAAE,GAAG,CAAC,gDAClF,CAAC;IAE1D,MAAM,CAAC,MAAM,SAAS,GAAI,EAAE,SAAS,MAAM,EAAE,GAAG,SAAS,MAAM,EAAE,MAAM,MAAM,EAAE,iBAAiB,eAAe,EAAE,UAAU,OAAO,CAAC,EAAE,EAAE,GAAG,CAAC,gDAClF,CAAC;;CAoF7D"}
|