homebridge-hw-energysocket 2.2.3 → 2.3.1
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/dist/matter-energy.d.ts
CHANGED
|
@@ -8,6 +8,8 @@ export declare class MatterEnergyPublisher {
|
|
|
8
8
|
private readonly uuidBySerial;
|
|
9
9
|
private lastEnergyUpdate;
|
|
10
10
|
private readonly loggedPower;
|
|
11
|
+
private readonly ready;
|
|
12
|
+
private readonly pending;
|
|
11
13
|
constructor(api: API, log: Logger);
|
|
12
14
|
get enabled(): boolean;
|
|
13
15
|
private matter;
|
|
@@ -19,6 +21,7 @@ export declare class MatterEnergyPublisher {
|
|
|
19
21
|
}): void;
|
|
20
22
|
ensureOutlet(properties: EnergySocketAccessoryProperties, socketApi: EnergySocketApi): Promise<void>;
|
|
21
23
|
updateReading(serialNumber: string, watts?: number | null, importKwh?: number | null, powerOn?: boolean): Promise<void>;
|
|
24
|
+
private flush;
|
|
22
25
|
private handlers;
|
|
23
26
|
private currentMilliAmps;
|
|
24
27
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"matter-energy.d.ts","sourceRoot":"","sources":["../src/matter-energy.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AAC9C,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAKxD,OAAO,KAAK,EAAE,+BAA+B,EAAE,MAAM,SAAS,CAAC;AAW/D,qBAAa,qBAAqB;
|
|
1
|
+
{"version":3,"file":"matter-energy.d.ts","sourceRoot":"","sources":["../src/matter-energy.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AAC9C,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAKxD,OAAO,KAAK,EAAE,+BAA+B,EAAE,MAAM,SAAS,CAAC;AAW/D,qBAAa,qBAAqB;IAQpB,OAAO,CAAC,QAAQ,CAAC,GAAG;IAAO,OAAO,CAAC,QAAQ,CAAC,GAAG;IAP3D,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAqB;IAC3C,OAAO,CAAC,QAAQ,CAAC,YAAY,CAA6B;IAC1D,OAAO,CAAC,gBAAgB,CAA6B;IACrD,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAqB;IACjD,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAqB;IAC3C,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAsF;gBAEjF,GAAG,EAAE,GAAG,EAAmB,GAAG,EAAE,MAAM;IAEnE,IAAI,OAAO,IAAI,OAAO,CAErB;IAED,OAAO,CAAC,MAAM;IAId,QAAQ,CAAC,SAAS,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,OAAO,CAAC,EAAE;YAAE,YAAY,CAAC,EAAE,MAAM,CAAA;SAAE,CAAA;KAAE,GAAG,IAAI;IAO1E,YAAY,CAAC,UAAU,EAAE,+BAA+B,EAAE,SAAS,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAgEpG,aAAa,CAAC,YAAY,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,EAAE,OAAO,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;YAa/G,KAAK;IA0CnB,OAAO,CAAC,QAAQ;IAahB,OAAO,CAAC,gBAAgB;CAGzB"}
|
package/dist/matter-energy.js
CHANGED
|
@@ -21,6 +21,8 @@ class MatterEnergyPublisher {
|
|
|
21
21
|
this.uuidBySerial = new Map();
|
|
22
22
|
this.lastEnergyUpdate = new Map();
|
|
23
23
|
this.loggedPower = new Set();
|
|
24
|
+
this.ready = new Set();
|
|
25
|
+
this.pending = new Map();
|
|
24
26
|
}
|
|
25
27
|
get enabled() {
|
|
26
28
|
var _a, _b;
|
|
@@ -76,19 +78,55 @@ class MatterEnergyPublisher {
|
|
|
76
78
|
},
|
|
77
79
|
handlers: this.handlers(socketApi),
|
|
78
80
|
};
|
|
79
|
-
|
|
81
|
+
const publisher = this.api.matter;
|
|
82
|
+
const published = accessory;
|
|
83
|
+
if (publisher.publishExternalAccessories) {
|
|
84
|
+
yield publisher.publishExternalAccessories(MATTER_PLUGIN_NAME, [accessory]);
|
|
85
|
+
this.log.info(`${properties.displayName} Matter is een los Matter-stopcontact. Koppel dit accessoire zelf met zijn Matter-code.`);
|
|
86
|
+
}
|
|
87
|
+
else {
|
|
88
|
+
yield matter.registerPlatformAccessories(MATTER_PLUGIN_NAME, settings_1.PLATFORM_NAME, [accessory]);
|
|
89
|
+
this.log.info(`Matter-stopcontact gepubliceerd voor ${properties.displayName}.`);
|
|
90
|
+
}
|
|
80
91
|
this.known.add(uuid);
|
|
81
|
-
|
|
92
|
+
if (published._eventEmitter) {
|
|
93
|
+
published._eventEmitter.on('ready', () => {
|
|
94
|
+
this.ready.add(uuid);
|
|
95
|
+
void this.flush(properties.serialNumber);
|
|
96
|
+
});
|
|
97
|
+
}
|
|
98
|
+
else {
|
|
99
|
+
this.ready.add(uuid);
|
|
100
|
+
void this.flush(properties.serialNumber);
|
|
101
|
+
}
|
|
82
102
|
});
|
|
83
103
|
}
|
|
84
104
|
updateReading(serialNumber, watts, importKwh, powerOn) {
|
|
85
105
|
return __awaiter(this, void 0, void 0, function* () {
|
|
86
|
-
var _a;
|
|
87
106
|
const matter = this.matter();
|
|
88
107
|
const uuid = this.uuidBySerial.get(serialNumber);
|
|
89
108
|
if (!this.enabled || !matter || !uuid || watts === undefined || watts === null) {
|
|
90
109
|
return;
|
|
91
110
|
}
|
|
111
|
+
this.pending.set(serialNumber, { watts, importKwh, powerOn: powerOn || watts > 1 });
|
|
112
|
+
if (!this.ready.has(uuid)) {
|
|
113
|
+
return;
|
|
114
|
+
}
|
|
115
|
+
yield this.flush(serialNumber);
|
|
116
|
+
});
|
|
117
|
+
}
|
|
118
|
+
flush(serialNumber) {
|
|
119
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
120
|
+
var _a;
|
|
121
|
+
const matter = this.matter();
|
|
122
|
+
const uuid = this.uuidBySerial.get(serialNumber);
|
|
123
|
+
const reading = this.pending.get(serialNumber);
|
|
124
|
+
if (!matter || !uuid || !reading) {
|
|
125
|
+
return;
|
|
126
|
+
}
|
|
127
|
+
const watts = reading.watts;
|
|
128
|
+
const importKwh = reading.importKwh;
|
|
129
|
+
const powerOn = reading.powerOn;
|
|
92
130
|
try {
|
|
93
131
|
yield matter.updateAccessoryState(uuid, 'electricalPowerMeasurement', {
|
|
94
132
|
voltage: NOMINAL_VOLTAGE_MV,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"matter-energy.js","sourceRoot":"","sources":["../src/matter-energy.ts"],"names":[],"mappings":";;;;;;;;;;;;AAGA,yCAA2C;AAE3C,MAAM,kBAAkB,GAAG,4BAA4B,CAAC;AAGxD,MAAM,kBAAkB,GAAG,MAAO,CAAC;AASnC,MAAa,qBAAqB;
|
|
1
|
+
{"version":3,"file":"matter-energy.js","sourceRoot":"","sources":["../src/matter-energy.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"displayName": "Homebridge HW Energysocket",
|
|
3
3
|
"name": "homebridge-hw-energysocket",
|
|
4
|
-
"version": "2.
|
|
4
|
+
"version": "2.3.1",
|
|
5
5
|
"description": "This Homebridge plugin exposes your HomeWizard Energy Sockets to Apple HomeKit. So you can use the Home App to switch your Energy Sockets on or off and integrate the Energy Sockets into your Home Automations.",
|
|
6
6
|
"license": "MIT",
|
|
7
7
|
"author": {
|