@petro-kushchak/homebridge-tuya-eve 1.0.10 → 1.0.11
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 +36 -47
- package/dist/index.js.map +1 -1
- package/dist/lib/eveHistoryService.js +3 -4
- package/dist/lib/eveHistoryService.js.map +1 -1
- package/package.json +1 -1
package/dist/index.js
CHANGED
|
@@ -1,27 +1,4 @@
|
|
|
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
|
-
};
|
|
25
2
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
26
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
27
4
|
};
|
|
@@ -29,8 +6,6 @@ const eveHistoryService_1 = require("./lib/eveHistoryService");
|
|
|
29
6
|
const tuyapi_1 = __importDefault(require("tuyapi"));
|
|
30
7
|
const EnergyCharacteristics_1 = __importDefault(require("./lib/EnergyCharacteristics"));
|
|
31
8
|
const homebridgeCallbacks_1 = require("./lib/homebridgeCallbacks");
|
|
32
|
-
const path = __importStar(require("path"));
|
|
33
|
-
const fs = __importStar(require("fs"));
|
|
34
9
|
let hap;
|
|
35
10
|
const ONOFF_DP = '1';
|
|
36
11
|
const AMP_DP = '18';
|
|
@@ -62,7 +37,6 @@ class TuyaSwitchAccessoryAccessory {
|
|
|
62
37
|
this.key = config.key;
|
|
63
38
|
this.model = config.model || 'TuyaSwitch';
|
|
64
39
|
this.updateInterval = config.updateInterval || 5000;
|
|
65
|
-
this.historyFilename = `history_${this.id}.json`;
|
|
66
40
|
this.EnergyCharacteristics = EnergyCharacteristics_1.default.create(hap.Characteristic);
|
|
67
41
|
this.device = new tuyapi_1.default({
|
|
68
42
|
id: this.id,
|
|
@@ -102,7 +76,9 @@ class TuyaSwitchAccessoryAccessory {
|
|
|
102
76
|
.getCharacteristic(this.EnergyCharacteristics.TotalConsumption)
|
|
103
77
|
.on('get', this.getTotalConsumption.bind(this));
|
|
104
78
|
// create handlers for required characteristics
|
|
105
|
-
this.historyService = new eveHistoryService_1.EveHistoryService(this, this.api, 'energy',
|
|
79
|
+
this.historyService = new eveHistoryService_1.EveHistoryService(this, this.api, 'energy',
|
|
80
|
+
// this.historyFilename,
|
|
81
|
+
this.logger);
|
|
106
82
|
this.readTotalConsumption();
|
|
107
83
|
//device events
|
|
108
84
|
setTimeout(async () => {
|
|
@@ -193,36 +169,49 @@ class TuyaSwitchAccessoryAccessory {
|
|
|
193
169
|
return status.dps[1];
|
|
194
170
|
}
|
|
195
171
|
readTotalConsumption() {
|
|
196
|
-
this.historyService.readHistory((lastEntry, history) => {
|
|
172
|
+
this.historyService.readHistory((lastEntry, history, extra) => {
|
|
197
173
|
const lastItem = history.pop();
|
|
198
174
|
if (lastItem) {
|
|
199
|
-
this.
|
|
175
|
+
this.log.info('History: last item: %s', lastItem);
|
|
200
176
|
}
|
|
201
177
|
else {
|
|
202
|
-
this.
|
|
178
|
+
this.log.info('History: no data');
|
|
203
179
|
}
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
const filename = path.join(filepath, this.historyFilename);
|
|
208
|
-
this.log.info(`Reading history: ${filename}`);
|
|
209
|
-
const data = fs.readFileSync(filename, 'utf8');
|
|
210
|
-
const jsonData = typeof data === 'object' ? data : JSON.parse(data);
|
|
211
|
-
const totalConsumption = jsonData.extra && jsonData.extra.totalConsumption
|
|
212
|
-
? jsonData.extra.totalConsumption
|
|
180
|
+
this.log.info('History: extra: %s', extra);
|
|
181
|
+
const totalConsumption = extra.totalConsumption
|
|
182
|
+
? extra.totalConsumption
|
|
213
183
|
: 0.0;
|
|
214
|
-
const resetTotal =
|
|
215
|
-
?
|
|
184
|
+
const resetTotal = extra.resetTotal
|
|
185
|
+
? extra.resetTotal
|
|
216
186
|
: 0; // Math.floor(Date.now() / 1000) - 978307200 // seconds since 01.01.2001
|
|
217
187
|
this.log.info(`totalConsumption: ${totalConsumption} resetTotal: ${resetTotal}`);
|
|
218
188
|
this.totalConsumption = totalConsumption;
|
|
219
189
|
this.resetTotal = resetTotal;
|
|
220
|
-
}
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
190
|
+
});
|
|
191
|
+
// try {
|
|
192
|
+
// const filepath = this.api ? this.api.user.storagePath() : './config';
|
|
193
|
+
// const filename = path.join(filepath, this.historyFilename);
|
|
194
|
+
// this.log.info(`Reading history: ${filename}`);
|
|
195
|
+
// const data = fs.readFileSync(filename, 'utf8');
|
|
196
|
+
// const jsonData = typeof data === 'object' ? data : JSON.parse(data);
|
|
197
|
+
// const totalConsumption =
|
|
198
|
+
// jsonData.extra && jsonData.extra.totalConsumption
|
|
199
|
+
// ? jsonData.extra.totalConsumption
|
|
200
|
+
// : 0.0;
|
|
201
|
+
// const resetTotal =
|
|
202
|
+
// jsonData.extra && jsonData.extra.resetTotal
|
|
203
|
+
// ? jsonData.extra.resetTotal
|
|
204
|
+
// : 0; // Math.floor(Date.now() / 1000) - 978307200 // seconds since 01.01.2001
|
|
205
|
+
// this.log.info(
|
|
206
|
+
// `totalConsumption: ${totalConsumption} resetTotal: ${resetTotal}`,
|
|
207
|
+
// );
|
|
208
|
+
// this.totalConsumption = totalConsumption;
|
|
209
|
+
// this.resetTotal = resetTotal;
|
|
210
|
+
// } catch (err) {
|
|
211
|
+
// this.log.error(`readTotalConsumption error: ${err}`);
|
|
212
|
+
// this.totalConsumption = 0;
|
|
213
|
+
// this.resetTotal = 0;
|
|
214
|
+
// }
|
|
226
215
|
}
|
|
227
216
|
getServices() {
|
|
228
217
|
return [
|
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,14 +6,13 @@ 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, serviceType,
|
|
9
|
+
constructor(accessory, api, serviceType, logger) {
|
|
10
10
|
this.accessory = accessory;
|
|
11
11
|
this.api = api;
|
|
12
12
|
this.serviceType = serviceType;
|
|
13
|
-
this.filename = filename;
|
|
14
13
|
this.logger = logger;
|
|
15
14
|
const FakeGatoHistoryService = (0, fakegato_history_1.default)(api);
|
|
16
|
-
this.historyService = new FakeGatoHistoryService(this.serviceType, this.accessory, { storage: 'fs', log: this.logger
|
|
15
|
+
this.historyService = new FakeGatoHistoryService(this.serviceType, this.accessory, { storage: 'fs', log: this.logger });
|
|
17
16
|
}
|
|
18
17
|
getService() {
|
|
19
18
|
return this.historyService;
|
|
@@ -45,7 +44,7 @@ class EveHistoryService {
|
|
|
45
44
|
const accessoryName = 'name' in thisAccessory ? thisAccessory['name'] : thisAccessory;
|
|
46
45
|
this.logger.debug('read data from', accessoryName);
|
|
47
46
|
const jsonFile = typeof data === 'object' ? data : JSON.parse(data);
|
|
48
|
-
lastEntryHandler(jsonFile.lastEntry, jsonFile.history);
|
|
47
|
+
lastEntryHandler(jsonFile.lastEntry, jsonFile.history, jsonFile.extra);
|
|
49
48
|
}
|
|
50
49
|
catch (e) {
|
|
51
50
|
this.logger.debug('**ERROR fetching persisting data restart from zero - invalid JSON**', e);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"eveHistoryService.js","sourceRoot":"","sources":["../../src/lib/eveHistoryService.ts"],"names":[],"mappings":";;;;;;AAAA,wEAAwC;AAwBxC,MAAa,iBAAiB;IAG5B,YACU,SAA0B,EAC1B,GAAQ,EACR,WAAmB,EACnB,
|
|
1
|
+
{"version":3,"file":"eveHistoryService.js","sourceRoot":"","sources":["../../src/lib/eveHistoryService.ts"],"names":[],"mappings":";;;;;;AAAA,wEAAwC;AAwBxC,MAAa,iBAAiB;IAG5B,YACU,SAA0B,EAC1B,GAAQ,EACR,WAAmB,EACnB,MAAe;QAHf,cAAS,GAAT,SAAS,CAAiB;QAC1B,QAAG,GAAH,GAAG,CAAK;QACR,gBAAW,GAAX,WAAW,CAAQ;QACnB,WAAM,GAAN,MAAM,CAAS;QAEvB,MAAM,sBAAsB,GAAG,IAAA,0BAAQ,EAAC,GAAG,CAAC,CAAC;QAC7C,IAAI,CAAC,cAAc,GAAG,IAAI,sBAAsB,CAC9C,IAAI,CAAC,WAAW,EAChB,IAAI,CAAC,SAAS,EACd,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,CAAC,MAAM,EAAE,CACpC,CAAC;IACJ,CAAC;IAED,UAAU;QACR,OAAO,IAAI,CAAC,cAAyB,CAAC;IACxC,CAAC;IAED,qBAAqB,CAAC,KAAK;QACxB,IAAI,CAAC,cAAiC,CAAC,qBAAqB,CAAC,KAAK,CAAC,CAAC;IACvE,CAAC;IAED,qBAAqB;QACnB,OAAQ,IAAI,CAAC,cAAiC,CAAC,qBAAqB,EAAE,CAAC;IACzE,CAAC;IAED,QAAQ,CAAC,KAA0B;QAChC,IAAI,CAAC,cAAiC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IAC1D,CAAC;IAED,WAAW,CACT,gBAIS;QAET,MAAM,OAAO,GAAK,IAAI,CAAC,GAAyC;aAC7D,qBAAqB,CAAC;QAEzB,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,GACjB,MAAM,IAAI,aAAa,CAAC,CAAC,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC;4BAClE,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,gBAAgB,EAAE,aAAa,CAAC,CAAC;4BACnD,MAAM,QAAQ,GACZ,OAAO,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;4BACrD,gBAAgB,CACd,QAAQ,CAAC,SAAS,EAClB,QAAQ,CAAC,OAAgC,EACzC,QAAQ,CAAC,KAA4B,CACtC,CAAC;yBACH;wBAAC,OAAO,CAAC,EAAE;4BACV,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,qEAAqE,EACrE,CAAC,CACF,CAAC;yBACH;qBACF;iBACF;qBAAM;oBACL,oBAAoB;oBACpB,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,oDAAoD,EACpD,GAAG,CACJ,CAAC;iBACH;YACH,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC;SACb,CAAC,CAAC;IACL,CAAC;CACF;AAnFD,8CAmFC"}
|
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.11",
|
|
5
5
|
"description": "Homebridge plugin for TuyAPI (with Eve app energy consumption monitoring)",
|
|
6
6
|
"license": "MIT",
|
|
7
7
|
"repository": {
|