isy-nodejs 0.5.0-beta.56 → 0.5.0-beta.57

package/lib/Devices/ISYDevice.js

@@ -1,6 +1,5 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ISYUpdateableLevelDevice = exports.ISYLevelDevice = exports.ISYUpdateableBinaryStateDevice = exports.ISYBinaryStateDevice = exports.ISYDevice = void 0;
-const util_1 = require("util");
 const ISY_1 = require("../ISY");
 const ISYConstants_1 = require("../ISYConstants");
 const ISYNode_1 = require("../ISYNode");
@@ -26,7 +25,7 @@ class ISYDevice extends ISYNode_1.ISYNode {
         if (this.parentAddress !== this.address &&
             this.parentAddress !== undefined) {
             this._parentDevice = isy.getDevice(this.parentAddress);
-            if (!util_1.isNullOrUndefined(this._parentDevice)) {
+            if (this._parentDevice != null) {
                 this._parentDevice.addChild(this);
             }
         }

package/lib/ISY.d.ts

@@ -110,6 +110,7 @@ export declare class ISY extends EventEmitter {
         data: any;
     }): void;
     initializeWebSocket(): void;
+    shutdown(): void;
     private closeWebSocket;
     getDevice(address: string, parentsOnly?: boolean): ISYDevice<any>;
     getScene(address: string | number): any;

package/lib/ISY.js

@@ -390,6 +390,9 @@ class ISY extends events_1.EventEmitter {
                         device = child;
                     }
                 }
+                if (device === null || device === undefined) {
+                    continue;
+                }
                 if (Array.isArray(node.property)) {
                     for (let prop of node.property) {
                         device[prop.id] = device.convertFrom(prop.value, prop.uom);
@@ -552,30 +555,36 @@ class ISY extends events_1.EventEmitter {
         })
             .on('fail', (data, response) => {
             that.logger(`Websocket subscription failure: ${data}`);
-            throw new Error('Failed calling ISY');
+            that.closeWebSocket();
         })
             .on('abort', () => {
             that.logger('Websocket subscription aborted.');
-            throw new Error('Call to ISY was aborted');
+            that.closeWebSocket();
         })
             .on('timeout', (ms) => {
             that.logger(`Websocket subscription timed out after ${ms} milliseconds.`);
-            throw new Error('Timeout contacting ISY');
+            that.closeWebSocket();
         });
     }
+    shutdown() {
+        if (this.guardianTimer) {
+            clearInterval(this.guardianTimer);
+            this.guardianTimer = undefined;
+        }
+        this.closeWebSocket();
+    }
     closeWebSocket() {
         if (!this.webSocket) {
             return;
         }
+        const webSocket = this.webSocket;
+        this.webSocket = undefined;
         try {
-            this.webSocket.close();
+            webSocket.close();
         }
         catch (error) {
             this.logger(`Websocket close failed: ${error}`);
         }
-        finally {
-            this.webSocket = undefined;
-        }
     }
     getDevice(address, parentsOnly = false) {
         let s = this.deviceList.get(address);

package/lib/ISYNode.d.ts

@@ -1,7 +1,8 @@
 /// <reference types="node" />
 import { EventEmitter } from 'events';
 import { Family } from './Families';
-import { ISY, NodeType } from './ISY';
+import { NodeType } from './ISYConstants';
+import type { ISY } from './ISY';
 import { PropertyChangedEventEmitter } from './Utils';
 export declare class ISYNode extends EventEmitter implements PropertyChangedEventEmitter {
     readonly isy: ISY;

package/lib/ISYNode.js

@@ -2,7 +2,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ISYNode = void 0;
 const events_1 = require("events");
 const Families_1 = require("./Families");
-const ISY_1 = require("./ISY");
+const ISYConstants_1 = require("./ISYConstants");
 class ISYNode extends events_1.EventEmitter {
     constructor(isy, node) {
         var _a, _b;
@@ -24,7 +24,7 @@ class ISYNode extends events_1.EventEmitter {
         //if (s.length > 1)
         //s.shift();
         this.baseDisplayName = s.join(' ').replace(/([A-Z])/g, ' $1').replace('  ', ' ').replace('  ', ' ').trim();
-        if (this.parentType === ISY_1.NodeType.Folder) {
+        if (this.parentType === ISYConstants_1.NodeType.Folder) {
             this.folder = isy.folderMap.get(this.parent._);
             isy.logger(`${this.name} this node is in folder ${this.folder}`);
             this.logger = (msg) => {
@@ -78,7 +78,8 @@ class ISYNode extends events_1.EventEmitter {
         else {
             // this.logger(event.control);
             const e = event.control;
-            const dispName = ISY_1.Controls[e];
+            const { Controls } = require('./ISY');
+            const dispName = Controls[e];
             if (dispName !== undefined && dispName !== null) {
                 this.logger(`Command ${dispName.label} (${e}) triggered.`);
             }

package/package.json

@@ -2,7 +2,7 @@
     "name": "isy-nodejs",
     "description": "Javascript wrapper for ISY interface including websockets for change notifications. Fork of isy-js by Rod Toll. Designed to be used in a node.js application.",
     "license": "MIT",
-    "version": "0.5.0-beta.56",
+    "version": "0.5.0-beta.57",
     "author": {
         "name": "Rod Toll & Pradeep Mouli",
         "email": "rod_toll@hotmail.com"