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

package/package.json

@@ -2,7 +2,7 @@
     "name": "isy-nodejs",
     "description": "Node.js 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": "1.0.1-alpha.3",
+    "version": "1.0.1-alpha.5",
     "author": {
         "name": "Pradeep Mouli"
     },
@@ -71,5 +71,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "5671288e3fde06848a4767d39c22b987157fc20a"
+    "gitHead": "ce49adae004a6ba0589251732b944a3eb3edc1a2"
 }

package/src/Devices/Insteon/InsteonBaseDevice.ts

@@ -1,16 +1,17 @@
+import 'winston';
+import { Converters } from '../../Converters.js';
+import type { Command } from '../../Definitions/Global/Commands.js';
+import { Driver, DriverType } from '../../Definitions/Global/Drivers.js';
 import { Family, Insteon } from '../../Definitions/Global/Families.js';
-import { ISY } from '../../ISY.js';
 import { UnitOfMeasure as UOM, UnitOfMeasure } from '../../Definitions/Global/UOM.js';
-import { byteToDegree, byteToPct, pctToByte, type StringKeys } from '../../Utils.js';
+import { ISY } from '../../ISY.js';
+import { ISYNode } from '../../ISYNode.js';
 import { NodeInfo } from '../../Model/NodeInfo.js';
+import { byteToDegree, byteToPct, pctToByte, type StringKeys } from '../../Utils.js';
 import { ISYDeviceNode } from '../ISYDeviceNode.js';
-import { ISYNode } from '../../ISYNode.js';
-import 'winston';
-import type { Driver, DriverType } from '../../Definitions/Global/Drivers.js';
-import { Converters } from '../../Converters.js';
-import type { Command } from '../../Definitions/Global/Commands.js';
 
 import type { Merge } from '@project-chip/matter.js/util';
+import type { DriverState } from '../../Model/DriverState.js';
 
 // import { InsteonNLS } from './insteonfam.js'
 export class InsteonBaseDevice<D extends ISYNode.DriverSignatures = {}, C extends ISYNode.CommandSignatures = {}> extends ISYDeviceNode<
@@ -23,7 +24,7 @@ export class InsteonBaseDevice<D extends ISYNode.DriverSignatures = {}, C extend
 	constructor(isy: ISY, deviceNode: NodeInfo) {
 		super(isy, deviceNode);
 		this.family = Family.Insteon;
-
+		(this.drivers as any).ERR = Driver.create('ERR', this as any, deviceNode.property as DriverState, { uom: UnitOfMeasure.Index, label: 'Responding', name: 'responding' });
 		//// this.productName = InsteonNLS.getDeviceDescription(String.fromCharCode(category,device,version));
 		//his.childDevices = {};
 	}

package/src/Devices/Insteon/InsteonFanDevice.ts

@@ -5,12 +5,15 @@ import { States } from '../../ISYConstants.js';
 import { InsteonBaseDevice } from './InsteonBaseDevice.js';
 import { InsteonDimmableDevice } from './InsteonDimmableDevice.js';
 import 'winston';
-import type { NodeInfo } from '../../Model/NodeInfo.js';
+import type { NodeInfo, StaticNodeInfo } from '../../Model/NodeInfo.js';
 import {Insteon} from './index.js';
+import  { Command, Driver, UnitOfMeasure } from '../../Definitions/index.js';
+import type { DriverState } from '../../Model/DriverState.js';
 
-export class InsteonFanMotorDevice extends InsteonBaseDevice {
-	constructor (isy: ISY, deviceNode: NodeInfo) {
+export class InsteonFanMotorDevice extends InsteonBaseDevice<Driver.Signatures<'ST'>, Command.Signatures<'DON' | 'DOF'>> {
+	constructor (isy: ISY, deviceNode: StaticNodeInfo) {
 		super(isy, deviceNode);
+		this.drivers.ST = Driver.create('ST', this, deviceNode.property as DriverState, { uom: UnitOfMeasure.Percent, label: 'Fan Speed (%)', name: 'fanSpeed' });
 		this.hidden = true;
 	}
 

package/src/Devices/Insteon/InsteonRelayDevice.ts

@@ -14,7 +14,7 @@ import { Properties } from '../../ISYConstants.js';
 
 import type { DriverState } from '../../Model/DriverState.js';
 
-export class InsteonRelayDevice extends InsteonBaseDevice<Driver.Signatures<'ST' | 'OL' | 'RR'>, Command.Signatures<'DON' | 'DOF'>> {
+export class InsteonRelayDevice extends InsteonBaseDevice<Driver.Signatures<'ST' | 'OL' | 'RR' | 'ERR'>, Command.Signatures<'DON' | 'DOF'>> {
 	// #region Constructors (1)
 
 	constructor(isy: ISY, nodeInfo: NodeInfo) {
@@ -22,6 +22,7 @@ export class InsteonRelayDevice extends InsteonBaseDevice<Driver.Signatures<'ST'
 		this.drivers.ST = Driver.create('ST', this, nodeInfo.property as DriverState, { uom: UnitOfMeasure.Percent, label: 'Status', name: 'status' });
 		this.drivers.OL = Driver.create('OL', this, nodeInfo.property as DriverState, { uom: UnitOfMeasure.Percent, label: 'On Level', name: 'onLevel' });
 		this.drivers.RR = Driver.create('RR', this, nodeInfo.property as DriverState, { uom: UnitOfMeasure.Index, label: 'Ramp Rate', name: 'rampRate' });
+		this.drivers.ERR = Driver.create('ERR', this, nodeInfo.property as DriverState, { uom: UnitOfMeasure.Index, label: 'Error', name: 'error' });
 	}
 
 	// #endregion Constructors (1)

package/src/ISY.ts

@@ -331,7 +331,11 @@ export class ISY extends EventEmitter implements Disposable {
 						//
 						const impactedDevice = this.getNode(evt.node);
 						if (impactedDevice !== undefined && impactedDevice !== null) {
-							impactedDevice.handleEvent(evt);
+							try {
+								impactedDevice.handleEvent(evt);
+							} catch (e) {
+								this.logger.error(`Error handling event for ${impactedDevice.name}: ${e.message}`);
+							}
 						} else {
 							this.logger.warn(`${EventType[stringControl]} Event for Unidentified Device: ${JSON.stringify(evt)}`);
 						}