isy-nodejs 1.0.1-alpha.22 → 1.0.1-alpha.24

package/package.json

@@ -2,7 +2,7 @@
     "name": "isy-nodejs",
     "description": "Node.js wrapper for ISY interface including websockets for change notifications. Fork of isy-js by Rod Toll. Designed to be used in a node.js application.",
     "license": "MIT",
-    "version": "1.0.1-alpha.22",
+    "version": "1.0.1-alpha.24",
     "author": {
         "name": "Pradeep Mouli"
     },
@@ -69,5 +69,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "58d143722781c7f2388e90af3b69eb112bc190ed"
+    "gitHead": "a84d9f53c93e1177b1237aeca4cf18f5e42b50f7"
 }

package/src/Devices/Insteon/DimmerLampSwitch.ts

@@ -0,0 +1,209 @@
+/* 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 as Base } from './InsteonBaseDevice.js';
+import { ISYDeviceNode } from '../ISYDeviceNode.js';
+import { Driver } from '../../Definitions/Global/Drivers.js';
+import { Insteon } from '../../Definitions/index.js';
+import type { DriverState } from '../../Model/DriverState.js';
+import { NodeFactory } from '../NodeFactory.js';
+
+
+export const nodeDefId = "DimmerLampSwitch";
+
+type Commands = DimmerLampSwitch.Commands;
+type Drivers = DimmerLampSwitch.Drivers;
+
+export class DimmerLampSwitchNode extends Base<Drivers, Commands> implements DimmerLampSwitch.Interface {
+	public override readonly commands = {
+		DON: this.on,
+		DOF: this.off,
+		DFOF: this.fastOff,
+		DFON: this.fastOn,
+		BRT: this.brighten,
+		DIM: this.dim,
+		FDUP: this.fadeUp,
+		FDDOWN: this.fadeDown,
+		FDSTOP: this.fadeStop,
+		QUERY: this.query,
+		BEEP: this.beep,
+		OL: this.updateOnLevel,
+		RR: this.updateRampRate,
+		BL: this.backlight,
+		WDU: this.writeChanges
+	};
+	static override nodeDefId = "DimmerLampSwitch";
+	declare readonly nodeDefId: "DimmerLampSwitch";
+	constructor (isy: ISY, nodeInfo: NodeInfo) {
+		super(isy, nodeInfo);
+		this.drivers.ST = Driver.create("ST", this, nodeInfo.property as DriverState, { uom: UnitOfMeasure.Percent, label: "Status", name: "status" });
+		this.drivers.OL = Driver.create("OL", this, nodeInfo.property as DriverState, { uom: UnitOfMeasure.Percent, label: "On Level", name: "onLevel" });
+		this.drivers.RR = Driver.create("RR", this, nodeInfo.property as DriverState, { uom: UnitOfMeasure.Index, label: "Ramp Rate", name: "rampRate" });
+		this.drivers.ERR = Driver.create("ERR", this, nodeInfo.property as DriverState, { uom: UnitOfMeasure.Index, label: "Responding", name: "responding" });
+		
+	}
+	async on(value?: number) {
+		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 brighten() {
+		return this.sendCommand("BRT");
+	}
+	async dim() {
+		return this.sendCommand("DIM");
+	}
+	async fadeUp() {
+		return this.sendCommand("FDUP");
+	}
+	async fadeDown() {
+		return this.sendCommand("FDDOWN");
+	}
+	async fadeStop() {
+		return this.sendCommand("FDSTOP");
+	}
+	async query() {
+		return this.sendCommand("QUERY");
+	}
+	async beep(value?: number) {
+		return this.sendCommand("BEEP", { value: value });
+	}
+	async updateOnLevel(value: number) {
+		return this.sendCommand("OL", { value: value });
+	}
+	async updateRampRate(value: number) {
+		return this.sendCommand("RR", { value: value });
+	}
+	async backlight(value: number) {
+		return this.sendCommand("BL", { value: value });
+	}
+	async writeChanges() {
+		return this.sendCommand("WDU");
+	}
+	public get status(): number {
+		return this.drivers.ST?.value;
+	}
+	public get onLevel(): number {
+		return this.drivers.OL?.value;
+	}
+	public get rampRate(): number {
+		return this.drivers.RR?.value;
+	}
+	public get responding(): Insteon.Error {
+		return this.drivers.ERR?.value;
+	}
+}
+
+NodeFactory.register(DimmerLampSwitchNode);
+
+export namespace DimmerLampSwitch {
+	export interface Interface extends Omit<InstanceType<typeof DimmerLampSwitchNode>, keyof ISYDeviceNode<any, any, any, any>> {
+		nodeDefId: "DimmerLampSwitch";
+	}
+	export function is(node: ISYNode<any, any, any, any>): node is DimmerLampSwitchNode {
+		return node.nodeDefId === nodeDefId;
+	}
+	export function create(isy: ISY, nodeInfo: NodeInfo) {
+		return new DimmerLampSwitchNode(isy, nodeInfo);
+	}
+	export const Node = DimmerLampSwitchNode;
+	export type Commands = {
+		DON: ((value?: number) => Promise<boolean>) & {
+			label: "On";
+			name: "on";
+		};
+		DOF: (() => Promise<boolean>) & {
+			label: "Off";
+			name: "off";
+		};
+		DFOF: (() => Promise<boolean>) & {
+			label: "Fast Off";
+			name: "fastOff";
+		};
+		DFON: (() => Promise<boolean>) & {
+			label: "Fast On";
+			name: "fastOn";
+		};
+		BRT: (() => Promise<boolean>) & {
+			label: "Brighten";
+			name: "brighten";
+		};
+		DIM: (() => Promise<boolean>) & {
+			label: "Dim";
+			name: "dim";
+		};
+		FDUP: (() => Promise<boolean>) & {
+			label: "Fade Up";
+			name: "fadeUp";
+		};
+		FDDOWN: (() => Promise<boolean>) & {
+			label: "Fade Down";
+			name: "fadeDown";
+		};
+		FDSTOP: (() => Promise<boolean>) & {
+			label: "Fade Stop";
+			name: "fadeStop";
+		};
+		QUERY: (() => Promise<boolean>) & {
+			label: "Query";
+			name: "query";
+		};
+		BEEP: ((value?: number) => Promise<boolean>) & {
+			label: "Beep";
+			name: "beep";
+		};
+		OL: ((value: number) => Promise<boolean>) & {
+			label: "On Level";
+			name: "updateOnLevel";
+		};
+		RR: ((value: number) => Promise<boolean>) & {
+			label: "Ramp Rate";
+			name: "updateRampRate";
+		};
+		BL: ((value: number) => Promise<boolean>) & {
+			label: "Backlight";
+			name: "backlight";
+		};
+		WDU: (() => Promise<boolean>) & {
+			label: "Write Changes";
+			name: "writeChanges";
+		};
+	};
+	export type Drivers = {
+		ST: {
+			uom: UnitOfMeasure.Percent;
+			value: number;
+			label: "Status";
+			name: "status";
+		};
+		OL: {
+			uom: UnitOfMeasure.Percent;
+			value: number;
+			label: "On Level";
+			name: "onLevel";
+		};
+		RR: {
+			uom: UnitOfMeasure.Index;
+			value: number;
+			label: "Ramp Rate";
+			name: "rampRate";
+		};
+		ERR: {
+			uom: UnitOfMeasure.Index;
+			value: Insteon.Error;
+			label: "Responding";
+			name: "responding";
+		};
+	};
+}

package/src/Devices/Insteon/InsteonBaseDevice.ts

@@ -20,7 +20,7 @@ export class InsteonBaseDevice<D extends ISYNode.DriverSignatures = {}, C extend
 	C
 > {
 	// #region Constructors (1)
-
+	
 	constructor(isy: ISY, deviceNode: NodeInfo) {
 		super(isy, deviceNode);
 		this.family = Family.Insteon;

package/src/Devices/Insteon/InsteonDimmableDevice.ts

@@ -11,6 +11,7 @@ import { OnOff, ClusterType } from '@project-chip/matter.js/cluster';
 import 'winston';
 import { UnitOfMeasure } from '../../Definitions/Global/UOM.js';
 import type { NodeInfo } from '../../Model/NodeInfo.js';
+import { DimmerLampSwitch } from './DimmerLampSwitch.js';
 
 // #region Type aliases (2)
 
@@ -22,7 +23,7 @@ type OnOffBehavior = typeof OOB;
 // #region Classes (1)
 
 //@ts-ignore
-export class InsteonDimmableDevice extends InsteonRelayDevice implements MapsTo<LevelControlBehavior, OnOffBehavior> {
+export class InsteonDimmableDevice extends DimmerLampSwitch.Node{
 	// #region Constructors (1)
 
 	constructor(isy: ISY, node: NodeInfo) {
@@ -37,7 +38,7 @@ export class InsteonDimmableDevice extends InsteonRelayDevice implements MapsTo<
 	// public async updateBrightnessLevel(level: number): Promise<{}> {
 	// 	return super.(level);
 	// }
-	public override async initialize(endpoint: EndpointFor<LevelControlBehavior, OnOffBehavior>): Promise<void> {
+	/*public override async initialize(endpoint: EndpointFor<LevelControlBehavior, OnOffBehavior>): Promise<void> {
 		try {
 			await super.initialize(endpoint);
 			const that = this;
@@ -51,7 +52,7 @@ export class InsteonDimmableDevice extends InsteonRelayDevice implements MapsTo<
 			// //endpoint.events.levelCont
 			// endpoint.events.levelControl.maxLevel$Changed.on((value) => that.sendCommand("OL",value));
 		} catch (error) {}
-	}
+	}*/
 
 	// #endregion Public Methods (1)
 }

package/src/Matter/Behaviors/ISYBridgedDeviceBehavior.ts

@@ -6,7 +6,7 @@
 import { ClusterBehavior } from '@project-chip/matter.js/behavior/cluster';
 import type { StateType } from '@project-chip/matter.js/behavior/state';
 import { Internal } from '@project-chip/matter.js/behavior/state/managed';
-import { EventEmitter, Observable } from '@project-chip/matter.js/util';
+import { EventEmitter, Observable, ObservableProxy } from '@project-chip/matter.js/util';
 import internal from 'stream';
 import type { Driver } from '../../Definitions/Global/Drivers.js';
 import { ISY, type Family, type ISYNode } from '../../ISY.js';
@@ -33,13 +33,18 @@ export class ISYBridgedDeviceBehavior<N extends ISYNode<any, D, any, any>, D ext
 		this.internal.map = MappingRegistry.getMapping(this.internal.device as unknown as ISYNode<Family, any, any, any>);
 		ISY.instance.logger.debug(`Initializing ${this.constructor.name} for ${this.internal.device.constructor.name} ${this.internal.device.name} with address ${address}`);
 		if (d) {
-			d.events.on('PropertyChanged', this.handlePropertyChange.bind(this));
+			d.events.on('propertyChanged', this.handlePropertyChange.bind(this));
 			for(const f in d.drivers)
 			{
 				let evt = `${d.drivers[f].name}Changed`;
-				this.events[evt] = Observable<[{ driver: string; newValue: any; oldValue: any; formattedValue: string }]>();
+				const obs = Observable<[{ driver: string; newValue: any; oldValue: any; formattedValue: string }]>();
+
+				d.events.on(evt, (driver: string, newValue: any, oldValue: any, formattedValue: string) => obs.emit({ driver, newValue, oldValue, formattedValue }));
+				this.events[evt] = obs;
+				
 				//@ts-ignore
-				d.events.on(evt, (driver: string, newValue: any, oldValue: any, formattedValue: string) => this.events.emit(evt, { driver, newValue, oldValue, formattedValue } as unknown as any));
+				//d.events.on(evt, (driver: string, newValue: any, oldValue: any, formattedValue: string) => this.events.emit(evt, { driver, newValue, oldValue, formattedValue } as unknown as any));
+
 			}
 		}
 	}
@@ -61,7 +66,9 @@ export class ISYBridgedDeviceBehavior<N extends ISYNode<any, D, any, any>, D ext
 	}
 
 	override [Symbol.asyncDispose]() {
+
 		this.internal.device = null;
+
 		return super[Symbol.asyncDispose]();
 	}
 }

package/src/Matter/Bridge/Server.ts

@@ -41,6 +41,10 @@ export interface Config {
 	vendorId: number;
 	vendorName?: string;
 
+	ipv4?: boolean;
+
+	ipv6?: boolean;
+
 	// #endregion Properties (8)
 }
 
@@ -96,7 +100,7 @@ export async function createMatterServer(isy?: ISY, config?: Config): Promise<Se
 		network: {
 			port: config.port,
 
-			//ipv4: false,
+			ipv4: config.ipv4,
 			discoveryCapabilities: {
 				onIpNetwork: true
 			}
@@ -311,7 +315,9 @@ async function initializeConfiguration(isy: ISY, config?: Config): Promise<Confi
 		productName,
 		productId,
 		port,
-		uniqueId
+		uniqueId,
+		ipv4: config.ipv4 ?? true,
+		ipv6: config.ipv6 ?? true
 	};
 }