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

package/src/Devices/ISYDeviceNode.ts

@@ -1,182 +1,159 @@
-
+import type { Category } from '../Definitions/Global/Categories.js';
+import type { Command } from '../Definitions/Global/Commands.js';
 import type { Driver } from '../Definitions/Global/Drivers.js';
-import {type ISY } from '../ISY.js';
-import type { ISYDevice } from '../ISYDevice.js';
-import { ISYNode} from '../ISYNode.js';
+import type { Event } from '../Definitions/Global/Events.js';
+import type { Family } from '../Definitions/index.js';
+import { type ISY } from '../ISY.js';
+import type { ISYDevice, ISYDeviceInfo } from '../ISYDevice.js';
+import { ISYNode } from '../ISYNode.js';
 import type { ISYScene } from '../ISYScene.js';
 import type { DriverState } from '../Model/DriverState.js';
 import type { NodeInfo } from '../Model/NodeInfo.js';
-import type { Category } from '../Definitions/Global/Categories.js';
-import type { Command } from '../Definitions/Global/Commands.js';
-import type { Event } from '../Definitions/Global/Events.js';
 import type { StringKeys } from '../Utils.js';
-import type { Family } from '../Definitions/index.js';
 
-export interface ISYDeviceInfo
+export class ISYDeviceNode<
+		T extends Family,
+		D extends ISYNode.DriverSignatures,
+		C extends ISYNode.CommandSignatures,
+		E extends ISYNode.EventSignatures = { [x in keyof D]: Event.DriverToEvent<D[x]> & { driver: x } } & { [x in keyof C]: Event.CommandToEvent<C[x]> & { command: x } }
+	>
+	extends ISYNode<T, D, C, E>
+	implements ISYDeviceInfo
 {
-	type: string;
-	deviceClass: any;
+	public declare family: T;
 
-	productName: string;
+	public readonly typeCode: string;
+	public readonly deviceClass: any;
+	public readonly category: Category;
+	public readonly subCategory: number;
 
-	productId: string | number;
+	//public readonly isDimmable: boolean;
 
-	modelName: string;
+	//public _parentDevice: ISYDeviceNode<T, any, any, any>;
+	//public readonly children: Array<ISYDeviceNode<T, any, any, any>> = [];
 
+	public _enabled: any;
+	productName: string;
+	model: string;
 	modelNumber: string;
-
-}
-
-export class ISYDeviceNode<
-  T extends Family,
-  D extends ISYNode.DriverSignatures,
-  C extends ISYNode.CommandSignatures,
-  E extends ISYNode.EventSignatures = {[x in keyof D]: Event.DriverToEvent<D[x]> & {driver: x}} & {[x in keyof C]: Event.CommandToEvent<C[x]> & {command: x}}
->
-  extends ISYNode<T, D, C, E> implements ISYDeviceInfo
-   {
-  public declare family: T;
-
-  public readonly typeCode: string;
-  public readonly deviceClass: any;
-  public readonly category: Category;
-  public readonly subCategory: number;
-
-
-  declare
-
-  //public readonly isDimmable: boolean;
-
-  //public _parentDevice: ISYDeviceNode<T, any, any, any>;
-  //public readonly children: Array<ISYDeviceNode<T, any, any, any>> = [];
-
-
-  public _enabled: any;
-  productName: string;
-  model: string;
-  modelNumber: string;
-  version: string;
-
-  constructor (isy: ISY, node: NodeInfo) {
-
-    super(isy, node);
-
-    this.family = node.family as T;
-    this.nodeType = 1;
-    this.type = node.type;
-    this._enabled = node.enabled;
-    this.deviceClass = node.deviceClass;
-    this.parentAddress = node.pnode;
-    const s = this.type.split(".");
-    this.category = Number(s[0]) as Category;
-    this.subCategory = Number(s[1]);
-
-    // console.log(nodeDetail);
-    // if (this.parentAddress !== this.address && this.parentAddress !== undefined) {
-    //   this._parentDevice = isy.getDevice(this.parentAddress) as unknown as ISYDeviceNode<T, any, any, any>;
-    //   if (!isNullOrUndefined(this._parentDevice)) {
-    //     this._parentDevice.addChild(this);
-    //   }
-    // }
-    // if (Array.isArray(node.property)) {
-    //   for (const prop of node.property) {
-    //     this.local[prop.id] = this.convertFrom(prop.value, prop.uom, prop.id as Driver.Literal);
-    //     this.formatted[prop.id] = prop.formatted;
-    //     this.uom[prop.id] = prop.uom;
-    //     this.logger(
-    //       `Property ${Controls[prop.id].label} (${prop.id}) initialized to: ${this.local[prop.id]} (${this.formatted[prop.id]})`
-    //     );
-    //   }
-    // } else if (node.property) {
-    //   this.local[node.property.id] = this.convertFrom(
-    //     node.property.value,
-    //     node.property.uom,
-    //     node.property.id as Driver.Literal
-    //   );
-    //   this.formatted[node.property.id] = node.property.formatted;
-    //   this.uom[node.property.id] = node.property.uom;
-    //   this.logger(
-    //     `Property ${Controls[node.property.id].label} (${node.property.id}) initialized to: ${this.local[node.property.id]} (${this.formatted[node.property.id]})`
-    //   );
-    // }
-  }
+	version: string;
+
+	constructor(isy: ISY, node: NodeInfo) {
+		super(isy, node);
+
+		this.family = node.family as T;
+		this.nodeType = 1;
+		this.type = node.type;
+		this._enabled = node.enabled;
+		this.deviceClass = node.deviceClass;
+		this.parentAddress = node.pnode;
+		const s = this.type.split('.');
+		this.category = Number(s[0]) as Category;
+		this.subCategory = Number(s[1]);
+
+		// console.log(nodeDetail);
+		// if (this.parentAddress !== this.address && this.parentAddress !== undefined) {
+		//   this._parentDevice = isy.getDevice(this.parentAddress) as unknown as ISYDeviceNode<T, any, any, any>;
+		//   if (!isNullOrUndefined(this._parentDevice)) {
+		//     this._parentDevice.addChild(this);
+		//   }
+		// }
+		// if (Array.isArray(node.property)) {
+		//   for (const prop of node.property) {
+		//     this.local[prop.id] = this.convertFrom(prop.value, prop.uom, prop.id as Driver.Literal);
+		//     this.formatted[prop.id] = prop.formatted;
+		//     this.uom[prop.id] = prop.uom;
+		//     this.logger(
+		//       `Property ${Controls[prop.id].label} (${prop.id}) initialized to: ${this.local[prop.id]} (${this.formatted[prop.id]})`
+		//     );
+		//   }
+		// } else if (node.property) {
+		//   this.local[node.property.id] = this.convertFrom(
+		//     node.property.value,
+		//     node.property.uom,
+		//     node.property.id as Driver.Literal
+		//   );
+		//   this.formatted[node.property.id] = node.property.formatted;
+		//   this.uom[node.property.id] = node.property.uom;
+		//   this.logger(
+		//     `Property ${Controls[node.property.id].label} (${node.property.id}) initialized to: ${this.local[node.property.id]} (${this.formatted[node.property.id]})`
+		//   );
+		// }
+	}
+	manufacturer: string;
 	productId: string | number;
 	modelName: string;
 
-  _parentDevice: ISYDevice<T, any, any, any>;
-  children: ISYNode<any, any, any, any>[];
-
-  public addChild<K extends ISYNode<any,any, any, any>>(childDevice: K) {
-    this.children.push(childDevice);
-  }
-
-  // override get parentNode() : ISYDevice<T, any, any, any> {
-  //   super.parentNode()
-  //   if (this._parentDevice === undefined) {
-  //     if (this.parentAddress !== this.address && this.parentAddress !== null && this.parentAddress !== undefined) {
-  //       this._parentDevice = this.isy.getDevice(this.parentAddress) as unknown as ISYDeviceNode<T, Driver.Literal, string>;
-  //       if (this._parentDevice !== null) {
-  //         this._parentDevice.addChild(this);
-  //       }
-  //     }
-  //     this._parentDevice = null;
-  //   }
-  //   return this._parentDevice;
-  // }
-
-  // public async readProperty(propertyName: Driver.Literal): Promise<DriverState> {
-  //   var result = await this.isy.sendRequest(`nodes/${this.address}/${propertyName}`);
-  //   this.logger(JSON.stringify(result), "debug");
-  //   return result.property;
-  // }
-
-  // public async readProperties(): Promise<DriverState[]> {
-  //   var result = await this.isy.sendRequest(`nodes/${this.address}/status`);
-  //   this.logger(JSON.stringify(result), "debug");
-  //   return result.property;
-  // }
-
-  // public async updateProperty(propertyName: Driver.Literal, value: string): Promise<any> {
-  //   const val = this.convertTo(Number(value), Number(this.uom[propertyName]));
-  //   this.logger(`Updating property ${Controls[propertyName].label}. incoming value: ${value} outgoing value: ${val}`);
-  //   this.pending[propertyName] = value;
-  //   return this.isy.sendRequest(`nodes/${this.address}/set/${propertyName}/${val}`).then((p) => {
-  //     this.local[propertyName] = value;
-  //     this.pending[propertyName] = null;
-  //   });
-  // }
-
-
-
-
-
-  // public override handlePropertyChange(driver: any, value: any, formattedValue: string) {
-  //   let changed = false;
-  //   const priorVal = this.local[driver];
-  //   try {
-  //     const val = this.convertFrom(value, this.uom[driver]);
-
-  //     if (this.local[driver] !== val) {
-  //       this.logger(`Property ${Controls[driver].label} (${driver}) updated to: ${val} (${formattedValue})`);
-  //       this.local[driver] = val;
-  //       this.formatted[driver] = formattedValue;
-  //       this.lastChanged = new Date();
-  //       changed = true;
-  //     } else {
-  //       this.logger(`Update event triggered, property ${Controls[driver].label} (${driver}) is unchanged.`);
-  //     }
-  //     if (changed) {
-  //       this.emit("PropertyChanged", driver, val, priorVal, formattedValue);
-
-  //       this.scenes.forEach((element) => {
-  //         this.logger(`Recalulating ${element.deviceFriendlyName}`);
-  //         element.recalculateState();
-  //       });
-  //     }
-  //   } catch (error) {
-  //     this.logger(error, "error");
-  //   } finally {
-  //     return changed;
-  //   }
-  // }
+	_parentDevice: ISYDevice<T, any, any, any>;
+	children: ISYNode<any, any, any, any>[];
+
+	public addChild<K extends ISYNode<any, any, any, any>>(childDevice: K) {
+		this.children.push(childDevice);
+	}
+
+	// override get parentNode() : ISYDevice<T, any, any, any> {
+	//   super.parentNode()
+	//   if (this._parentDevice === undefined) {
+	//     if (this.parentAddress !== this.address && this.parentAddress !== null && this.parentAddress !== undefined) {
+	//       this._parentDevice = this.isy.getDevice(this.parentAddress) as unknown as ISYDeviceNode<T, Driver.Literal, string>;
+	//       if (this._parentDevice !== null) {
+	//         this._parentDevice.addChild(this);
+	//       }
+	//     }
+	//     this._parentDevice = null;
+	//   }
+	//   return this._parentDevice;
+	// }
+
+	// public async readProperty(propertyName: Driver.Literal): Promise<DriverState> {
+	//   var result = await this.isy.sendRequest(`nodes/${this.address}/${propertyName}`);
+	//   this.logger(JSON.stringify(result), "debug");
+	//   return result.property;
+	// }
+
+	// public async readProperties(): Promise<DriverState[]> {
+	//   var result = await this.isy.sendRequest(`nodes/${this.address}/status`);
+	//   this.logger(JSON.stringify(result), "debug");
+	//   return result.property;
+	// }
+
+	// public async updateProperty(propertyName: Driver.Literal, value: string): Promise<any> {
+	//   const val = this.convertTo(Number(value), Number(this.uom[propertyName]));
+	//   this.logger(`Updating property ${Controls[propertyName].label}. incoming value: ${value} outgoing value: ${val}`);
+	//   this.pending[propertyName] = value;
+	//   return this.isy.sendRequest(`nodes/${this.address}/set/${propertyName}/${val}`).then((p) => {
+	//     this.local[propertyName] = value;
+	//     this.pending[propertyName] = null;
+	//   });
+	// }
+
+	// public override handlePropertyChange(driver: any, value: any, formattedValue: string) {
+	//   let changed = false;
+	//   const priorVal = this.local[driver];
+	//   try {
+	//     const val = this.convertFrom(value, this.uom[driver]);
+
+	//     if (this.local[driver] !== val) {
+	//       this.logger(`Property ${Controls[driver].label} (${driver}) updated to: ${val} (${formattedValue})`);
+	//       this.local[driver] = val;
+	//       this.formatted[driver] = formattedValue;
+	//       this.lastChanged = new Date();
+	//       changed = true;
+	//     } else {
+	//       this.logger(`Update event triggered, property ${Controls[driver].label} (${driver}) is unchanged.`);
+	//     }
+	//     if (changed) {
+	//       this.emit("PropertyChanged", driver, val, priorVal, formattedValue);
+
+	//       this.scenes.forEach((element) => {
+	//         this.logger(`Recalulating ${element.deviceFriendlyName}`);
+	//         element.recalculateState();
+	//       });
+	//     }
+	//   } catch (error) {
+	//     this.logger(error, "error");
+	//   } finally {
+	//     return changed;
+	//   }
+	// }
 }

package/src/Devices/Insteon/Generated/AlertModuleArmed.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 = "AlertModuleArmed";
+const nodeDefId = "AlertModuleArmed";
 
 type Commands = AlertModuleArmed.Commands;
 type Drivers = AlertModuleArmed.Drivers;
 
 export class AlertModuleArmedNode extends Base<Drivers, Commands> implements AlertModuleArmed.Interface {
-	public readonly commands = {
+	public override readonly commands = {
 		DON: this.on,
 		DOF: this.off,
 		QUERY: this.query,
 		BEEP: this.beep,
 		WDU: this.writeChanges
 	};
-	static nodeDefId = "AlertModuleArmed";
+	static override nodeDefId = "AlertModuleArmed";
+	static override implements = ["AlertModuleArmed", "SirenAlert", "SirenArm"];
 	declare readonly nodeDefId: "AlertModuleArmed";
 	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 query() {
-		return this.sendCommand("QUERY");
-	}
-	async beep(value?: number) {
-		return this.sendCommand("BEEP", { value: value });
-	}
-	async writeChanges() {
-		return this.sendCommand("WDU");
-	}
+	async on() { return this.sendCommand("DON"); }
+	async off() { return this.sendCommand("DOF"); }
+	async query() { return this.sendCommand("QUERY"); }
+	async beep(value?: number) { return this.sendCommand("BEEP", { value: value }); }
+	async writeChanges() { return this.sendCommand("WDU"); }
 	public get status(): Insteon.OnLevelRelay {
 		return this.drivers.ST?.value;
 	}
@@ -61,8 +52,9 @@ export namespace AlertModuleArmed {
 	export interface Interface extends Omit<InstanceType<typeof AlertModuleArmedNode>, keyof ISYDeviceNode<any, any, any, any>> {
 		nodeDefId: "AlertModuleArmed";
 	}
-	export function is(node: ISYNode<any, any, any, any>): node is AlertModuleArmedNode {
-		return node.nodeDefId === nodeDefId;
+	export function is(node: ISYNode<any, any, any, any>): node is AlertModuleArmedNode { return ["AlertModuleArmed"].includes(node.nodeDefId); }
+	export function isImplementedBy(node: ISYNode<any, any, any, any>): node is AlertModuleArmedNode {
+		return ["AlertModuleArmed", "BallastRelayLampSwitch", "BallastRelayLampSwitch_ADV", "RelayLampSwitch", "RelayLampSwitch_ADV", "RelayLampSwitchLED", "RelayLampSwitchLED_ADV", "RelayLampOnly", "RelayLampOnly_ADV", "KeypadRelay", "KeypadRelay_ADV", "FanLincMotor", "EZRAIN_Output", "AlertModuleSiren", "AlertModuleSiren_ADV"].includes(node.nodeDefId);
 	}
 	export function create(isy: ISY, nodeInfo: NodeInfo) {
 		return new AlertModuleArmedNode(isy, nodeInfo);

package/src/Devices/Insteon/Generated/AlertModuleSiren.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 = "AlertModuleSiren";
+const nodeDefId = "AlertModuleSiren";
 
 type Commands = AlertModuleSiren.Commands;
 type Drivers = AlertModuleSiren.Drivers;
 
 export class AlertModuleSirenNode extends Base<Drivers, Commands> implements AlertModuleSiren.Interface {
-	public readonly commands = {
+	public override readonly commands = {
 		DON: this.on,
 		DOF: this.off,
 		DFOF: this.fastOff,
@@ -27,34 +27,21 @@ export class AlertModuleSirenNode extends Base<Drivers, Commands> implements Ale
 		BEEP: this.beep,
 		WDU: this.writeChanges
 	};
-	static nodeDefId = "AlertModuleSiren";
-	declare readonly nodeDefId: "AlertModuleSiren";
+	static override nodeDefId = "AlertModuleSiren";
+	static override implements = ["AlertModuleSiren", "AlertModuleArmed", "SirenAlert", "SirenArm"];
+	declare readonly nodeDefId: "AlertModuleSiren" | "AlertModuleSiren_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 on(onLevel?: number) {
-		return this.sendCommand("DON", { OL: onLevel });
-	}
-	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 writeChanges() {
-		return this.sendCommand("WDU");
-	}
+	async on(onLevel?: number) { return this.sendCommand("DON", { OL: onLevel }); }
+	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 writeChanges() { return this.sendCommand("WDU"); }
 	public get status(): Insteon.OnLevelRelay {
 		return this.drivers.ST?.value;
 	}
@@ -64,13 +51,15 @@ export class AlertModuleSirenNode extends Base<Drivers, Commands> implements Ale
 }
 
 NodeFactory.register(AlertModuleSirenNode);
+NodeFactory.register(AlertModuleSirenNode, "AlertModuleSiren_ADV");
 
 export namespace AlertModuleSiren {
 	export interface Interface extends Omit<InstanceType<typeof AlertModuleSirenNode>, keyof ISYDeviceNode<any, any, any, any>> {
-		nodeDefId: "AlertModuleSiren";
+		nodeDefId: "AlertModuleSiren" | "AlertModuleSiren_ADV";
 	}
-	export function is(node: ISYNode<any, any, any, any>): node is AlertModuleSirenNode {
-		return node.nodeDefId === nodeDefId;
+	export function is(node: ISYNode<any, any, any, any>): node is AlertModuleSirenNode { return ["AlertModuleSiren", "AlertModuleSiren_ADV"].includes(node.nodeDefId); }
+	export function isImplementedBy(node: ISYNode<any, any, any, any>): node is AlertModuleSirenNode {
+		return ["AlertModuleSiren", "AlertModuleSiren_ADV"].includes(node.nodeDefId);
 	}
 	export function create(isy: ISY, nodeInfo: NodeInfo) {
 		return new AlertModuleSirenNode(isy, nodeInfo);

package/src/Devices/Insteon/Generated/BallastRelayLampSwitch.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 = "BallastRelayLampSwitch";
+const nodeDefId = "BallastRelayLampSwitch";
 
 type Commands = BallastRelayLampSwitch.Commands;
 type Drivers = BallastRelayLampSwitch.Drivers;
 
 export class BallastRelayLampSwitchNode extends Base<Drivers, Commands> implements BallastRelayLampSwitch.Interface {
-	public readonly commands = {
+	public override readonly commands = {
 		DON: this.on,
 		DOF: this.off,
 		DFOF: this.fastOff,
@@ -27,34 +27,21 @@ export class BallastRelayLampSwitchNode extends Base<Drivers, Commands> implemen
 		BEEP: this.beep,
 		WDU: this.writeChanges
 	};
-	static nodeDefId = "BallastRelayLampSwitch";
-	declare readonly nodeDefId: "BallastRelayLampSwitch";
+	static override nodeDefId = "BallastRelayLampSwitch";
+	static override implements = ["BallastRelayLampSwitch", "RelayLampOnly", "RelayLampOnly_ADV", "IRLincTx", "EZRAIN_Output", "EZIO2x4_Output", "EZIO2x4_Input", "EZIO2x4_Input_ADV", "BinaryAlarm", "BinaryAlarm_ADV", "BinaryControl", "BinaryControl_ADV", "AlertModuleArmed", "SirenAlert", "SirenArm"];
+	declare readonly nodeDefId: "BallastRelayLampSwitch" | "BallastRelayLampSwitch_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 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 writeChanges() {
-		return this.sendCommand("WDU");
-	}
+	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 writeChanges() { return this.sendCommand("WDU"); }
 	public get status(): Insteon.Sml {
 		return this.drivers.ST?.value;
 	}
@@ -64,13 +51,15 @@ export class BallastRelayLampSwitchNode extends Base<Drivers, Commands> implemen
 }
 
 NodeFactory.register(BallastRelayLampSwitchNode);
+NodeFactory.register(BallastRelayLampSwitchNode, "BallastRelayLampSwitch_ADV");
 
 export namespace BallastRelayLampSwitch {
 	export interface Interface extends Omit<InstanceType<typeof BallastRelayLampSwitchNode>, keyof ISYDeviceNode<any, any, any, any>> {
-		nodeDefId: "BallastRelayLampSwitch";
+		nodeDefId: "BallastRelayLampSwitch" | "BallastRelayLampSwitch_ADV";
 	}
-	export function is(node: ISYNode<any, any, any, any>): node is BallastRelayLampSwitchNode {
-		return node.nodeDefId === nodeDefId;
+	export function is(node: ISYNode<any, any, any, any>): node is BallastRelayLampSwitchNode { return ["BallastRelayLampSwitch", "BallastRelayLampSwitch_ADV"].includes(node.nodeDefId); }
+	export function isImplementedBy(node: ISYNode<any, any, any, any>): node is BallastRelayLampSwitchNode {
+		return ["BallastRelayLampSwitch", "BallastRelayLampSwitch_ADV"].includes(node.nodeDefId);
 	}
 	export function create(isy: ISY, nodeInfo: NodeInfo) {
 		return new BallastRelayLampSwitchNode(isy, nodeInfo);

package/src/Devices/Insteon/Generated/BinaryAlarm.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,33 +12,28 @@ import { Insteon } from "../../../Definitions/index.js";
 import type { DriverState } from "../../../Model/DriverState.js";
 import { NodeFactory } from "../../NodeFactory.js";
 
-export const nodeDefId = "BinaryAlarm";
+const nodeDefId = "BinaryAlarm";
 
 type Commands = BinaryAlarm.Commands;
 type Drivers = BinaryAlarm.Drivers;
 
 export class BinaryAlarmNode extends Base<Drivers, Commands> implements BinaryAlarm.Interface {
-	public readonly commands = {
+	public override readonly commands = {
 		QUERY: this.query,
 		BEEP: this.beep,
 		WDU: this.writeChanges
 	};
-	static nodeDefId = "BinaryAlarm";
-	declare readonly nodeDefId: "BinaryAlarm";
+	static override nodeDefId = "BinaryAlarm";
+	static override implements = ["BinaryAlarm", "BinaryControl", "BinaryControl_ADV", "SirenAlert", "SirenArm"];
+	declare readonly nodeDefId: "BinaryAlarm" | "BinaryAlarm_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 query() {
-		return this.sendCommand("QUERY");
-	}
-	async beep(value?: number) {
-		return this.sendCommand("BEEP", { 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 writeChanges() { return this.sendCommand("WDU"); }
 	public get status(): Insteon.OnLevelRelay {
 		return this.drivers.ST?.value;
 	}
@@ -48,13 +43,15 @@ export class BinaryAlarmNode extends Base<Drivers, Commands> implements BinaryAl
 }
 
 NodeFactory.register(BinaryAlarmNode);
+NodeFactory.register(BinaryAlarmNode, "BinaryAlarm_ADV");
 
 export namespace BinaryAlarm {
 	export interface Interface extends Omit<InstanceType<typeof BinaryAlarmNode>, keyof ISYDeviceNode<any, any, any, any>> {
-		nodeDefId: "BinaryAlarm";
+		nodeDefId: "BinaryAlarm" | "BinaryAlarm_ADV";
 	}
-	export function is(node: ISYNode<any, any, any, any>): node is BinaryAlarmNode {
-		return node.nodeDefId === nodeDefId;
+	export function is(node: ISYNode<any, any, any, any>): node is BinaryAlarmNode { return ["BinaryAlarm", "BinaryAlarm_ADV"].includes(node.nodeDefId); }
+	export function isImplementedBy(node: ISYNode<any, any, any, any>): node is BinaryAlarmNode {
+		return ["BinaryAlarm", "BallastRelayLampSwitch", "BallastRelayLampSwitch_ADV", "RelayLampSwitch", "RelayLampSwitch_ADV", "RelayLampSwitchLED", "RelayLampSwitchLED_ADV", "KeypadRelay", "KeypadRelay_ADV", "BinaryAlarm_ADV"].includes(node.nodeDefId);
 	}
 	export function create(isy: ISY, nodeInfo: NodeInfo) {
 		return new BinaryAlarmNode(isy, nodeInfo);