homebridge-tydom 0.23.8 → 0.23.10

package/README.md

@@ -51,7 +51,7 @@
   "private": true,
   "description": "This file keeps track of which plugins should be installed.",
   "dependencies": {
-    "homebridge-tydom": "^0.15.1"
+    "homebridge-tydom": "^0.23.9"
   }
 }
 ```

package/lib/accessories/outlet.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateOutlet = exports.setupOutlet = void 0;
-const definitions_1 = require("hap-nodejs/dist/lib/definitions");
 const lodash_1 = require("lodash");
 const tydom_1 = require("../helpers/tydom");
 const utils_1 = require("../utils");
@@ -10,7 +9,7 @@ const accessory_1 = require("../helpers/accessory");
 const setupOutlet = (accessory, controller) => {
     const { context } = accessory;
     const { client } = controller;
-    const { On } = hap_1.Characteristic;
+    const { On, OutletInUse } = hap_1.Characteristic;
     const { deviceId, endpointId } = context;
     (0, accessory_1.setupAccessoryInformationService)(accessory, controller);
     (0, accessory_1.setupAccessoryIdentifyHandler)(accessory, controller);
@@ -49,14 +48,14 @@ const setupOutlet = (accessory, controller) => {
         }
     });
     service
-        .getCharacteristic(definitions_1.OutletInUse)
+        .getCharacteristic(OutletInUse)
         .on("get" /* CharacteristicEventTypes.GET */, async (callback) => {
-        (0, utils_1.debugGet)(definitions_1.OutletInUse, service);
+        (0, utils_1.debugGet)(OutletInUse, service);
         try {
             const data = await (0, tydom_1.getTydomDeviceData)(client, { deviceId, endpointId });
             const energyInstantTotElecP = (0, tydom_1.getTydomDataPropValue)(data, 'energyInstantTotElecP');
             const nextValue = energyInstantTotElecP > 0;
-            (0, utils_1.debugGetResult)(definitions_1.OutletInUse, service, nextValue);
+            (0, utils_1.debugGetResult)(OutletInUse, service, nextValue);
             callback(null, nextValue);
         }
         catch (err) {
@@ -68,7 +67,7 @@ exports.setupOutlet = setupOutlet;
 const updateOutlet = (accessory, _controller, updates) => {
     updates.forEach((update) => {
         const { name, value } = update;
-        const { On } = hap_1.Characteristic;
+        const { On, OutletInUse } = hap_1.Characteristic;
         switch (name) {
             case 'level': {
                 const service = (0, accessory_1.getAccessoryService)(accessory, hap_1.Service.Outlet);
@@ -80,8 +79,8 @@ const updateOutlet = (accessory, _controller, updates) => {
             case 'energyInstantTotElecP': {
                 const service = (0, accessory_1.getAccessoryService)(accessory, hap_1.Service.Outlet);
                 const nextValue = (0, lodash_1.toNumber)(value) > 0;
-                (0, utils_1.debugSetUpdate)(definitions_1.OutletInUse, service, nextValue);
-                service.updateCharacteristic(definitions_1.OutletInUse, nextValue);
+                (0, utils_1.debugSetUpdate)(OutletInUse, service, nextValue);
+                service.updateCharacteristic(OutletInUse, nextValue);
                 return;
             }
             default:

package/lib/bin/cli.js

@@ -14,10 +14,12 @@ const main = async () => {
             const allDevicesConfig = dump['/configs/file'];
             const allDevicesMeta = dump['/devices/meta'];
             for (const deviceMeta of allDevicesMeta) {
-                const signature = (0, tydom_1.getEndpointSignatureFromMetadata)(deviceMeta.endpoints[0].metadata);
-                const config = allDevicesConfig.endpoints.find((item) => item.id_device === deviceMeta.id);
-                const hash = `${config === null || config === void 0 ? void 0 : config.first_usage}:${await (0, utils_1.sha256)(signature)}`;
-                console.dir({ id: config === null || config === void 0 ? void 0 : config.id_device, name: config === null || config === void 0 ? void 0 : config.name, signature, hash });
+                for (const endpointMeta of deviceMeta.endpoints) {
+                    const signature = (0, tydom_1.getEndpointSignatureFromMetadata)(endpointMeta.metadata);
+                    const config = allDevicesConfig.endpoints.find((item) => item.id_device === deviceMeta.id && item.id_endpoint === endpointMeta.id);
+                    const hash = `${config === null || config === void 0 ? void 0 : config.first_usage}:${await (0, utils_1.sha256)(signature)}`;
+                    console.dir({ id: `${deviceMeta.id}.${endpointMeta.id}`, name: config === null || config === void 0 ? void 0 : config.name, signature, hash });
+                }
             }
             break;
         }

package/lib/controller.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 import { EventEmitter } from 'events';
-import type { Categories, Logging } from 'homebridge';
+import { Categories, Logging } from 'homebridge';
 import TydomClient from 'tydom-client';
 import { TydomHttpMessage, TydomResponse } from 'tydom-client/lib/utils/tydom';
 import { TydomPlatformConfig } from './platform';
@@ -25,7 +25,8 @@ export default class TydomController extends EventEmitter {
     private state;
     private refreshInterval?;
     constructor(log: Logging, config: TydomPlatformConfig);
-    getAccessoryId(deviceId: number): string;
+    getUniqueId(deviceId: number, endpointId: number): string;
+    getAccessoryId(deviceId: number, endpointId: number): string;
     connect(): Promise<void>;
     sync(): Promise<{
         config: TydomConfigResponse;

package/lib/controller.js

@@ -43,9 +43,12 @@ class TydomController extends events_1.EventEmitter {
             this.emit('disconnect');
         });
     }
-    getAccessoryId(deviceId) {
+    getUniqueId(deviceId, endpointId) {
+        return deviceId === endpointId ? `${deviceId}` : `${deviceId}:${endpointId}`;
+    }
+    getAccessoryId(deviceId, endpointId) {
         const { username } = this.config;
-        return `tydom:${username.slice(6)}:accessories:${deviceId}`;
+        return `tydom:${username.slice(6)}:accessories:${this.getUniqueId(deviceId, endpointId)}`;
     }
     async connect() {
         const { hostname, username } = this.config;
@@ -95,6 +98,7 @@ class TydomController extends events_1.EventEmitter {
         const { endpoints, groups: configGroups } = config;
         endpoints.forEach((endpoint) => {
             const { id_endpoint: endpointId, id_device: deviceId, name: deviceName, first_usage: firstUsage } = endpoint;
+            const uniqueId = this.getUniqueId(deviceId, endpointId);
             const { metadata } = (0, tydom_1.getEndpointDetailsFromMeta)(endpoint, meta);
             const groupId = (0, tydom_1.getEndpointGroupIdFromGroups)(endpoint, groups);
             const group = groupId ? configGroups.find(({ id }) => id === groupId) : undefined;
@@ -120,12 +124,12 @@ class TydomController extends events_1.EventEmitter {
             if (excludedCategories.length && (0, utils_1.stringIncludes)(excludedCategories, category)) {
                 return;
             }
-            if (!this.devices.has(deviceId)) {
+            if (!this.devices.has(uniqueId)) {
                 this.log.info(`Adding new device with firstUsage=${(0, utils_1.chalkString)(firstUsage)}, deviceId=${(0, utils_1.chalkNumber)(deviceId)} and endpointId=${(0, utils_1.chalkNumber)(endpointId)}`);
-                const accessoryId = this.getAccessoryId(deviceId);
+                const accessoryId = this.getAccessoryId(deviceId, endpointId);
                 const nameFromSetting = (0, lodash_1.get)(settings, `${deviceId}.name`);
                 const name = nameFromSetting || deviceName;
-                this.devices.set(deviceId, category);
+                this.devices.set(uniqueId, category);
                 const context = {
                     name,
                     category,
@@ -168,27 +172,31 @@ class TydomController extends events_1.EventEmitter {
             return;
         }
         body.forEach((device) => {
+            var _a;
             const { id: deviceId, endpoints } = device;
-            if (!this.devices.has(deviceId)) {
-                (0, utils_1.debug)(`${chalk_1.default.bold.yellow('←PUT')}:${chalk_1.default.blue('ignored')} for device id=${(0, utils_1.chalkString)(deviceId)}, endpoints:\n${(0, utils_1.chalkJson)(endpoints)}`);
-                return;
+            for (const endpoint of endpoints) {
+                const { id: endpointId, data, cdata } = endpoint;
+                const updates = type === 'data' ? data : cdata;
+                const uniqueId = this.getUniqueId(deviceId, endpointId);
+                if (!this.devices.has(uniqueId)) {
+                    (0, utils_1.debug)(`${chalk_1.default.bold.yellow('←PUT')}:${chalk_1.default.blue('ignored')} for device id=${(0, utils_1.chalkString)(deviceId)} and endpointId=${(0, utils_1.chalkNumber)(endpointId)}`);
+                    return;
+                }
+                const category = (_a = this.devices.get(uniqueId)) !== null && _a !== void 0 ? _a : 1 /* Categories.OTHER */;
+                const accessoryId = this.getAccessoryId(deviceId, endpointId);
+                (0, utils_1.debug)(`${chalk_1.default.bold.green('←PUT')}:${chalk_1.default.blue('update')} for deviceId=${(0, utils_1.chalkNumber)(deviceId)} and endpointId=${(0, utils_1.chalkNumber)(endpointId)}, updates:\n${(0, utils_1.chalkJson)(updates)}`);
+                const context = {
+                    category,
+                    deviceId,
+                    endpointId,
+                    accessoryId
+                };
+                this.emit('update', {
+                    type,
+                    updates,
+                    context
+                });
             }
-            const category = this.devices.get(deviceId);
-            const { id: endpointId, data, cdata } = endpoints[0];
-            const updates = type === 'data' ? data : cdata;
-            const accessoryId = this.getAccessoryId(deviceId);
-            (0, utils_1.debug)(`${chalk_1.default.bold.green('←PUT')}:${chalk_1.default.blue('update')} for device id=${(0, utils_1.chalkString)(deviceId)}, updates:\n${(0, utils_1.chalkJson)(updates)}`);
-            const context = {
-                category,
-                deviceId,
-                endpointId,
-                accessoryId
-            };
-            this.emit('update', {
-                type,
-                updates,
-                context
-            });
         });
     }
 }

package/lib/helpers/tydom.js

@@ -96,7 +96,6 @@ const ENDPOINTS_SIGNATURES_CATEGORIES = {
     'hvac:16804a9994bce28275150db329a9c0b931ef7f20608c1a3d2ff248f58569f0d3': 10 /* Categories.SENSOR */,
     'hvac:17f933bec8ed29f9b2a2cd5280fb5b64806cf8a1c064c83950e350f491d7cb9f': 9 /* Categories.THERMOSTAT */,
     'hvac:1bab47d1dd7e898b5dc2e9867b14dfb8bc9272c4cb0b5d1221da962d43a6ffb4': 9 /* Categories.THERMOSTAT */,
-    'hvac:e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855': 10 /* Categories.SENSOR */,
     'light:449e2a60377094cde10224cee91d378fb0ae373ae6ceea0ac2cbc1ed011bffa7': 5 /* Categories.LIGHTBULB */,
     'light:fce45085835f4f2790ea3b17d208b5ace34935444d2535e75ba3f0a2ce86de5f': 5 /* Categories.LIGHTBULB */,
     'others:449e2a60377094cde10224cee91d378fb0ae373ae6ceea0ac2cbc1ed011bffa7': 5 /* Categories.LIGHTBULB */,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "homebridge-tydom",
-  "version": "0.23.8",
+  "version": "0.23.10",
   "description": "Homebridge plugin to manage Tydom devices by Delta Dore",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",