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

package/src/Devices/UDI/Generated/PulseCounter.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,14 +12,15 @@ import { UDI } from "../../../Definitions/index.js";
 import type { DriverState } from "../../../Model/DriverState.js";
 import { NodeFactory } from "../../NodeFactory.js";
 
-export const nodeDefId = "EM3PulseCounter";
+const nodeDefId = "EM3PulseCounter";
 
 type Commands = PulseCounter.Commands;
 type Drivers = PulseCounter.Drivers;
 
 export class PulseCounterNode extends Base<Drivers, Commands> implements PulseCounter.Interface {
-	public readonly commands = {};
-	static nodeDefId = "EM3PulseCounter";
+	public override readonly commands = {};
+	static override nodeDefId = "EM3PulseCounter";
+	static override implements = ["EM3PulseCounter"];
 	declare readonly nodeDefId: "EM3PulseCounter";
 	constructor (isy: ISY, nodeInfo: NodeInfo) {
 		super(isy, nodeInfo);
@@ -48,8 +49,9 @@ export namespace PulseCounter {
 	export interface Interface extends Omit<InstanceType<typeof PulseCounterNode>, keyof ISYDeviceNode<any, any, any, any>> {
 		nodeDefId: "EM3PulseCounter";
 	}
-	export function is(node: ISYNode<any, any, any, any>): node is PulseCounterNode {
-		return node.nodeDefId === nodeDefId;
+	export function is(node: ISYNode<any, any, any, any>): node is PulseCounterNode { return ["EM3PulseCounter"].includes(node.nodeDefId); }
+	export function isImplementedBy(node: ISYNode<any, any, any, any>): node is PulseCounterNode {
+		return ["EM3PulseCounter"].includes(node.nodeDefId);
 	}
 	export function create(isy: ISY, nodeInfo: NodeInfo) {
 		return new PulseCounterNode(isy, nodeInfo);

package/src/Devices/UDI/Generated/Relay.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 { UDI } from "../../../Definitions/index.js";
 import type { DriverState } from "../../../Model/DriverState.js";
 import { NodeFactory } from "../../NodeFactory.js";
 
-export const nodeDefId = "EM3Relay";
+const nodeDefId = "EM3Relay";
 
 type Commands = Relay.Commands;
 type Drivers = Relay.Drivers;
 
 export class RelayNode extends Base<Drivers, Commands> implements Relay.Interface {
-	public readonly commands = {
+	public override readonly commands = {
 		DON: this.on,
 		DOF: this.off,
 		QUERY: this.query
 	};
-	static nodeDefId = "EM3Relay";
+	static override nodeDefId = "EM3Relay";
+	static override implements = ["EM3Relay"];
 	declare readonly nodeDefId: "EM3Relay";
 	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 on() { return this.sendCommand("DON"); }
+	async off() { return this.sendCommand("DOF"); }
+	async query() { return this.sendCommand("QUERY"); }
 	public get status(): (0 | 100) {
 		return this.drivers.ST?.value;
 	}
@@ -53,8 +48,9 @@ export namespace Relay {
 	export interface Interface extends Omit<InstanceType<typeof RelayNode>, keyof ISYDeviceNode<any, any, any, any>> {
 		nodeDefId: "EM3Relay";
 	}
-	export function is(node: ISYNode<any, any, any, any>): node is RelayNode {
-		return node.nodeDefId === nodeDefId;
+	export function is(node: ISYNode<any, any, any, any>): node is RelayNode { return ["EM3Relay"].includes(node.nodeDefId); }
+	export function isImplementedBy(node: ISYNode<any, any, any, any>): node is RelayNode {
+		return ["EM3Relay"].includes(node.nodeDefId);
 	}
 	export function create(isy: ISY, nodeInfo: NodeInfo) {
 		return new RelayNode(isy, nodeInfo);

package/src/Devices/UDI/Generated/TemperatureSensor.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,14 +12,15 @@ import { UDI } from "../../../Definitions/index.js";
 import type { DriverState } from "../../../Model/DriverState.js";
 import { NodeFactory } from "../../NodeFactory.js";
 
-export const nodeDefId = "EM3TempSensor";
+const nodeDefId = "EM3TempSensor";
 
 type Commands = TemperatureSensor.Commands;
 type Drivers = TemperatureSensor.Drivers;
 
 export class TemperatureSensorNode extends Base<Drivers, Commands> implements TemperatureSensor.Interface {
-	public readonly commands = {};
-	static nodeDefId = "EM3TempSensor";
+	public override readonly commands = {};
+	static override nodeDefId = "EM3TempSensor";
+	static override implements = ["EM3TempSensor"];
 	declare readonly nodeDefId: "EM3TempSensor";
 	constructor (isy: ISY, nodeInfo: NodeInfo) {
 		super(isy, nodeInfo);
@@ -40,8 +41,9 @@ export namespace TemperatureSensor {
 	export interface Interface extends Omit<InstanceType<typeof TemperatureSensorNode>, keyof ISYDeviceNode<any, any, any, any>> {
 		nodeDefId: "EM3TempSensor";
 	}
-	export function is(node: ISYNode<any, any, any, any>): node is TemperatureSensorNode {
-		return node.nodeDefId === nodeDefId;
+	export function is(node: ISYNode<any, any, any, any>): node is TemperatureSensorNode { return ["EM3TempSensor"].includes(node.nodeDefId); }
+	export function isImplementedBy(node: ISYNode<any, any, any, any>): node is TemperatureSensorNode {
+		return ["EM3TempSensor"].includes(node.nodeDefId);
 	}
 	export function create(isy: ISY, nodeInfo: NodeInfo) {
 		return new TemperatureSensorNode(isy, nodeInfo);

package/src/Devices/ZWave/Generated/ColorSwitch.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,20 +12,21 @@ import { ZWave } from "../../../Definitions/index.js";
 import type { DriverState } from "../../../Model/DriverState.js";
 import { NodeFactory } from "../../NodeFactory.js";
 
-export const nodeDefId = "186";
+const nodeDefId = "186";
 
 type Commands = ColorSwitch.Commands;
 type Drivers = ColorSwitch.Drivers;
 
 export class ColorSwitchNode extends Base<Drivers, Commands> implements ColorSwitch.Interface {
-	public readonly commands = {
+	public override readonly commands = {
 		DON: this.set,
 		FDUP: this.fadeUp,
 		FDDOWN: this.fadeDown,
 		FDSTOP: this.fadeStop,
 		QUERY: this.query
 	};
-	static nodeDefId = "186";
+	static override nodeDefId = "186";
+	static override implements = ["186"];
 	declare readonly nodeDefId: "186";
 	constructor (isy: ISY, nodeInfo: NodeInfo) {
 		super(isy, nodeInfo);
@@ -34,21 +35,11 @@ export class ColorSwitchNode extends Base<Drivers, Commands> implements ColorSwi
 		this.drivers.GV3 = Driver.create("GV3", this, nodeInfo.property as DriverState, { uom: UnitOfMeasure.Raw1ByteUnsignedValue, label: "Green", name: "green" });
 		this.drivers.GV4 = Driver.create("GV4", this, nodeInfo.property as DriverState, { uom: UnitOfMeasure.Raw1ByteUnsignedValue, label: "Blue", name: "blue" });
 	}
-	async set(warmWhite?: number, red?: number, green?: number, blue?: number, duration?: number | number) {
-		return this.sendCommand("DON", { GV0: warmWhite, GV2: red, GV3: green, GV4: blue, RR: duration });
-	}
-	async fadeUp(component: number, startLevel?: number, duration?: number | number) {
-		return this.sendCommand("FDUP", { ID: component, STARTLEVEL: startLevel, RR: duration });
-	}
-	async fadeDown(component: number, startLevel?: number, duration?: number | number) {
-		return this.sendCommand("FDDOWN", { ID: component, STARTLEVEL: startLevel, RR: duration });
-	}
-	async fadeStop(component: number) {
-		return this.sendCommand("FDSTOP", { ID: component });
-	}
-	async query() {
-		return this.sendCommand("QUERY");
-	}
+	async set(warmWhite?: number, red?: number, green?: number, blue?: number, duration?: number | number) { return this.sendCommand("DON", { GV0: warmWhite, GV2: red, GV3: green, GV4: blue, RR: duration }); }
+	async fadeUp(component: ZWave.ColorComponent, startLevel?: number, duration?: number | number) { return this.sendCommand("FDUP", { ID: component, STARTLEVEL: startLevel, RR: duration }); }
+	async fadeDown(component: ZWave.ColorComponent, startLevel?: number, duration?: number | number) { return this.sendCommand("FDDOWN", { ID: component, STARTLEVEL: startLevel, RR: duration }); }
+	async fadeStop(component: ZWave.ColorComponent) { return this.sendCommand("FDSTOP", { ID: component }); }
+	async query() { return this.sendCommand("QUERY"); }
 	public get warmWhite(): number {
 		return this.drivers.GV0?.value;
 	}
@@ -69,8 +60,9 @@ export namespace ColorSwitch {
 	export interface Interface extends Omit<InstanceType<typeof ColorSwitchNode>, keyof ISYDeviceNode<any, any, any, any>> {
 		nodeDefId: "186";
 	}
-	export function is(node: ISYNode<any, any, any, any>): node is ColorSwitchNode {
-		return node.nodeDefId === nodeDefId;
+	export function is(node: ISYNode<any, any, any, any>): node is ColorSwitchNode { return ["186"].includes(node.nodeDefId); }
+	export function isImplementedBy(node: ISYNode<any, any, any, any>): node is ColorSwitchNode {
+		return ["186"].includes(node.nodeDefId);
 	}
 	export function create(isy: ISY, nodeInfo: NodeInfo) {
 		return new ColorSwitchNode(isy, nodeInfo);
@@ -81,15 +73,15 @@ export namespace ColorSwitch {
 			label: "Set";
 			name: "set";
 		};
-		FDUP: ((ID: number, STARTLEVEL?: number, RR?: number | number) => Promise<boolean>) & {
+		FDUP: ((ID: ZWave.ColorComponent, STARTLEVEL?: number, RR?: number | number) => Promise<boolean>) & {
 			label: "Fade Up";
 			name: "fadeUp";
 		};
-		FDDOWN: ((ID: number, STARTLEVEL?: number, RR?: number | number) => Promise<boolean>) & {
+		FDDOWN: ((ID: ZWave.ColorComponent, STARTLEVEL?: number, RR?: number | number) => Promise<boolean>) & {
 			label: "Fade Down";
 			name: "fadeDown";
 		};
-		FDSTOP: ((ID: number) => Promise<boolean>) & {
+		FDSTOP: ((ID: ZWave.ColorComponent) => Promise<boolean>) & {
 			label: "Fade Stop";
 			name: "fadeStop";
 		};

package/src/Devices/ZWave/Generated/DimmerSwitch.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 { ZWave } from "../../../Definitions/index.js";
 import type { DriverState } from "../../../Model/DriverState.js";
 import { NodeFactory } from "../../NodeFactory.js";
 
-export const nodeDefId = "119";
+const nodeDefId = "119";
 
 type Commands = DimmerSwitch.Commands;
 type Drivers = DimmerSwitch.Drivers;
 
 export class DimmerSwitchNode extends Base<Drivers, Commands> implements DimmerSwitch.Interface {
-	public readonly commands = {
+	public override readonly commands = {
 		DON: this.on,
 		DOF: this.off,
 		DFON: this.fastOn,
@@ -33,52 +33,27 @@ export class DimmerSwitchNode extends Base<Drivers, Commands> implements DimmerS
 		CONFIG: this.setConfiguration,
 		WDU: this.writeChanges
 	};
-	static nodeDefId = "119";
+	static override nodeDefId = "119";
+	static override implements = ["119"];
 	declare readonly nodeDefId: "119";
 	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?: number | number, rampRate?: number | number) {
-		return this.sendCommand("DON", { value: value, RR: rampRate });
-	}
-	async off() {
-		return this.sendCommand("DOF");
-	}
-	async fastOn() {
-		return this.sendCommand("DFON");
-	}
-	async fastOff() {
-		return this.sendCommand("DFOF");
-	}
-	async brighten() {
-		return this.sendCommand("BRT");
-	}
-	async dim() {
-		return this.sendCommand("DIM");
-	}
-	async fadeUp(startLevel?: number | number, rampRate?: number | number) {
-		return this.sendCommand("FDUP", { STARTLEVEL: startLevel, RR: rampRate });
-	}
-	async fadeDown(startLevel?: number | number, rampRate?: number | number) {
-		return this.sendCommand("FDDOWN", { STARTLEVEL: startLevel, RR: rampRate });
-	}
-	async fade(direction: ZWave.FadeDirection, startLevel?: number | number, rampRate?: number | number, direction2?: ZWave.FadeDirection, fadeRate2?: number | number) {
-		return this.sendCommand("FADE", { DIR: direction, STARTLEVEL: startLevel, RR: rampRate, DIR2: direction2, STEP2: fadeRate2 });
-	}
-	async fadeStop() {
-		return this.sendCommand("FDSTOP");
-	}
-	async query() {
-		return this.sendCommand("QUERY");
-	}
-	async setConfiguration(parameterNumber: number, parameterValue: number | number | number | number | number | number) {
-		return this.sendCommand("CONFIG", { NUM: parameterNumber, VAL: parameterValue });
-	}
-	async writeChanges() {
-		return this.sendCommand("WDU");
-	}
+	async on(value?: ZWave.PercentOpt | number, rampRate?: number | number) { return this.sendCommand("DON", value, { RR: rampRate }); }
+	async off() { return this.sendCommand("DOF"); }
+	async fastOn() { return this.sendCommand("DFON"); }
+	async fastOff() { return this.sendCommand("DFOF"); }
+	async brighten() { return this.sendCommand("BRT"); }
+	async dim() { return this.sendCommand("DIM"); }
+	async fadeUp(startLevel?: ZWave.PercentOpt | number, rampRate?: number | number) { return this.sendCommand("FDUP", { STARTLEVEL: startLevel, RR: rampRate }); }
+	async fadeDown(startLevel?: ZWave.PercentOpt | number, rampRate?: number | number) { return this.sendCommand("FDDOWN", { STARTLEVEL: startLevel, RR: rampRate }); }
+	async fade(direction: ZWave.FadeDirection, startLevel?: ZWave.PercentOpt | number, rampRate?: number | number, direction2?: ZWave.FadeDirection, fadeRate2?: number | number) { return this.sendCommand("FADE", { DIR: direction, STARTLEVEL: startLevel, RR: rampRate, DIR2: direction2, STEP2: fadeRate2 }); }
+	async fadeStop() { return this.sendCommand("FDSTOP"); }
+	async query() { return this.sendCommand("QUERY"); }
+	async setConfiguration(parameterNumber: number, parameterValue: number | number | number | number | number | number) { return this.sendCommand("CONFIG", { NUM: parameterNumber, VAL: parameterValue }); }
+	async writeChanges() { return this.sendCommand("WDU"); }
 	public get status(): number {
 		return this.drivers.ST?.value;
 	}
@@ -93,15 +68,16 @@ export namespace DimmerSwitch {
 	export interface Interface extends Omit<InstanceType<typeof DimmerSwitchNode>, keyof ISYDeviceNode<any, any, any, any>> {
 		nodeDefId: "119";
 	}
-	export function is(node: ISYNode<any, any, any, any>): node is DimmerSwitchNode {
-		return node.nodeDefId === nodeDefId;
+	export function is(node: ISYNode<any, any, any, any>): node is DimmerSwitchNode { return ["119"].includes(node.nodeDefId); }
+	export function isImplementedBy(node: ISYNode<any, any, any, any>): node is DimmerSwitchNode {
+		return ["119"].includes(node.nodeDefId);
 	}
 	export function create(isy: ISY, nodeInfo: NodeInfo) {
 		return new DimmerSwitchNode(isy, nodeInfo);
 	}
 	export const Node = DimmerSwitchNode;
 	export type Commands = {
-		DON: ((value?: number | number, RR?: number | number) => Promise<boolean>) & {
+		DON: ((value?: ZWave.PercentOpt | number, RR?: number | number) => Promise<boolean>) & {
 			label: "On";
 			name: "on";
 		};
@@ -125,15 +101,15 @@ export namespace DimmerSwitch {
 			label: "Dim";
 			name: "dim";
 		};
-		FDUP: ((STARTLEVEL?: number | number, RR?: number | number) => Promise<boolean>) & {
+		FDUP: ((STARTLEVEL?: ZWave.PercentOpt | number, RR?: number | number) => Promise<boolean>) & {
 			label: "Fade Up";
 			name: "fadeUp";
 		};
-		FDDOWN: ((STARTLEVEL?: number | number, RR?: number | number) => Promise<boolean>) & {
+		FDDOWN: ((STARTLEVEL?: ZWave.PercentOpt | number, RR?: number | number) => Promise<boolean>) & {
 			label: "Fade Down";
 			name: "fadeDown";
 		};
-		FADE: ((DIR: ZWave.FadeDirection, STARTLEVEL?: number | number, RR?: number | number, DIR2?: ZWave.FadeDirection, STEP2?: number | number) => Promise<boolean>) & {
+		FADE: ((DIR: ZWave.FadeDirection, STARTLEVEL?: ZWave.PercentOpt | number, RR?: number | number, DIR2?: ZWave.FadeDirection, STEP2?: number | number) => Promise<boolean>) & {
 			label: "Fade";
 			name: "fade";
 		};

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

@@ -0,0 +1,2 @@
+export * from './ColorSwitch.js';
+export * from './DimmerSwitch.js';

package/src/Devices/ZWave/index.ts

@@ -20,6 +20,8 @@ export class Base<Drivers extends ISYNode.DriverSignatures, Commands extends ISY
 		//// this.productName = InsteonNLS.getDeviceDescription(String.fromCharCode(category,device,version))
 }
 
+
+
 export async function create(...nodeInfo: NodeInfo<FamilyEnum.ZWave>[])
 {
 	let nodes = [] as Base<any, any>[];
@@ -29,4 +31,6 @@ export async function create(...nodeInfo: NodeInfo<FamilyEnum.ZWave>[])
 		nodes.push(await NodeFactory.create(node) as unknown as Base<any, any>);
 	}
 	return nodes;
-}
+}
+
+//export * from './Generated/index.js';

package/src/Devices/ZigBeeLegacy/Generated/Relay.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,37 +12,30 @@ import { ZigBeeLegacy } from "../../../Definitions/index.js";
 import type { DriverState } from "../../../Model/DriverState.js";
 import { NodeFactory } from "../../NodeFactory.js";
 
-export const nodeDefId = "RelayLoadControl";
+const nodeDefId = "RelayLoadControl";
 
 type Commands = Relay.Commands;
 type Drivers = Relay.Drivers;
 
 export class RelayNode extends Base<Drivers, Commands> implements Relay.Interface {
-	public readonly commands = {
+	public override readonly commands = {
 		DON: this.on,
 		DOF: this.off,
 		QUERY: this.query,
 		ADRPST: this.adr
 	};
-	static nodeDefId = "RelayLoadControl";
+	static override nodeDefId = "RelayLoadControl";
+	static override implements = ["RelayLoadControl"];
 	declare readonly nodeDefId: "RelayLoadControl";
 	constructor (isy: ISY, nodeInfo: NodeInfo) {
 		super(isy, nodeInfo);
 		this.drivers.ST = Driver.create("ST", this, nodeInfo.property as DriverState, { uom: UnitOfMeasure.Unknown, label: "Status", name: "status" });
 		this.drivers.ERR = Driver.create("ERR", this, nodeInfo.property as DriverState, { uom: UnitOfMeasure.Unknown, label: "Responding", name: "responding" });
 	}
-	async on() {
-		return this.sendCommand("DON");
-	}
-	async off() {
-		return this.sendCommand("DOF");
-	}
-	async query() {
-		return this.sendCommand("QUERY");
-	}
-	async adr(value: ) {
-		return this.sendCommand("ADRPST", { value: value });
-	}
+	async on() { return this.sendCommand("DON"); }
+	async off() { return this.sendCommand("DOF"); }
+	async query() { return this.sendCommand("QUERY"); }
+	async adr(value: ) { return this.sendCommand("ADRPST", value); }
 	public get status(): {
         
 return this.drivers.ST?.value;
@@ -60,8 +53,9 @@ export namespace Relay {
 	export interface Interface extends Omit<InstanceType<typeof RelayNode>, keyof ISYDeviceNode<any, any, any, any>> {
 		nodeDefId: "RelayLoadControl";
 	}
-	export function is(node: ISYNode<any, any, any, any>): node is RelayNode {
-		return node.nodeDefId === nodeDefId;
+	export function is(node: ISYNode<any, any, any, any>): node is RelayNode { return ["RelayLoadControl"].includes(node.nodeDefId); }
+	export function isImplementedBy(node: ISYNode<any, any, any, any>): node is RelayNode {
+		return ["RelayLoadControl"].includes(node.nodeDefId);
 	}
 	export function create(isy: ISY, nodeInfo: NodeInfo) {
 		return new RelayNode(isy, nodeInfo);

package/src/Devices/ZigBeeLegacy/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 { ZigBeeLegacy } 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,
@@ -29,7 +29,8 @@ export class ThermostatNode extends Base<Drivers, Commands> implements Thermosta
 		QUERY: this.query,
 		ADRPST: this.adr
 	};
-	static nodeDefId = "Thermostat";
+	static override nodeDefId = "Thermostat";
+	static override implements = ["Thermostat"];
 	declare readonly nodeDefId: "Thermostat";
 	constructor (isy: ISY, nodeInfo: NodeInfo) {
 		super(isy, nodeInfo);
@@ -43,33 +44,15 @@ export class ThermostatNode extends Base<Drivers, Commands> implements Thermosta
 		this.drivers.CLISMD = Driver.create("CLISMD", this, nodeInfo.property as DriverState, { uom: UnitOfMeasure.Unknown, label: "Schedule Mode", name: "scheduleMode" });
 		this.drivers.ERR = Driver.create("ERR", this, nodeInfo.property as DriverState, { uom: UnitOfMeasure.Unknown, label: "Responding", name: "responding" });
 	}
-	async updateHeatSetpoint(value: ) {
-		return this.sendCommand("CLISPH", { value: value });
-	}
-	async updateCoolSetpoint(value: ) {
-		return this.sendCommand("CLISPC", { value: value });
-	}
-	async updateMode(value: ) {
-		return this.sendCommand("CLIMD", { value: value });
-	}
-	async updateFanMode(value: ) {
-		return this.sendCommand("CLIFS", { value: value });
-	}
-	async updateScheduleMode(value: ) {
-		return this.sendCommand("CLISMD", { value: value });
-	}
-	async heatSetpointShift(value: ) {
-		return this.sendCommand("CLISPHD", { value: value });
-	}
-	async coolSetpointShift(value: ) {
-		return this.sendCommand("CLISPCD", { value: value });
-	}
-	async query() {
-		return this.sendCommand("QUERY");
-	}
-	async adr(value: ) {
-		return this.sendCommand("ADRPST", { value: value });
-	}
+	async updateHeatSetpoint(value: ) { return this.sendCommand("CLISPH", value); }
+	async updateCoolSetpoint(value: ) { return this.sendCommand("CLISPC", value); }
+	async updateMode(value: ) { return this.sendCommand("CLIMD", value); }
+	async updateFanMode(value: ) { return this.sendCommand("CLIFS", value); }
+	async updateScheduleMode(value: ) { return this.sendCommand("CLISMD", value); }
+	async heatSetpointShift(value: ) { return this.sendCommand("CLISPHD", value); }
+	async coolSetpointShift(value: ) { return this.sendCommand("CLISPCD", value); }
+	async query() { return this.sendCommand("QUERY"); }
+	async adr(value: ) { return this.sendCommand("ADRPST", value); }
 	public get temperature(): {
         
 return this.drivers.ST?.value;
@@ -122,8 +105,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/index.ts

@@ -1,24 +1,29 @@
-
 import type { Family } from '../Definitions/index.js';
-import {Insteon} from "./Insteon/index.js";
-import { ZWaveBaseDevice } from "./ZWave/ZWaveBaseDevice.js";
+import * as Insteon from './Insteon/index.js';
+import { NodeFactory } from './NodeFactory.js';
+import { ZWaveBaseDevice } from './ZWave/ZWaveBaseDevice.js';
+import * as ZWave from './ZWave/index.js';
 
 export const Devices = {
-  Insteon: Insteon,
-  ZWave: { Base: ZWaveBaseDevice },
-  ZigBee: {},
+	Insteon: Insteon,
+	ZWave: { Base: ZWaveBaseDevice },
+	ZigBee: {}
+};
+Insteon.AlertModuleArmed.Node
+
+export * as Insteon from './Insteon/index.js';
+export * as ZWave from './ZWave/index.js';
 
-}
 
 export namespace Devices {
-  export type Insteon = typeof Insteon;
-  export type ZWave = { Base: ZWaveBaseDevice };
-  export type ZigBee = {};
+	export type Insteon = typeof Insteon;
+	export type ZWave = typeof ZWave;
+	export type ZigBee = {};
 }
 
-
 export type Devices<T extends Family.Insteon | Family.ZWave | Family.ZigBee> = (typeof Devices)[`Insteon`];
 
-export type ToDevice<T extends keyof Devices<any>> = T extends keyof Devices<infer B> ? Devices<B>[`${T}`] : never;
+/*export type ToDevice<T extends keyof Devices<any>> = T extends keyof Devices<infer B> ? Devices<B>[`${T}`] : never;*/
 
+NodeFactory.sortImplementsRegistry();
 export default Devices;

package/src/ISY.ts

@@ -470,12 +470,18 @@ export class ISY extends EventEmitter implements Disposable {
 	}
 
 	public async loadVariables(type: VariableType): Promise<any> {
+		try
+		{
 		const that = this;
 		this.logger.info(`Loading ISY Variables of type: ${type}`);
 		return this.sendRequest(`vars/definitions/${type}`)
 			.then((result) => that.#createVariables(type, result))
 			.then(() => that.sendRequest(`vars/get/${type}`))
 			.then(that.#setVariableValues.bind(that));
+		}
+		catch{
+			this.logger.warn('error loading variables');
+		}
 	}
 
 	public nodeChangedHandler(node: ELKAlarmPanelDevice | ElkAlarmSensorDevice, propertyName = null) {
@@ -531,12 +537,12 @@ export class ISY extends EventEmitter implements Disposable {
 		if (parameters !== null && parameters !== undefined) {
 			if (typeof parameters == 'object') {
 				var q = parameters as Record<P, string | number>;
-				for (const paramName of Object.getOwnPropertyNames(q)) {
-					if (paramName === 'value') {
+				for (const paramName in q) {
+					if (paramName === 'value' || paramName === 'default') {
 						uriToUse += `/${q[paramName]}`;
 						continue;
 					}
-					if (typeof q[paramName] === 'string' || typeof q[paramName] === 'number') uriToUse += `/${paramName}/${q[paramName]}`;
+					else if (typeof q[paramName] === 'string' || typeof q[paramName] === 'number') 		uriToUse += `/${paramName}/${q[paramName]}`;
 				}
 
 				//uriToUse += `/${q[((p : Record<string,number|number>) => `${p[]}/${p.paramValue}` ).join('/')}`;