@petro-kushchak/homebridge-tuya-eve 1.0.8 → 1.0.9
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
|
@@ -102,7 +102,7 @@ class TuyaSwitchAccessoryAccessory {
|
|
|
102
102
|
.getCharacteristic(this.EnergyCharacteristics.TotalConsumption)
|
|
103
103
|
.on('get', this.getTotalConsumption.bind(this));
|
|
104
104
|
// create handlers for required characteristics
|
|
105
|
-
this.historyService = new eveHistoryService_1.EveHistoryService(this, this.api, 'energy', this.logger);
|
|
105
|
+
this.historyService = new eveHistoryService_1.EveHistoryService(this, this.api, 'energy', this.historyFilename, this.logger);
|
|
106
106
|
this.readTotalConsumption();
|
|
107
107
|
//device events
|
|
108
108
|
setTimeout(async () => {
|
|
@@ -116,19 +116,17 @@ class TuyaSwitchAccessoryAccessory {
|
|
|
116
116
|
this.log(`Device state: ${JSON.stringify(state)}`);
|
|
117
117
|
this.updateState(state.dps);
|
|
118
118
|
const consumption = this.watts * delta; // W/s
|
|
119
|
-
|
|
120
|
-
const resetTotal = this.resetTotal;
|
|
121
|
-
this.totalConsumption += totalConsumption;
|
|
119
|
+
this.totalConsumption += consumption / kHour;
|
|
122
120
|
this.historyService.addEntry({ time: now / 1000, power: this.watts });
|
|
123
121
|
const extra = this.historyService.getExtraPersistedData();
|
|
124
122
|
if (!extra) {
|
|
125
123
|
this.historyService.setExtraPersistedData({
|
|
126
|
-
totalConsumption,
|
|
127
|
-
resetTotal,
|
|
124
|
+
totalConsumption: this.totalConsumption,
|
|
125
|
+
resetTotal: this.resetTotal,
|
|
128
126
|
});
|
|
129
127
|
}
|
|
130
|
-
else if (extra.totalConsumption !== totalConsumption ||
|
|
131
|
-
extra.resetTotal !== resetTotal) {
|
|
128
|
+
else if (extra.totalConsumption !== this.totalConsumption ||
|
|
129
|
+
extra.resetTotal !== this.resetTotal) {
|
|
132
130
|
extra.totalConsumption = this.totalConsumption;
|
|
133
131
|
extra.resetTotal = this.resetTotal;
|
|
134
132
|
this.historyService.setExtraPersistedData(extra);
|
|
@@ -190,14 +188,15 @@ class TuyaSwitchAccessoryAccessory {
|
|
|
190
188
|
await this.device.set({ set: value, dps: '1' });
|
|
191
189
|
}
|
|
192
190
|
async getPowerOnOff() {
|
|
193
|
-
this.log.info('GET ON');
|
|
194
191
|
const status = await this.device.get();
|
|
192
|
+
this.log.info(`GET ON: ${status.dps[1]}`);
|
|
195
193
|
return status.dps[1];
|
|
196
194
|
}
|
|
197
195
|
readTotalConsumption() {
|
|
198
196
|
try {
|
|
199
197
|
const filepath = this.api ? this.api.user.storagePath() : './config';
|
|
200
198
|
const filename = path.join(filepath, this.historyFilename);
|
|
199
|
+
this.log.info(`Reading history: ${filename}`);
|
|
201
200
|
const data = fs.readFileSync(filename, 'utf8');
|
|
202
201
|
const jsonData = typeof data === 'object' ? data : JSON.parse(data);
|
|
203
202
|
const totalConsumption = jsonData.extra && jsonData.extra.totalConsumption
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,13 +6,14 @@ 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, logger) {
|
|
9
|
+
constructor(accessory, api, serviceType, filename, logger) {
|
|
10
10
|
this.accessory = accessory;
|
|
11
11
|
this.api = api;
|
|
12
12
|
this.serviceType = serviceType;
|
|
13
|
+
this.filename = filename;
|
|
13
14
|
this.logger = logger;
|
|
14
15
|
const FakeGatoHistoryService = (0, fakegato_history_1.default)(api);
|
|
15
|
-
this.historyService = new FakeGatoHistoryService(this.serviceType, this.accessory, { storage: 'fs', log: this.logger });
|
|
16
|
+
this.historyService = new FakeGatoHistoryService(this.serviceType, this.accessory, { storage: 'fs', log: this.logger, filename: this.filename });
|
|
16
17
|
}
|
|
17
18
|
getService() {
|
|
18
19
|
return this.historyService;
|
|
@@ -27,7 +28,8 @@ class EveHistoryService {
|
|
|
27
28
|
this.historyService.addEntry(entry);
|
|
28
29
|
}
|
|
29
30
|
readHistory(lastEntryHandler) {
|
|
30
|
-
const storage = this.api
|
|
31
|
+
const storage = this.api
|
|
32
|
+
.globalFakeGatoStorage;
|
|
31
33
|
if (!storage) {
|
|
32
34
|
this.logger.debug('Failed to access globalFakeGatoStorage');
|
|
33
35
|
return;
|
|
@@ -42,7 +44,7 @@ class EveHistoryService {
|
|
|
42
44
|
try {
|
|
43
45
|
const accessoryName = 'name' in thisAccessory ? thisAccessory['name'] : thisAccessory;
|
|
44
46
|
this.logger.debug('read data from', accessoryName);
|
|
45
|
-
const jsonFile = typeof
|
|
47
|
+
const jsonFile = typeof data === 'object' ? data : JSON.parse(data);
|
|
46
48
|
lastEntryHandler(jsonFile.lastEntry, jsonFile.history);
|
|
47
49
|
}
|
|
48
50
|
catch (e) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"eveHistoryService.js","sourceRoot":"","sources":["../../src/lib/eveHistoryService.ts"],"names":[],"mappings":";;;;;;AAAA,wEAAwC;AAwBxC,MAAa,iBAAiB;
|
|
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,QAAgB,EAChB,MAAe;QAJf,cAAS,GAAT,SAAS,CAAiB;QAC1B,QAAG,GAAH,GAAG,CAAK;QACR,gBAAW,GAAX,WAAW,CAAQ;QACnB,aAAQ,GAAR,QAAQ,CAAQ;QAChB,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,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE,CAC7D,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,gBAGS;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,CAC1C,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;AAlFD,8CAkFC"}
|
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.9",
|
|
5
5
|
"description": "Homebridge plugin for TuyAPI (with Eve app energy consumption monitoring)",
|
|
6
6
|
"license": "MIT",
|
|
7
7
|
"repository": {
|