@petro-kushchak/homebridge-tuya-eve 1.0.5 → 1.0.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/dist/index.js +27 -15
- package/dist/index.js.map +1 -1
- package/dist/lib/homebridgeCallbacks.js +25 -0
- package/dist/lib/homebridgeCallbacks.js.map +1 -0
- package/package.json +1 -1
package/dist/index.js
CHANGED
|
@@ -5,7 +5,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
const eveHistoryService_1 = require("./lib/eveHistoryService");
|
|
6
6
|
const tuyapi_1 = __importDefault(require("tuyapi"));
|
|
7
7
|
const EnergyCharacteristics_1 = __importDefault(require("./lib/EnergyCharacteristics"));
|
|
8
|
+
const homebridgeCallbacks_1 = require("./lib/homebridgeCallbacks");
|
|
8
9
|
let hap;
|
|
10
|
+
const ONOFF_DP = '1';
|
|
11
|
+
const AMP_DP = '18';
|
|
12
|
+
const WATT_DP = '19';
|
|
13
|
+
const VOLT_DP = '20';
|
|
9
14
|
/**
|
|
10
15
|
* Platform Accessory
|
|
11
16
|
* An instance of this class is created for each accessory your platform registers
|
|
@@ -19,6 +24,7 @@ class TuyaSwitchAccessoryAccessory {
|
|
|
19
24
|
this.amperes = 0;
|
|
20
25
|
this.watts = 0;
|
|
21
26
|
this.volts = 0;
|
|
27
|
+
this.inUse = false;
|
|
22
28
|
this.totalConsumption = 0;
|
|
23
29
|
this.resetTotal = 0;
|
|
24
30
|
hap = api.hap;
|
|
@@ -47,18 +53,10 @@ class TuyaSwitchAccessoryAccessory {
|
|
|
47
53
|
this.service
|
|
48
54
|
.getCharacteristic(hap.Characteristic.On)
|
|
49
55
|
.on("get" /* CharacteristicEventTypes.GET */, (callback) => {
|
|
50
|
-
this.log.info(
|
|
51
|
-
callback(undefined,
|
|
56
|
+
this.log.info('GET ON');
|
|
57
|
+
callback(undefined, this.inUse);
|
|
52
58
|
})
|
|
53
|
-
.on("set" /* CharacteristicEventTypes.SET */, (
|
|
54
|
-
this.log.info(`[${this.name} Switch] SET ON: ${value}`);
|
|
55
|
-
// if (value) {
|
|
56
|
-
// this.device.
|
|
57
|
-
// } else {
|
|
58
|
-
// // this.streamer.stopPlaying();
|
|
59
|
-
// }
|
|
60
|
-
callback();
|
|
61
|
-
});
|
|
59
|
+
.on("set" /* CharacteristicEventTypes.SET */, (0, homebridgeCallbacks_1.callbackify)(this.setPowerOnOff.bind(this)));
|
|
62
60
|
this.service.addOptionalCharacteristic(this.EnergyCharacteristics.Volts);
|
|
63
61
|
this.service.addOptionalCharacteristic(this.EnergyCharacteristics.Amperes);
|
|
64
62
|
this.service.addOptionalCharacteristic(this.EnergyCharacteristics.Watts);
|
|
@@ -84,19 +82,22 @@ class TuyaSwitchAccessoryAccessory {
|
|
|
84
82
|
//device events
|
|
85
83
|
setTimeout(async () => {
|
|
86
84
|
this.device.on('connected', () => {
|
|
87
|
-
this.log(
|
|
85
|
+
this.log('Connected to device!');
|
|
86
|
+
// setInterval(() => {}, this.updateInterval);
|
|
88
87
|
});
|
|
89
88
|
this.device.on('disconnected', () => {
|
|
90
|
-
this.log(
|
|
89
|
+
this.log('Disconnected to device!');
|
|
91
90
|
});
|
|
92
91
|
this.device.on('error', (error) => {
|
|
93
92
|
this.log(`Error ${error}!`);
|
|
94
93
|
});
|
|
95
94
|
this.device.on('data', (data) => {
|
|
96
|
-
this.log(`
|
|
95
|
+
this.log(`DATA ${JSON.stringify(data)}!`);
|
|
96
|
+
this.updateState(data.dps);
|
|
97
97
|
});
|
|
98
98
|
this.device.on('dp-refresh', (data) => {
|
|
99
|
-
this.log(`
|
|
99
|
+
this.log(`REFRESH ${JSON.stringify(data)}!`);
|
|
100
|
+
this.updateState(data.dps);
|
|
100
101
|
});
|
|
101
102
|
//device find&connect
|
|
102
103
|
await this.device.find();
|
|
@@ -127,6 +128,17 @@ class TuyaSwitchAccessoryAccessory {
|
|
|
127
128
|
// this.updateState(this.device.state);
|
|
128
129
|
callback(null, this.watts);
|
|
129
130
|
}
|
|
131
|
+
updateState(dps) {
|
|
132
|
+
this.amperes = dps[AMP_DP] ? dps[AMP_DP] / 1000 : 0;
|
|
133
|
+
this.watts = dps[WATT_DP] ? dps[WATT_DP] / 10 : 0;
|
|
134
|
+
this.volts = dps[VOLT_DP] ? dps[VOLT_DP] / 10 : 0;
|
|
135
|
+
this.inUse = dps[ONOFF_DP] ? dps[ONOFF_DP] : false;
|
|
136
|
+
this.log.info(`[${this.device.context.name}] updated a:${this.amperes} w:${this.watts} v:${this.volts} on: ${this.inUse}`);
|
|
137
|
+
}
|
|
138
|
+
async setPowerOnOff(value) {
|
|
139
|
+
this.log.info(`SET ON: ${value}`);
|
|
140
|
+
await this.device.set({ set: value, dps: '1' });
|
|
141
|
+
}
|
|
130
142
|
getServices() {
|
|
131
143
|
return [
|
|
132
144
|
this.informationService,
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.callbackify = void 0;
|
|
4
|
+
/* eslint-disable @typescript-eslint/ban-types */
|
|
5
|
+
function callbackify(task) {
|
|
6
|
+
return (...args) => {
|
|
7
|
+
const onlyArgs = [];
|
|
8
|
+
let callback = undefined;
|
|
9
|
+
for (const arg of args) {
|
|
10
|
+
if (typeof arg === 'function') {
|
|
11
|
+
callback = arg;
|
|
12
|
+
break;
|
|
13
|
+
}
|
|
14
|
+
onlyArgs.push(arg);
|
|
15
|
+
}
|
|
16
|
+
if (!callback) {
|
|
17
|
+
throw new Error('Missing callback parameter!');
|
|
18
|
+
}
|
|
19
|
+
task(...onlyArgs)
|
|
20
|
+
.then((data) => callback(undefined, data))
|
|
21
|
+
.catch((err) => callback(err));
|
|
22
|
+
};
|
|
23
|
+
}
|
|
24
|
+
exports.callbackify = callbackify;
|
|
25
|
+
//# sourceMappingURL=homebridgeCallbacks.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"homebridgeCallbacks.js","sourceRoot":"","sources":["../../src/lib/homebridgeCallbacks.ts"],"names":[],"mappings":";;;AAAA,iDAAiD;AACjD,SAAgB,WAAW,CAAC,IAA0C;IAClE,OAAO,CAAC,GAAG,IAAW,EAAE,EAAE;QACtB,MAAM,QAAQ,GAAU,EAAE,CAAC;QAC3B,IAAI,QAAQ,GAAa,SAAS,CAAC;QAEnC,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE;YACpB,IAAI,OAAO,GAAG,KAAK,UAAU,EAAE;gBAC3B,QAAQ,GAAG,GAAG,CAAC;gBACf,MAAM;aACT;YACD,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;SACtB;QACD,IAAI,CAAC,QAAQ,EAAE;YACX,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;SAClD;QACD,IAAI,CAAC,GAAG,QAAQ,CAAC;aACZ,IAAI,CAAC,CAAC,IAAS,EAAE,EAAE,CAAC,QAAQ,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;aAC9C,KAAK,CAAC,CAAC,GAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC;IAC5C,CAAC,CAAC;AACN,CAAC;AAnBD,kCAmBC"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"displayName": "Homebridge Tuya Eve",
|
|
3
3
|
"name": "@petro-kushchak/homebridge-tuya-eve",
|
|
4
|
-
"version": "1.0.
|
|
4
|
+
"version": "1.0.6",
|
|
5
5
|
"description": "Homebridge plugin for TuyAPI (with Eve app energy consumption monitoring)",
|
|
6
6
|
"license": "MIT",
|
|
7
7
|
"repository": {
|