homebridge-securitysystem 9.1.0-beta.1 → 9.1.1-beta.1

package/.github/workflows/build-package.yml

@@ -15,17 +15,29 @@ jobs:
   build-package:
     name: Build package
     runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      id-token: write
+      attestations: write
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Setup node
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v5
 
         with:
           cache: "npm"
           registry-url: https://registry.npmjs.org/
 
       - name: Build package
-        run: npm ci
+        run: |
+          npm ci
+          npm pack
+
+      - name: Attest build provenance
+        if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}
+        uses: actions/attest-build-provenance@v3
+        with:
+          subject-path: "*.tgz"

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

@@ -27,10 +27,10 @@ jobs:
 
     steps:
       - name: Checkout branch
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Setup node
-        uses: actions/setup-node@v4.0.1
+        uses: actions/setup-node@v5
 
       - name: Get next version
         uses: MiguelRipoll23/get-next-version@v3.0.0

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

@@ -20,7 +20,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Review Dependencies
         uses: actions/dependency-review-action@v4

package/.github/workflows/publish-release.yml

@@ -23,7 +23,7 @@ jobs:
 
     steps:
       - name: Checkout branch
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Get tag name
         id: get-tag-name
@@ -66,10 +66,10 @@ jobs:
 
     steps:
       - name: Checkout branch
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Setup node
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v5
 
         with:
           registry-url: https://registry.npmjs.org/

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

@@ -17,7 +17,7 @@ jobs:
       pull-requests: write
 
     steps:
-      - uses: actions/stale@v9
+      - uses: actions/stale@v10
         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": "9.1.0-beta.1",
+  "version": "9.1.1-beta.1",
   "description": "Homebridge plugin that creates a security system accessory that can be triggered by HomeKit sensors.",
   "main": "src/index.js",
   "scripts": {
@@ -41,7 +41,7 @@
     "homebridge": "^1.6.0 || ^2.0.0"
   },
   "dependencies": {
-    "express": "^4.17.1",
+    "express": "^5.1.0",
     "node-fetch": "^2.6.7",
     "node-persist": "^4.0.1"
   },

package/src/index.js

@@ -900,7 +900,7 @@ SecuritySystem.prototype.resetUsingOffMode = function () {
   this.updateTargetState(
     Characteristic.SecuritySystemTargetState.DISARM,
     originTypes.INTERNAL,
-    false,
+    0,
     null
   );
 
@@ -908,7 +908,7 @@ SecuritySystem.prototype.resetUsingOffMode = function () {
     this.updateTargetState(
       originalTargetState,
       originTypes.INTERNAL,
-      true,
+      this.getArmingSeconds(originalTargetState),
       null
     );
   }, 100);
@@ -1077,18 +1077,13 @@ SecuritySystem.prototype.updateTargetState = function (
   }
 
   // Set arming delay
-  let armSeconds = 0;
+  const armSeconds = Number(delay) || 0;
 
-  if (delay) {
-    armSeconds = this.getArmingSeconds();
+  if (armSeconds > 0) {
+    this.handleArmingState();
 
-    // Delay actions
-    if (armSeconds > 0) {
-      this.handleArmingState();
-
-      // Log
-      this.log.info("Arm delay (" + armSeconds + " second/s)");
-    }
+    // Log
+    this.log.info("Arm delay (" + armSeconds + " second/s)");
   }
 
   // Arm the security system
@@ -1105,14 +1100,17 @@ SecuritySystem.prototype.updateTargetState = function (
   return true;
 };
 
-SecuritySystem.prototype.getArmingSeconds = function () {
+SecuritySystem.prototype.getArmingSeconds = function (state) {
+  const targetState =
+    typeof state === "number" ? state : this.targetState;
+
   let armSeconds = options.armSeconds;
 
   const isCurrentStateAlarmTriggered =
     this.currentState ===
     Characteristic.SecuritySystemCurrentState.ALARM_TRIGGERED;
   const isTargetStateDisarm =
-    this.targetState === Characteristic.SecuritySystemTargetState.DISARM;
+    targetState === Characteristic.SecuritySystemTargetState.DISARM;
 
   // No delay when triggered or set to Off
   if (isCurrentStateAlarmTriggered || isTargetStateDisarm) {
@@ -1120,11 +1118,11 @@ SecuritySystem.prototype.getArmingSeconds = function () {
   }
 
   const isTargetStateHome =
-    this.targetState === Characteristic.SecuritySystemTargetState.STAY_ARM;
+    targetState === Characteristic.SecuritySystemTargetState.STAY_ARM;
   const isTargetStateAway =
-    this.targetState === Characteristic.SecuritySystemTargetState.AWAY_ARM;
+    targetState === Characteristic.SecuritySystemTargetState.AWAY_ARM;
   const isTargetStateNight =
-    this.targetState === Characteristic.SecuritySystemTargetState.NIGHT_ARM;
+    targetState === Characteristic.SecuritySystemTargetState.NIGHT_ARM;
 
   // Custom mode seconds
   if (isTargetStateHome && options.isValueSet(options.homeArmSeconds)) {
@@ -1154,7 +1152,12 @@ SecuritySystem.prototype.getTargetState = function (callback) {
 };
 
 SecuritySystem.prototype.setTargetState = function (value, callback) {
-  this.updateTargetState(value, originTypes.REGULAR_SWITCH, true, callback);
+  this.updateTargetState(
+    value,
+    originTypes.REGULAR_SWITCH,
+    this.getArmingSeconds(value),
+    callback
+  );
 };
 
 SecuritySystem.prototype.updateTripSwitch = function (
@@ -1369,7 +1372,7 @@ SecuritySystem.prototype.updateTripSwitch = function (
         this.updateTargetState(
           Characteristic.SecuritySystemTargetState.DISARM,
           originTypes.INTERNAL,
-          false,
+          0,
           null
         );
       }
@@ -1432,7 +1435,13 @@ SecuritySystem.prototype.isAuthenticated = function (req, res) {
 };
 
 SecuritySystem.prototype.getDelayParameter = function (req) {
-  return req.query.delay === "true" ? true : false;
+  const value = parseInt(req.query.delay, 10);
+
+  if (Number.isNaN(value) || value < 0) {
+    return 0;
+  }
+
+  return value;
 };
 
 SecuritySystem.prototype.sendCodeRequiredError = function (res) {
@@ -1498,7 +1507,7 @@ SecuritySystem.prototype.startServer = async function () {
 
     let result = true;
 
-    if (this.getDelayParameter(req)) {
+    if (this.getDelayParameter(req) > 0) {
       // Delay
       result = this.updateTripSwitch(true, originTypes.EXTERNAL, false, null);
     } else {
@@ -2264,7 +2273,7 @@ SecuritySystem.prototype.setModeHomeSwitch = function (value, callback) {
   this.updateTargetState(
     Characteristic.SecuritySystemTargetState.STAY_ARM,
     originTypes.INTERNAL,
-    true,
+    this.getArmingSeconds(Characteristic.SecuritySystemTargetState.STAY_ARM),
     null
   );
   callback(null);
@@ -2286,7 +2295,7 @@ SecuritySystem.prototype.setModeAwaySwitch = function (value, callback) {
   this.updateTargetState(
     Characteristic.SecuritySystemTargetState.AWAY_ARM,
     originTypes.INTERNAL,
-    true,
+    this.getArmingSeconds(Characteristic.SecuritySystemTargetState.AWAY_ARM),
     null
   );
   callback(null);
@@ -2308,7 +2317,7 @@ SecuritySystem.prototype.setModeNightSwitch = function (value, callback) {
   this.updateTargetState(
     Characteristic.SecuritySystemTargetState.NIGHT_ARM,
     originTypes.INTERNAL,
-    true,
+    this.getArmingSeconds(Characteristic.SecuritySystemTargetState.NIGHT_ARM),
     null
   );
   callback(null);
@@ -2330,7 +2339,7 @@ SecuritySystem.prototype.setModeOffSwitch = function (value, callback) {
   this.updateTargetState(
     Characteristic.SecuritySystemTargetState.DISARM,
     originTypes.INTERNAL,
-    true,
+    0,
     null
   );
   callback(null);
@@ -2355,7 +2364,7 @@ SecuritySystem.prototype.setModeAwayExtendedSwitch = function (
   this.updateTargetState(
     Characteristic.SecuritySystemTargetState.AWAY_ARM,
     originTypes.INTERNAL,
-    true,
+    this.getArmingSeconds(Characteristic.SecuritySystemTargetState.AWAY_ARM),
     null
   );
   callback(null);
@@ -2393,7 +2402,7 @@ SecuritySystem.prototype.setModePauseSwitch = function (value, callback) {
     this.updateTargetState(
       Characteristic.SecuritySystemTargetState.DISARM,
       originTypes.INTERNAL,
-      true,
+      0,
       null
     );
 
@@ -2401,7 +2410,12 @@ SecuritySystem.prototype.setModePauseSwitch = function (value, callback) {
     if (options.pauseMinutes !== 0) {
       this.pauseTimeout = setTimeout(() => {
         this.log.info("Mode pause (Finished)");
-        this.Atate(this.pausedCurrentState, originTypes.INTERNAL, true, null);
+        this.updateTargetState(
+          this.pausedCurrentState,
+          originTypes.INTERNAL,
+          this.getArmingSeconds(this.pausedCurrentState),
+          null
+        );
       }, options.pauseMinutes * 60 * 1000);
     }
   } else {
@@ -2415,7 +2429,7 @@ SecuritySystem.prototype.setModePauseSwitch = function (value, callback) {
     this.updateTargetState(
       this.pausedCurrentState,
       originTypes.INTERNAL,
-      true,
+      this.getArmingSeconds(this.pausedCurrentState),
       null
     );
   }