homebridge-securitysystem 8.0.1 → 8.1.0-beta.1

package/.github/workflows/bump-version.yml

@@ -30,7 +30,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Create tag name
-        uses: MiguelRipoll23/create-tag-name@v2.0.0
+        uses: MiguelRipoll23/create-tag-name@v2.1.0
         id: create-tag-name
         with:
           channel: ${{ inputs.channel }}
@@ -41,7 +41,7 @@ jobs:
           version: ${{ steps.create-tag-name.outputs.tag-name }}
 
       - name: Create pull request
-        uses: peter-evans/create-pull-request@v5
+        uses: peter-evans/create-pull-request@v6
         with:
           branch: version/${{ steps.create-tag-name.outputs.tag-name }}
           commit-message: ${{ steps.create-tag-name.outputs.tag-name }}

package/.github/workflows/dependency-review.yml

@@ -23,4 +23,4 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Review Dependencies
-        uses: actions/dependency-review-action@v3
+        uses: actions/dependency-review-action@v4

package/.github/workflows/stale-activity.yml

@@ -17,7 +17,7 @@ jobs:
       pull-requests: write
 
     steps:
-      - uses: actions/stale@v8
+      - uses: actions/stale@v9
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           stale-issue-message: "This issue has been automatically marked as stale because it has not had recent activity. It will be closed in a few days if no further activity occurs. Thank you for your contributions."

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "homebridge-securitysystem",
   "displayName": "Homebridge Security System",
-  "version": "8.0.1",
+  "version": "8.1.0-beta.1",
   "description": "Homebridge plugin that creates a security system accessory that can be triggered by HomeKit sensors.",
   "main": "src/index.js",
   "scripts": {
@@ -42,7 +42,8 @@
   },
   "dependencies": {
     "express": "^4.17.1",
-    "node-persist": "^3.0.5"
+    "node-fetch": "^2.6.7",
+    "node-persist": "^4.0.1"
   },
   "devDependencies": {
     "eslint": "^8.0.0"

package/src/index.js

@@ -2,6 +2,7 @@ const fs = require("fs");
 const path = require("path");
 const storage = require("node-persist");
 const { spawn } = require("child_process");
+const fetch = require("node-fetch");
 const express = require("express");
 
 const packageJson = require("../package.json");
@@ -800,18 +801,7 @@ SecuritySystem.prototype.setCurrentState = function (state, origin) {
       this.resetTimeout = null;
       this.log.info("Reset (Finished)");
 
-      // Update triggered reset motion sensor
-      this.triggeredResetMotionSensorService.updateCharacteristic(
-        Characteristic.MotionDetected,
-        true
-      );
-
-      setTimeout(() => {
-        this.triggeredResetMotionSensorService.updateCharacteristic(
-          Characteristic.MotionDetected,
-          false
-        );
-      }, 750);
+      this.triggerResetSensor();
 
       // Alternative flow (Triggered -> Off -> Armed mode)
       if (options.resetOffFlow) {
@@ -844,6 +834,21 @@ SecuritySystem.prototype.setCurrentState = function (state, origin) {
   this.save();
 };
 
+SecuritySystem.prototype.triggerResetSensor = function () {
+  // Update triggered reset motion sensor
+  this.triggeredResetMotionSensorService.updateCharacteristic(
+    Characteristic.MotionDetected,
+    true
+  );
+
+  setTimeout(() => {
+    this.triggeredResetMotionSensorService.updateCharacteristic(
+      Characteristic.MotionDetected,
+      false
+    );
+  }, 750);
+};
+
 SecuritySystem.prototype.resetTimers = function () {
   // Clear trigger timeout
   if (this.triggerTimeout !== null) {
@@ -1026,6 +1031,12 @@ SecuritySystem.prototype.updateTargetState = function (
     return false;
   }
 
+  // Trigger reset sensor for mode
+  // change in triggered state
+  if (isCurrentStateAlarmTriggered) {
+    this.triggerResetSensor();
+  }
+
   // Set arming delay
   let armSeconds = 0;
 
@@ -1838,7 +1849,7 @@ SecuritySystem.prototype.sendWebhookEvent = function (type, state, origin) {
   path = path.replace("${currentMode}", this.state2Mode(this.currentState));
 
   // Send GET request to server
-  fetch(options.webhookUrl + path, { credentials: "include" })
+  fetch(options.webhookUrl + path)
     .then((response) => {
       if (response.ok === false) {
         throw new Error(`Status code (${response.status})`);