hoffmation-base 3.2.25 → 3.2.27

package/lib/interfaces/deviceSettings/iDeviceSettings.d.ts

@@ -8,6 +8,15 @@ export interface iDeviceSettings extends iObjectSettings {
      *
      */
     energySettings: iExcessEnergyConsumerSettings | undefined;
+    /**
+     * The position of the device in the room in meters
+     * @default {x: 0, y: 0, z: 0}
+     */
+    trilaterationRoomPosition: {
+        x: number;
+        y: number;
+        z: number;
+    };
     /**
      *
      */

package/lib/interfaces/iTrilaterationCoordinate.d.ts

@@ -0,0 +1,17 @@
+/**
+ *
+ */
+export interface iTrilaterationCoordinate {
+    /**
+     *
+     */
+    x: number;
+    /**
+     *
+     */
+    y: number;
+    /**
+     *
+     */
+    z: number;
+}

package/lib/interfaces/iTrilaterationCoordinate.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/lib/interfaces/iTrilaterationPoint.d.ts

@@ -1,19 +1,8 @@
+import { iTrilaterationCoordinate } from './iTrilaterationCoordinate';
 /**
  *
  */
-export interface iTrilaterationPoint {
-    /**
-     *
-     */
-    x: number;
-    /**
-     *
-     */
-    y: number;
-    /**
-     *
-     */
-    z: number;
+export interface iTrilaterationPoint extends iTrilaterationCoordinate {
     /**
      *
      */

package/lib/interfaces/index.d.ts

@@ -53,3 +53,4 @@ export { iDeviceCluster } from './iDevicecluster';
 export { iDaytime } from './iDaytime';
 export { iBlockAutomaticHandler } from './iBlockAutomaticHandler';
 export { iTemperatureMeasurement } from './iTemperatureMeasurement';
+export { iTrilaterationCoordinate } from './iTrilaterationCoordinate';

package/lib/interfaces/settings/iRestSettings.d.ts

@@ -1,3 +1,4 @@
+import { iRestUser } from './iRestUser';
 /**
  * Interface for the REST settings.
  * This is primarily used to configure the REST service within Hoffmation-Express.
@@ -7,8 +8,16 @@ export interface iRestSettings {
      * Whether the REST service should be active.
      */
     active: boolean;
+    /**
+     * Whether the Web UI should be active.
+     */
+    webUi: boolean;
     /**
      * The port the REST service should listen on.
      */
     port?: number;
+    /**
+     * The allowed users for the REST service.
+     */
+    user?: iRestUser[];
 }

package/lib/interfaces/settings/iRestUser.d.ts

@@ -0,0 +1,21 @@
+/**
+ *
+ */
+export interface iRestUser {
+    /**
+     *
+     */
+    username: string;
+    /**
+     *
+     */
+    passwordHash: string;
+    /**
+     *
+     */
+    publicKey: string;
+    /**
+     *
+     */
+    permissions: string[];
+}

package/lib/interfaces/settings/iRestUser.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/lib/interfaces/settings/index.d.ts

@@ -30,4 +30,5 @@ export { iLedSettings } from './iLedSettings';
 export { iSceneSettings } from './iSceneSettings';
 export { iSettingsProvider } from './iSettingsProvider';
 export { iWledSettings } from './iWledSettings';
+export { iRestUser } from './iRestUser';
 export { iGlobalHeaterSettings } from './iGlobalHeaterSettings';

package/lib/server/config/exampleConfig.js

@@ -18,6 +18,7 @@ exports.ExampleConfig = {
     },
     restServer: {
         active: true,
+        webUi: true,
         expressPort: 4444,
     },
     roomDefault: {

package/lib/settingsObjects/deviceSettings/deviceSettings.d.ts

@@ -1,8 +1,13 @@
-import { iBlockAutomaticSettings, iDeviceSettings, iExcessEnergyConsumerSettings } from '../../interfaces';
+import { iBlockAutomaticSettings, iDeviceSettings, iExcessEnergyConsumerSettings, iTrilaterationCoordinate } from '../../interfaces';
 import { ObjectSettings } from '../objectSettings';
 import { BlockAutomaticCommand, iBaseCommand } from '../../command';
 export declare abstract class DeviceSettings extends ObjectSettings implements iDeviceSettings {
     buildBlockAutomaticCommand(c: iBaseCommand): BlockAutomaticCommand | null | undefined;
+    /**
+     * The position of the device in the room in meters
+     * @default {x: 0, y: 0, z: 0}
+     */
+    trilaterationRoomPosition: iTrilaterationCoordinate;
     /**
      * Any device could be an energy consumer, so we have to provide the settings for it
      * @default undefined

package/lib/settingsObjects/deviceSettings/deviceSettings.js

@@ -9,6 +9,11 @@ const command_1 = require("../../command");
 class DeviceSettings extends objectSettings_1.ObjectSettings {
     constructor() {
         super(...arguments);
+        /**
+         * The position of the device in the room in meters
+         * @default {x: 0, y: 0, z: 0}
+         */
+        this.trilaterationRoomPosition = { x: 0, y: 0, z: 0 };
         /**
          * Any device could be an energy consumer, so we have to provide the settings for it
          * @default undefined
@@ -33,7 +38,7 @@ class DeviceSettings extends objectSettings_1.ObjectSettings {
         return new command_1.BlockAutomaticCommand(c, (_b = this.blockAutomaticSettings) === null || _b === void 0 ? void 0 : _b.blockAutomaticDurationMS, '', (_c = this.blockAutomaticSettings) === null || _c === void 0 ? void 0 : _c.defaultCollisionSolving, (_d = this.blockAutomaticSettings) === null || _d === void 0 ? void 0 : _d.revertToAutomaticAtBlockLift);
     }
     fromPartialObject(_obj) {
-        var _a;
+        var _a, _b;
         if (_obj.energySettings) {
             if (this.energySettings === undefined) {
                 this.energySettings = new excessEnergyConsumerSettings_1.ExcessEnergyConsumerSettings();
@@ -47,6 +52,7 @@ class DeviceSettings extends objectSettings_1.ObjectSettings {
             this.blockAutomaticSettings.fromPartialObject(_obj.blockAutomaticSettings);
         }
         this.skipInHomebridge = (_a = _obj.skipInHomebridge) !== null && _a !== void 0 ? _a : this.skipInHomebridge;
+        this.trilaterationRoomPosition = (_b = _obj.trilaterationRoomPosition) !== null && _b !== void 0 ? _b : this.trilaterationRoomPosition;
         super.fromPartialObject(_obj);
     }
     toJSON() {