isy-nodejs 1.0.2-alpha.3 → 1.0.2-alpha.4

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

@@ -3,7 +3,7 @@
 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 { ISY } from "../../../ISY.js";
 import type { ISYNode } from "../../../ISYNode.js";
 import { Base } from "../index.js";
 import { ISYDeviceNode } from "../../ISYDeviceNode.js";
@@ -12,49 +12,44 @@ import { Insteon } from "../../../Definitions/index.js";
 import type { DriverState } from "../../../Model/DriverState.js";
 import { NodeFactory } from "../../NodeFactory.js";
 
-export const nodeDefId = "RelaySwitchOnlyPlusQuery";
+const nodeDefId = "RelaySwitchOnlyPlusQuery";
 
 type Commands = RelaySwitchOnlyPlusQuery.Commands;
 type Drivers = RelaySwitchOnlyPlusQuery.Drivers;
 
 export class RelaySwitchOnlyPlusQueryNode extends Base<Drivers, Commands> implements RelaySwitchOnlyPlusQuery.Interface {
-	public readonly commands = {
+	public override readonly commands = {
 		QUERY: this.query,
 		BEEP: this.beep,
 		BL: this.backlight,
 		WDU: this.writeChanges
 	};
-	static nodeDefId = "RelaySwitchOnlyPlusQuery";
-	declare readonly nodeDefId: "RelaySwitchOnlyPlusQuery";
+	static override nodeDefId = "RelaySwitchOnlyPlusQuery";
+	static override implements = ["RelaySwitchOnlyPlusQuery", "RelaySwitchOnly", "RelaySwitchOnly_ADV", "IRLincTx", "SirenAlert", "SirenArm"];
+	declare readonly nodeDefId: "RelaySwitchOnlyPlusQuery" | "RelaySwitchOnlyPlusQuery_ADV";
 	constructor (isy: ISY, nodeInfo: NodeInfo) {
 		super(isy, nodeInfo);
 		this.drivers.ERR = Driver.create("ERR", this, nodeInfo.property as DriverState, { uom: UnitOfMeasure.Index, label: "Responding", name: "responding" });
 	}
-	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");
-	}
+	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 responding(): Insteon.Error {
 		return this.drivers.ERR?.value;
 	}
 }
 
 NodeFactory.register(RelaySwitchOnlyPlusQueryNode);
+NodeFactory.register(RelaySwitchOnlyPlusQueryNode, "RelaySwitchOnlyPlusQuery_ADV");
 
 export namespace RelaySwitchOnlyPlusQuery {
 	export interface Interface extends Omit<InstanceType<typeof RelaySwitchOnlyPlusQueryNode>, keyof ISYDeviceNode<any, any, any, any>> {
-		nodeDefId: "RelaySwitchOnlyPlusQuery";
+		nodeDefId: "RelaySwitchOnlyPlusQuery" | "RelaySwitchOnlyPlusQuery_ADV";
 	}
-	export function is(node: ISYNode<any, any, any, any>): node is RelaySwitchOnlyPlusQueryNode {
-		return node.nodeDefId === nodeDefId;
+	export function is(node: ISYNode<any, any, any, any>): node is RelaySwitchOnlyPlusQueryNode { return ["RelaySwitchOnlyPlusQuery", "RelaySwitchOnlyPlusQuery_ADV"].includes(node.nodeDefId); }
+	export function isImplementedBy(node: ISYNode<any, any, any, any>): node is RelaySwitchOnlyPlusQueryNode {
+		return ["RelaySwitchOnlyPlusQuery", "DimmerMotorSwitch", "DimmerMotorSwitch_ADV", "DimmerLampSwitch", "DimmerLampSwitch_ADV", "DimmerLampSwitchLED", "DimmerLampSwitchLED_ADV", "RelayLampSwitch", "RelayLampSwitch_ADV", "RelayLampSwitchLED", "RelayLampSwitchLED_ADV", "RelaySwitchOnlyPlusQuery_ADV"].includes(node.nodeDefId);
 	}
 	export function create(isy: ISY, nodeInfo: NodeInfo) {
 		return new RelaySwitchOnlyPlusQueryNode(isy, nodeInfo);

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

@@ -3,7 +3,7 @@
 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 { ISY } from "../../../ISY.js";
 import type { ISYNode } from "../../../ISYNode.js";
 import { Base } from "../index.js";
 import { ISYDeviceNode } from "../../ISYDeviceNode.js";
@@ -12,25 +12,24 @@ import { Insteon } from "../../../Definitions/index.js";
 import type { DriverState } from "../../../Model/DriverState.js";
 import { NodeFactory } from "../../NodeFactory.js";
 
-export const nodeDefId = "RemoteLinc2";
+const nodeDefId = "RemoteLinc2";
 
 type Commands = RemoteLinc2.Commands;
 type Drivers = RemoteLinc2.Drivers;
 
 export class RemoteLinc2Node extends Base<Drivers, Commands> implements RemoteLinc2.Interface {
-	public readonly commands = {
+	public override readonly commands = {
 		WDU: this.writeChanges
 	};
-	static nodeDefId = "RemoteLinc2";
-	declare readonly nodeDefId: "RemoteLinc2";
+	static override nodeDefId = "RemoteLinc2";
+	static override implements = ["RemoteLinc2", "SirenAlert", "SirenArm"];
+	declare readonly nodeDefId: "RemoteLinc2" | "RemoteLinc2_ADV";
 	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 writeChanges() {
-		return this.sendCommand("WDU");
-	}
+	async writeChanges() { return this.sendCommand("WDU"); }
 	public get status(): number {
 		return this.drivers.ST?.value;
 	}
@@ -40,13 +39,15 @@ export class RemoteLinc2Node extends Base<Drivers, Commands> implements RemoteLi
 }
 
 NodeFactory.register(RemoteLinc2Node);
+NodeFactory.register(RemoteLinc2Node, "RemoteLinc2_ADV");
 
 export namespace RemoteLinc2 {
 	export interface Interface extends Omit<InstanceType<typeof RemoteLinc2Node>, keyof ISYDeviceNode<any, any, any, any>> {
-		nodeDefId: "RemoteLinc2";
+		nodeDefId: "RemoteLinc2" | "RemoteLinc2_ADV";
 	}
-	export function is(node: ISYNode<any, any, any, any>): node is RemoteLinc2Node {
-		return node.nodeDefId === nodeDefId;
+	export function is(node: ISYNode<any, any, any, any>): node is RemoteLinc2Node { return ["RemoteLinc2", "RemoteLinc2_ADV"].includes(node.nodeDefId); }
+	export function isImplementedBy(node: ISYNode<any, any, any, any>): node is RemoteLinc2Node {
+		return ["RemoteLinc2", "DimmerMotorSwitch", "DimmerMotorSwitch_ADV", "DimmerLampSwitch", "DimmerLampSwitch_ADV", "DimmerLampSwitchLED", "DimmerLampSwitchLED_ADV", "KeypadDimmer", "KeypadDimmer_ADV", "RemoteLinc2_ADV"].includes(node.nodeDefId);
 	}
 	export function create(isy: ISY, nodeInfo: NodeInfo) {
 		return new RemoteLinc2Node(isy, nodeInfo);

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

@@ -3,7 +3,7 @@
 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 { ISY } from "../../../ISY.js";
 import type { ISYNode } from "../../../ISYNode.js";
 import { Base } from "../index.js";
 import { ISYDeviceNode } from "../../ISYDeviceNode.js";
@@ -12,13 +12,13 @@ import { Insteon } from "../../../Definitions/index.js";
 import type { DriverState } from "../../../Model/DriverState.js";
 import { NodeFactory } from "../../NodeFactory.js";
 
-export const nodeDefId = "Siren_ADV";
+const nodeDefId = "Siren";
 
 type Commands = Siren.Commands;
 type Drivers = Siren.Drivers;
 
 export class SirenNode extends Base<Drivers, Commands> implements Siren.Interface {
-	public readonly commands = {
+	public override readonly commands = {
 		DON: this.on,
 		DOF: this.off,
 		ARM: this.arm,
@@ -27,8 +27,9 @@ export class SirenNode extends Base<Drivers, Commands> implements Siren.Interfac
 		BEEP: this.beep,
 		WDU: this.writeChanges
 	};
-	static nodeDefId = "Siren_ADV";
-	declare readonly nodeDefId: "Siren_ADV";
+	static override nodeDefId = "Siren";
+	static override implements = ["Siren", "SirenAlert", "SirenArm"];
+	declare readonly nodeDefId: "Siren" | "Siren_ADV";
 	constructor (isy: ISY, nodeInfo: NodeInfo) {
 		super(isy, nodeInfo);
 		this.drivers.ST = Driver.create("ST", this, nodeInfo.property as DriverState, { uom: UnitOfMeasure.Percent, label: "Siren", name: "siren" });
@@ -37,27 +38,13 @@ export class SirenNode extends Base<Drivers, Commands> implements Siren.Interfac
 		this.drivers.DUR = Driver.create("DUR", this, nodeInfo.property as DriverState, { uom: UnitOfMeasure.DurationInSeconds, label: "Siren Duration", name: "sirenDuration" });
 		this.drivers.ERR = Driver.create("ERR", this, nodeInfo.property as DriverState, { uom: UnitOfMeasure.Index, label: "Responding", name: "responding" });
 	}
-	async on(duration?: number) {
-		return this.sendCommand("DON", { DUR: duration });
-	}
-	async off() {
-		return this.sendCommand("DOF");
-	}
-	async arm(value: Insteon.SirenMode) {
-		return this.sendCommand("ARM", { value: value });
-	}
-	async disarm() {
-		return this.sendCommand("DISARM");
-	}
-	async query() {
-		return this.sendCommand("QUERY");
-	}
-	async beep(value?: number) {
-		return this.sendCommand("BEEP", { value: value });
-	}
-	async writeChanges() {
-		return this.sendCommand("WDU");
-	}
+	async on(duration?: number) { return this.sendCommand("DON", { DUR: duration }); }
+	async off() { return this.sendCommand("DOF"); }
+	async arm(value: Insteon.SirenMode) { return this.sendCommand("ARM", { value: value }); }
+	async disarm() { return this.sendCommand("DISARM"); }
+	async query() { return this.sendCommand("QUERY"); }
+	async beep(value?: number) { return this.sendCommand("BEEP", { value: value }); }
+	async writeChanges() { return this.sendCommand("WDU"); }
 	public get siren(): Insteon.OnLevelRelay {
 		return this.drivers.ST?.value;
 	}
@@ -76,13 +63,15 @@ export class SirenNode extends Base<Drivers, Commands> implements Siren.Interfac
 }
 
 NodeFactory.register(SirenNode);
+NodeFactory.register(SirenNode, "Siren_ADV");
 
 export namespace Siren {
 	export interface Interface extends Omit<InstanceType<typeof SirenNode>, keyof ISYDeviceNode<any, any, any, any>> {
-		nodeDefId: "Siren_ADV";
+		nodeDefId: "Siren" | "Siren_ADV";
 	}
-	export function is(node: ISYNode<any, any, any, any>): node is SirenNode {
-		return node.nodeDefId === nodeDefId;
+	export function is(node: ISYNode<any, any, any, any>): node is SirenNode { return ["Siren", "Siren_ADV"].includes(node.nodeDefId); }
+	export function isImplementedBy(node: ISYNode<any, any, any, any>): node is SirenNode {
+		return ["Siren", "Siren_ADV"].includes(node.nodeDefId);
 	}
 	export function create(isy: ISY, nodeInfo: NodeInfo) {
 		return new SirenNode(isy, nodeInfo);

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

@@ -3,7 +3,7 @@
 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 { ISY } from "../../../ISY.js";
 import type { ISYNode } from "../../../ISYNode.js";
 import { Base } from "../index.js";
 import { ISYDeviceNode } from "../../ISYDeviceNode.js";
@@ -12,15 +12,16 @@ import { Insteon } from "../../../Definitions/index.js";
 import type { DriverState } from "../../../Model/DriverState.js";
 import { NodeFactory } from "../../NodeFactory.js";
 
-export const nodeDefId = "SirenAlert";
+const nodeDefId = "SirenAlert";
 
 type Commands = SirenAlert.Commands;
 type Drivers = SirenAlert.Drivers;
 
 export class SirenAlertNode extends Base<Drivers, Commands> implements SirenAlert.Interface {
-	public readonly commands = {};
-	static nodeDefId = "SirenAlert";
-	declare readonly nodeDefId: "SirenAlert";
+	public override readonly commands = {};
+	static override nodeDefId = "SirenAlert";
+	static override implements = ["SirenAlert"];
+	declare readonly nodeDefId: "SirenAlert" | "SirenArm";
 	constructor (isy: ISY, nodeInfo: NodeInfo) {
 		super(isy, nodeInfo);
 		this.drivers.ERR = Driver.create("ERR", this, nodeInfo.property as DriverState, { uom: UnitOfMeasure.Index, label: "Responding", name: "responding" });
@@ -31,13 +32,15 @@ export class SirenAlertNode extends Base<Drivers, Commands> implements SirenAler
 }
 
 NodeFactory.register(SirenAlertNode);
+NodeFactory.register(SirenAlertNode, "SirenArm");
 
 export namespace SirenAlert {
 	export interface Interface extends Omit<InstanceType<typeof SirenAlertNode>, keyof ISYDeviceNode<any, any, any, any>> {
-		nodeDefId: "SirenAlert";
+		nodeDefId: "SirenAlert" | "SirenArm";
 	}
-	export function is(node: ISYNode<any, any, any, any>): node is SirenAlertNode {
-		return node.nodeDefId === nodeDefId;
+	export function is(node: ISYNode<any, any, any, any>): node is SirenAlertNode { return ["SirenAlert", "SirenArm"].includes(node.nodeDefId); }
+	export function isImplementedBy(node: ISYNode<any, any, any, any>): node is SirenAlertNode {
+		return ["SirenAlert", "X10", "Thermostat", "TempLinc", "OnOffControl", "OnOffControl_ADV", "DimmerMotorSwitch", "DimmerMotorSwitch_ADV", "DimmerLampSwitch", "DimmerLampSwitch_ADV", "DimmerLampSwitchLED", "DimmerLampSwitchLED_ADV", "DimmerSwitchOnly", "DimmerSwitchOnly_ADV", "DimmerLampOnly", "KeypadDimmer", "KeypadDimmer_ADV", "BallastRelayLampSwitch", "BallastRelayLampSwitch_ADV", "RelayLampSwitch", "RelayLampSwitch_ADV", "RelayLampSwitchLED", "RelayLampSwitchLED_ADV", "RelaySwitchOnlyPlusQuery", "RelaySwitchOnlyPlusQuery_ADV", "RelaySwitchOnly", "RelaySwitchOnly_ADV", "RelayLampOnly", "RelayLampOnly_ADV", "KeypadRelay", "KeypadRelay_ADV", "RemoteLinc2", "RemoteLinc2_ADV", "IRLincTx", "FanLincMotor", "KeypadButton", "KeypadButton_ADV", "EZRAIN_Output", "EZRAIN_Input", "EZRAIN_Input_ADV", "EZIO2x4_Output", "EZIO2x4_Input", "EZIO2x4_Input_ADV", "IMETER_SOLO", "DoorLock", "BinaryAlarm", "BinaryAlarm_ADV", "BinaryControl", "BinaryControl_ADV", "AlertModuleSiren", "AlertModuleSiren_ADV", "AlertModuleArmed", "Siren", "Siren_ADV", "SirenArm", "PIR2844_ADV", "PIR2844C_ADV", "PIR2844OnOff_ADV"].includes(node.nodeDefId);
 	}
 	export function create(isy: ISY, nodeInfo: NodeInfo) {
 		return new SirenAlertNode(isy, nodeInfo);

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

@@ -3,7 +3,7 @@
 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 { ISY } from "../../../ISY.js";
 import type { ISYNode } from "../../../ISYNode.js";
 import { Base } from "../index.js";
 import { ISYDeviceNode } from "../../ISYDeviceNode.js";
@@ -12,13 +12,13 @@ import { Insteon } from "../../../Definitions/index.js";
 import type { DriverState } from "../../../Model/DriverState.js";
 import { NodeFactory } from "../../NodeFactory.js";
 
-export const nodeDefId = "TempLinc";
+const nodeDefId = "TempLinc";
 
 type Commands = TempLinc.Commands;
 type Drivers = TempLinc.Drivers;
 
 export class TempLincNode extends Base<Drivers, Commands> implements TempLinc.Interface {
-	public readonly commands = {
+	public override readonly commands = {
 		CLISPH: this.updateHeatSetpoint,
 		CLISPC: this.updateCoolSetpoint,
 		CLIMD: this.updateMode,
@@ -30,7 +30,8 @@ export class TempLincNode extends Base<Drivers, Commands> implements TempLinc.In
 		SETTIME: this.setTime,
 		WDU: this.writeChanges
 	};
-	static nodeDefId = "TempLinc";
+	static override nodeDefId = "TempLinc";
+	static override implements = ["TempLinc", "IRLincTx", "SirenAlert", "SirenArm"];
 	declare readonly nodeDefId: "TempLinc";
 	constructor (isy: ISY, nodeInfo: NodeInfo) {
 		super(isy, nodeInfo);
@@ -43,36 +44,16 @@ export class TempLincNode extends Base<Drivers, Commands> implements TempLinc.In
 		this.drivers.CLIHCS = Driver.create("CLIHCS", this, nodeInfo.property as DriverState, { uom: UnitOfMeasure.ThermostatHeatCoolState, label: "Heat/Cool State", name: "heatCoolState" });
 		this.drivers.ERR = Driver.create("ERR", this, nodeInfo.property as DriverState, { uom: UnitOfMeasure.Index, label: "Responding", name: "responding" });
 	}
-	async updateHeatSetpoint(value: number) {
-		return this.sendCommand("CLISPH", { value: value });
-	}
-	async updateCoolSetpoint(value: number) {
-		return this.sendCommand("CLISPC", { value: value });
-	}
-	async updateMode(value: (0 | 1 | 2 | 3 | 5)) {
-		return this.sendCommand("CLIMD", { value: value });
-	}
-	async updateFanMode(value: (7 | 8)) {
-		return this.sendCommand("CLIFS", { value: value });
-	}
-	async setpointUp() {
-		return this.sendCommand("BRT");
-	}
-	async setpointDown() {
-		return this.sendCommand("DIM");
-	}
-	async beep(value?: number) {
-		return this.sendCommand("BEEP", { value: value });
-	}
-	async query() {
-		return this.sendCommand("QUERY");
-	}
-	async setTime() {
-		return this.sendCommand("SETTIME");
-	}
-	async writeChanges() {
-		return this.sendCommand("WDU");
-	}
+	async updateHeatSetpoint(value: number) { return this.sendCommand("CLISPH", { value: value }); }
+	async updateCoolSetpoint(value: number) { return this.sendCommand("CLISPC", { value: value }); }
+	async updateMode(value: (0 | 1 | 2 | 3 | 5)) { return this.sendCommand("CLIMD", { value: value }); }
+	async updateFanMode(value: (7 | 8)) { return this.sendCommand("CLIFS", { value: value }); }
+	async setpointUp() { return this.sendCommand("BRT"); }
+	async setpointDown() { return this.sendCommand("DIM"); }
+	async beep(value?: number) { return this.sendCommand("BEEP", { value: value }); }
+	async query() { return this.sendCommand("QUERY"); }
+	async setTime() { return this.sendCommand("SETTIME"); }
+	async writeChanges() { return this.sendCommand("WDU"); }
 	public get temperature(): number {
 		return this.drivers.ST?.value;
 	}
@@ -105,8 +86,9 @@ export namespace TempLinc {
 	export interface Interface extends Omit<InstanceType<typeof TempLincNode>, keyof ISYDeviceNode<any, any, any, any>> {
 		nodeDefId: "TempLinc";
 	}
-	export function is(node: ISYNode<any, any, any, any>): node is TempLincNode {
-		return node.nodeDefId === nodeDefId;
+	export function is(node: ISYNode<any, any, any, any>): node is TempLincNode { return ["TempLinc"].includes(node.nodeDefId); }
+	export function isImplementedBy(node: ISYNode<any, any, any, any>): node is TempLincNode {
+		return ["TempLinc", "Thermostat"].includes(node.nodeDefId);
 	}
 	export function create(isy: ISY, nodeInfo: NodeInfo) {
 		return new TempLincNode(isy, nodeInfo);

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

@@ -3,7 +3,7 @@
 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 { ISY } from "../../../ISY.js";
 import type { ISYNode } from "../../../ISYNode.js";
 import { Base } from "../index.js";
 import { ISYDeviceNode } from "../../ISYDeviceNode.js";
@@ -12,13 +12,13 @@ import { Insteon } from "../../../Definitions/index.js";
 import type { DriverState } from "../../../Model/DriverState.js";
 import { NodeFactory } from "../../NodeFactory.js";
 
-export const nodeDefId = "Thermostat";
+const nodeDefId = "Thermostat";
 
 type Commands = Thermostat.Commands;
 type Drivers = Thermostat.Drivers;
 
 export class ThermostatNode extends Base<Drivers, Commands> implements Thermostat.Interface {
-	public readonly commands = {
+	public override readonly commands = {
 		CLISPH: this.updateHeatSetpoint,
 		CLISPC: this.updateCoolSetpoint,
 		CLIMD: this.updateMode,
@@ -30,7 +30,8 @@ export class ThermostatNode extends Base<Drivers, Commands> implements Thermosta
 		SETTIME: this.setTime,
 		WDU: this.writeChanges
 	};
-	static nodeDefId = "Thermostat";
+	static override nodeDefId = "Thermostat";
+	static override implements = ["Thermostat"];
 	declare readonly nodeDefId: "Thermostat";
 	constructor (isy: ISY, nodeInfo: NodeInfo) {
 		super(isy, nodeInfo);
@@ -43,36 +44,16 @@ export class ThermostatNode extends Base<Drivers, Commands> implements Thermosta
 		this.drivers.CLIHCS = Driver.create("CLIHCS", this, nodeInfo.property as DriverState, { uom: UnitOfMeasure.ThermostatHeatCoolState, label: "Heat/Cool State", name: "heatCoolState" });
 		this.drivers.ERR = Driver.create("ERR", this, nodeInfo.property as DriverState, { uom: UnitOfMeasure.Index, label: "Responding", name: "responding" });
 	}
-	async updateHeatSetpoint(value: number) {
-		return this.sendCommand("CLISPH", { value: value });
-	}
-	async updateCoolSetpoint(value: number) {
-		return this.sendCommand("CLISPC", { value: value });
-	}
-	async updateMode(value: (0 | 1 | 2 | 3 | 5 | 6 | 7)) {
-		return this.sendCommand("CLIMD", { value: value });
-	}
-	async updateFanMode(value: (7 | 8)) {
-		return this.sendCommand("CLIFS", { value: value });
-	}
-	async setpointUp() {
-		return this.sendCommand("BRT");
-	}
-	async setpointDown() {
-		return this.sendCommand("DIM");
-	}
-	async beep(value?: number) {
-		return this.sendCommand("BEEP", { value: value });
-	}
-	async query() {
-		return this.sendCommand("QUERY");
-	}
-	async setTime() {
-		return this.sendCommand("SETTIME");
-	}
-	async writeChanges() {
-		return this.sendCommand("WDU");
-	}
+	async updateHeatSetpoint(value: number) { return this.sendCommand("CLISPH", { value: value }); }
+	async updateCoolSetpoint(value: number) { return this.sendCommand("CLISPC", { value: value }); }
+	async updateMode(value: (0 | 1 | 2 | 3 | 5 | 6 | 7)) { return this.sendCommand("CLIMD", { value: value }); }
+	async updateFanMode(value: (7 | 8)) { return this.sendCommand("CLIFS", { value: value }); }
+	async setpointUp() { return this.sendCommand("BRT"); }
+	async setpointDown() { return this.sendCommand("DIM"); }
+	async beep(value?: number) { return this.sendCommand("BEEP", { value: value }); }
+	async query() { return this.sendCommand("QUERY"); }
+	async setTime() { return this.sendCommand("SETTIME"); }
+	async writeChanges() { return this.sendCommand("WDU"); }
 	public get temperature(): number {
 		return this.drivers.ST?.value;
 	}
@@ -105,8 +86,9 @@ export namespace Thermostat {
 	export interface Interface extends Omit<InstanceType<typeof ThermostatNode>, keyof ISYDeviceNode<any, any, any, any>> {
 		nodeDefId: "Thermostat";
 	}
-	export function is(node: ISYNode<any, any, any, any>): node is ThermostatNode {
-		return node.nodeDefId === nodeDefId;
+	export function is(node: ISYNode<any, any, any, any>): node is ThermostatNode { return ["Thermostat"].includes(node.nodeDefId); }
+	export function isImplementedBy(node: ISYNode<any, any, any, any>): node is ThermostatNode {
+		return ["Thermostat"].includes(node.nodeDefId);
 	}
 	export function create(isy: ISY, nodeInfo: NodeInfo) {
 		return new ThermostatNode(isy, nodeInfo);

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

@@ -3,7 +3,7 @@
 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 { ISY } from "../../../ISY.js";
 import type { ISYNode } from "../../../ISYNode.js";
 import { Base } from "../index.js";
 import { ISYDeviceNode } from "../../ISYDeviceNode.js";
@@ -12,41 +12,32 @@ import { Insteon } from "../../../Definitions/index.js";
 import type { DriverState } from "../../../Model/DriverState.js";
 import { NodeFactory } from "../../NodeFactory.js";
 
-export const nodeDefId = "X10";
+const nodeDefId = "X10";
 
 type Commands = X10.Commands;
 type Drivers = X10.Drivers;
 
 export class X10Node extends Base<Drivers, Commands> implements X10.Interface {
-	public readonly commands = {
+	public override readonly commands = {
 		DON: this.on,
 		DOF: this.off,
 		BRT: this.brighten,
 		DIM: this.dim,
 		QUERY: this.query
 	};
-	static nodeDefId = "X10";
+	static override nodeDefId = "X10";
+	static override implements = ["X10"];
 	declare readonly nodeDefId: "X10";
 	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() {
-		return this.sendCommand("DON");
-	}
-	async off() {
-		return this.sendCommand("DOF");
-	}
-	async brighten() {
-		return this.sendCommand("BRT");
-	}
-	async dim() {
-		return this.sendCommand("DIM");
-	}
-	async query() {
-		return this.sendCommand("QUERY");
-	}
+	async on() { return this.sendCommand("DON"); }
+	async off() { return this.sendCommand("DOF"); }
+	async brighten() { return this.sendCommand("BRT"); }
+	async dim() { return this.sendCommand("DIM"); }
+	async query() { return this.sendCommand("QUERY"); }
 	public get status(): Insteon.OnLevelRelay {
 		return this.drivers.ST?.value;
 	}
@@ -61,8 +52,9 @@ export namespace X10 {
 	export interface Interface extends Omit<InstanceType<typeof X10Node>, keyof ISYDeviceNode<any, any, any, any>> {
 		nodeDefId: "X10";
 	}
-	export function is(node: ISYNode<any, any, any, any>): node is X10Node {
-		return node.nodeDefId === nodeDefId;
+	export function is(node: ISYNode<any, any, any, any>): node is X10Node { return ["X10"].includes(node.nodeDefId); }
+	export function isImplementedBy(node: ISYNode<any, any, any, any>): node is X10Node {
+		return ["X10"].includes(node.nodeDefId);
 	}
 	export function create(isy: ISY, nodeInfo: NodeInfo) {
 		return new X10Node(isy, nodeInfo);

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

@@ -0,0 +1,38 @@
+export * from './AlertModuleArmed.js';
+export * from './AlertModuleSiren.js';
+export * from './BallastRelayLampSwitch.js';
+export * from './BinaryAlarm.js';
+export * from './BinaryControl.js';
+export * from './DimmerLamp.js';
+export * from './DimmerLampSwitch.js';
+export * from './DimmerLampSwitchLed.js';
+export * from './DimmerMotorSwitch.js';
+export * from './DimmerSwitch.js';
+export * from './DoorLock.js';
+export * from './Ezio2x4Input.js';
+export * from './Ezio2x4Output.js';
+export * from './EzrainInput.js';
+export * from './EzrainOutput.js';
+export * from './FanLincMotor.js';
+export * from './I3KeypadFlags.js';
+export * from './I3PaddleFlags.js';
+export * from './ImeterSolo.js';
+export * from './IrLincTx.js';
+export * from './KeypadButton.js';
+export * from './KeypadDimmer.js';
+export * from './KeypadRelay.js';
+export * from './OnOffControl.js';
+export * from './Pir2844.js';
+export * from './Pir2844c.js';
+export * from './Pir2844OnOff.js';
+export * from './RelayLamp.js';
+export * from './RelayLampSwitch.js';
+export * from './RelayLampSwitchLed.js';
+export * from './RelaySwitch.js';
+export * from './RelaySwitchOnlyPlusQuery.js';
+export * from './RemoteLinc2.js';
+export * from './Siren.js';
+export * from './SirenAlert.js';
+export * from './TempLinc.js';
+export * from './Thermostat.js';
+export * from './X10.js';

package/src/Devices/Insteon/InsteonBaseDevice.ts

@@ -14,17 +14,18 @@ import type { Merge } from '@matter/general';
 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<
+export class InsteonBaseDevice<D extends ISYNode.DriverSignatures = Driver.Signatures<"ST">, C extends ISYNode.CommandSignatures = {}> extends ISYDeviceNode<
 	Family.Insteon,
-	Merge<{ ST: { name: 'status'; label: 'Status'; value: number; uom: UnitOfMeasure.Percent } }, D>,
+	D,
 	C
 > {
 	// #region Constructors (1)
-	static vendorName: string = 'Insteon Technologies, Inc.';
+	override readonly manufacturer: string = 'Insteon Technologies, Inc.';
+
+	static override family : Family.Insteon = Family.Insteon;
 	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

@@ -2,13 +2,12 @@ import { Family } from '../../Definitions/Global/Families.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 type { DriverState } from '../../Model/DriverState.js';
+import type { NodeInfo, StaticNodeInfo } from '../../Model/NodeInfo.js';
+import { InsteonBaseDevice } from './InsteonBaseDevice.js';
+import { InsteonDimmableDevice } from './InsteonDimmableDevice.js';
 
 export class InsteonFanMotorDevice extends InsteonBaseDevice<Driver.Signatures<'ST'>, Command.Signatures<'DON' | 'DOF'>> {
 	constructor(isy: ISY, deviceNode: StaticNodeInfo) {

package/src/Devices/Insteon/InsteonRelayDevice.ts

@@ -20,6 +20,7 @@ export class InsteonRelayDevice extends RelayLampSwitch.Node /*InsteonBaseDevice
 
 	constructor(isy: ISY, nodeInfo: NodeInfo) {
 		super(isy, nodeInfo);
+		
 	}
 
 	// #endregion Constructors (1)