isy-nodejs 1.0.1-alpha.1 → 1.0.1-alpha.3

package/dist/esm/ISY.js

@@ -1,54 +1,54 @@
-import WebSocket from "faye-websocket";
-import { writeFile } from "fs";
-import { Parser } from "xml2js";
-import { parseBooleans, parseNumbers } from "xml2js/lib/processors.js";
-import { XmlDocument } from "xmldoc";
-import axios from "axios";
-import { EventEmitter } from "events";
-import winston, { format, Logger, loggers } from "winston";
-import { Category } from "./Definitions/Global/Categories.js";
-import { Family } from "./Definitions/Global/Families.js";
-import { DeviceFactory } from "./Devices/DeviceFactory.js";
-import { ELKAlarmPanelDevice } from "./Devices/Elk/ElkAlarmPanelDevice.js";
-import { ElkAlarmSensorDevice } from "./Devices/Elk/ElkAlarmSensorDevice.js";
-import { InsteonBaseDevice } from "./Devices/Insteon/InsteonBaseDevice.js";
-import { InsteonOutletDevice } from "./Devices/Insteon/InsteonDevice.js";
-import { InsteonDimmableDevice } from "./Devices/Insteon/InsteonDimmableDevice.js";
-import { InsteonDimmerOutletDevice } from "./Devices/Insteon/InsteonDimmerOutletDevice.js";
-import { InsteonDimmerSwitchDevice } from "./Devices/Insteon/InsteonDimmerSwitchDevice.js";
-import { InsteonDoorWindowSensorDevice } from "./Devices/Insteon/InsteonDoorWindowSensorDevice.js";
-import { InsteonFanDevice, InsteonFanMotorDevice } from "./Devices/Insteon/InsteonFanDevice.js";
-import { InsteonKeypadButtonDevice } from "./Devices/Insteon/InsteonKeypadDevice.js";
-import { InsteonKeypadDimmerDevice } from "./Devices/Insteon/InsteonKeypadDimmerDevice.js";
-import { InsteonKeypadRelayDevice } from "./Devices/Insteon/InsteonKeypadRelayDevice.js";
-import { InsteonLeakSensorDevice } from "./Devices/Insteon/InsteonLeakSensorDevice.js";
-import { InsteonLockDevice } from "./Devices/Insteon/InsteonLockDevice.js";
-import { InsteonMotionSensorDevice } from "./Devices/Insteon/InsteonMotionSensorDevice.js";
-import { InsteonOnOffOutletDevice } from "./Devices/Insteon/InsteonOnOffOutletDevice.js";
-import { InsteonRelayDevice } from "./Devices/Insteon/InsteonRelayDevice.js";
-import { InsteonSmokeSensorDevice } from "./Devices/Insteon/InsteonSmokeSensorDevice.js";
-import { InsteonThermostatDevice } from "./Devices/Insteon/InsteonThermostatDevice.js";
-import { EventType } from "./Events/EventType.js";
-import { NodeType, Props, States, VariableType } from "./ISYConstants.js";
-import { ISYNode } from "./ISYNode.js";
-import { ISYDeviceNode } from "./Devices/ISYDeviceNode.js";
-import { ISYScene } from "./ISYScene.js";
-import { ISYVariable } from "./ISYVariable.js";
-import * as Utils from "./Utils.js";
-import { XMLParser } from "fast-xml-parser";
+import WebSocket from 'faye-websocket';
+import { writeFile } from 'fs';
+import { Parser } from 'xml2js';
+import { parseBooleans, parseNumbers } from 'xml2js/lib/processors.js';
+import { XmlDocument } from 'xmldoc';
+import axios from 'axios';
+import { EventEmitter } from 'events';
+import winston, { format, Logger, loggers } from 'winston';
+import { Category } from './Definitions/Global/Categories.js';
+import { Family } from './Definitions/Global/Families.js';
+import { DeviceFactory } from './Devices/DeviceFactory.js';
+import { ELKAlarmPanelDevice } from './Devices/Elk/ElkAlarmPanelDevice.js';
+import { ElkAlarmSensorDevice } from './Devices/Elk/ElkAlarmSensorDevice.js';
+import { InsteonBaseDevice } from './Devices/Insteon/InsteonBaseDevice.js';
+import { InsteonOutletDevice } from './Devices/Insteon/InsteonDevice.js';
+import { InsteonDimmableDevice } from './Devices/Insteon/InsteonDimmableDevice.js';
+import { InsteonDimmerOutletDevice } from './Devices/Insteon/InsteonDimmerOutletDevice.js';
+import { InsteonDimmerSwitchDevice } from './Devices/Insteon/InsteonDimmerSwitchDevice.js';
+import { InsteonDoorWindowSensorDevice } from './Devices/Insteon/InsteonDoorWindowSensorDevice.js';
+import { InsteonFanDevice, InsteonFanMotorDevice } from './Devices/Insteon/InsteonFanDevice.js';
+import { InsteonKeypadButtonDevice } from './Devices/Insteon/InsteonKeypadDevice.js';
+import { InsteonKeypadDimmerDevice } from './Devices/Insteon/InsteonKeypadDimmerDevice.js';
+import { InsteonKeypadRelayDevice } from './Devices/Insteon/InsteonKeypadRelayDevice.js';
+import { InsteonLeakSensorDevice } from './Devices/Insteon/InsteonLeakSensorDevice.js';
+import { InsteonLockDevice } from './Devices/Insteon/InsteonLockDevice.js';
+import { InsteonMotionSensorDevice } from './Devices/Insteon/InsteonMotionSensorDevice.js';
+import { InsteonOnOffOutletDevice } from './Devices/Insteon/InsteonOnOffOutletDevice.js';
+import { InsteonRelayDevice } from './Devices/Insteon/InsteonRelayDevice.js';
+import { InsteonSmokeSensorDevice } from './Devices/Insteon/InsteonSmokeSensorDevice.js';
+import { InsteonThermostatDevice } from './Devices/Insteon/InsteonThermostatDevice.js';
+import { EventType } from './Events/EventType.js';
+import { NodeType, Props, States, VariableType } from './ISYConstants.js';
+import { ISYNode } from './ISYNode.js';
+import { ISYDeviceNode } from './Devices/ISYDeviceNode.js';
+import { ISYScene } from './ISYScene.js';
+import { ISYVariable } from './ISYVariable.js';
+import * as Utils from './Utils.js';
+import { XMLParser } from 'fast-xml-parser';
 import { NodeFactory } from './Devices/NodeFactory.js';
-export { Category as Categories, ELKAlarmPanelDevice, ElkAlarmSensorDevice, Family, InsteonBaseDevice, InsteonDimmableDevice, InsteonDimmerOutletDevice, InsteonDimmerSwitchDevice, InsteonDoorWindowSensorDevice, InsteonFanDevice, InsteonFanMotorDevice, InsteonKeypadButtonDevice, InsteonKeypadDimmerDevice, InsteonKeypadRelayDevice, InsteonLeakSensorDevice, InsteonLockDevice, InsteonMotionSensorDevice, InsteonOnOffOutletDevice, InsteonOutletDevice, InsteonRelayDevice, InsteonSmokeSensorDevice, InsteonThermostatDevice, ISYDeviceNode as ISYDevice, ISYNode, ISYScene, ISYVariable, NodeType, Props, States, Utils, VariableType, };
+export { Category as Categories, ELKAlarmPanelDevice, ElkAlarmSensorDevice, Family, InsteonBaseDevice, InsteonDimmableDevice, InsteonDimmerOutletDevice, InsteonDimmerSwitchDevice, InsteonDoorWindowSensorDevice, InsteonFanDevice, InsteonFanMotorDevice, InsteonKeypadButtonDevice, InsteonKeypadDimmerDevice, InsteonKeypadRelayDevice, InsteonLeakSensorDevice, InsteonLockDevice, InsteonMotionSensorDevice, InsteonOnOffOutletDevice, InsteonOutletDevice, InsteonRelayDevice, InsteonSmokeSensorDevice, InsteonThermostatDevice, ISYDeviceNode as ISYDevice, ISYNode, ISYScene, ISYVariable, NodeType, Props, States, Utils, VariableType };
 const defaultParserOptions = {
     explicitArray: false,
     mergeAttrs: true,
     attrValueProcessors: [parseNumbers, parseBooleans],
     valueProcessors: [parseNumbers, parseBooleans],
-    tagNameProcessors: [(tagName) => (tagName === "st" || tagName === "cmd" || tagName === "nodeDef" ? "" : tagName)],
+    tagNameProcessors: [(tagName) => (tagName === 'st' || tagName === 'cmd' || tagName === 'nodeDef' ? '' : tagName)]
 };
 const defaultXMLParserOptions = {
     parseAttributeValue: true,
     allowBooleanAttributes: true,
-    attributeNamePrefix: "",
+    attributeNamePrefix: '',
     attributesGroupName: false,
     ignoreAttributes: false,
     // updateTag(tagName, jPath, attrs) {
@@ -56,20 +56,20 @@ const defaultXMLParserOptions = {
     // 	//	return false;
     // 	//return tagName;
     // },
-    textNodeName: "_",
-    commentPropName: "$comment",
-    cdataPropName: "$cdata",
+    textNodeName: '_',
+    commentPropName: '$comment',
+    cdataPropName: '$cdata',
     ignoreDeclaration: true,
     tagValueProcessor: (tagName, tagValue, jPath, hasAttributes, isLeafNode) => {
-        if (tagValue === "")
+        if (tagValue === '')
             return null;
         return tagValue;
     },
     isArray(tagName, jPath, isLeafNode, isAttribute) {
-        if (tagName === "property")
+        if (tagName === 'property')
             return true;
         return false;
-    },
+    }
 };
 axios.defaults.transitional.forcedJSONParsing = false;
 const parser = new Parser(defaultParserOptions);
@@ -90,7 +90,7 @@ export class ISY extends EventEmitter {
     sceneList = new Map();
     storagePath;
     variableList = new Map();
-    wsprotocol = "ws";
+    wsprotocol = 'ws';
     zoneMap = new Map();
     static instance;
     configInfo;
@@ -102,35 +102,35 @@ export class ISY extends EventEmitter {
     model;
     nodesLoaded = false;
     productId = 5226;
-    productName = "eisy";
+    productName = 'eisy';
     serverVersion;
-    vendorName = "Universal Devices, Inc.";
+    vendorName = 'Universal Devices, Inc.';
     webSocket;
     // #endregion Properties (30)
     // #region Constructors (1)
     constructor(config, logger = new Logger(), storagePath) {
         super();
         this.enableWebSocket = config.enableWebSocket ?? true;
-        this.storagePath = storagePath ?? "./";
-        this.displayNameFormat = config.displayNameFormat ?? "${location ?? folder} ${spokenName ?? name}";
+        this.storagePath = storagePath ?? './';
+        this.displayNameFormat = config.displayNameFormat ?? '${location ?? folder} ${spokenName ?? name}';
         this.host = config.host;
         this.port = config.port;
         this.credentials = {
             username: config.username,
-            password: config.password,
+            password: config.password
         };
         this.protocol = config.protocol;
-        this.wsprotocol = config.protocol === "https" ? "wss" : "ws";
+        this.wsprotocol = config.protocol === 'https' ? 'wss' : 'ws';
         this.elkEnabled = config.elkEnabled ?? false;
         this.nodesLoaded = false;
         var fopts = format((info) => {
             info.message = JSON.stringify(info.message);
             return info;
-        })({ label: "ISY" });
-        this.logger = loggers.add("isy", {
+        })({ label: 'ISY' });
+        this.logger = loggers.add('isy', {
             transports: logger.transports,
             levels: logger.levels,
-            format: format.label({ label: "ISY" }),
+            format: format.label({ label: 'ISY' })
         });
         this.guardianTimer = null;
         if (this.elkEnabled) {
@@ -216,7 +216,7 @@ export class ISY extends EventEmitter {
             else if (evt.action instanceof Number || evt.action instanceof String) {
                 actionValue = Number(evt.action);
             }
-            const stringControl = Number(evt.control?.replace("_", ""));
+            const stringControl = Number(evt.control?.replace('_', ''));
             switch (stringControl) {
                 case EventType.Elk:
                     if (actionValue === 2) {
@@ -245,9 +245,9 @@ export class ISY extends EventEmitter {
                     this.logger.debug(`Received ${EventType[Number(stringControl)]} Signal from ISY: ${JSON.stringify(evt)}`);
                     break;
                 default:
-                    if (evt.node !== "" && evt.node !== undefined && evt.node !== null) {
+                    if (evt.node !== '' && evt.node !== undefined && evt.node !== null) {
                         //
-                        const impactedDevice = this.getDevice(evt.node);
+                        const impactedDevice = this.getNode(evt.node);
                         if (impactedDevice !== undefined && impactedDevice !== null) {
                             impactedDevice.handleEvent(evt);
                         }
@@ -276,7 +276,7 @@ export class ISY extends EventEmitter {
             await this.#finishInitialize(true);
         }
         catch (e) {
-            this.handleInitializeError("initialize", e);
+            this.handleInitializeError('initialize', e);
         }
         finally {
             if (this.nodesLoaded !== true) {
@@ -287,7 +287,7 @@ export class ISY extends EventEmitter {
     }
     initializeWebSocket() {
         const that = this;
-        const auth = `Basic ${Buffer.from(`${this.credentials.username}:${this.credentials.password}`).toString("base64")}`;
+        const auth = `Basic ${Buffer.from(`${this.credentials.username}:${this.credentials.password}`).toString('base64')}`;
         this.logger.info(`Opening webSocket: ${this.wsprotocol}://${this.address}/rest/subscribe`);
         if (this.webSocket) {
             try {
@@ -297,42 +297,42 @@ export class ISY extends EventEmitter {
                 this.logger.warn(`Error closing existing websocket: ${e.message}`);
             }
         }
-        this.webSocket = new WebSocket.Client(`${this.wsprotocol}://${this.address}/rest/subscribe`, ["ISYSUB"], {
+        this.webSocket = new WebSocket.Client(`${this.wsprotocol}://${this.address}/rest/subscribe`, ['ISYSUB'], {
             headers: {
-                Origin: "com.universal-devices.websockets.isy",
-                Authorization: auth,
+                Origin: 'com.universal-devices.websockets.isy',
+                Authorization: auth
             },
-            ping: 10,
+            ping: 10
         });
         this.lastActivity = new Date();
         this.webSocket
-            .on("message", (event) => {
+            .on('message', (event) => {
             that.logger.silly(`Received message: ${JSON.stringify(event.data, null, 2)}`);
             that.handleWebSocketMessage(event);
         })
-            .on("error", (err, response) => {
+            .on('error', (err, response) => {
             that.logger.warn(`Websocket subscription error: ${JSON.stringify(err.message)}`);
             /// throw new Error('Error calling ISY' + err);
         })
-            .on("fail", (data, response) => {
+            .on('fail', (data, response) => {
             that.logger.warn(`Websocket subscription failure: ${data}`);
-            throw new Error("Failed calling ISY");
+            throw new Error('Failed calling ISY');
         })
-            .on("abort", () => {
-            that.logger.warn("Websocket subscription aborted.");
-            throw new Error("Call to ISY was aborted");
+            .on('abort', () => {
+            that.logger.warn('Websocket subscription aborted.');
+            throw new Error('Call to ISY was aborted');
         })
-            .on("timeout", (ms) => {
+            .on('timeout', (ms) => {
             that.logger.warn(`Websocket subscription timed out after ${ms} milliseconds.`);
-            throw new Error("Timeout contacting ISY");
+            throw new Error('Timeout contacting ISY');
         });
     }
     async loadConfig() {
         try {
-            this.logger.info("Loading ISY Config");
-            const configuration = (await this.sendRequest("config")).configuration;
+            this.logger.info('Loading ISY Config');
+            const configuration = (await this.sendRequest('config')).configuration;
             if (this.isDebugEnabled) {
-                writeFile(this.storagePath + "/ISYConfigDump.json", JSON.stringify(configuration), this.logger.error);
+                writeFile(this.storagePath + '/ISYConfigDump.json', JSON.stringify(configuration), this.logger.error);
             }
             const controls = configuration.controls;
             this.model = configuration.deviceSpecs.model;
@@ -354,18 +354,18 @@ export class ISY extends EventEmitter {
             return configuration;
         }
         catch (e) {
-            this.handleInitializeError("config", e);
+            this.handleInitializeError('config', e);
             throw Error(`Error Loading Config: ${e.message}`);
         }
     }
     async loadNodes() {
         try {
-            const result = await this.sendRequest("nodes");
+            const result = await this.sendRequest('nodes');
             if (this.isDebugEnabled)
-                writeFile(this.storagePath + "/ISYNodesDump.json", JSON.stringify(result), this.logger.error);
-            await this.#readFolderNodes(result).catch((p) => this.logger.error("Error Loading Folders", p));
-            await this.#readDeviceNodes(result).catch((p) => this.logger.error("Error Loading Devices", p));
-            await this.#readSceneNodes(result).catch((p) => this.logger.error("Error Loading Scenes", p));
+                writeFile(this.storagePath + '/ISYNodesDump.json', JSON.stringify(result), this.logger.error);
+            await this.#readFolderNodes(result).catch((p) => this.logger.error('Error Loading Folders', p));
+            await this.#readDeviceNodes(result).catch((p) => this.logger.error('Error Loading Devices', p));
+            await this.#readSceneNodes(result).catch((p) => this.logger.error('Error Loading Scenes', p));
             return result;
         }
         catch (e) {
@@ -394,9 +394,9 @@ export class ISY extends EventEmitter {
     async refreshStatuses() {
         try {
             const that = this;
-            const result = await that.sendRequest("status");
+            const result = await that.sendRequest('status');
             if (that.isDebugEnabled) {
-                writeFile(that.storagePath + "/ISYStatusDump.json", JSON.stringify(result), this.logger.error);
+                writeFile(that.storagePath + '/ISYStatusDump.json', JSON.stringify(result), this.logger.error);
             }
             this.logger.debug(result);
             for (const node of result.nodes.node) {
@@ -451,14 +451,14 @@ export class ISY extends EventEmitter {
     async sendNodeCommand(node, command, parameters) {
         let uriToUse = `nodes/${node.address}/cmd/${command}`;
         if (parameters !== null && parameters !== undefined) {
-            if (typeof parameters == "object") {
+            if (typeof parameters == 'object') {
                 var q = parameters;
                 for (const paramName of Object.getOwnPropertyNames(q)) {
                     uriToUse += `/${paramName}/${q[paramName]}`;
                 }
                 //uriToUse += `/${q[((p : Record<string,number|number>) => `${p[]}/${p.paramValue}` ).join('/')}`;
             }
-            else if (typeof parameters == "number" || typeof parameters == "string") {
+            else if (typeof parameters == 'number' || typeof parameters == 'string') {
                 uriToUse += `/${parameters}`;
             }
         }
@@ -468,28 +468,28 @@ export class ISY extends EventEmitter {
     async sendRequest(url, options = { trailingSlash: true }) {
         const requestLogLevel = options.requestLogLevel ?? winston.config.cli.levels.debug;
         const responseLogLevel = options.responseLogLevel ?? winston.config.cli.levels.silly;
-        url = `${this.protocol}://${this.address}/rest/${url}${options.trailingSlash ? "/" : ""}`;
+        url = `${this.protocol}://${this.address}/rest/${url}${options.trailingSlash ? '/' : ''}`;
         this.logger.log(`Sending request: ${url}`, requestLogLevel);
         try {
             const response = await axios.get(url, {
-                auth: { username: this.credentials.username, password: this.credentials.password },
+                auth: { username: this.credentials.username, password: this.credentials.password }
             });
             if (response.data) {
-                if (response.headers["content-type"].toString().includes("xml")) {
+                if (response.headers['content-type'].toString().includes('xml')) {
                     let curParser = parser;
                     if (options.parserOptions)
                         curParser = new Parser({ ...defaultParserOptions, ...options.parserOptions });
                     var altParser = new XMLParser(defaultXMLParserOptions);
                     var s = altParser.parse(response.data);
-                    this.logger.log(`Response: ${JSON.stringify(s)}`, requestLogLevel ?? "debug");
+                    this.logger.log(`Response: ${JSON.stringify(s)}`, requestLogLevel ?? 'debug');
                     return s;
                 }
-                else if (response.headers["content-type"].toString().includes("json")) {
-                    this.logger.log(`Response: ${JSON.stringify(response.data)}`, requestLogLevel ?? "debug");
+                else if (response.headers['content-type'].toString().includes('json')) {
+                    this.logger.log(`Response: ${JSON.stringify(response.data)}`, requestLogLevel ?? 'debug');
                     return JSON.parse(response.data);
                 }
                 else {
-                    this.logger.log(`Response Header: ${JSON.stringify(response.headers)} Response: ${JSON.stringify(response.data)}`, responseLogLevel ?? "debug");
+                    this.logger.log(`Response Header: ${JSON.stringify(response.headers)} Response: ${JSON.stringify(response.data)}`, responseLogLevel ?? 'debug');
                     return response.data;
                 }
             }
@@ -510,9 +510,7 @@ export class ISY extends EventEmitter {
     // #endregion Public Methods (22)
     // #region Private Methods (11)
     #checkForFailure(response) {
-        return (response === null ||
-            response instanceof Error ||
-            (response.RestResponse !== undefined && response.RestResponse.status !== 200));
+        return response === null || response instanceof Error || (response.RestResponse !== undefined && response.RestResponse.status !== 200);
     }
     #createVariableKey(type, id) {
         return `${type}:${id}`;
@@ -543,14 +541,14 @@ export class ISY extends EventEmitter {
     #guardian() {
         const timeNow = new Date();
         if (Number(timeNow) - Number(this.lastActivity) > 60000) {
-            this.logger.info("Guardian: Detected no activity in more then 60 seconds. Reinitializing web sockets");
+            this.logger.info('Guardian: Detected no activity in more then 60 seconds. Reinitializing web sockets');
             this.initializeWebSocket();
         }
     }
     #loadElkInitialStatus(result) {
         const p = new Parser({
             explicitArray: false,
-            mergeAttrs: true,
+            mergeAttrs: true
         });
         p.parseString(result, (err, res) => {
             if (err) {
@@ -574,7 +572,7 @@ export class ISY extends EventEmitter {
     }
     #loadElkNodes(result) {
         const document = new XmlDocument(result);
-        const nodes = document.childNamed("areas").childNamed("area").childrenNamed("zone");
+        const nodes = document.childNamed('areas').childNamed('area').childrenNamed('zone');
         for (let index = 0; index < nodes.length; index++) {
             const id = nodes[index].attr.id;
             const name = nodes[index].attr.name;
@@ -584,65 +582,70 @@ export class ISY extends EventEmitter {
         }
     }
     async #readDeviceNodes(obj) {
-        this.logger.info("Loading Device Nodes");
+        this.logger.info('Loading Device Nodes');
         for (const nodeInfo of obj.nodes.node) {
-            this.logger.debug(`Loading Device Node: ${JSON.stringify(nodeInfo)}`);
-            if (!this.deviceMap.has(nodeInfo.pnode)) {
-                const address = nodeInfo.address;
-                this.deviceMap[nodeInfo.pnode] = {
-                    address,
-                };
-            }
-            else {
-                this.deviceMap[nodeInfo.pnode].push(nodeInfo.address);
-            }
-            let newDevice = null;
-            // let deviceTypeInfo = this.isyTypeToTypeName(device.type, device.address);
-            // this.logger.info(JSON.stringify(deviceTypeInfo));
-            const enabled = nodeInfo.enabled ?? true;
-            const d = await NodeFactory.get(nodeInfo);
-            const m = DeviceFactory.getDeviceDetails(nodeInfo);
-            if (d) {
-                newDevice = new d(this, nodeInfo);
-            }
-            if (m) {
-                newDevice = newDevice ?? new m.class(this, nodeInfo);
-                newDevice.productName = m.name;
-                newDevice.model = `(${m.modelNumber}) ${m.name} v.${m.version}`;
-                newDevice.modelNumber = m.modelNumber;
-                newDevice.version = m.version;
-            }
-            if (enabled) {
-                if (newDevice === null) {
-                    this.logger.warn(`Device type resolution failed for ${nodeInfo.name} with type: ${nodeInfo.type} and nodedef: ${nodeInfo.nodeDefId}`);
-                    newDevice = new ISYDeviceNode(this, nodeInfo);
+            try {
+                this.logger.debug(`Loading Device Node: ${JSON.stringify(nodeInfo)}`);
+                if (!this.deviceMap.has(nodeInfo.pnode)) {
+                    const address = nodeInfo.address;
+                    this.deviceMap[nodeInfo.pnode] = {
+                        address
+                    };
+                }
+                else {
+                    this.deviceMap[nodeInfo.pnode].push(nodeInfo.address);
+                }
+                let newDevice = null;
+                // let deviceTypeInfo = this.isyTypeToTypeName(device.type, device.address);
+                // this.logger.info(JSON.stringify(deviceTypeInfo));
+                const enabled = nodeInfo.enabled ?? true;
+                const d = await NodeFactory.get(nodeInfo);
+                const m = DeviceFactory.getDeviceDetails(nodeInfo);
+                if (d) {
+                    newDevice = new d(this, nodeInfo);
                 }
-                else if (newDevice !== null) {
-                    if (m.unsupported) {
-                        this.logger.warn("Device not currently supported: " + JSON.stringify(nodeInfo) + " /n It has been mapped to: " + d.name);
+                if (m) {
+                    newDevice = newDevice ?? new m.class(this, nodeInfo);
+                    newDevice.productName = m.name;
+                    newDevice.model = `(${m.modelNumber}) ${m.name} v.${m.version}`;
+                    newDevice.modelNumber = m.modelNumber;
+                    newDevice.version = m.version;
+                }
+                if (enabled) {
+                    if (newDevice === null) {
+                        this.logger.warn(`Device type resolution failed for ${nodeInfo.name} with type: ${nodeInfo.type} and nodedef: ${nodeInfo.nodeDefId}`);
+                        newDevice = new ISYDeviceNode(this, nodeInfo);
                     }
-                    try {
-                        await newDevice.refreshNotes();
+                    else if (newDevice !== null) {
+                        if (m.unsupported) {
+                            this.logger.warn('Device not currently supported: ' + JSON.stringify(nodeInfo) + ' /n It has been mapped to: ' + d.name);
+                        }
+                        try {
+                            await newDevice.refreshNotes();
+                        }
+                        catch (e) {
+                            this.logger.debug('No notes found.');
+                        }
+                        // if (!newDevice.hidden) {
+                        // }
+                        // this.deviceList.push(newDevice);
                     }
-                    catch (e) {
-                        this.logger.debug("No notes found.");
+                    else {
                     }
-                    // if (!newDevice.hidden) {
-                    // }
-                    // this.deviceList.push(newDevice);
+                    this.nodeMap.set(newDevice.address, newDevice);
                 }
                 else {
+                    this.logger.info(`Ignoring disabled device: ${nodeInfo.name}`);
                 }
-                this.nodeMap.set(newDevice.address, newDevice);
             }
-            else {
-                this.logger.info(`Ignoring disabled device: ${nodeInfo.name}`);
+            catch (e) {
+                this.logger.error(`Error loading device node: ${e.message}`);
             }
         }
         this.logger.info(`${this.nodeMap.size} devices added.`);
     }
     async #readFolderNodes(result) {
-        this.logger.info("Loading Folder Nodes");
+        this.logger.info('Loading Folder Nodes');
         if (result?.nodes?.folder) {
             for (const folder of result.nodes.folder) {
                 this.logger.info(`Loading Folder Node: ${JSON.stringify(folder)}`);
@@ -651,9 +654,9 @@ export class ISY extends EventEmitter {
         }
     }
     async #readSceneNodes(result) {
-        this.logger.info("Loading Scene Nodes");
+        this.logger.info('Loading Scene Nodes');
         for (const scene of result.nodes?.group) {
-            if (scene.name === "ISY" || scene.name === "IoX" || scene.name === "Auto DR") {
+            if (scene.name === 'ISY' || scene.name === 'IoX' || scene.name === 'Auto DR') {
                 continue;
             } // Skip ISY & Auto DR Scenes
             const newScene = new ISYScene(this, scene);
@@ -661,7 +664,7 @@ export class ISY extends EventEmitter {
                 await newScene.refreshNotes();
             }
             catch (e) {
-                this.logger.debug("No notes found.");
+                this.logger.debug('No notes found.');
             }
             this.sceneList.set(newScene.address, newScene);
         }