isy-nodejs 1.0.1-alpha.4 → 1.0.1-alpha.6

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.4",
+    "version": "1.0.1-alpha.6",
     "author": {
         "name": "Pradeep Mouli"
     },
@@ -46,6 +46,7 @@
         "@types/node": "^22.7.5",
         "@types/xml2js": "",
         "@types/xmldoc": "",
+        "microdiff": "^1.4.0",
         "mocha": "",
         "rimraf": "^6.0.1"
     },
@@ -56,6 +57,7 @@
         "axios": "^1.7.7",
         "fast-xml-parser": "^4.5.0",
         "faye-websocket": "^0.11.4",
+        "install": "^0.13.0",
         "mocha": "^10.7.3",
         "p-queue": "^8.0.1",
         "winston": "^3.15.0",
@@ -71,5 +73,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "889a0e652819a994d1faee561c045978cac9619f"
+    "gitHead": "960151429615c48f5774a0911ca58885a39e55b4"
 }

package/src/Devices/Insteon/InsteonFanDevice.ts

@@ -43,7 +43,7 @@ export class InsteonFanDevice extends InsteonBaseDevice {
 	constructor(isy: ISY, deviceNode: NodeInfo) {
 		super(isy, deviceNode);
 		this.light = new InsteonDimmableDevice(isy, deviceNode);
-		this.light.events.on('PropertyChanged', ((a: any, b: any, c: any, d: string) => { this.emit('PropertyChanged', `light.${a}`, b, c, d); }).bind(this));
+		/*this.light.events.on('PropertyChanged', ((a: any, b: any, c: any, d: string) => { this.emit('PropertyChanged', `light.${a}`, b, c, d); }).bind(this));*/
 		this.addChild(this.light);
 	}
 

package/src/Devices/Insteon/InsteonRelayDevice.ts

@@ -7,6 +7,7 @@ import { InsteonBaseDevice } from './InsteonBaseDevice.js';
 
 import type { OnOffBehavior } from '@project-chip/matter.js/behaviors/on-off';
 import 'winston';
+import { RelayLampSwitch } from './RelayLampSwitch.js';
 import type { Command } from '../../Definitions/Global/Commands.js';
 import { Driver, DriverType } from '../../Definitions/Global/Drivers.js';
 import { UnitOfMeasure } from '../../Definitions/index.js';
@@ -14,15 +15,11 @@ import { Properties } from '../../ISYConstants.js';
 
 import type { DriverState } from '../../Model/DriverState.js';
 
-export class InsteonRelayDevice extends InsteonBaseDevice<Driver.Signatures<'ST' | 'OL' | 'RR' | 'ERR'>, Command.Signatures<'DON' | 'DOF'>> {
+export class InsteonRelayDevice extends RelayLampSwitch.Node /*InsteonBaseDevice<Driver.Signatures<'ST' | 'OL' | 'RR' | 'ERR'>, Command.Signatures<'DON' | 'DOF'>>*/ {
 	// #region Constructors (1)
 
 	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: 'Error', name: 'error' });
 	}
 
 	// #endregion Constructors (1)
@@ -58,7 +55,7 @@ export class InsteonRelayDevice extends InsteonBaseDevice<Driver.Signatures<'ST'
 
 	} */
 	public override async sendBeep(level: number = 100): Promise<any> {
-		return super.sendBeep(level);
+		return super.beep(level);
 	}
 
 	// #endregion Public Methods (2)

package/src/Devices/Insteon/RelayLampSwitch.ts

@@ -0,0 +1,131 @@
+/* THIS FILE WAS AUTOMATICALLY GENERATED. DO NOT EDIT DIRECTLY. */
+
+import { UnitOfMeasure } from "../../Definitions/Global/UOM.js";
+import { Family } from "../../Definitions/Global/Families.js";
+import type { NodeInfo } from "../../Model/NodeInfo.js";
+import type { ISY } from "../../ISY.js";
+import type { ISYNode } from "../../ISYNode.js";
+import { InsteonBaseDevice } from "./InsteonBaseDevice.js";
+import { ISYDeviceNode } from "../ISYDeviceNode.js";
+import { Driver } from "../../Definitions/Global/Drivers.js";
+import { Insteon } from "../../Definitions/index.js";
+import type { DriverState } from "../../Model/DriverState.js";
+import { NodeFactory } from "../NodeFactory.js";
+
+export const nodeDefId = "RelayLampSwitch";
+
+type Commands = RelayLampSwitch.Commands;
+type Drivers = RelayLampSwitch.Drivers;
+
+export class RelayLampSwitchNode extends InsteonBaseDevice<Drivers, Commands> implements RelayLampSwitch.Interface {
+	public override readonly commands = {
+		DON: this.on,
+		DOF: this.off,
+		DFOF: this.fastOff,
+		DFON: this.fastOn,
+		QUERY: this.query,
+		BEEP: this.beep,
+		BL: this.backlight,
+		WDU: this.writeChanges
+	};
+	static override nodeDefId = 'RelayLampSwitch';
+	declare readonly nodeDefId: 'RelayLampSwitch';
+	constructor(isy: ISY, nodeInfo: NodeInfo) {
+		super(isy, nodeInfo);
+		this.drivers.ST = Driver.create('ST', this, nodeInfo.property as DriverState, { uom: UnitOfMeasure.Percent, label: 'Status', name: 'status' });
+		this.drivers.ERR = Driver.create('ERR', this, nodeInfo.property as DriverState, { uom: UnitOfMeasure.Index, label: 'Responding', name: 'responding' });
+	}
+	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 backlight(value: number) {
+		return this.sendCommand('BL', { value: value });
+	}
+	async writeChanges() {
+		return this.sendCommand('WDU');
+	}
+	public get status(): Insteon.OnLevelRelay {
+		return this.drivers.ST?.value;
+	}
+	public get responding(): Insteon.Error {
+		return this.drivers.ERR?.value;
+	}
+}
+
+NodeFactory.register(RelayLampSwitchNode);
+
+export namespace RelayLampSwitch {
+	export interface Interface extends Omit<InstanceType<typeof RelayLampSwitchNode>, keyof ISYDeviceNode<any, any, any, any>> {
+		nodeDefId: "RelayLampSwitch";
+	}
+	export function is(node: ISYNode<any, any, any, any>): node is RelayLampSwitchNode {
+		return node.nodeDefId === nodeDefId;
+	}
+	export function create(isy: ISY, nodeInfo: NodeInfo) {
+		return new RelayLampSwitchNode(isy, nodeInfo);
+	}
+	export const Node = RelayLampSwitchNode;
+	export type Commands = {
+		DON: ((value?: (0 | 100)) => 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";
+		};
+		QUERY: (() => Promise<boolean>) & {
+			label: "Query";
+			name: "query";
+		};
+		BEEP: ((value?: number) => Promise<boolean>) & {
+			label: "Beep";
+			name: "beep";
+		};
+		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: Insteon.OnLevelRelay;
+			label: "Status";
+			name: "status";
+		};
+		ERR: {
+			uom: UnitOfMeasure.Index;
+			value: Insteon.Error;
+			label: "Responding";
+			name: "responding";
+		};
+	};
+}

package/src/ISY.ts

@@ -331,7 +331,11 @@ export class ISY extends EventEmitter implements Disposable {
 						//
 						const impactedDevice = this.getNode(evt.node);
 						if (impactedDevice !== undefined && impactedDevice !== null) {
-							impactedDevice.handleEvent(evt);
+							try {
+								impactedDevice.handleEvent(evt);
+							} catch (e) {
+								this.logger.error(`Error handling event for ${impactedDevice.name}: ${e.message}`);
+							}
 						} else {
 							this.logger.warn(`${EventType[stringControl]} Event for Unidentified Device: ${JSON.stringify(evt)}`);
 						}
@@ -567,10 +571,10 @@ export class ISY extends EventEmitter implements Disposable {
 			responseLogLevel?: any;
 		} = { trailingSlash: true }
 	): Promise<any> {
-		const requestLogLevel = options.requestLogLevel ?? winston.config.cli.levels.debug;
-		const responseLogLevel = options.responseLogLevel ?? winston.config.cli.levels.silly;
+		const requestLogLevel = options.requestLogLevel ?? 'debug';
+		const responseLogLevel = options.responseLogLevel ?? 'silly';
 		url = `${this.protocol}://${this.address}/rest/${url}${options.trailingSlash ? '/' : ''}`;
-		this.logger.log(`Sending request: ${url}`, requestLogLevel);
+		this.logger.log(requestLogLevel, `Sending request: ${url}`);
 		try {
 			const response = await axios.get(url, {
 				auth: { username: this.credentials.username, password: this.credentials.password }
@@ -581,13 +585,13 @@ export class ISY extends EventEmitter implements Disposable {
 					if (options.parserOptions) curParser = new Parser({ ...defaultParserOptions, ...options.parserOptions });
 					var altParser = new XMLParser(defaultXMLParserOptions);
 					var s = altParser.parse(response.data);
-					this.logger.log(`Response: ${JSON.stringify(s)}`, requestLogLevel ?? 'debug');
+					this.logger.log(requestLogLevel ?? 'debug',`Response: ${JSON.stringify(s)}`);
 					return s;
 				} else if (response.headers['content-type'].toString().includes('json')) {
-					this.logger.log(`Response: ${JSON.stringify(response.data)}`, requestLogLevel ?? 'debug');
+					this.logger.log(responseLogLevel ?? 'debug', `Response: ${JSON.stringify(response.data)}`);
 					return JSON.parse(response.data);
 				} else {
-					this.logger.log(`Response Header: ${JSON.stringify(response.headers)} Response: ${JSON.stringify(response.data)}`, responseLogLevel ?? 'debug');
+					this.logger.log(responseLogLevel ?? 'debug',`Response Header: ${JSON.stringify(response.headers)} Response: ${JSON.stringify(response.data)}`);
 					return response.data;
 				}
 			}

package/src/ISYNode.ts

@@ -253,7 +253,7 @@ export class ISYNode<
 		} else {
 			// this.logger(event.control);
 			const e = event.control;
-			const dispName = this.commands[e].name;
+			const dispName = this.commands[e]?.name;
 			if (dispName !== undefined && dispName !== null) {
 				this.logger(`Command ${dispName} (${e}) triggered.`);
 			} else {

package/src/ISYScene.ts

@@ -77,7 +77,7 @@ export class ISYScene extends ISYNode<Family.Scene, Driver.Signatures<'ST'>,Comm
 	get isOn() {
 		for (const device of this.members) {
 			if (device instanceof Insteon.Relay)  {
-				if (device.drivers.ST?.value === 1) {
+				if (device.drivers.ST?.value != 0) {
 					return true;
 				}
 			}

package/src/Matter/Behaviors/ISYBridgedDeviceBehavior.ts

@@ -52,7 +52,7 @@ export class ISYBridgedDeviceBehavior extends Behavior {
 		this.events.propertyChanged.emit({ driver, newValue, oldValue, formattedValue });
 	}
 
-	[Symbol.asyncDispose]() {
+	override [Symbol.asyncDispose]() {
 		this.internal.device = null;
 		return super[Symbol.asyncDispose]();
 	}

package/src/Matter/Server/Server.ts

@@ -1,5 +1,6 @@
 import { NodeJsEnvironment } from '@project-chip/matter-node.js/environment';
 import { StorageBackendDisk } from '@project-chip/matter-node.js/storage';
+import { CommissioningOptions } from '@project-chip/matter.js/behavior/system/commissioning';
 import { BridgedDeviceBasicInformationServer } from '@project-chip/matter.js/behaviors/bridged-device-basic-information';
 import { VendorId } from '@project-chip/matter.js/datatype';
 import { logEndpoint, OnOffBaseDevice } from '@project-chip/matter.js/device';
@@ -11,7 +12,7 @@ import { AggregatorEndpoint } from '@project-chip/matter.js/endpoints/Aggregator
 import { Environment, StorageService } from '@project-chip/matter.js/environment';
 import { Level, levelFromString, Logger as MatterLogger } from '@project-chip/matter.js/log';
 import { ServerNode } from '@project-chip/matter.js/node';
-import { QrCode } from '@project-chip/matter.js/schema';
+import { CommissioningFlowType, QrCode } from '@project-chip/matter.js/schema';
 import { resolve } from 'path';
 import { config } from 'winston';
 import { InsteonDimmableDevice, InsteonKeypadButtonDevice, InsteonRelayDevice, ISY } from '../../ISY.js';
@@ -70,9 +71,12 @@ export async function createServerNode(isy: ISY = ISY.instance): Promise<ServerN
 		// Optional when operating only one device on a host, Default port is 5540
 		network: {
 			port: config.port,
+
 			//ipv4: false,
 			discoveryCapabilities: {
 				onIpNetwork: true
+
+
 			}
 		},
 
@@ -192,7 +196,7 @@ export async function createServerNode(isy: ISY = ISY.instance): Promise<ServerN
 	 */
 
 	logger.info('Bringing server online');
-	await server.bringOnline();
+	await server.run();
 
 	logger.info('Matter Server is online');
 	/**

package/src/Model/ClassDefinition.ts

@@ -1,7 +1,7 @@
 import { camelize, capitalize } from '@project-chip/matter.js/util';
 import camelcase from 'camelcase';
 import { getRandomValues } from 'crypto';
-import { detailedDiff } from 'deep-object-diff';
+//import { detailedDiff } from 'deep-object-diff';
 import { create } from 'domain';
 import * as fs from 'fs';
 import diff from 'microdiff';

package/tsconfig.json

@@ -15,7 +15,7 @@
 		"noImplicitThis": true,
 		"esModuleInterop": true,
 		"resolveJsonModule": true,
-		"suppressImplicitAnyIndexErrors": true,
+		//"suppressImplicitAnyIndexErrors": true,
 		"typeRoots": [
 			"../../node_modules/@types",
 			"types"
@@ -31,7 +31,7 @@
 		"index.js",
 		"index.d.ts",
 		"src/Definitions/Global/*.ts",
-		"src/Devices/Insteon/Generated/*",
+		"src/Devices/Insteon/Generated/RelayLampSwitch.ts",
 	],
 	"exclude": [
 		"node_modules/@project-chip/*",