@smarterhomeapp/homebridge-vantage 1.0.1 → 1.0.3

package/README.md

@@ -1,6 +1,8 @@
 # Homebridge Vantage Controls
+[![verified-by-homebridge](https://img.shields.io/badge/homebridge-verified-blueviolet?color=%23491F59&style=flat)](https://github.com/homebridge/homebridge/wiki/Verified-Plugins)
 
-A [Homebridge](https://homebridge.io/) plugin for Vantage Controls InFusion system.
+A [Homebridge](https://homebridge.io/) plugin for Vantage Controls InFusion system. 
+This plugin replaces the one sold on smarterhome.io allowing anyone to download on the platform of their choice.
 
 ## Features
 
@@ -20,7 +22,7 @@ npm install -g homebridge
 
 2. Install this plugin:
 ```bash
-npm install -g homebridge-vantage
+npm install -g @smarterhomeapp/homebridge-vantage
 ```
 
 3. Add the platform to your `config.json`:
@@ -74,7 +76,7 @@ npm install -g homebridge-vantage
 
 1. Clone the repository:
 ```bash
-git clone https://github.com/yourusername/homebridge-vantage.git
+git clone https://github.com/smarterhomeapp/homebridge-vantage.git
 cd homebridge-vantage
 ```
 
@@ -125,5 +127,5 @@ MIT License - see LICENSE file for details.
 ## Support
 
 For issues and questions:
-- [GitHub Issues](https://github.com/yourusername/homebridge-vantage/issues)
-- [Homebridge Community](https://github.com/homebridge/homebridge) 
+- [GitHub Issues](https://github.com/smarterhomeapp/homebridge-vantage/issues)
+- [Homebridge Community](https://github.com/homebridge/homebridge) 

package/dist/platform.js

@@ -219,7 +219,7 @@ class VantagePlatform {
             const svc = acc.getService(S.Thermostat);
             if (!svc || !dev)
                 return;
-            this.log.info(`thermostatIndoorModeChange (VID=${vid}, Name=${dev.name}, Mode=${mode}, TargetTemp=${targetTemp})`);
+            this.log.debug(`thermostatIndoorModeChange (VID=${vid}, Name=${dev.name}, Mode=${mode}, TargetTemp=${targetTemp})`);
             // this.log.info(`Before update - dev.mode=${dev.mode}, dev.targetTemp=${dev.targetTemp}, dev.heating=${dev.heating}, dev.cooling=${dev.cooling}`);
             if (targetTemp === -1) {
                 // Only update mode when targetTemp is -1 (mode change without temperature)

package/dist/settings.d.ts

@@ -1,2 +1,2 @@
-export declare const PLUGIN_NAME = "homebridge-vantage";
+export declare const PLUGIN_NAME = "@smarterhomeapp/homebridge-vantage";
 export declare const PLATFORM_NAME = "VantageControls";

package/dist/settings.js

@@ -1,5 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PLATFORM_NAME = exports.PLUGIN_NAME = void 0;
-exports.PLUGIN_NAME = 'homebridge-vantage';
+exports.PLUGIN_NAME = '@smarterhomeapp/homebridge-vantage';
 exports.PLATFORM_NAME = 'VantageControls';

package/dist/vantageInfusion.d.ts

@@ -29,6 +29,10 @@ export declare class VantageInfusion extends EventEmitter {
     /** XML/config discovery; returns devices (replaces old Discover/DiscoverSSL) */
     discoverDevices(): Promise<VantageDevice[]>;
     private processConfigurationXml;
+    /** Escape text for XML (same as sanitize in index.js). */
+    private static escapeXml;
+    /** Build cache XML from readObjects (same structure + sanitization as original index.js). */
+    private buildCacheXml;
     private pullConfigurationXml;
     setBrightness(vid: string, level: number): Promise<void>;
     setHue(vid: string, hue: number): Promise<void>;

package/dist/vantageInfusion.js

@@ -48,6 +48,7 @@ const TYPE_THERMO = [
     'Tekmar.tN4_Gateway_482_Zone_-_Slab_Only_CHILD',
     'Tekmar.tN4_Gateway_482_Zone_CHILD',
     'Legrand.MH_HVAC_Control_CHILD',
+    'Vantage.HVAC-IU-Zone_CHILD'
 ];
 const TYPE_BLIND = [
     'Blind',
@@ -93,8 +94,13 @@ class VantageInfusion extends events_1.EventEmitter {
             this.isInsecureCfg = false;
         }
         else {
-            this.isInsecureCmd = await this.portUsable(3001, 'STATUS ALL\n');
-            this.isInsecureCfg = await this.portUsable(2001, '<IIntrospection><GetInterfaces><call></call></GetInterfaces></IIntrospection>\n');
+            // Probe sequentially to avoid controller session limits
+            const cmdResult = await this.portUsable(3001, 'STATUS ALL\n');
+            // brief backoff before probing config port
+            await new Promise((r) => setTimeout(r, 150));
+            const cfgResult = await this.portUsable(2001, '<IIntrospection><GetInterfaces><call></call></GetInterfaces></IIntrospection>\n');
+            this.isInsecureCmd = !!cmdResult;
+            this.isInsecureCfg = !!cfgResult;
         }
         // Legacy-style port logs
         this.opts.log.info(this.isInsecureCmd ? 'Using insecure port: 3001' : 'Using SSL port: 3010');
@@ -104,21 +110,46 @@ class VantageInfusion extends events_1.EventEmitter {
     portUsable(port, probe) {
         return new Promise((resolve) => {
             let sawData = false;
+            this.opts.log.debug(`Testing ${this.opts.ipaddress}:${port} with probe: "${probe.trim()}"`);
             const sock = net.connect({ host: this.opts.ipaddress, port }, () => {
+                this.opts.log.debug(`Connected to ${this.opts.ipaddress}:${port}`);
+                // improve send behavior
+                sock.setNoDelay(true);
+                // keep a post-connect timeout; fail if no reply in time
+                sock.setTimeout(8000);
+                // write immediately
+                this.opts.log.debug(`Sending initial probe on port ${port}`);
                 sock.write(probe);
+                // send a second probe shortly after to coax a response
+                setTimeout(() => {
+                    if (!sawData) {
+                        this.opts.log.debug(`Re-sending probe on port ${port}`);
+                        sock.write(probe);
+                    }
+                }, 150);
+            });
+            sock.once('connect', () => {
+                this.opts.log.debug(`Port ${port} connection established`);
             });
-            sock.setTimeout(5000, () => sock.destroy());
-            sock.once('connect', () => sock.setTimeout(0));
-            sock.on('data', () => {
+            sock.on('data', (data) => {
+                const text = data.toString();
+                this.opts.log.debug(`Port ${port} received data: ${text.slice(0, 200).replace(/\r/g, '\\r').replace(/\n/g, '\\n')}`);
                 sawData = true;
                 resolve(true);
                 sock.destroy();
             });
+            sock.on('timeout', () => {
+                this.opts.log.debug(`Port ${port} post-connect timeout`);
+                sock.destroy();
+            });
             sock.on('close', () => {
+                this.opts.log.debug(`Port ${port} closed, sawData: ${sawData}`);
                 if (!sawData)
                     resolve(false);
             });
-            sock.on('error', () => {
+            sock.on('error', (err) => {
+                const msg = err instanceof Error ? `${err.code || ''} ${err.message}` : String(err);
+                this.opts.log.debug(`Port ${port} error: ${msg}`);
                 /* resolve on close path */
             });
         });
@@ -383,6 +414,25 @@ class VantageInfusion extends events_1.EventEmitter {
         }
         return filtered;
     }
+    /** Escape text for XML (same as sanitize in index.js). */
+    static escapeXml(s) {
+        return String(s)
+            .replace(/&/g, '&amp;')
+            .replace(/</g, '&lt;')
+            .replace(/>/g, '&gt;')
+            .replace(/"/g, '&quot;')
+            .replace(/'/g, '&apos;');
+    }
+    /** Build cache XML from readObjects (same structure + sanitization as original index.js). */
+    buildCacheXml(readObjects) {
+        const frag = readObjects.map((o) => {
+            const k = Object.keys(o)[0];
+            const v = o[k];
+            const body = Object.keys(v).map((kk) => `<${kk}>${VantageInfusion.escapeXml(String(v[kk]))}</${kk}>`).join('');
+            return `<Object><${k}>${body}</${k}></Object>`;
+        }).join('');
+        return `<Project><Objects>${frag}</Objects></Project>`;
+    }
     pullConfigurationXml() {
         return new Promise((resolve) => {
             const finishOnce = (socket, xml) => {
@@ -426,15 +476,7 @@ class VantageInfusion extends events_1.EventEmitter {
                         return;
                     }
                     if (readObjects.length && Date.now() - lastProgress > 2000) {
-                        // Build minimal XML with what we gathered
-                        const xml = '<Project><Objects>' +
-                            readObjects.map((o) => {
-                                const k = Object.keys(o)[0];
-                                const v = o[k];
-                                const body = Object.keys(v).map((kk) => `<${kk}>${String(v[kk])}</${kk}>`).join('');
-                                return `<Object><${k}>${body}</${k}></Object>`;
-                            }).join('') +
-                            '</Objects></Project>';
+                        const xml = this.buildCacheXml(readObjects);
                         clearInterval(watchdog);
                         finishOnce(socket, xml);
                     }
@@ -542,14 +584,7 @@ class VantageInfusion extends events_1.EventEmitter {
                         }
                         // ----- END CONDITION -----
                         if (shouldBreak) {
-                            const xml = '<Project><Objects>' +
-                                readObjects.map((o) => {
-                                    const k = Object.keys(o)[0];
-                                    const v = o[k];
-                                    const body = Object.keys(v).map((kk) => `<${kk}>${String(v[kk])}</${kk}>`).join('');
-                                    return `<Object><${k}>${body}</${k}></Object>`;
-                                }).join('') +
-                                '</Objects></Project>';
+                            const xml = this.buildCacheXml(readObjects);
                             clearLoginFallback();
                             clearInterval(watchdog);
                             finishOnce(socket, xml);
@@ -559,30 +594,16 @@ class VantageInfusion extends events_1.EventEmitter {
                 socket.on('end', () => {
                     this.opts.log.info("ending" + shouldBreak);
                     if (!finishOnce._done && readObjects.length) {
-                        const xml = '<Project><Objects>' +
-                            readObjects.map((o) => {
-                                const k = Object.keys(o)[0];
-                                const v = o[k];
-                                const body = Object.keys(v).map((kk) => `<${kk}>${String(v[kk])}</${kk}>`).join('');
-                                return `<Object><${k}>${body}</${k}></Object>`;
-                            }).join('') +
-                            '</Objects></Project>';
+                        const xml = this.buildCacheXml(readObjects);
                         clearLoginFallback();
                         clearInterval(watchdog);
                         finishOnce(socket, xml);
                     }
                 });
                 socket.on('close', () => {
-                    this.opts.log.info("closing" + shouldBreak);
+                    this.opts.log.debug("closing " + shouldBreak);
                     if (!finishOnce._done && readObjects.length) {
-                        const xml = '<Project><Objects>' +
-                            readObjects.map((o) => {
-                                const k = Object.keys(o)[0];
-                                const v = o[k];
-                                const body = Object.keys(v).map((kk) => `<${kk}>${String(v[kk])}</${kk}>`).join('');
-                                return `<Object><${k}>${body}</${k}></Object>`;
-                            }).join('') +
-                            '</Objects></Project>';
+                        const xml = this.buildCacheXml(readObjects);
                         clearLoginFallback();
                         clearInterval(watchdog);
                         finishOnce(socket, xml);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@smarterhomeapp/homebridge-vantage",
-  "version": "1.0.1",
+  "version": "1.0.3",
   "description": "Homebridge plugin for Vantage InFusion (dynamic platform, HB 1.6+ / 2.0 ready)",
   "license": "MIT",
   "keywords": [