npm - homebridge-freeathome-local-api - Versions diffs - 1.4.2 → 1.4.3 - Mend

homebridge-freeathome-local-api 1.4.2 → 1.4.3

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.

Files changed (12) hide show

package/CHANGELOG.md +7 -0
package/config.schema.json +16 -0
package/dist/motionSensorAccessory.d.ts +2 -0
package/dist/motionSensorAccessory.d.ts.map +1 -1
package/dist/motionSensorAccessory.js +16 -0
package/dist/motionSensorAccessory.js.map +1 -1
package/dist/platform.js +1 -1
package/dist/platform.js.map +1 -1
package/package.json +1 -1
package/sonar-project.properties +1 -1
package/test/motionSensorAccessory.spec.ts +102 -0
package/test/platform.mock.ts +9 -5

package/CHANGELOG.md CHANGED Viewed

@@ -5,6 +5,13 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+## [1.4.3](https://github.com/pgerke/homebridge-freeathome-local-api/releases/tag/1.4.3) - 04.01.2023
+### Changed
+- [#31](https://github.com/pgerke/homebridge-freeathome-local-api/issues/31):
+  Added an option to automatically reset motion sensors after a predefined timeout.
 ## [1.4.2](https://github.com/pgerke/homebridge-freeathome-local-api/releases/tag/1.4.2) - 03.01.2023
 ### Fixed

package/config.schema.json CHANGED Viewed

@@ -48,6 +48,22 @@
         "required": false,
         "default": false
       },
+      "motionSensorAutoReset": {
+        "title": "Automatic Reset for Motion Sensors",
+        "description": "Determines whether motion sensors will be reset automatically.",
+        "type": "boolean",
+        "required": false,
+        "default": true
+      },
+      "motionSensorDefaultResetTimer": {
+        "title": "Motion Sensor Default Reset Timer",
+        "description": "Determines the default reset timer for motion sensors. Only relevant if the automatic reset is enabled.",
+        "type": "integer",
+        "required": false,
+        "default": 20000,
+        "minimum": 500,
+        "maximum": 60000
+      },
       "verboseErrors": {
         "title": "Verbose Errors",
         "description": "Determines whether verbose error messages shall be used, for example for message validation. This is a debug option that should only be enabled if needed.",

package/dist/motionSensorAccessory.d.ts CHANGED Viewed

@@ -8,6 +8,7 @@ export declare class MotionSensorAccessory extends FreeAtHomeAccessory {
     readonly accessory: PlatformAccessory<FreeAtHomeContext>;
     private readonly service;
     private motionDetected;
+    private resetTimeout?;
     /**
      * Constructs a new motion sensor accessory instance.
      * @param platform The free&#64;home Homebridge platform controlling the accessory
@@ -15,5 +16,6 @@ export declare class MotionSensorAccessory extends FreeAtHomeAccessory {
      */
     constructor(platform: FreeAtHomeHomebridgePlatform, accessory: PlatformAccessory<FreeAtHomeContext>);
     updateDatapoint(datapoint: string, value: string): void;
+    private processAutoResetTimer;
 }
 //# sourceMappingURL=motionSensorAccessory.d.ts.map

package/dist/motionSensorAccessory.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"motionSensorAccessory.d.ts","sourceRoot":"","sources":["../src/motionSensorAccessory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAW,MAAM,YAAY,CAAC;AACxD,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,4BAA4B,EAAE,MAAM,YAAY,CAAC;AAE1D,iCAAiC;AACjC,qBAAa,qBAAsB,SAAQ,mBAAmB;~~IAU1D~~,QAAQ,CAAC,QAAQ,EAAE,4BAA4B;IAC/C,QAAQ,CAAC,SAAS,EAAE,iBAAiB,CAAC,iBAAiB,CAAC;~~IAV1D~~,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAU;IAClC,OAAO,CAAC,cAAc,CAAU;~~IAEhC~~;;;;OAIG;gBAEQ,QAAQ,EAAE,4BAA4B,EACtC,SAAS,EAAE,iBAAiB,CAAC,iBAAiB,CAAC;~~IAoB1C~~,eAAe,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI;~~CAaxE~~"}
1	+ {"version":3,"file":"motionSensorAccessory.d.ts","sourceRoot":"","sources":["../src/motionSensorAccessory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAW,MAAM,YAAY,CAAC;AACxD,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,4BAA4B,EAAE,MAAM,YAAY,CAAC;AAE1D,iCAAiC;AACjC,qBAAa,qBAAsB,SAAQ,mBAAmB;IAW1D,QAAQ,CAAC,QAAQ,EAAE,4BAA4B;IAC/C,QAAQ,CAAC,SAAS,EAAE,iBAAiB,CAAC,iBAAiB,CAAC;IAX1D,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAU;IAClC,OAAO,CAAC,cAAc,CAAU;IAChC,OAAO,CAAC,YAAY,CAAC,CAAiB;IAEtC;;;;OAIG;gBAEQ,QAAQ,EAAE,4BAA4B,EACtC,SAAS,EAAE,iBAAiB,CAAC,iBAAiB,CAAC;IAqB1C,eAAe,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI;IAgBvE,OAAO,CAAC,qBAAqB;CAkB9B"}

package/dist/motionSensorAccessory.js CHANGED Viewed

@@ -16,6 +16,7 @@ class MotionSensorAccessory extends freeAtHomeAccessory_1.FreeAtHomeAccessory {
         this.accessory = accessory;
         // set initial state
         this.motionDetected = !!parseInt((_b = (_a = this.accessory.context.channel.outputs) === null || _a === void 0 ? void 0 : _a.odp0000.value) !== null && _b !== void 0 ? _b : "0");
+        this.processAutoResetTimer();
         // get the MotionSensor service if it exists, otherwise create a new service instance
         this.service =
             this.accessory.getService(this.platform.Service.MotionSensor) ||
@@ -31,8 +32,23 @@ class MotionSensorAccessory extends freeAtHomeAccessory_1.FreeAtHomeAccessory {
             return;
         // do the update
         this.motionDetected = !!parseInt(value);
+        this.processAutoResetTimer();
         this.doUpdateDatapoint("Motion Sensor", this.service, this.platform.Characteristic.MotionDetected, this.motionDetected);
     }
+    processAutoResetTimer() {
+        // Set, reset or cancel a timer, if automatic reset is enabled
+        if (this.platform.config.motionSensorAutoReset) {
+            // If a timer is running, clear it
+            if (!!this.resetTimeout) {
+                clearTimeout(this.resetTimeout);
+                this.resetTimeout = undefined;
+            }
+            // Set a new reset timer, if motion was detected.
+            if (this.motionDetected) {
+                this.resetTimeout = setTimeout(() => this.updateDatapoint("odp0000", "0"), this.platform.config.motionSensorDefaultResetTimer);
+            }
+        }
+    }
 }
 exports.MotionSensorAccessory = MotionSensorAccessory;
 //# sourceMappingURL=motionSensorAccessory.js.map

package/dist/motionSensorAccessory.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"motionSensorAccessory.js","sourceRoot":"","sources":["../src/motionSensorAccessory.ts"],"names":[],"mappings":";;;AACA,+DAA4D;AAI5D,iCAAiC;AACjC,MAAa,qBAAsB,SAAQ,yCAAmB;~~IAI5D~~;;;;OAIG;IACH,YACW,QAAsC,EACtC,SAA+C;;QAExD,KAAK,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;QAHlB,aAAQ,GAAR,QAAQ,CAA8B;QACtC,cAAS,GAAT,SAAS,CAAsC;QAIxD,oBAAoB;QACpB,IAAI,CAAC,cAAc,GAAG,CAAC,CAAC,QAAQ,CAC9B,MAAA,MAAA,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,0CAAE,OAAO,CAAC,KAAK,mCAAI,GAAG,CAC7D,CAAC;~~QAEF~~,qFAAqF;QACrF,IAAI,CAAC,OAAO;YACV,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,YAAY,CAAC;gBAC7D,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;QAEhE,2DAA2D;QAC3D,IAAI,CAAC,OAAO;aACT,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,cAAc,CAAC;aAC9D,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;IACtC,CAAC;IAEe,eAAe,CAAC,SAAiB,EAAE,KAAa;QAC9D,6BAA6B;QAC7B,IAAI,SAAS,KAAK,SAAS;YAAE,OAAO;QAEpC,gBAAgB;QAChB,IAAI,CAAC,cAAc,GAAG,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QACxC,IAAI,CAAC,iBAAiB,CACpB,eAAe,EACf,IAAI,CAAC,OAAO,EACZ,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,cAAc,EAC3C,IAAI,CAAC,cAAc,CACpB,CAAC;IACJ,CAAC;CACF;~~AA5CD~~,~~sDA4CC~~"}
1	+ {"version":3,"file":"motionSensorAccessory.js","sourceRoot":"","sources":["../src/motionSensorAccessory.ts"],"names":[],"mappings":";;;AACA,+DAA4D;AAI5D,iCAAiC;AACjC,MAAa,qBAAsB,SAAQ,yCAAmB;IAK5D;;;;OAIG;IACH,YACW,QAAsC,EACtC,SAA+C;;QAExD,KAAK,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;QAHlB,aAAQ,GAAR,QAAQ,CAA8B;QACtC,cAAS,GAAT,SAAS,CAAsC;QAIxD,oBAAoB;QACpB,IAAI,CAAC,cAAc,GAAG,CAAC,CAAC,QAAQ,CAC9B,MAAA,MAAA,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,0CAAE,OAAO,CAAC,KAAK,mCAAI,GAAG,CAC7D,CAAC;QACF,IAAI,CAAC,qBAAqB,EAAE,CAAC;QAE7B,qFAAqF;QACrF,IAAI,CAAC,OAAO;YACV,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,YAAY,CAAC;gBAC7D,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;QAEhE,2DAA2D;QAC3D,IAAI,CAAC,OAAO;aACT,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,cAAc,CAAC;aAC9D,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;IACtC,CAAC;IAEe,eAAe,CAAC,SAAiB,EAAE,KAAa;QAC9D,6BAA6B;QAC7B,IAAI,SAAS,KAAK,SAAS;YAAE,OAAO;QAEpC,gBAAgB;QAChB,IAAI,CAAC,cAAc,GAAG,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QACxC,IAAI,CAAC,qBAAqB,EAAE,CAAC;QAE7B,IAAI,CAAC,iBAAiB,CACpB,eAAe,EACf,IAAI,CAAC,OAAO,EACZ,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,cAAc,EAC3C,IAAI,CAAC,cAAc,CACpB,CAAC;IACJ,CAAC;IAEO,qBAAqB;QAC3B,8DAA8D;QAC9D,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,qBAAgC,EAAE;YACzD,kCAAkC;YAClC,IAAI,CAAC,CAAC,IAAI,CAAC,YAAY,EAAE;gBACvB,YAAY,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;gBAChC,IAAI,CAAC,YAAY,GAAG,SAAS,CAAC;aAC/B;YAED,iDAAiD;YACjD,IAAI,IAAI,CAAC,cAAc,EAAE;gBACvB,IAAI,CAAC,YAAY,GAAG,UAAU,CAC5B,GAAG,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC,SAAS,EAAE,GAAG,CAAC,EAC1C,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,6BAAuC,CAC7D,CAAC;aACH;SACF;IACH,CAAC;CACF;AAnED,sDAmEC"}

package/dist/platform.js CHANGED Viewed

@@ -259,7 +259,7 @@ class FreeAtHomeHomebridgePlatform {
         datapoints.forEach((datapoint) => {
             var _a;
             // Ignore data points that have an unexpected format
-            const match = datapoint.match(/^(ABB[a-z0-9]{9})\/(ch[\da-f]{4})\/(odp\d{4})$/i);
+            const match = datapoint.match(/^([a-z0-9]{12})\/(ch[\da-f]{4})\/(odp\d{4})$/i);
             if (!match) {
                 this.log.debug(`Ignored datapoint ${datapoint}: Unexpected format`);
                 return;

package/dist/platform.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"platform.js","sourceRoot":"","sources":["../src/platform.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"platform.js","sourceRoot":"","sources":["../src/platform.ts"],"names":[],"mappings":";;;AAUA,yCAAwD;AACxD,6EAMqC;AACrC,uEAAoE;AACpE,2DAA+E;AAC/E,6CAA8E;AAE9E,uDAAoD;AAEpD,6FAA0F;AAC1F,iCAAmC;AACnC,qEAAkE;AAClE,mEAAgE;AAChE,+DAA4D;AAC5D,yEAAsE;AACtE,iDAA4D;AAC5D,iCAAoC;AAEpC,MAAM,WAAW,GAAG,GAAG,CAAC;AAExB,6CAA6C;AAC7C,MAAa,4BAA4B;IAmBvC,IAAY,gBAAgB;QAC1B,OAAO,IAAI,CAAC,MAAM,CAAC,YAAuB,CAAC;IAC7C,CAAC;IAED;;;;;OAKG;IACH,YACkB,GAAW,EACX,MAAsB,EACtB,GAAQ;;QAFR,QAAG,GAAH,GAAG,CAAQ;QACX,WAAM,GAAN,MAAM,CAAgB;QACtB,QAAG,GAAH,GAAG,CAAK;QA/B1B,4BAA4B;QACZ,YAAO,GAAmB,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC;QAC/D,mCAAmC;QACnB,mBAAc,GAC5B,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC;QAC9B,8CAA8C;QAC9B,gBAAW,GAAgD,EAAE,CAAC;QAC7D,uBAAkB,GAE/B,EAAE,CAAC;QAGU,mBAAc,GAAG,IAAI,GAAG,EAA+B,CAAC;QAGjE,wBAAmB,GAAG,CAAC,CAAC;QAkB9B,yCAAyC;QACzC,IAAI,CAAC,eAAe,GAAG,MAAC,IAAI,CAAC,MAAM,CAAC,eAA0B,mCAAI,EAAE,CAAC;QAErE,yDAAyD;QACzD,IAAI,CAAC,SAAS,GAAG;YACf,KAAK,EAAE,CAAC,OAAiB,EAAE,GAAG,cAAyB,EAAE,EAAE,CACzD,GAAG,CAAC,KAAK,CAAS,OAAO,EAAE,GAAG,cAAc,CAAC;YAC/C,KAAK,EAAE,CAAC,OAAiB,EAAE,GAAG,cAAyB,EAAE,EAAE,CACzD,GAAG,CAAC,KAAK,CAAS,OAAO,EAAE,GAAG,cAAc,CAAC;YAC/C,GAAG,EAAE,CAAC,OAAiB,EAAE,GAAG,cAAyB,EAAE,EAAE,CACvD,GAAG,CAAC,IAAI,CAAS,OAAO,EAAE,GAAG,cAAc,CAAC;YAC9C,IAAI,EAAE,CAAC,OAAiB,EAAE,GAAG,cAAyB,EAAE,EAAE,CACxD,GAAG,CAAC,IAAI,CAAS,OAAO,EAAE,GAAG,cAAc,CAAC;SAC/C,CAAC;QAEF,wCAAwC;QACxC,IAAI,CAAC,KAAK,GAAG,IAAI,+CAAiB,CAChC,IAAI,CAAC,MAAM,CAAC,IAAc,EAC1B,IAAI,CAAC,MAAM,CAAC,IAAc,EAC1B,IAAI,CAAC,MAAM,CAAC,QAAkB,EAC9B,IAAI,CAAC,MAAM,CAAC,UAAqB,EACjC,IAAI,CAAC,MAAM,CAAC,aAAwB,EACpC,IAAI,CAAC,SAAS,CACf,CAAC;QACF,mBAAW,CAAC,OAAO,CAAC,kBAAkB;YACpC,CAAC,IAAI,CAAC,MAAM,CAAC,8BAA8B,CAAC;QAE9C,6BAA6B;QAC7B,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,gBAAgB,EAAE,GAAG,EAAE;YACnC,IAAI,CAAC,mBAAmB,GAAG,CAAC,CAAC;QAC/B,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,iBAAiB,EAAE,CAAC,IAAY,EAAE,MAAc,EAAE,EAAE;YAChE,IAAI,IAAI,KAAK,IAAI;gBAAE,OAAO;YAE1B,IAAI,CAAC,GAAG,CAAC,IAAI,CACX,yDAAyD,IAAI,CAAC,QAAQ,EAAE,KAAK,MAAM,CAAC,QAAQ,EAAE,EAAE,CACjG,CAAC;YACF,IAAI,IAAI,CAAC,mBAAmB,IAAI,IAAI,CAAC,eAAe,EAAE;gBACpD,IAAI,CAAC,GAAG,CAAC,KAAK,CACZ,6EAA6E,CAC9E,CAAC;gBACF,OAAO;aACR;YAED,MAAM,KAAK,GAAG,WAAW,GAAG,CAAC,IAAI,IAAI,CAAC,mBAAmB,EAAE,CAAC;YAC5D,IAAI,CAAC,GAAG,CAAC,IAAI,CACX,8BAA8B,KAAK,OAAO,IAAI,CAAC,mBAAmB,IAAI,IAAI,CAAC,eAAe,GAAG,CAC9F,CAAC;YACF,UAAU,CACR,GAAG,EAAE,CACH,IAAI,CAAC,KAAK,CAAC,gBAAgB,CACzB,CAAC,IAAI,CAAC,MAAM,CAAC,8BAA8B,CAC5C,EACH,KAAK,CACN,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,mCAAmC;QACnC,IAAI,CAAC,qBAAqB,GAAG,IAAI,CAAC,KAAK;aACpC,oBAAoB,EAAE;aACtB,SAAS,CAAC,CAAC,OAAyB,EAAE,EAAE,CACvC,IAAI,CAAC,sBAAsB,CAAC,OAAO,CAAC,CACrC,CAAC;QAEJ,oBAAoB;QACpB,IAAI,IAAI,CAAC,gBAAgB;YAAE,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,4BAA4B,CAAC,CAAC;QAEvE,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,iCAAiC,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAEpE,2GAA2G;QAC3G,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,oBAAoB,EAAE,GAAG,EAAE;YACrC,GAAG,CAAC,KAAK,CAAC,sCAAsC,CAAC,CAAC;YAElD,iCAAiC;YACjC,IAAI,CAAC,GAAG,CAAC,6BAA6B,CACpC,sBAAW,EACX,wBAAa,EACb,IAAI,CAAC,kBAAkB,CACxB,CAAC;YAEF,gBAAgB;YAChB,IAAI,CAAC,eAAe,EAAE;iBACnB,IAAI,CAAC,GAAG,EAAE,CACT,IAAI,CAAC,GAAG,CAAC,IAAI,CACX,wBAAwB,IAAI,CAAC,cAAc,CAAC,IAAI,uBAAuB,CACxE,CACF;iBACA,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,yBAAyB,EAAE,KAAK,CAAC,CAAC,CAAC;YAEtE,4CAA4C;YAC5C,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,8BAA8B,CAAC,CAAC;QAC3E,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,UAAU,EAAE,GAAG,EAAE;YAC3B,GAAG,CAAC,KAAK,CAAC,4BAA4B,CAAC,CAAC;YACxC,IAAI,CAAC,qBAAqB,CAAC,WAAW,EAAE,CAAC;QAC3C,CAAC,CAAC,CAAC;IACL,CAAC;IAED;;;;;;OAMG;IACI,kBAAkB,CAAC,SAA4B;QACpD,sCAAsC;QACtC,IAAI,CAAC,IAAA,yCAAqB,EAAC,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE;YACrD,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YACxC,IAAI,CAAC,GAAG,CAAC,IAAI,CACX,sDAAsD,EACtD,SAAS,CAAC,WAAW,CACtB,CAAC;YACF,OAAO;SACR;QAED,gCAAgC;QAChC,IACE,IAAI,CAAC,gBAAgB,CACnB,SAAS,CAAC,OAAO,CAAC,YAAY,EAC9B,SAAS,CAAC,OAAO,CAAC,SAAS,CAC5B,EACD;YACA,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YACxC,IAAI,CAAC,GAAG,CAAC,IAAI,CACX,yDAAyD,EACzD,SAAS,CAAC,WAAW,CACtB,CAAC;YACF,OAAO;SACR;QAED,wGAAwG;QACxG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,+BAA+B,EAAE,SAAS,CAAC,WAAW,CAAC,CAAC;QACtE,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IACnC,CAAC;IAED,kFAAkF;IAC1E,KAAK,CAAC,eAAe;QAC3B,8BAA8B;QAC9B,MAAM,MAAM,GAAkB,MAAM,IAAI,CAAC,KAAK,CAAC,gBAAgB,EAAE,CAAC;QAElE,yBAAyB;QACzB,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,gBAAS,CAAC,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,MAAc,EAAE,EAAE;YAChE,6CAA6C;YAC7C,IACE,CAAC,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,IAAI,oBAAoB;gBACjD,CAAC,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,iBAAiB;;gBAE3C,OAAO;YAET,kCAAkC;YAClC,MAAM,MAAM,GAAG,MAAM,CAAC,gBAAS,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;YACjD,IAAI,CAAC,MAAM,CAAC,QAAQ;gBAAE,OAAO;YAE7B,sEAAsE;YACtE,4DAA4D;YAC5D,MAAM,+BAA+B,GAAG,CAAC,CAAC,MAAM,CAAC,KAAK,IAAI,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC;YAExE,yBAAyB;YACzB,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,CAAC,SAAiB,EAAE,EAAE;;gBACzD,+HAA+H;gBAC/H,oEAAoE;gBACpE,MAAM,OAAO,GAAG,MAAM,CAAC,QAAS,CAAC,SAAS,CAAC,CAAC;gBAC5C,IACE,CAAC,IAAI,CAAC,eAAe,CACnB,MAAM,EACN,SAAS,EACT,OAAO,EACP,+BAA+B,CAChC;oBAED,OAAO;gBAET,kCAAkC;gBAClC,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,MAAM,IAAI,SAAS,EAAE,CAAC,CAAC;gBAClE,IAAI,SAAS,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC;gBAC9D,IAAI,SAAS,EAAE;oBACb,+BAA+B;oBAC/B,IAAI,CAAC,GAAG,CAAC,IAAI,CACX,0CAA0C,EAC1C,SAAS,CAAC,WAAW,CACtB,CAAC;oBAEF,iBAAiB;oBACjB,SAAS,CAAC,OAAO,CAAC,YAAY,GAAG,MAAM,CAAC;oBACxC,SAAS,CAAC,OAAO,CAAC,MAAM,GAAG,MAAM,CAAC;oBAClC,SAAS,CAAC,OAAO,CAAC,OAAO,GAAG,OAAO,CAAC;oBACpC,SAAS,CAAC,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC;oBACxC,IAAI,CAAC,GAAG,CAAC,yBAAyB,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;oBAChD,4GAA4G;oBAC5G,qDAAqD;oBACrD,2FAA2F;oBAC3F,2FAA2F;iBAC5F;qBAAM;oBACL,4DAA4D;oBAC5D,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,uBAAuB,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;oBAC5D,yBAAyB;oBACzB,SAAS,GAAG,IAAI,IAAI,CAAC,GAAG,CAAC,iBAAiB,CACxC,MAAA,OAAO,CAAC,WAAW,mCAAI,IAAI,EAC3B,IAAI,CACL,CAAC;oBACF,SAAS,CAAC,OAAO,CAAC,YAAY,GAAG,MAAM,CAAC;oBACxC,SAAS,CAAC,OAAO,CAAC,MAAM,GAAG,MAAM,CAAC;oBAClC,SAAS,CAAC,OAAO,CAAC,OAAO,GAAG,OAAO,CAAC;oBACpC,SAAS,CAAC,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC;oBACxC,sCAAsC;oBACtC,IAAI,CAAC,GAAG,CAAC,2BAA2B,CAAC,sBAAW,EAAE,wBAAa,EAAE;wBAC/D,SAAS;qBACV,CAAC,CAAC;iBACJ;gBAED,kHAAkH;gBAClH,sHAAsH;gBACtH,kFAAkF;gBAClF,0BAA0B;gBAC1B,IAAI,CAAC,IAAA,yCAAqB,EAAC,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC;oBAAE,OAAO;gBAE9D,mBAAmB;gBACnB,oEAAoE;gBACpE,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE,OAAO,CAAC,UAAW,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC;YAC1E,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC;IAEO,eAAe,CACrB,MAAc,EACd,SAAiB,EACjB,OAAgB,EAChB,+BAAwC;;QAExC,8BAA8B;QAC9B,IACE,CAAC,CACC,OAAO,CAAC,UAAU;YAClB,MAAM,CAAC,MAAM,CAAS,uBAAU,CAAC,CAAC,QAAQ,CACxC,OAAO,CAAC,UAAU,CAAC,WAAW,EAAE,CACjC,CACF,EACD;YACA,IAAI,CAAC,GAAG,CAAC,KAAK,CACZ,WAAW,MAAM,KAAK,SAAS,kBAC7B,MAAA,OAAO,CAAC,UAAU,mCAAI,aACxB,qBAAqB,CACtB,CAAC;YACF,OAAO,KAAK,CAAC;SACd;QAED,8BAA8B;QAC9B,IAAI,CAAC,+BAA+B,IAAI,CAAC,CAAC,OAAO,CAAC,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,EAAE;YACxE,IAAI,CAAC,GAAG,CAAC,KAAK,CACZ,WAAW,MAAM,KAAK,SAAS,uCAAuC,CACvE,CAAC;YACF,OAAO,KAAK,CAAC;SACd;QAED,yBAAyB;QACzB,IAAI,IAAI,CAAC,gBAAgB,CAAC,MAAM,EAAE,SAAS,CAAC,EAAE;YAC5C,IAAI,CAAC,GAAG,CAAC,KAAK,CACZ,WAAW,MAAM,KAAK,SAAS,0CAA0C,CAC1E,CAAC;YACF,OAAO,KAAK,CAAC;SACd;QAED,8BAA8B;QAC9B,IACE,CAAC,IAAI,CAAC,gBAAgB;YACtB,+CAAkC,CAAC,QAAQ,CACzC,OAAO,CAAC,UAAU,CAAC,WAAW,EAAgB,CAC/C,EACD;YACA,OAAO,KAAK,CAAC;SACd;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IACO,eAAe,CACrB,MAAc,EACd,UAAkB,EAClB,SAAiB,EACjB,SAA+C;QAE/C,MAAM,aAAa,GAAG,IAAI,CAAC,oBAAoB,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;QAEnE,QAAQ,UAAU,CAAC,WAAW,EAAE,EAAE;YAChC,KAAK,uBAAU,CAAC,sCAAsC,CAAC;YACvD,KAAK,uBAAU,CAAC,mBAAmB;gBACjC,IAAI,CAAC,cAAc,CAAC,GAAG,CACrB,GAAG,MAAM,IAAI,SAAS,EAAE,EACxB,IAAI,iDAAuB,CAAC,IAAI,EAAE,SAAS,EAAE,aAAa,CAAC,CAC5D,CAAC;gBACF,OAAO;YACT,KAAK,uBAAU,CAAC,kDAAkD;gBAChE,IAAI,CAAC,cAAc,CAAC,GAAG,CACrB,GAAG,MAAM,IAAI,SAAS,EAAE,EACxB,IAAI,uEAAkC,CAAC,IAAI,EAAE,SAAS,CAAC,CACxD,CAAC;gBACF,OAAO;YACT,KAAK,uBAAU,CAAC,oBAAoB,CAAC;YACrC,KAAK,uBAAU,CAAC,gBAAgB,CAAC;YACjC,KAAK,uBAAU,CAAC,kBAAkB;gBAChC,IAAI,CAAC,cAAc,CAAC,GAAG,CACrB,GAAG,MAAM,IAAI,SAAS,EAAE,EACxB,IAAI,iCAAe,CAAC,IAAI,EAAE,SAAS,CAAC,CACrC,CAAC;gBACF,OAAO;YACT,KAAK,uBAAU,CAAC,kBAAkB;gBAChC,IAAI,CAAC,cAAc,CAAC,GAAG,CACrB,GAAG,MAAM,IAAI,SAAS,EAAE,EACxB,IAAI,+CAAsB,CAAC,IAAI,EAAE,SAAS,CAAC,CAC5C,CAAC;gBACF,OAAO;YACT,KAAK,uBAAU,CAAC,qBAAqB;gBACnC,IAAI,CAAC,cAAc,CAAC,GAAG,CACrB,GAAG,MAAM,IAAI,SAAS,EAAE,EACxB,IAAI,6CAAqB,CAAC,IAAI,EAAE,SAAS,CAAC,CAC3C,CAAC;gBACF,OAAO;YACT,KAAK,uBAAU,CAAC,4BAA4B;gBAC1C,IAAI,CAAC,cAAc,CAAC,GAAG,CACrB,GAAG,MAAM,IAAI,SAAS,EAAE,EACxB,IAAI,yCAAmB,CAAC,IAAI,EAAE,SAAS,CAAC,CACzC,CAAC;gBACF,OAAO;YACT,KAAK,uBAAU,CAAC,oBAAoB,CAAC;YACrC,KAAK,uBAAU,CAAC,kBAAkB,CAAC;YACnC,KAAK,uBAAU,CAAC,yBAAyB,CAAC;YAC1C,KAAK,uBAAU,CAAC,mBAAmB;gBACjC,IAAI,CAAC,cAAc,CAAC,GAAG,CACrB,GAAG,MAAM,IAAI,SAAS,EAAE,EACxB,IAAI,mDAAwB,CAAC,IAAI,EAAE,SAAS,CAAC,CAC9C,CAAC;gBACF,OAAO;YACT;gBACE,IAAI,CAAC,GAAG,CAAC,KAAK,CACZ,GAAG,MAAM,KAAK,SAAS,iDAAiD,UAAU,IAAI,CACvF,CAAC;SACL;IACH,CAAC;IAEO,gBAAgB,CAAC,MAAc,EAAE,OAAe;QACtD,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,eAAe;YAAE,OAAO,KAAK,CAAC;QAE/C,OAAQ,IAAI,CAAC,MAAM,CAAC,eAAiC,CAAC,IAAI,CACxD,CAAC,CAAC,EAAE,EAAE,CACJ,CAAC,CAAC,WAAW,EAAE,KAAK,GAAG,MAAM,CAAC,WAAW,EAAE,IAAI;YAC/C,CAAC,CAAC,WAAW,EAAE,KAAK,GAAG,MAAM,CAAC,WAAW,EAAE,IAAI,OAAO,CAAC,WAAW,EAAE,EAAE,CACzE,CAAC;IACJ,CAAC;IAEO,sBAAsB,CAAC,OAAyB;QACtD,6BAA6B;QAC7B,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,gBAAS,CAAC,CAAC,UAAU,CAAC,CAAC;QAE9D,UAAU,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,EAAE;;YAC/B,oDAAoD;YACpD,MAAM,KAAK,GAAG,SAAS,CAAC,KAAK,CAC3B,+CAA+C,CAChD,CAAC;YACF,IAAI,CAAC,KAAK,EAAE;gBACV,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,qBAAqB,SAAS,qBAAqB,CAAC,CAAC;gBACpE,OAAO;aACR;YAED,qFAAqF;YACrF,MAAA,IAAI,CAAC,cAAc;iBAChB,GAAG,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,0CAC7B,eAAe,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,gBAAS,CAAC,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC;QAC1E,CAAC,CAAC,CAAC;IACL,CAAC;IAEO,oBAAoB,CAAC,MAAc,EAAE,OAAe;;QAC1D,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,YAAY;YAAE,OAAO,4BAAa,CAAC,SAAS,CAAC;QAE9D,MAAM,GAAG,GAAG,GAAG,MAAM,CAAC,WAAW,EAAE,IAAI,OAAO,CAAC,WAAW,EAAE,EAAE,CAAC;QAC/D,MAAM,QAAQ,GAAI,IAAI,CAAC,MAAM,CAAC,YAAmC,CAAC,MAAM,CACtE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,WAAW,EAAE,KAAK,GAAG,CACvC,CAAC;QAEF,QAAQ,QAAQ,CAAC,MAAM,EAAE;YACvB,KAAK,CAAC;gBACJ,OAAO,4BAAa,CAAC,SAAS,CAAC;YACjC,KAAK,CAAC;gBACJ,MAAM;YACR;gBACE,IAAI,CAAC,GAAG,CAAC,IAAI,CACX,mDAAmD,GAAG,+BAA+B,CACtF,CAAC;gBACF,MAAM;SACT;QAED,OAAO,MAAA,4BAAa,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,mCAAI,4BAAa,CAAC,SAAS,CAAC;IACpE,CAAC;CACF;AA1aD,oEA0aC"}

package/package.json CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "displayName": "free@home Local API",
   "name": "homebridge-freeathome-local-api",
-  "version": "1.4.2",
+  "version": "1.4.3",
   "preview": false,
   "description": "Control your free@home setup using the local API provided by your System Access Point",
   "license": "MIT",

package/sonar-project.properties CHANGED Viewed

@@ -3,7 +3,7 @@ sonar.projectKey=homebridge-freeathome-local-api
 # defaults to project key
 sonar.projectName=Homebridge free@home Local API Plugin
 # defaults to 'not provided'
-sonar.projectVersion=1.2.0
+sonar.projectVersion=1.4.3
 # Path is relative to the sonar-project.properties file. Defaults to .
 sonar.sources=src

package/test/motionSensorAccessory.spec.ts CHANGED Viewed

@@ -34,6 +34,7 @@ describe("Motion Sensor Accessory", () => {
   });
   afterEach(() => {
     platform.resetLoggerCalls();
+    jasmine.clock().uninstall();
   });
   it("should be created", async () => {
@@ -109,4 +110,105 @@ describe("Motion Sensor Accessory", () => {
       true
     );
   });
+  it("should not set a reset timer if the sensor is reset manually", async () => {
+    platform.config.motionSensorAutoReset = true;
+    const accessory = new MotionSensorAccessory(platform, platformAccessory);
+    const instance = accessory as unknown as {
+      resetTimeout?: NodeJS.Timeout;
+      service: Service;
+      doUpdateDatapoint: (
+        acccessoryDisplayType: string,
+        service: Service,
+        characteristic: WithUUID<new () => Characteristic>,
+        characteristicValue: CharacteristicValue
+      ) => void;
+    };
+    const spy = spyOn(instance, "doUpdateDatapoint");
+    const characteristic = instance.service.getCharacteristic(
+      accessory.platform.Characteristic.MotionDetected
+    );
+    expect(await characteristic.handleGetRequest()).toBeFalse();
+    expect(instance.resetTimeout).toBeUndefined();
+    accessory.updateDatapoint("odp0000", "0");
+    expect(spy).toHaveBeenCalledWith(
+      "Motion Sensor",
+      instance.service,
+      accessory.platform.Characteristic.MotionDetected,
+      false
+    );
+    expect(instance.resetTimeout).toBeUndefined();
+  });
+  it("should cancel a set reset timer if the sensor is reset manually", async () => {
+    jasmine.clock().install();
+    platform.config.motionSensorAutoReset = true;
+    const accessory = new MotionSensorAccessory(platform, platformAccessory);
+    const instance = accessory as unknown as {
+      resetTimeout?: NodeJS.Timeout;
+      service: Service;
+      doUpdateDatapoint: (
+        acccessoryDisplayType: string,
+        service: Service,
+        characteristic: WithUUID<new () => Characteristic>,
+        characteristicValue: CharacteristicValue
+      ) => void;
+    };
+    const spy = spyOn(instance, "doUpdateDatapoint");
+    const characteristic = instance.service.getCharacteristic(
+      accessory.platform.Characteristic.MotionDetected
+    );
+    expect(await characteristic.handleGetRequest()).toBeFalse();
+    instance.resetTimeout = setTimeout(
+      () => fail("Timer should be cancelled"),
+      10000
+    );
+    accessory.updateDatapoint("odp0000", "0");
+    expect(spy).toHaveBeenCalledWith(
+      "Motion Sensor",
+      instance.service,
+      accessory.platform.Characteristic.MotionDetected,
+      false
+    );
+    expect(instance.resetTimeout).toBeUndefined();
+    jasmine.clock().tick(15000);
+  });
+  it("should reset the sensor automatically after the specified time", async () => {
+    jasmine.clock().install();
+    platform.config.motionSensorAutoReset = true;
+    const accessory = new MotionSensorAccessory(platform, platformAccessory);
+    const instance = accessory as unknown as {
+      resetTimeout?: NodeJS.Timeout;
+      service: Service;
+      doUpdateDatapoint: (
+        acccessoryDisplayType: string,
+        service: Service,
+        characteristic: WithUUID<new () => Characteristic>,
+        characteristicValue: CharacteristicValue
+      ) => void;
+    };
+    const spy = spyOn(instance, "doUpdateDatapoint");
+    const characteristic = instance.service.getCharacteristic(
+      accessory.platform.Characteristic.MotionDetected
+    );
+    expect(await characteristic.handleGetRequest()).toBeFalse();
+    expect(instance.resetTimeout).toBeUndefined();
+    accessory.updateDatapoint("odp0000", "1");
+    expect(spy).toHaveBeenCalledWith(
+      "Motion Sensor",
+      instance.service,
+      accessory.platform.Characteristic.MotionDetected,
+      true
+    );
+    expect(instance.resetTimeout).toBeDefined();
+    jasmine.clock().tick(20000);
+    expect(instance.resetTimeout).toBeUndefined();
+    expect(spy).toHaveBeenCalledWith(
+      "Motion Sensor",
+      instance.service,
+      accessory.platform.Characteristic.MotionDetected,
+      false
+    );
+  });
 });

package/test/platform.mock.ts CHANGED Viewed

@@ -3,10 +3,6 @@ import { HomebridgeAPI } from "homebridge/lib/api";
 import { FreeAtHomeHomebridgePlatform } from "./../src/platform";
 const api = new HomebridgeAPI();
-const config: PlatformConfig = {
-  name: "Test Platform Configuration",
-  platform: "free@home Unit Testing Platform",
-};
 const logger: Logger = {
   debug: jasmine.createSpy(),
   error: jasmine.createSpy(),
@@ -14,10 +10,18 @@ const logger: Logger = {
   warn: jasmine.createSpy(),
   log: jasmine.createSpy(),
 };
+function config(): PlatformConfig {
+  return {
+    name: "Test Platform Configuration",
+    platform: "free@home Unit Testing Platform",
+    motionSensorAutoReset: false,
+    motionSensorDefaultResetTimer: 20000,
+  };
+}
 export class MockFreeAtHomeHomebridgePlatform extends FreeAtHomeHomebridgePlatform {
   constructor() {
-    super(logger, config, api);
+    super(logger, config(), api);
   }
   public resetLoggerCalls(): void {