node-red-contrib-homekit-bridged 1.7.0-dev.3 → 1.7.0-dev.5

package/build/lib/api.js

@@ -25,6 +25,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const logger_1 = require("@nrchkb/logger");
 const hap_nodejs_1 = require("hap-nodejs");
+const EveCharacteristics_1 = __importDefault(require("./hap/eve-app/EveCharacteristics"));
 const Storage_1 = require("./Storage");
 const HapCategories_1 = __importDefault(require("./types/hap-nodejs/HapCategories"));
 const version = require('../../package.json').version.trim();
@@ -127,9 +128,9 @@ module.exports = function (RED) {
         });
     };
     const _initNRCHKBCustomCharacteristicsAPI = () => __awaiter(this, void 0, void 0, function* () {
-        const getCustomCharacteristics = () => {
-            return Storage_1.Storage.loadCustomCharacteristics()
-                .then((value) => {
+        const getCustomCharacteristics = () => __awaiter(this, void 0, void 0, function* () {
+            try {
+                const value = yield Storage_1.Storage.loadCustomCharacteristics();
                 log.trace('loadCustomCharacteristics()');
                 log.trace(value);
                 if (Array.isArray(value)) {
@@ -137,14 +138,14 @@ module.exports = function (RED) {
                 }
                 else {
                     log.debug('customCharacteristics is not Array, returning empty value');
-                    return [];
+                    return EveCharacteristics_1.default;
                 }
-            })
-                .catch((error) => {
+            }
+            catch (error) {
                 log.error(`Failed to get customCharacteristics in nrchkbStorage due to ${error}`);
-                return [];
-            });
-        };
+                return EveCharacteristics_1.default;
+            }
+        });
         const characteristicNameToKey = (name) => {
             return name.replace(' ', '');
         };
@@ -260,7 +261,7 @@ module.exports = function (RED) {
             });
         }));
         RED.httpAdmin.post('/nrchkb/config', RED.auth.needsPermission('nrchkb.write'), (req, res) => __awaiter(this, void 0, void 0, function* () {
-            const customCharacteristics = req.body.customCharacteristics || [];
+            const customCharacteristics = req.body.customCharacteristics || EveCharacteristics_1.default;
             Storage_1.Storage.saveCustomCharacteristics(customCharacteristics)
                 .then(() => {
                 res.sendStatus(200);

package/build/lib/hap/HAPCharacteristic.d.ts

@@ -0,0 +1,9 @@
+import { Characteristic } from 'hap-nodejs';
+import { EveS2R1, EveS2R2, EveS2W1, EveS2W2 } from './eve-app/EveCharacteristics';
+declare class HAPCharacteristic extends Characteristic {
+    static EveS2R1: typeof EveS2R1;
+    static EveS2R2: typeof EveS2R2;
+    static EveS2W1: typeof EveS2W1;
+    static EveS2W2: typeof EveS2W2;
+}
+export default HAPCharacteristic;

package/build/lib/hap/HAPCharacteristic.js

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const hap_nodejs_1 = require("hap-nodejs");
+class HAPCharacteristic extends hap_nodejs_1.Characteristic {
+}
+exports.default = HAPCharacteristic;

package/build/lib/hap/HAPService.d.ts

@@ -0,0 +1,6 @@
+import { Service } from 'hap-nodejs';
+import { EveHistoryData } from './eve-app/EveServices';
+declare class HAPService extends Service {
+    static EveHistoryData: typeof EveHistoryData;
+}
+export default HAPService;

package/build/lib/hap/HAPService.js

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const hap_nodejs_1 = require("hap-nodejs");
+class HAPService extends hap_nodejs_1.Service {
+}
+exports.default = HAPService;

package/build/lib/hap/eve-app/EveCharacteristics.d.ts

@@ -0,0 +1,20 @@
+import CustomCharacteristicType from '../../types/CustomCharacteristicType';
+import HAPCharacteristic from '../HAPCharacteristic';
+declare const EveCharacteristics: CustomCharacteristicType[];
+export declare class EveS2R1 extends HAPCharacteristic {
+    static readonly UUID: string;
+    constructor();
+}
+export declare class EveS2R2 extends HAPCharacteristic {
+    static readonly UUID: string;
+    constructor();
+}
+export declare class EveS2W1 extends HAPCharacteristic {
+    static readonly UUID: string;
+    constructor();
+}
+export declare class EveS2W2 extends HAPCharacteristic {
+    static readonly UUID: string;
+    constructor();
+}
+export default EveCharacteristics;

package/build/lib/hap/eve-app/EveCharacteristics.js

@@ -0,0 +1,89 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.EveS2W2 = exports.EveS2W1 = exports.EveS2R2 = exports.EveS2R1 = void 0;
+const HAPCharacteristic_1 = __importDefault(require("../HAPCharacteristic"));
+const EveCharacteristics = [
+    {
+        UUID: 'E863F10A-079E-48FF-8F27-9C2605A29F52',
+        name: 'Eve-Volt',
+        format: "float",
+        perms: ["pr"],
+        description: 'Volt (V) value. Used by Eve.app.',
+    },
+    {
+        UUID: 'E863F126-079E-48FF-8F27-9C2605A29F52',
+        name: 'Eve-Ampere',
+        format: "float",
+        perms: ["pr"],
+        description: 'Ampere (A) value. Used by Eve.app.',
+    },
+    {
+        UUID: 'E863F10D-079E-48FF-8F27-9C2605A29F52',
+        name: 'Eve-Watt',
+        format: "float",
+        perms: ["pr"],
+        description: 'Watt (W) value. Used by Eve.app, reported as "Consumption".',
+    },
+    {
+        UUID: 'E863F10C-079E-48FF-8F27-9C2605A29F52',
+        name: 'Eve-Kilowatt-hour',
+        format: "float",
+        perms: ["pr"],
+        description: 'Kilowatt-hour (kWh) value. Used by Eve.app, reported as Total Consumption.',
+    },
+    {
+        UUID: 'E863F110-079E-48FF-8F27-9C2605A29F52',
+        name: 'Eve-Volt-Ampere',
+        format: "uint16",
+        perms: ["pr"],
+        description: 'Volt-Ampere (VA) value. Used by Eve.app.',
+    },
+];
+class EveS2R1 extends HAPCharacteristic_1.default {
+    constructor() {
+        super('Eve-S2R1', EveS2R1.UUID, {
+            format: "data",
+            perms: ["pr", "ev", "hd"],
+        });
+    }
+}
+exports.EveS2R1 = EveS2R1;
+EveS2R1.UUID = 'E863F116-079E-48FF-8F27-9C2605A29F52';
+HAPCharacteristic_1.default.EveS2R1 = EveS2R1;
+class EveS2R2 extends HAPCharacteristic_1.default {
+    constructor() {
+        super('Eve-S2R2', EveS2R2.UUID, {
+            format: "data",
+            perms: ["pr", "ev", "hd"],
+        });
+    }
+}
+exports.EveS2R2 = EveS2R2;
+EveS2R2.UUID = 'E863F117-079E-48FF-8F27-9C2605A29F52';
+HAPCharacteristic_1.default.EveS2R2 = EveS2R2;
+class EveS2W1 extends HAPCharacteristic_1.default {
+    constructor() {
+        super('Eve-S2W1', EveS2W1.UUID, {
+            format: "data",
+            perms: ["pw", "hd"],
+        });
+    }
+}
+exports.EveS2W1 = EveS2W1;
+EveS2W1.UUID = 'E863F11C-079E-48FF-8F27-9C2605A29F52';
+HAPCharacteristic_1.default.EveS2W1 = EveS2W1;
+class EveS2W2 extends HAPCharacteristic_1.default {
+    constructor() {
+        super('Eve-S2W2', EveS2W2.UUID, {
+            format: "data",
+            perms: ["pw", "hd"],
+        });
+    }
+}
+exports.EveS2W2 = EveS2W2;
+EveS2W2.UUID = 'E863F121-079E-48FF-8F27-9C2605A29F52';
+HAPCharacteristic_1.default.EveS2W2 = EveS2W2;
+exports.default = EveCharacteristics;

package/build/lib/hap/eve-app/EveServices.d.ts

@@ -0,0 +1,5 @@
+import HAPService from '../HAPService';
+export declare class EveHistoryData extends HAPService {
+    static readonly UUID: string;
+    constructor();
+}

package/build/lib/hap/eve-app/EveServices.js

@@ -0,0 +1,20 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.EveHistoryData = void 0;
+const HAPCharacteristic_1 = __importDefault(require("../HAPCharacteristic"));
+const HAPService_1 = __importDefault(require("../HAPService"));
+class EveHistoryData extends HAPService_1.default {
+    constructor() {
+        super('EveHistoryData', EveHistoryData.UUID);
+        this.addCharacteristic(HAPCharacteristic_1.default.EveS2R1);
+        this.addCharacteristic(HAPCharacteristic_1.default.EveS2R2);
+        this.addCharacteristic(HAPCharacteristic_1.default.EveS2W1);
+        this.addCharacteristic(HAPCharacteristic_1.default.EveS2W2);
+    }
+}
+exports.EveHistoryData = EveHistoryData;
+EveHistoryData.UUID = 'E863F007-079E-48FF-8F27-9C2605A29F52';
+HAPService_1.default.EveHistoryData = EveHistoryData;

package/build/nodes/service.html

@@ -203,13 +203,14 @@
         <div class="form-row">
             <label for="node-input-adaptiveLightingOptionsMode"><i class="fa fa-hand-o-up"></i> Mode</label>
             <select id="node-input-adaptiveLightingOptionsMode">
-                <option value="1" selected="selected">AUTOMATIC</option>
+                <option value="" selected hidden disabled>AUTOMATIC</option>
+                <option value="1">AUTOMATIC</option>
                 <option value="2" disabled>MANUAL</option>
             </select>
         </div>
         <div class="form-row">
             <label for="node-input-adaptiveLightingOptionsCustomTemperatureAdjustment"><i class="fa fa-thermometer-quarter"></i> Custom Temperature Adjustment</label>
-            <input type="number" id="node-input-adaptiveLightingOptionsCustomTemperatureAdjustment">
+            <input type="number" id="node-input-adaptiveLightingOptionsCustomTemperatureAdjustment" placeholder="0">
         </div>
     </div>
 
@@ -498,12 +499,10 @@
                 value: false,
             },
             adaptiveLightingOptionsMode: {
-                value: 1,
-                validate: RED.validators.number()
+                validate: RED.validators.number(true)
             },
             adaptiveLightingOptionsCustomTemperatureAdjustment: {
-                value: 0,
-                validate: RED.validators.number()
+                validate: RED.validators.number(true)
             },
         },
         inputs: 1,

package/build/nodes/service2.html

@@ -203,13 +203,14 @@
         <div class="form-row">
             <label for="node-input-adaptiveLightingOptionsMode"><i class="fa fa-hand-o-up"></i> Mode</label>
             <select id="node-input-adaptiveLightingOptionsMode">
-                <option value="1" selected="selected">AUTOMATIC</option>
+                <option value="" selected hidden disabled>AUTOMATIC</option>
+                <option value="1">AUTOMATIC</option>
                 <option value="2" disabled>MANUAL</option>
             </select>
         </div>
         <div class="form-row">
             <label for="node-input-adaptiveLightingOptionsCustomTemperatureAdjustment"><i class="fa fa-thermometer-quarter"></i> Custom Temperature Adjustment</label>
-            <input type="number" id="node-input-adaptiveLightingOptionsCustomTemperatureAdjustment">
+            <input type="number" id="node-input-adaptiveLightingOptionsCustomTemperatureAdjustment" placeholder="0">
         </div>
     </div>
 
@@ -508,12 +509,10 @@ if (nrchkbExperimental) {
                 value: false,
             },
             adaptiveLightingOptionsMode: {
-                value: 1,
-                validate: RED.validators.number()
+                validate: RED.validators.number(true)
             },
             adaptiveLightingOptionsCustomTemperatureAdjustment: {
-                value: 0,
-                validate: RED.validators.number()
+                validate: RED.validators.number(true)
             },
         },
         inputs: 1,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "node-red-contrib-homekit-bridged",
-    "version": "1.7.0-dev.3",
+    "version": "1.7.0-dev.5",
     "description": "Node-RED nodes to simulate Apple HomeKit devices.",
     "main": "build/nodes/nrchkb.js",
     "scripts": {