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

package/src/Devices/Elk/ElkAlarmSensorDevice.ts

@@ -1,4 +1,3 @@
-
 import { Family } from '../../Definitions/Global/Families.js';
 import { ISY } from '../../ISY.js';
 import { ISYDeviceNode } from '../ISYDeviceNode.js';
@@ -6,7 +5,7 @@ import { AlarmSensorPhysicalState, AlarmSensorLogicalState } from './ElkAlarmPan
 /////////////////////////////
 // ELKAlarmSensor
 //
-export class ElkAlarmSensorDevice extends ISYDeviceNode<Family.Global,any,any> {
+export class ElkAlarmSensorDevice extends ISYDeviceNode<Family.Global, any, any> {
 	[x: string]: any;
 	public area: number;
 	public zone: string;
@@ -17,9 +16,12 @@ export class ElkAlarmSensorDevice extends ISYDeviceNode<Family.Global,any,any> {
 	public physicalState: AlarmSensorPhysicalState;
 	public logicalState: AlarmSensorLogicalState;
 	public voltage: number;
-	constructor (isy: ISY, name: string, area: number, zone: string) {
+	constructor(isy: ISY, name: string, area: number, zone: string) {
 		super(isy, {
-			family: Family.Global, name, address: `ElkZone_${zone}`, enabled: true,
+			family: Family.Global,
+			name,
+			address: `ElkZone_${zone}`,
+			enabled: true,
 			pnode: undefined,
 			startDelay: 0,
 			hint: '',
@@ -49,13 +51,13 @@ export class ElkAlarmSensorDevice extends ISYDeviceNode<Family.Global,any,any> {
 		return this.physicalState;
 	}
 	public isBypassed() {
-		return (this.logicalState === 3);
+		return this.logicalState === 3;
 	}
 	public getLogicalState() {
 		return this.logicalState;
 	}
 	public getCurrentDoorWindowState() {
-		return (this.physicalState === this.SENSOR_STATE_PHYSICAL_OPEN || this.logicalState === this.SENSOR_STATE_LOGICAL_VIOLATED);
+		return this.physicalState === this.SENSOR_STATE_PHYSICAL_OPEN || this.logicalState === this.SENSOR_STATE_LOGICAL_VIOLATED;
 	}
 	public getSensorStatus() {
 		return 'PS [' + this.physicalState + '] LS [' + this.logicatState + ']';
@@ -63,17 +65,11 @@ export class ElkAlarmSensorDevice extends ISYDeviceNode<Family.Global,any,any> {
 	public isPresent() {
 		if (this.voltage < 65 || this.voltage > 80) {
 			return true;
-		}
-		else {
+		} else {
 			return false;
 		}
 	}
-	public override handleEvent(event: {
-		control?: string;
-		data?: any;
-		node?: any;
-		eventInfo?: any;
-	}) {
+	public override handleEvent(event: { control?: string; data?: any; node?: any; eventInfo?: any }) {
 		const zoneUpdate = event.eventInfo.ze;
 		const zone = zoneUpdate.attr.zone;
 		const updateType = zoneUpdate.attr.type;
@@ -84,24 +80,22 @@ export class ElkAlarmSensorDevice extends ISYDeviceNode<Family.Global,any,any> {
 				if (this.logicalState !== valueToSet) {
 					const temp = this.logicalState;
 					this.logicalState = valueToSet;
-					this.emit('PropertyChanged', 'logicalState', this.logicalState, temp, this.voltage.toString());
+					this.emit('propertyChanged', 'logicalState', this.logicalState, temp, this.voltage.toString());
 					// Not triggering change update on logical state because physical always follows and don't want double notify.
 					// valueChanged = true;
 				}
-			}
-			else if (updateType === 52) {
+			} else if (updateType === 52) {
 				if (this.physicalState !== valueToSet) {
 					const temp = this.physicalState;
 					this.physicalState = valueToSet;
-					this.emit('PropertyChanged', 'physicalState', this.physicalState, temp, this.voltage.toString());
+					this.emit('propertyChanged', 'physicalState', this.physicalState, temp, this.voltage.toString());
 					valueChanged = true;
 				}
-			}
-			else if (updateType === 53) {
+			} else if (updateType === 53) {
 				if (this.voltage !== valueToSet) {
 					const temp = this.voltage;
 					this.voltage = valueToSet;
-					this.emit('PropertyChanged', 'voltage', this.voltage, temp, this.voltage.toString());
+					this.emit('propertyChanged', 'voltage', this.voltage, temp, this.voltage.toString());
 					valueChanged = true;
 				}
 			}

package/src/Devices/Insteon/Generated/RelayLamp.ts

@@ -1,5 +1,5 @@
-/* THIS FILE WAS AUTOMATICALLY GENERATED. DO NOT EDIT DIRECTLY. */
-
+/* THIS FILE WAS AUTOMATICALLY GENERATED. DO NOT EDIT DIRECTLY. */
+
 import { UnitOfMeasure } from "../../../Definitions/Global/UOM.js";
 import { Family } from "../../../Definitions/Global/Families.js";
 import type { NodeInfo } from "../../../Model/NodeInfo.js";
@@ -11,12 +11,12 @@ import { Driver } from "../../../Definitions/Global/Drivers.js";
 import { Insteon } from "../../../Definitions/index.js";
 import type { DriverState } from "../../../Model/DriverState.js";
 import { NodeFactory } from "../../NodeFactory.js";
-
+
 export const nodeDefId = "RelayLampOnly";
-
+
 type Commands = RelayLamp.Commands;
 type Drivers = RelayLamp.Drivers;
-
+
 export class RelayLampNode extends Base<Drivers, Commands> implements RelayLamp.Interface {
 	public readonly commands = {
 		DON: this.on,
@@ -33,6 +33,7 @@ export class RelayLampNode extends Base<Drivers, Commands> implements RelayLamp.
 		super(isy, nodeInfo);
 		this.drivers.ST = Driver.create("ST", this, nodeInfo.property as DriverState, { uom: UnitOfMeasure.Percent, label: "Status", name: "status" });
 		this.drivers.ERR = Driver.create("ERR", this, nodeInfo.property as DriverState, { uom: UnitOfMeasure.Index, label: "Responding", name: "responding" });
+		
 	}
 	async on(value?: (0 | 100)) {
 		return this.sendCommand("DON", { value: value });
@@ -62,9 +63,9 @@ export class RelayLampNode extends Base<Drivers, Commands> implements RelayLamp.
 		return this.drivers.ERR?.value;
 	}
 }
-
+
 NodeFactory.register(RelayLampNode);
-
+
 export namespace RelayLamp {
 	export interface Interface extends Omit<InstanceType<typeof RelayLampNode>, keyof ISYDeviceNode<any, any, any, any>> {
 		nodeDefId: "RelayLampOnly";

package/src/Devices/Insteon/InsteonBaseDevice.ts

@@ -1,16 +1,17 @@
+import 'winston';
+import { Converter } 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 = {};
 	}
@@ -37,7 +38,7 @@ export class InsteonBaseDevice<D extends ISYNode.DriverSignatures = {}, C extend
 			case UOM.DegreeX2:
 				return byteToDegree(value);
 			case UOM.LevelFrom0To255:
-				return Converters.Standard.LevelFrom0To255.Percent.to(value);
+				return Converter.Standard.LevelFrom0To255.Percent.to(value);
 			case UOM.Fahrenheit:
 				return value / 10;
 			default:

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 {Insteon} from './index.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;
 	}
 
@@ -22,7 +25,7 @@ export class InsteonFanMotorDevice extends InsteonBaseDevice {
 	}
 
 	public async updateFanSpeed(level: number) {
-		return (level);
+		return level;
 	}
 	public async updateIsOn(isOn: boolean) {
 		if (!isOn) {
@@ -31,7 +34,6 @@ export class InsteonFanMotorDevice extends InsteonBaseDevice {
 			//return this.commands.BEEP(States.Level.Max);
 		}
 	}
-
 }
 
 export class InsteonFanDevice extends InsteonBaseDevice {
@@ -40,11 +42,11 @@ export class InsteonFanDevice extends InsteonBaseDevice {
 	constructor(isy: ISY, deviceNode: NodeInfo) {
 		super(isy, deviceNode);
 		this.light = new InsteonDimmableDevice(isy, deviceNode);
-		this.light.events.on('PropertyChanged', ((a: any, b: any, c: any, d: string) => { this.emit('PropertyChanged', `light.${a}`, b, c, d); }).bind(this));
+		/*this.light.events.on('PropertyChanged', ((a: any, b: any, c: any, d: string) => { this.emit('PropertyChanged', `light.${a}`, b, c, d); }).bind(this));*/
 		this.addChild(this.light);
 	}
 
-	public override handleEvent(event: { control?: string; data?: any; node?: any; }): boolean {
+	public override handleEvent(event: { control?: string; data?: any; node?: any }): boolean {
 		this.logger(JSON.stringify(event));
 		const child = this.children.find((p) => p.address === event.node);
 		if (child !== undefined) {
@@ -58,13 +60,16 @@ export class InsteonFanDevice extends InsteonBaseDevice {
 		if (childDevice instanceof InsteonFanMotorDevice) {
 			this.logger('Fan Motor Found');
 			this.motor = childDevice as InsteonFanMotorDevice;
-			this.motor.events.on('statusChanged', ((a: any, b: any, c: any, d: string) => { this.emit('PropertyChanged', `motor.${a}`, b, c, d); }).bind(this));
+			this.motor.events.on(
+				'statusChanged',
+				((a: any, b: any, c: any, d: string) => {
+					this.emit('propertyChanged', `motor.${a}`, b, c, d);
+				}).bind(this)
+			);
 		}
 	}
 
 	public async updateFanSpeed(level: number) {
 		return this.motor.updateFanSpeed(level);
 	}
-
-
 }

package/src/Devices/Insteon/InsteonMotionSensorDevice.ts

@@ -16,13 +16,13 @@ export class InsteonMotionSensorDevice extends InsteonBaseDevice {
 			if (controlName === Commands.On) {
 				this.logger('Motion detected.');
 				this._isMotionDetected = true;
-				this.emit('ControlTriggered',controlName);
-				this.emit('PropertyChanged', 'motionDetected', true, false, "true");
+				this.emit('controlTriggered',controlName);
+				this.emit('propertyChanged', 'motionDetected', true, false, "true");
 
 				setTimeout(() => {
 					this.logger('No motion detected in last 30 seconds.');
 					this._isMotionDetected = false;
-					this.emit('PropertyChanged', 'motionDetected', false, true, "false"); /*Included for compatiblity purposes*/
+					this.emit('propertyChanged', 'motionDetected', false, true, "false"); /*Included for compatiblity purposes*/
 				}, 30000);
 				return true;
 			}
@@ -30,8 +30,8 @@ export class InsteonMotionSensorDevice extends InsteonBaseDevice {
 			else if (controlName === Commands.Off) {
 				this._isMotionDetected = false;
 				this.logger('No motion detected.');
-				this.emit('ControlTriggered',controlName);
-				this.emit('PropertyChanged', 'motionDetected', false, true, "false");
+				this.emit('controlTriggered',controlName);
+				this.emit('propertyChanged', 'motionDetected', false, true, "false");
 				return true;
 			}
 

package/src/Devices/Insteon/InsteonRelayDevice.ts

@@ -7,6 +7,7 @@ import { InsteonBaseDevice } from './InsteonBaseDevice.js';
 
 import type { OnOffBehavior } from '@project-chip/matter.js/behaviors/on-off';
 import 'winston';
+import { RelayLampSwitch } from './RelayLampSwitch.js';
 import type { Command } from '../../Definitions/Global/Commands.js';
 import { Driver, DriverType } from '../../Definitions/Global/Drivers.js';
 import { UnitOfMeasure } from '../../Definitions/index.js';
@@ -14,14 +15,11 @@ 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 RelayLampSwitch.Node /*InsteonBaseDevice<Driver.Signatures<'ST' | 'OL' | 'RR' | 'ERR'>, Command.Signatures<'DON' | 'DOF'>>*/ {
 	// #region Constructors (1)
 
 	constructor(isy: ISY, nodeInfo: NodeInfo) {
 		super(isy, nodeInfo);
-		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' });
 	}
 
 	// #endregion Constructors (1)
@@ -57,7 +55,7 @@ export class InsteonRelayDevice extends InsteonBaseDevice<Driver.Signatures<'ST'
 
 	} */
 	public override async sendBeep(level: number = 100): Promise<any> {
-		return super.sendBeep(level);
+		return super.beep(level);
 	}
 
 	// #endregion Public Methods (2)

package/src/Devices/Insteon/RelayLampSwitch.ts

@@ -0,0 +1,131 @@
+/* THIS FILE WAS AUTOMATICALLY GENERATED. DO NOT EDIT DIRECTLY. */
+
+import { UnitOfMeasure } from "../../Definitions/Global/UOM.js";
+import { Family } from "../../Definitions/Global/Families.js";
+import type { NodeInfo } from "../../Model/NodeInfo.js";
+import type { ISY } from "../../ISY.js";
+import type { ISYNode } from "../../ISYNode.js";
+import { InsteonBaseDevice } from "./InsteonBaseDevice.js";
+import { ISYDeviceNode } from "../ISYDeviceNode.js";
+import { Driver } from "../../Definitions/Global/Drivers.js";
+import { Insteon } from "../../Definitions/index.js";
+import type { DriverState } from "../../Model/DriverState.js";
+import { NodeFactory } from "../NodeFactory.js";
+
+export const nodeDefId = "RelayLampSwitch";
+
+type Commands = RelayLampSwitch.Commands;
+type Drivers = RelayLampSwitch.Drivers;
+
+export class RelayLampSwitchNode extends InsteonBaseDevice<Drivers, Commands> implements RelayLampSwitch.Interface {
+	public override readonly commands = {
+		DON: this.on,
+		DOF: this.off,
+		DFOF: this.fastOff,
+		DFON: this.fastOn,
+		QUERY: this.query,
+		BEEP: this.beep,
+		BL: this.backlight,
+		WDU: this.writeChanges
+	};
+	static override nodeDefId = 'RelayLampSwitch';
+	declare readonly nodeDefId: 'RelayLampSwitch';
+	constructor(isy: ISY, nodeInfo: NodeInfo) {
+		super(isy, nodeInfo);
+		this.drivers.ST = Driver.create('ST', this, nodeInfo.property as DriverState, { uom: UnitOfMeasure.Percent, label: 'Status', name: 'status' });
+		this.drivers.ERR = Driver.create('ERR', this, nodeInfo.property as DriverState, { uom: UnitOfMeasure.Index, label: 'Responding', name: 'responding' });
+	}
+	async on(value?: 0 | 100) {
+		return this.sendCommand('DON', { value: value });
+	}
+	async off() {
+		return this.sendCommand('DOF');
+	}
+	async fastOff() {
+		return this.sendCommand('DFOF');
+	}
+	async fastOn() {
+		return this.sendCommand('DFON');
+	}
+	async query() {
+		return this.sendCommand('QUERY');
+	}
+	async beep(value?: number) {
+		return this.sendCommand('BEEP', { value: value });
+	}
+	async backlight(value: number) {
+		return this.sendCommand('BL', { value: value });
+	}
+	async writeChanges() {
+		return this.sendCommand('WDU');
+	}
+	public get status(): Insteon.OnLevelRelay {
+		return this.drivers.ST?.value;
+	}
+	public get responding(): Insteon.Error {
+		return this.drivers.ERR?.value;
+	}
+}
+
+NodeFactory.register(RelayLampSwitchNode);
+
+export namespace RelayLampSwitch {
+	export interface Interface extends Omit<InstanceType<typeof RelayLampSwitchNode>, keyof ISYDeviceNode<any, any, any, any>> {
+		nodeDefId: "RelayLampSwitch";
+	}
+	export function is(node: ISYNode<any, any, any, any>): node is RelayLampSwitchNode {
+		return node.nodeDefId === nodeDefId;
+	}
+	export function create(isy: ISY, nodeInfo: NodeInfo) {
+		return new RelayLampSwitchNode(isy, nodeInfo);
+	}
+	export const Node = RelayLampSwitchNode;
+	export type Commands = {
+		DON: ((value?: (0 | 100)) => Promise<boolean>) & {
+			label: "On";
+			name: "on";
+		};
+		DOF: (() => Promise<boolean>) & {
+			label: "Off";
+			name: "off";
+		};
+		DFOF: (() => Promise<boolean>) & {
+			label: "Fast Off";
+			name: "fastOff";
+		};
+		DFON: (() => Promise<boolean>) & {
+			label: "Fast On";
+			name: "fastOn";
+		};
+		QUERY: (() => Promise<boolean>) & {
+			label: "Query";
+			name: "query";
+		};
+		BEEP: ((value?: number) => Promise<boolean>) & {
+			label: "Beep";
+			name: "beep";
+		};
+		BL: ((value: number) => Promise<boolean>) & {
+			label: "Backlight";
+			name: "backlight";
+		};
+		WDU: (() => Promise<boolean>) & {
+			label: "Write Changes";
+			name: "writeChanges";
+		};
+	};
+	export type Drivers = {
+		ST: {
+			uom: UnitOfMeasure.Percent;
+			value: Insteon.OnLevelRelay;
+			label: "Status";
+			name: "status";
+		};
+		ERR: {
+			uom: UnitOfMeasure.Index;
+			value: Insteon.Error;
+			label: "Responding";
+			name: "responding";
+		};
+	};
+}