@petro-kushchak/homebridge-tuya-eve 1.0.5 → 1.0.7
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
CHANGED
|
@@ -1,11 +1,42 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
+
if (mod && mod.__esModule) return mod;
|
|
20
|
+
var result = {};
|
|
21
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
+
__setModuleDefault(result, mod);
|
|
23
|
+
return result;
|
|
24
|
+
};
|
|
2
25
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
26
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
27
|
};
|
|
5
28
|
const eveHistoryService_1 = require("./lib/eveHistoryService");
|
|
6
29
|
const tuyapi_1 = __importDefault(require("tuyapi"));
|
|
7
30
|
const EnergyCharacteristics_1 = __importDefault(require("./lib/EnergyCharacteristics"));
|
|
31
|
+
const homebridgeCallbacks_1 = require("./lib/homebridgeCallbacks");
|
|
32
|
+
const path = __importStar(require("path"));
|
|
33
|
+
const fs = __importStar(require("fs"));
|
|
8
34
|
let hap;
|
|
35
|
+
const ONOFF_DP = '1';
|
|
36
|
+
const AMP_DP = '18';
|
|
37
|
+
const WATT_DP = '19';
|
|
38
|
+
const VOLT_DP = '20';
|
|
39
|
+
const kHour = 60 * 60 * 1000;
|
|
9
40
|
/**
|
|
10
41
|
* Platform Accessory
|
|
11
42
|
* An instance of this class is created for each accessory your platform registers
|
|
@@ -19,6 +50,7 @@ class TuyaSwitchAccessoryAccessory {
|
|
|
19
50
|
this.amperes = 0;
|
|
20
51
|
this.watts = 0;
|
|
21
52
|
this.volts = 0;
|
|
53
|
+
this.inUse = false;
|
|
22
54
|
this.totalConsumption = 0;
|
|
23
55
|
this.resetTotal = 0;
|
|
24
56
|
hap = api.hap;
|
|
@@ -30,6 +62,7 @@ class TuyaSwitchAccessoryAccessory {
|
|
|
30
62
|
this.key = config.key;
|
|
31
63
|
this.model = config.model || 'TuyaSwitch';
|
|
32
64
|
this.updateInterval = config.updateInterval || 5000;
|
|
65
|
+
this.historyFilename = `history_${this.device.context.id}.json`;
|
|
33
66
|
this.EnergyCharacteristics = EnergyCharacteristics_1.default.create(hap.Characteristic);
|
|
34
67
|
this.device = new tuyapi_1.default({
|
|
35
68
|
id: this.id,
|
|
@@ -46,19 +79,8 @@ class TuyaSwitchAccessoryAccessory {
|
|
|
46
79
|
this.service = new hap.Service.Switch(this.name);
|
|
47
80
|
this.service
|
|
48
81
|
.getCharacteristic(hap.Characteristic.On)
|
|
49
|
-
.on("get" /* CharacteristicEventTypes.GET */, (
|
|
50
|
-
|
|
51
|
-
callback(undefined, false);
|
|
52
|
-
})
|
|
53
|
-
.on("set" /* CharacteristicEventTypes.SET */, (value, callback) => {
|
|
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
|
-
});
|
|
82
|
+
.on("get" /* CharacteristicEventTypes.GET */, (0, homebridgeCallbacks_1.callbackify)(this.getPowerOnOff.bind(this)))
|
|
83
|
+
.on("set" /* CharacteristicEventTypes.SET */, (0, homebridgeCallbacks_1.callbackify)(this.setPowerOnOff.bind(this)));
|
|
62
84
|
this.service.addOptionalCharacteristic(this.EnergyCharacteristics.Volts);
|
|
63
85
|
this.service.addOptionalCharacteristic(this.EnergyCharacteristics.Amperes);
|
|
64
86
|
this.service.addOptionalCharacteristic(this.EnergyCharacteristics.Watts);
|
|
@@ -80,23 +102,52 @@ class TuyaSwitchAccessoryAccessory {
|
|
|
80
102
|
.getCharacteristic(this.EnergyCharacteristics.TotalConsumption)
|
|
81
103
|
.on('get', this.getTotalConsumption.bind(this));
|
|
82
104
|
// create handlers for required characteristics
|
|
83
|
-
this.historyService = new eveHistoryService_1.EveHistoryService(this, this.api, this.logger);
|
|
105
|
+
this.historyService = new eveHistoryService_1.EveHistoryService(this, this.api, 'energy', this.logger);
|
|
106
|
+
this.readTotalConsumption();
|
|
84
107
|
//device events
|
|
85
108
|
setTimeout(async () => {
|
|
86
109
|
this.device.on('connected', () => {
|
|
87
|
-
this.log(
|
|
110
|
+
this.log('Connected to device!');
|
|
111
|
+
const lastTime = new Date().getTime();
|
|
112
|
+
setInterval(async () => {
|
|
113
|
+
const now = new Date().getTime();
|
|
114
|
+
const delta = (now - lastTime) / 1000;
|
|
115
|
+
const state = await this.device.get({ schema: true });
|
|
116
|
+
this.log(`Device state: ${state.dp}`);
|
|
117
|
+
this.updateState(state.dp);
|
|
118
|
+
const consumption = this.watts * delta; // W/s
|
|
119
|
+
const totalConsumption = consumption / kHour;
|
|
120
|
+
const resetTotal = this.resetTotal;
|
|
121
|
+
this.totalConsumption += totalConsumption;
|
|
122
|
+
this.historyService.addEntry({ time: now / 1000, power: this.watts });
|
|
123
|
+
const extra = this.historyService.getExtraPersistedData();
|
|
124
|
+
if (!extra) {
|
|
125
|
+
this.historyService.setExtraPersistedData({
|
|
126
|
+
totalConsumption,
|
|
127
|
+
resetTotal,
|
|
128
|
+
});
|
|
129
|
+
}
|
|
130
|
+
else if (extra.totalConsumption !== totalConsumption ||
|
|
131
|
+
extra.resetTotal !== resetTotal) {
|
|
132
|
+
extra.totalConsumption = this.totalConsumption;
|
|
133
|
+
extra.resetTotal = this.resetTotal;
|
|
134
|
+
this.historyService.setExtraPersistedData(extra);
|
|
135
|
+
}
|
|
136
|
+
}, this.updateInterval);
|
|
88
137
|
});
|
|
89
138
|
this.device.on('disconnected', () => {
|
|
90
|
-
this.log(
|
|
139
|
+
this.log('Disconnected to device!');
|
|
91
140
|
});
|
|
92
141
|
this.device.on('error', (error) => {
|
|
93
142
|
this.log(`Error ${error}!`);
|
|
94
143
|
});
|
|
95
144
|
this.device.on('data', (data) => {
|
|
96
|
-
this.log(`
|
|
145
|
+
this.log(`DATA ${JSON.stringify(data)}!`);
|
|
146
|
+
this.updateState(data.dps);
|
|
97
147
|
});
|
|
98
148
|
this.device.on('dp-refresh', (data) => {
|
|
99
|
-
this.log(`
|
|
149
|
+
this.log(`REFRESH ${JSON.stringify(data)}!`);
|
|
150
|
+
this.updateState(data.dps);
|
|
100
151
|
});
|
|
101
152
|
//device find&connect
|
|
102
153
|
await this.device.find();
|
|
@@ -127,6 +178,43 @@ class TuyaSwitchAccessoryAccessory {
|
|
|
127
178
|
// this.updateState(this.device.state);
|
|
128
179
|
callback(null, this.watts);
|
|
129
180
|
}
|
|
181
|
+
updateState(dps) {
|
|
182
|
+
this.amperes = dps[AMP_DP] ? dps[AMP_DP] / 1000 : 0;
|
|
183
|
+
this.watts = dps[WATT_DP] ? dps[WATT_DP] / 10 : 0;
|
|
184
|
+
this.volts = dps[VOLT_DP] ? dps[VOLT_DP] / 10 : 0;
|
|
185
|
+
this.inUse = dps[ONOFF_DP] ? dps[ONOFF_DP] : false;
|
|
186
|
+
this.log.info(`updated a:${this.amperes} w:${this.watts} v:${this.volts} on: ${this.inUse}`);
|
|
187
|
+
}
|
|
188
|
+
async setPowerOnOff(value) {
|
|
189
|
+
this.log.info(`SET ON: ${value}`);
|
|
190
|
+
await this.device.set({ set: value, dps: '1' });
|
|
191
|
+
}
|
|
192
|
+
async getPowerOnOff(value) {
|
|
193
|
+
this.log.info('GET ON');
|
|
194
|
+
await this.device.set({ set: value, dps: '1' });
|
|
195
|
+
}
|
|
196
|
+
readTotalConsumption() {
|
|
197
|
+
try {
|
|
198
|
+
const filepath = this.api ? this.api.user.storagePath() : './config';
|
|
199
|
+
const filename = path.join(filepath, this.historyFilename);
|
|
200
|
+
const data = fs.readFileSync(filename, 'utf8');
|
|
201
|
+
const jsonData = typeof data === 'object' ? data : JSON.parse(data);
|
|
202
|
+
const totalConsumption = jsonData.extra && jsonData.extra.totalConsumption
|
|
203
|
+
? jsonData.extra.totalConsumption
|
|
204
|
+
: 0.0;
|
|
205
|
+
const resetTotal = jsonData.extra && jsonData.extra.resetTotal
|
|
206
|
+
? jsonData.extra.resetTotal
|
|
207
|
+
: 0; // Math.floor(Date.now() / 1000) - 978307200 // seconds since 01.01.2001
|
|
208
|
+
this.log.info(`[${this.device.context.name}] totalConsumption: ${totalConsumption} resetTotal: ${resetTotal}`);
|
|
209
|
+
this.totalConsumption = totalConsumption;
|
|
210
|
+
this.resetTotal = resetTotal;
|
|
211
|
+
}
|
|
212
|
+
catch (err) {
|
|
213
|
+
this.log.error(`[${this.device.context.name}]readTotalConsumption error: ${err}`);
|
|
214
|
+
this.totalConsumption = 0;
|
|
215
|
+
this.resetTotal = 0;
|
|
216
|
+
}
|
|
217
|
+
}
|
|
130
218
|
getServices() {
|
|
131
219
|
return [
|
|
132
220
|
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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"}
|
|
@@ -6,16 +6,23 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
exports.EveHistoryService = void 0;
|
|
7
7
|
const fakegato_history_1 = __importDefault(require("fakegato-history"));
|
|
8
8
|
class EveHistoryService {
|
|
9
|
-
constructor(accessory, api, logger) {
|
|
9
|
+
constructor(accessory, api, serviceType, logger) {
|
|
10
10
|
this.accessory = accessory;
|
|
11
11
|
this.api = api;
|
|
12
|
+
this.serviceType = serviceType;
|
|
12
13
|
this.logger = logger;
|
|
13
14
|
const FakeGatoHistoryService = (0, fakegato_history_1.default)(api);
|
|
14
|
-
this.historyService = new FakeGatoHistoryService(
|
|
15
|
+
this.historyService = new FakeGatoHistoryService(this.serviceType, this.accessory, { storage: 'fs', log: this.logger });
|
|
15
16
|
}
|
|
16
17
|
getService() {
|
|
17
18
|
return this.historyService;
|
|
18
19
|
}
|
|
20
|
+
setExtraPersistedData(extra) {
|
|
21
|
+
this.historyService.setExtraPersistedData(extra);
|
|
22
|
+
}
|
|
23
|
+
getExtraPersistedData() {
|
|
24
|
+
return this.historyService.getExtraPersistedData();
|
|
25
|
+
}
|
|
19
26
|
addEntry(entry) {
|
|
20
27
|
this.historyService.addEntry(entry);
|
|
21
28
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"eveHistoryService.js","sourceRoot":"","sources":["../../src/lib/eveHistoryService.ts"],"names":[],"mappings":";;;;;;AAAA,wEAAwC;
|
|
1
|
+
{"version":3,"file":"eveHistoryService.js","sourceRoot":"","sources":["../../src/lib/eveHistoryService.ts"],"names":[],"mappings":";;;;;;AAAA,wEAAwC;AAwBxC,MAAa,iBAAiB;IAI1B,YAAoB,SAA0B,EAAU,GAAQ,EAAU,WAAmB,EAAU,MAAe;QAAlG,cAAS,GAAT,SAAS,CAAiB;QAAU,QAAG,GAAH,GAAG,CAAK;QAAU,gBAAW,GAAX,WAAW,CAAQ;QAAU,WAAM,GAAN,MAAM,CAAS;QACpH,MAAM,sBAAsB,GAAG,IAAA,0BAAQ,EAAC,GAAG,CAAC,CAAC;QAC7C,IAAI,CAAC,cAAc,GAAG,IAAI,sBAAsB,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,SAAS,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;IAC1H,CAAC;IAED,UAAU;QACR,OAAO,IAAI,CAAC,cAAyB,CAAC;IACxC,CAAC;IAED,qBAAqB,CAAC,KAAK;QAC3B,IAAI,CAAC,cAAiC,CAAC,qBAAqB,CAAC,KAAK,CAAC,CAAC;IACtE,CAAC;IAED,qBAAqB;QACpB,OAAQ,IAAI,CAAC,cAAiC,CAAC,qBAAqB,EAAE,CAAC;IACxE,CAAC;IAGC,QAAQ,CAAC,KAA0B;QAChC,IAAI,CAAC,cAAiC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IAC1D,CAAC;IAED,WAAW,CAAC,gBAA6E;QACvF,MAAM,OAAO,GAAK,IAAI,CAAC,GAAyC,CAAC,qBAAqB,CAAC;QAEvF,IAAI,CAAC,OAAO,EAAE;YACZ,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,wCAAwC,CAAC,CAAC;YAC5D,OAAO;SACR;QAED,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,6CAA6C,CAAC,CAAC;QACjE,MAAM,aAAa,GAAG,IAAI,CAAC,SAAS,CAAC;QACrC,OAAO,CAAC,IAAI,CAAC;YACX,OAAO,EAAE,IAAI,CAAC,cAAc;YAC5B,QAAQ,EAAE,UAAU,GAAG,EAAE,IAAI;gBAC3B,IAAI,CAAC,GAAG,EAAE;oBACR,IAAI,IAAI,EAAE;wBACR,IAAI;4BACF,MAAM,aAAa,GAAG,MAAM,IAAI,aAAa,CAAC,CAAC,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC;4BACtF,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,gBAAgB,EAAE,aAAa,CAAC,CAAC;4BACnD,MAAM,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;4BACtE,gBAAgB,CAAC,QAAQ,CAAC,SAAS,EAAE,QAAQ,CAAC,OAAgC,CAAC,CAAC;yBACjF;wBAAC,OAAO,CAAC,EAAE;4BACV,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,qEAAqE,EAAE,CAAC,CAAC,CAAC;yBAC7F;qBACF;iBACF;qBAAM;oBACL,oBAAoB;oBACpB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,oDAAoD,EAAE,GAAG,CAAC,CAAC;iBAC9E;YACH,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC;SACb,CAAC,CAAC;IACL,CAAC;CACJ;AAzDD,8CAyDC"}
|
|
@@ -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.7",
|
|
5
5
|
"description": "Homebridge plugin for TuyAPI (with Eve app energy consumption monitoring)",
|
|
6
6
|
"license": "MIT",
|
|
7
7
|
"repository": {
|