homebridge-texecom-full 4.2.1 → 4.2.3

package/.github/FUNDING.yml

@@ -9,4 +9,4 @@ issuehunt: # Replace with a single IssueHunt username
 lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
 polar: # Replace with a single Polar username
 buy_me_a_coffee: # Replace with a single Buy Me a Coffee username
-custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']
+custom: ['https://www.paypal.me/chrisposthumus']

package/CHANGELOG.md

@@ -2,10 +2,20 @@
 
 This change log documents all release versions of homebridge-texecom
 
+### 4.2.2-beta2 (2024-10-09)
+
+- **TWEAK** - Can not install in certain cases. Added post script to check if python is installed.
+- **TEST** - Tested on Homebridge V2
+
+### 4.2.2-beta1 (2024-09-14)
+
+- **TWEAK** - Area triggering reduced to Away Arm only
+            - Not triggering when in Home and evening arm
+
 ### 4.2.1 (2024-09-14)
 
-**FEATURE** - Added arm and disarm for each area
-            - Added zones to each area to be able to trigger an alarm.
+- **FEATURE** - Added arm and disarm for each area
+              - Added zones to each area to be able to trigger an alarm.
 
 ### 1.0.3 (2017-01-28)
 

package/README.md

@@ -1,3 +1,5 @@
+[![npm](https://badgen.net/npm/v/homebridge-texecom-full/latest)](https://www.npmjs.com/package/homebridge-texecom-full)
+[![npm](https://badgen.net/npm/dt/homebridge-texecom-full)](https://www.npmjs.com/package/homebridge-texecom-full)
 # homebridge-texecom-full
 
 A plugin for [Homebridge](https://github.com/nfarina/homebridge) that creates HomeKit motion, contact, smoke, or carbon monoxide sensors for alarm zones from a Texecom Premier intruder alarm via a serial connection or COM-IP module.

package/config.schema.json

@@ -121,6 +121,11 @@
                         "dwell"
                     ]
                 }
+            },
+            "debug":{
+                "type":"boolean",
+                "title":"Debug",
+                "default":false
             }
         },
         "required": true

package/index.js

@@ -24,7 +24,6 @@ var service_area;
 
 var setByAlarm = false;
 
-var changed = false;
 
 module.exports = function (homebridge) {
     Accessory = homebridge.platformAccessory;
@@ -129,46 +128,68 @@ TexecomPlatform.prototype = {
                     case "L":
                         stateValue = Characteristic.SecuritySystemCurrentState.ALARM_TRIGGERED;
                         platform.log.log("Area " + updated_area + " triggered");
-                        changed = true;
                         break;
                     case "D":
                         stateValue = Characteristic.SecuritySystemCurrentState.DISARMED;
                         platform.log.log("Area " + updated_area + " disarmed");
-                        changed = true;
-
-                        areas_armed = areas_armed.filter(value => value !== zpad(updated_area,3));
-
+                        areas_armed = areas_armed.filter(value => value !== zpad(updated_area, 3));
                         break;
                     case "A":
                         //user is for my setup
                         //my user 17 is full armed (remote)
+                        //my user on app is 254
                         //all the rest is night armed
 
-                        // Find the index of the first null or undefined value
-                        const index = areas_armed.findIndex(value => value === null || value === undefined);
-
-                        if (index !== -1) {
-                            // Replace the value at that index
-                            areas_armed[index] = zpad(updated_area,3);
-                        } else {
-                            // If no open slot, append to the end
-                            areas_armed.push(zpad(updated_area,3));
-                        }
-
-
                         if (user == "17") {
                             stateValue = Characteristic.SecuritySystemCurrentState.AWAY_ARM;
                             platform.log.log("Area " + updated_area + " armed");
                         }
+                        else if (user == "25" || user == "254") {
+                            // Read the target state
+                            const targetState = areaAccessories[updated_area - 1].target_State;
+
+                            // Map the targetState to the corresponding current state value
+                            switch (targetState) {
+                                case Characteristic.SecuritySystemTargetState.AWAY_ARM:
+                                    stateValue = Characteristic.SecuritySystemCurrentState.AWAY_ARM;
+                                    break;
+                                case Characteristic.SecuritySystemTargetState.STAY_ARM:
+                                    stateValue = Characteristic.SecuritySystemCurrentState.STAY_ARM;
+                                    break;
+                                case Characteristic.SecuritySystemTargetState.NIGHT_ARM:
+                                    stateValue = Characteristic.SecuritySystemCurrentState.NIGHT_ARM;
+                                    break;
+                                case Characteristic.SecuritySystemTargetState.DISARM:
+                                    stateValue = Characteristic.SecuritySystemCurrentState.DISARMED;
+                                    break;
+                                default:
+                                    platform.log.error("Unknown target state: " + targetState);
+                                    return;
+                            }
+
+                            platform.log.log("User 254: Target state is " + targetState + ", updated stateValue is " + stateValue);
+
+                        }
                         else {
                             stateValue = Characteristic.SecuritySystemCurrentState.NIGHT_ARM;
                             platform.log.log("Area " + updated_area + " night armed");
                         }
-                        changed = true;
+
+                        if (stateValue == Characteristic.SecuritySystemCurrentState.AWAY_ARM) {
+                            // Find the index of the first null or undefined value
+                            const index = areas_armed.findIndex(value => value === null || value === undefined);
+
+                            if (index !== -1) {
+                                // Replace the value at that index
+                                areas_armed[index] = zpad(updated_area, 3);
+                            } else {
+                                // If no open slot, append to the end
+                                areas_armed.push(zpad(updated_area, 3));
+                            }
+                        }
                         break;
                     default:
                         platform.log.log("Unknown status letter " + status);
-                        changed = true;
                         return;
                 }
                 for (var i = 0; i < areaCount; i++) {
@@ -244,6 +265,10 @@ function TexecomAccessory(log, config) {
     this.name = config["name"];
     this.zone_type = config["zone_type"] || config["area_type"] || "motion";
     this.dwell_time = config["dwell"] || 0;
+
+    if (config["area_type"] == "securitysystem") {
+        this.target_State = Characteristic.SecuritySystemTargetState.DISARM;
+    }
     try {
         if (Array.isArray(config["zones"])) {
             // If it's an array, apply zpad to each element
@@ -461,6 +486,7 @@ function areaTargetSecurityStateSet(platform, accessory, service, value, callbac
             platform.log.debug("Setting current status of area " + accessory.zone_number + " to " + currentState + " because alarm responded OK");
             service.getCharacteristic(Characteristic.SecuritySystemCurrentState)
                 .updateValue(currentState);
+            accessory.target_State = currentState;
             callback();
         })
         .catch((err) => {

package/package.json

@@ -2,11 +2,29 @@
   "displayName": "Homebridge Texecom",
   "name": "homebridge-texecom-full",
   "description": "A plugin for homebridge (https://github.com/nfarina/homebridge) to integrate Texecom Premier Elite alarm systems into HomeKit",
-  "version": "4.2.1",
+  "version": "4.2.3",
+  "author": {
+    "name": "Chris Posthumus",
+    "email": "chris.posthumus@gmail.com"
+  },
+  "homepage": "https://github.com/K1LL3R234/homebridge-texecom",
   "repository": {
     "type": "git",
-    "url": "https://github.com/K1LL3R234/homebridge-texecom"
+    "url": "https://github.com/K1LL3R234/homebridge-texecom.git"
+  },
+  "bugs": {
+    "url": "https://https://github.com/K1LL3R234/homebridge-texecom/issues"
   },
+  "funding": [
+    {
+      "type": "github",
+      "url": "https://github.com/sponsors/K1LL3R234"
+    },
+    {
+      "type": "paypal",
+      "url": "https://www.paypal.me/chrisposthumus"
+    }
+  ],
   "license": "MIT",
   "preferGlobal": true,
   "keywords": [
@@ -21,8 +39,9 @@
     "Texecom"
   ],
   "engines": {
-    "node": ">=0.12.0",
-    "homebridge": ">=0.2.5"
+    "homebridge": "^1.6.0 || ^2.0.0-beta.0",
+    "node": "^18.20.4 || ^20.15.1",
+    "python": ">=3.6.0"
   },
   "homebridge": {
     "platforms": [
@@ -35,4 +54,4 @@
     "string": "^3.3.3",
     "zpad": "^0.5.0"
   }
-}
+}

package/util/logutil.js

@@ -34,4 +34,4 @@ class LogUtil {
     }
 }
 
-module.exports = LogUtil;
+module.exports = LogUtil;

package/.vscode/launch.json

@@ -1,23 +0,0 @@
-{
-    /*"configurations": [
-        {
-            "type": "chrome",
-            "name": "localhost:8581",
-            "request": "launch",
-            "program":"${env:APPDATA}\\Roaming\\npm\\node_modules\\homebridge\\bin\\homebridge",
-            "url": "localhost:8581"
-        }
-    ]*/
-    "version": "0.2.0",
-    "configurations": [
-        {
-            "name": "Launch Program",
-            "program": "${env:APPDATA}\\npm\\node_modules\\homebridge\\bin\\homebridge",
-            "request": "launch",
-            "skipFiles": [
-                "<node_internals>//**"
-            ],
-            "type":"pwa-node"
-        }
-    ]
-}