homebridge-tydom 0.23.6 → 0.23.7

package/README.md

@@ -81,6 +81,8 @@
 
 Your username is the MAC Address of your local Tydom hardware, it should be `001A25` + your 6-character home ID that you can find in the mobile app.
 
+The password for newer Tydom setups can be auto-generated by the mobile application and hard to get. Only solution for now is to use some SSL Proxying application on your mobile to inspect the requests. You can follow the [following guide](https://github.com/mgcrea/homebridge-tydom/issues/72#issuecomment-1315036089) from @aure-olivier to get it.
+
 For your password, you can also use an environment variable `HOMEBRIDGE_TYDOM_PASSWORD` with the base64 encoded value of your password.
 
 > Example: `HOMEBRIDGE_TYDOM_PASSWORD=Zm9vYmFyYmF6` for a `foobarbaz` password (`echo -n "foobarbaz" | base64`)
@@ -211,7 +213,8 @@ You can override categories of devices (eg. some light switch used to manage a f
 }
 ```
 
-> `3` being the `Categories.FAN` number.
+> `3` being the `Fan` number.
+> `8` being the `Switch` number.
 
 ### Supported hardware
 

package/lib/accessories/lightbulb.d.ts

@@ -1,6 +1,6 @@
-import type { PlatformAccessory } from 'homebridge';
+import { PlatformAccessory } from 'homebridge';
 import TydomController from '../controller';
-import { TydomAccessoryContext } from '../typings/tydom';
+import { TydomAccessoryContext } from '../typings';
 type LightbulbSettings = Record<string, never>;
 type LightbulbState = {
     latestBrightness: number;

package/lib/accessories/lightbulb.js

@@ -1,20 +1,23 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateLightbulb = exports.setupLightbulb = void 0;
+const debug_1 = __importDefault(require("debug"));
 const lodash_1 = require("lodash");
-const accessory_1 = require("../helpers/accessory");
-const chalk_1 = require("../utils/chalk");
-const debug_1 = require("../utils/debug");
-const hap_1 = require("../config/hap");
+const helpers_1 = require("../helpers");
 const tydom_1 = require("../helpers/tydom");
+const utils_1 = require("../utils");
 const switchableService_1 = require("./services/switchableService");
+const hap_1 = require("../config/hap");
 const setupLightbulb = (accessory, controller) => {
     const { context } = accessory;
     const { client } = controller;
     const { On, Brightness } = hap_1.Characteristic;
     const { deviceId, endpointId, metadata, state } = context;
-    (0, accessory_1.setupAccessoryInformationService)(accessory, controller);
-    (0, accessory_1.setupAccessoryIdentifyHandler)(accessory, controller);
+    (0, helpers_1.setupAccessoryInformationService)(accessory, controller);
+    (0, helpers_1.setupAccessoryIdentifyHandler)(accessory, controller);
     Object.assign(state, {
         latestBrightness: 100,
         pendingUpdatedValues: [],
@@ -27,9 +30,9 @@ const setupLightbulb = (accessory, controller) => {
         return;
     }
     // Dimmable
-    const service = (0, accessory_1.addAccessoryService)(accessory, hap_1.Service.Lightbulb, `${accessory.displayName}`, true);
+    const service = (0, helpers_1.addAccessoryService)(accessory, hap_1.Service.Lightbulb, `${accessory.displayName}`, true);
     const debouncedSetLevel = (0, lodash_1.debounce)(async (value) => {
-        (0, debug_1.debugTydomPut)('level', accessory, value);
+        (0, utils_1.debugTydomPut)('level', accessory, value);
         await client.put(`/devices/${deviceId}/endpoints/${endpointId}/data`, [
             {
                 name: 'level',
@@ -43,12 +46,12 @@ const setupLightbulb = (accessory, controller) => {
     service
         .getCharacteristic(hap_1.Characteristic.On)
         .on("get" /* CharacteristicEventTypes.GET */, async (callback) => {
-        (0, debug_1.debugGet)(On, service);
+        (0, utils_1.debugGet)(On, service);
         try {
             const data = (await (0, tydom_1.getTydomDeviceData)(client, { deviceId, endpointId }));
             const level = (0, tydom_1.getTydomDataPropValue)(data, 'level');
             const nextValue = level > 0;
-            (0, debug_1.debugGetResult)(On, service, nextValue);
+            (0, utils_1.debugGetResult)(On, service, nextValue);
             callback(null, nextValue);
         }
         catch (err) {
@@ -56,12 +59,12 @@ const setupLightbulb = (accessory, controller) => {
         }
     })
         .on("set" /* CharacteristicEventTypes.SET */, async (value, callback) => {
-        (0, debug_1.debugSet)(On, service, value);
+        (0, utils_1.debugSet)(On, service, value);
         try {
             const nextLevel = value ? state.latestBrightness || 100 : 0;
             await debouncedSetLevel(nextLevel);
             service.updateCharacteristic(Brightness, nextLevel);
-            (0, debug_1.debugSetResult)(On, service, value);
+            (0, utils_1.debugSetResult)(On, service, value);
             callback();
         }
         catch (err) {
@@ -72,11 +75,11 @@ const setupLightbulb = (accessory, controller) => {
     service
         .getCharacteristic(hap_1.Characteristic.Brightness)
         .on("get" /* CharacteristicEventTypes.GET */, async (callback) => {
-        (0, debug_1.debugGet)(Brightness, service);
+        (0, utils_1.debugGet)(Brightness, service);
         try {
             const data = await (0, tydom_1.getTydomDeviceData)(client, { deviceId, endpointId });
             const level = (0, tydom_1.getTydomDataPropValue)(data, 'level');
-            (0, debug_1.debugGetResult)(Brightness, service, level);
+            (0, utils_1.debugGetResult)(Brightness, service, level);
             callback(null, level);
         }
         catch (err) {
@@ -84,7 +87,7 @@ const setupLightbulb = (accessory, controller) => {
         }
     })
         .on("set" /* CharacteristicEventTypes.SET */, async (value, callback) => {
-        (0, debug_1.debugSet)(Brightness, service, value);
+        (0, utils_1.debugSet)(Brightness, service, value);
         try {
             const nextValue = value;
             Object.assign(state, {
@@ -92,7 +95,7 @@ const setupLightbulb = (accessory, controller) => {
                 lastUpdatedAt: Date.now()
             });
             await debouncedSetLevel(nextValue);
-            (0, debug_1.debugSetResult)(Brightness, service, value);
+            (0, utils_1.debugSetResult)(Brightness, service, value);
             callback();
         }
         catch (err) {
@@ -117,24 +120,24 @@ const updateLightbulb = (accessory, controller, updates) => {
         const { name, value } = update;
         switch (name) {
             case 'level': {
-                const service = (0, accessory_1.getAccessoryService)(accessory, hap_1.Service.Lightbulb);
+                const service = (0, helpers_1.getAccessoryService)(accessory, hap_1.Service.Lightbulb);
                 const level = value;
                 if (level === null) {
-                    (0, debug_1.debug)(`Encountered a ${(0, chalk_1.chalkString)('level')} update with a null value!`);
+                    (0, debug_1.default)(`Encountered a ${(0, utils_1.chalkString)('level')} update with a null value!`);
                     return;
                 }
                 // @NOTE ignore pending updates
                 if (state.pendingUpdatedValues.includes(level)) {
-                    (0, debug_1.debug)(`Ignoring a delayed ${(0, chalk_1.chalkString)('level')} update with value=${(0, chalk_1.chalkNumber)(level)}`);
+                    (0, debug_1.default)(`Ignoring a delayed ${(0, utils_1.chalkString)('level')} update with value=${(0, utils_1.chalkNumber)(level)}`);
                     // Reset pending updates stack
                     state.pendingUpdatedValues = [];
                     return;
                 }
-                (0, debug_1.debugSetUpdate)(On, service, level > 0);
+                (0, utils_1.debugSetUpdate)(On, service, level > 0);
                 service.updateCharacteristic(On, level > 0);
                 // @NOTE Only update brightness for non-null values
                 if (level > 0) {
-                    (0, debug_1.debugSetUpdate)(Brightness, service, level);
+                    (0, utils_1.debugSetUpdate)(Brightness, service, level);
                     service.updateCharacteristic(Brightness, level);
                 }
                 return;

package/lib/accessories/outlet.d.ts

@@ -1,5 +1,5 @@
-import type { PlatformAccessory } from 'homebridge';
+import { PlatformAccessory } from 'homebridge';
 import { TydomAccessoryContext } from '../typings';
 import TydomController from '../controller';
 export declare const setupOutlet: (accessory: PlatformAccessory<TydomAccessoryContext>, controller: TydomController) => void;
-export declare const updateOutlet: (accessory: PlatformAccessory<TydomAccessoryContext>, controller: TydomController, updates: Record<string, unknown>[]) => void;
+export declare const updateOutlet: (accessory: PlatformAccessory<TydomAccessoryContext>, _controller: TydomController, updates: Record<string, unknown>[]) => void;

package/lib/accessories/outlet.js

@@ -1,17 +1,92 @@
 "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");
 const hap_1 = require("../config/hap");
 const accessory_1 = require("../helpers/accessory");
-const switchableService_1 = require("./services/switchableService");
 const setupOutlet = (accessory, controller) => {
+    const { context } = accessory;
+    const { client } = controller;
+    const { On } = hap_1.Characteristic;
+    const { deviceId, endpointId } = context;
     (0, accessory_1.setupAccessoryInformationService)(accessory, controller);
     (0, accessory_1.setupAccessoryIdentifyHandler)(accessory, controller);
     // Add the actual accessory Service
-    (0, switchableService_1.addAccessorySwitchableService)(accessory, controller, hap_1.Service.Outlet);
+    const service = (0, accessory_1.addAccessoryService)(accessory, hap_1.Service.Outlet, `${accessory.displayName}`, true);
+    service
+        .getCharacteristic(On)
+        .on("get" /* CharacteristicEventTypes.GET */, async (callback) => {
+        (0, utils_1.debugGet)(On, service);
+        try {
+            const data = await (0, tydom_1.getTydomDeviceData)(client, { deviceId, endpointId });
+            const plugCmd = (0, tydom_1.getTydomDataPropValue)(data, 'plugCmd');
+            const nextValue = plugCmd === 'ON';
+            (0, utils_1.debugGetResult)(On, service, nextValue);
+            callback(null, nextValue);
+        }
+        catch (err) {
+            callback(err);
+        }
+    })
+        .on("set" /* CharacteristicEventTypes.SET */, async (value, callback) => {
+        (0, utils_1.debugSet)(On, service, value);
+        try {
+            const tydomValue = value ? 'ON' : 'OFF';
+            await client.put(`/devices/${deviceId}/endpoints/${endpointId}/data`, [
+                {
+                    name: 'plugCmd',
+                    value: tydomValue
+                }
+            ]);
+            (0, utils_1.debugSetResult)(On, service, value, tydomValue);
+            callback();
+        }
+        catch (err) {
+            callback(err);
+        }
+    });
+    service
+        .getCharacteristic(definitions_1.OutletInUse)
+        .on("get" /* CharacteristicEventTypes.GET */, async (callback) => {
+        (0, utils_1.debugGet)(definitions_1.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);
+            callback(null, nextValue);
+        }
+        catch (err) {
+            callback(err);
+        }
+    });
 };
 exports.setupOutlet = setupOutlet;
-const updateOutlet = (accessory, controller, updates) => {
-    (0, switchableService_1.updateAccessorySwitchableService)(accessory, controller, updates, hap_1.Service.Outlet);
+const updateOutlet = (accessory, _controller, updates) => {
+    updates.forEach((update) => {
+        const { name, value } = update;
+        const { On } = hap_1.Characteristic;
+        switch (name) {
+            case 'level': {
+                const service = (0, accessory_1.getAccessoryService)(accessory, hap_1.Service.Outlet);
+                const nextValue = value === 'ON';
+                (0, utils_1.debugSetUpdate)(On, service, nextValue);
+                service.updateCharacteristic(On, nextValue);
+                return;
+            }
+            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);
+                return;
+            }
+            default:
+                return;
+        }
+    });
 };
 exports.updateOutlet = updateOutlet;

package/package.json

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