isy-nodejs 1.0.1-alpha.6 → 1.0.2-alpha.0

package/src/Devices/Insteon/InsteonFanDevice.ts

@@ -1,17 +1,17 @@
 import { Family } from '../../Definitions/Global/Families.js';
-import { ISY, ISYNode } from '../../ISY.js';
+import { ISY } from '../../ISY.js';
 import { States } from '../../ISYConstants.js';
 
 import { InsteonBaseDevice } from './InsteonBaseDevice.js';
 import { InsteonDimmableDevice } from './InsteonDimmableDevice.js';
 import 'winston';
 import type { NodeInfo, StaticNodeInfo } from '../../Model/NodeInfo.js';
-import {Insteon} from './index.js';
-import  { Command, Driver, UnitOfMeasure } from '../../Definitions/index.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<Driver.Signatures<'ST'>, Command.Signatures<'DON' | 'DOF'>> {
-	constructor (isy: ISY, deviceNode: StaticNodeInfo) {
+	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;
@@ -25,7 +25,7 @@ export class InsteonFanMotorDevice extends InsteonBaseDevice<Driver.Signatures<'
 	}
 
 	public async updateFanSpeed(level: number) {
-		return (level);
+		return level;
 	}
 	public async updateIsOn(isOn: boolean) {
 		if (!isOn) {
@@ -34,7 +34,6 @@ export class InsteonFanMotorDevice extends InsteonBaseDevice<Driver.Signatures<'
 			//return this.commands.BEEP(States.Level.Max);
 		}
 	}
-
 }
 
 export class InsteonFanDevice extends InsteonBaseDevice {
@@ -47,7 +46,7 @@ export class InsteonFanDevice extends InsteonBaseDevice {
 		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) {
@@ -61,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/InsteonKeypadDevice.ts

@@ -1,11 +1,11 @@
-import type { NodeInfo } from '../../Model/NodeInfo.js';
+import 'winston';
 import { ISY } from '../../ISY.js';
+import type { NodeInfo } from '../../Model/NodeInfo.js';
 import { InsteonRelayDevice } from './InsteonRelayDevice.js';
-import 'winston';
-
+import { KeypadButton } from './KeypadButton.js';
 
-export class InsteonKeypadButtonDevice extends InsteonRelayDevice {
-	constructor (isy: ISY, deviceNode: NodeInfo) {
+export class InsteonKeypadButtonDevice extends KeypadButton.Node {
+	constructor(isy: ISY, deviceNode: NodeInfo) {
 		super(isy, deviceNode);
 	}
 }

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

@@ -1,8 +1,8 @@
-import { Family, ISY } from '../../ISY.js';
+import {  ISY } from '../../ISY.js';
 
 import { NodeInfo } from '../../Model/NodeInfo.js';
-import { EndpointFor } from '../EndpointFor.js';
-import { MapsTo } from '../MapsTo.js';
+
+
 import { InsteonBaseDevice } from './InsteonBaseDevice.js';
 
 import type { OnOffBehavior } from '@project-chip/matter.js/behaviors/on-off';
@@ -26,22 +26,7 @@ export class InsteonRelayDevice extends RelayLampSwitch.Node /*InsteonBaseDevice
 
 	// #region Public Methods (2)
 
-	public async initialize(endpoint: EndpointFor<typeof OnOffBehavior>): Promise<void> {
-		/*endpoint.events.onOff.onOff$Changed.on((value) => {
-			this.commands.DON(value);
-			this.drivers.ST;
-		});
-		//endpoint.defaults.onOff.onOff = await this.isOn;
-		endpoint.set({ onOff: { onOff: (await this.drivers.ST.value) > 0 } });
-		const that = this;
-
-		this.events.on('StatusChanged', (propertyName, newValue, _oldValue, formattedValue) => {
-			if (propertyName === 'ST') {
-				endpoint.set({ onOff: { onOff: newValue > 0 } });
-				//endpoint.setSt onOff: newValue });
-			}
-		});*/
-	}
+
 
 	/*
 	public async updateIsOn(isOn: boolean): Promise<any> {

package/src/Devices/Insteon/{Generated/KeypadButton.ts → KeypadButton.ts}

@@ -1,29 +1,29 @@
-/* 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 { Base } from "../index.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";
-
+/* 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 { Base } from "./index.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 = "KeypadButton";
-
+
 type Commands = KeypadButton.Commands;
 type Drivers = KeypadButton.Drivers;
-
+
 export class KeypadButtonNode extends Base<Drivers, Commands> implements KeypadButton.Interface {
-	public readonly commands = {
+	public override readonly commands = {
 		QUERY: this.query,
 		BL: this.backlight,
 		WDU: this.writeChanges
 	};
-	static nodeDefId = "KeypadButton";
+	static override nodeDefId = "KeypadButton";
 	declare readonly nodeDefId: "KeypadButton";
 	constructor (isy: ISY, nodeInfo: NodeInfo) {
 		super(isy, nodeInfo);
@@ -46,9 +46,9 @@ export class KeypadButtonNode extends Base<Drivers, Commands> implements KeypadB
 		return this.drivers.ERR?.value;
 	}
 }
-
+
 NodeFactory.register(KeypadButtonNode);
-
+
 export namespace KeypadButton {
 	export interface Interface extends Omit<InstanceType<typeof KeypadButtonNode>, keyof ISYDeviceNode<any, any, any, any>> {
 		nodeDefId: "KeypadButton";

package/src/Devices/Insteon/RelayLampSwitch.ts

@@ -1,18 +1,19 @@
 /* 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";
+import { Driver } from '../../Definitions/Global/Drivers.js';
+import { Command } from '../../Definitions/index.js';
+import { Family } from '../../Definitions/Global/Families.js';
+import { UnitOfMeasure } from '../../Definitions/Global/UOM.js';
+import { Insteon } from '../../Definitions/index.js';
+import type { ISY } from '../../ISY.js';
+import type { ISYNode } from '../../ISYNode.js';
+import type { DriverState } from '../../Model/DriverState.js';
+import type { NodeInfo } from '../../Model/NodeInfo.js';
+import { ISYDeviceNode } from '../ISYDeviceNode.js';
+import { NodeFactory } from '../NodeFactory.js';
+import { InsteonBaseDevice } from './InsteonBaseDevice.js';
 
-export const nodeDefId = "RelayLampSwitch";
+export const nodeDefId = 'RelayLampSwitch';
 
 type Commands = RelayLampSwitch.Commands;
 type Drivers = RelayLampSwitch.Drivers;
@@ -32,11 +33,11 @@ export class RelayLampSwitchNode extends InsteonBaseDevice<Drivers, Commands> im
 	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' });
+		this.drivers.ST = Driver.create('ST', this, nodeInfo.state['ST'], { uom: UnitOfMeasure.Boolean, label: 'Status', name: 'status' });
+		this.drivers.ERR = Driver.create('ERR', this, nodeInfo.state['ERR'], { uom: UnitOfMeasure.Index, label: 'Responding', name: 'responding' });
 	}
 	async on(value?: 0 | 100) {
-		return this.sendCommand('DON', { value: value });
+		return this.sendCommand('DOF');
 	}
 	async off() {
 		return this.sendCommand('DOF');
@@ -59,7 +60,7 @@ export class RelayLampSwitchNode extends InsteonBaseDevice<Drivers, Commands> im
 	async writeChanges() {
 		return this.sendCommand('WDU');
 	}
-	public get status(): Insteon.OnLevelRelay {
+	public get status(): boolean {
 		return this.drivers.ST?.value;
 	}
 	public get responding(): Insteon.Error {
@@ -71,7 +72,7 @@ NodeFactory.register(RelayLampSwitchNode);
 
 export namespace RelayLampSwitch {
 	export interface Interface extends Omit<InstanceType<typeof RelayLampSwitchNode>, keyof ISYDeviceNode<any, any, any, any>> {
-		nodeDefId: "RelayLampSwitch";
+		nodeDefId: 'RelayLampSwitch';
 	}
 	export function is(node: ISYNode<any, any, any, any>): node is RelayLampSwitchNode {
 		return node.nodeDefId === nodeDefId;
@@ -81,51 +82,51 @@ export namespace RelayLampSwitch {
 	}
 	export const Node = RelayLampSwitchNode;
 	export type Commands = {
-		DON: ((value?: (0 | 100)) => Promise<boolean>) & {
-			label: "On";
-			name: "on";
+		DON: ((value?: 0 | 100) => Promise<boolean>) & {
+			label: 'On';
+			name: 'on';
 		};
 		DOF: (() => Promise<boolean>) & {
-			label: "Off";
-			name: "off";
+			label: 'Off';
+			name: 'off';
 		};
 		DFOF: (() => Promise<boolean>) & {
-			label: "Fast Off";
-			name: "fastOff";
+			label: 'Fast Off';
+			name: 'fastOff';
 		};
 		DFON: (() => Promise<boolean>) & {
-			label: "Fast On";
-			name: "fastOn";
+			label: 'Fast On';
+			name: 'fastOn';
 		};
 		QUERY: (() => Promise<boolean>) & {
-			label: "Query";
-			name: "query";
+			label: 'Query';
+			name: 'query';
 		};
 		BEEP: ((value?: number) => Promise<boolean>) & {
-			label: "Beep";
-			name: "beep";
+			label: 'Beep';
+			name: 'beep';
 		};
 		BL: ((value: number) => Promise<boolean>) & {
-			label: "Backlight";
-			name: "backlight";
+			label: 'Backlight';
+			name: 'backlight';
 		};
 		WDU: (() => Promise<boolean>) & {
-			label: "Write Changes";
-			name: "writeChanges";
+			label: 'Write Changes';
+			name: 'writeChanges';
 		};
 	};
 	export type Drivers = {
 		ST: {
-			uom: UnitOfMeasure.Percent;
-			value: Insteon.OnLevelRelay;
-			label: "Status";
-			name: "status";
+			uom: UnitOfMeasure.Boolean;
+			value: boolean;
+			label: 'Status';
+			name: 'status';
 		};
 		ERR: {
 			uom: UnitOfMeasure.Index;
 			value: Insteon.Error;
-			label: "Responding";
-			name: "responding";
+			label: 'Responding';
+			name: 'responding';
 		};
 	};
 }

package/src/Devices/MapsTo.ts

@@ -1,5 +1,5 @@
 import { Behavior } from '@project-chip/matter.js/behavior';
-import { EndpointFor, type EndpointForCluster } from './EndpointFor.js';
+
 import type { Cluster, ClusterType, MutableCluster } from '@project-chip/matter.js/cluster';
 
 
@@ -15,7 +15,7 @@ export type RelaxTypes<V> = V extends number
                   }
             : V;
 
-
+/*
 
 export interface MapsTo<T extends Behavior.Type, T1 extends Behavior.Type = T, T2 extends Behavior.Type = T, T3 extends Behavior.Type = T> {
 	 initialize(endpoint: EndpointFor<T, T1, T2, T3>): void | Promise<void>;
@@ -25,4 +25,4 @@ export interface MapsTo<T extends Behavior.Type, T1 extends Behavior.Type = T, T
 export interface MapsToCluster<T extends ClusterType.Of<ClusterType.Options<{}>>, T1 extends ClusterType = T, T2 extends ClusterType = T, T3 extends ClusterType = T> {
 	initialize(endpoint: EndpointForCluster<T,T1, T2, T3>): void;
 
-}
+}*/

package/src/Devices/NodeFactory.ts

@@ -1,10 +1,11 @@
-import type { MaybePromise } from '@project-chip/matter.js/util';
-import { Family, ISY } from '../ISY.js';
+
+import { ISY } from '../ISY.js';
 import  { ISYNode } from '../ISYNode.js';
 import type { NodeDef } from '../Model/NodeDef.js';
 import { isDynamic, type NodeInfo } from '../Model/NodeInfo.js';
 import type { Constructor } from './Constructor.js';
 import type { IdentityOf } from '../Utils.js';
+import { Family } from '../Definitions/index.js';
 
 
 

package/src/Devices/ZWave/ZWaveBaseDevice.ts

@@ -6,7 +6,7 @@ import { ISYDeviceNode } from '../ISYDeviceNode.js';
 import { ISYNode } from '../../ISYNode.js';
 import 'winston';
 import type { Driver } from '../../Definitions/Global/Drivers.js';
-import type { Merge } from '@project-chip/matter.js/util';
+import type { Merge } from '@matter/general';
 
 // import { InsteonNLS } from './insteonfam'
 export class ZWaveBaseDevice<D extends ISYNode.DriverSignatures = {}, C extends ISYNode.CommandSignatures = {}> extends ISYDeviceNode<Family.ZWave,Merge<D,Driver.Signatures<'ST'>>,C> {

package/src/Devices/ZWave/ZWaveDimmerSwitchDevice.ts

@@ -1,6 +1,6 @@
 
 
-import { Family } from '../../ISY.js';
+
 import { ZWaveBaseDevice } from './ZWaveBaseDevice.js';
 import 'winston';
 

package/src/Devices/index.ts

@@ -1,6 +1,6 @@
-import { Family } from "../ISY.js";
+
+import type { Family } from '../Definitions/index.js';
 import {Insteon} from "./Insteon/index.js";
-import { ISYDeviceNode } from './ISYDeviceNode.js';
 import { ZWaveBaseDevice } from "./ZWave/ZWaveBaseDevice.js";
 
 export const Devices = {