isy-nodejs 1.0.3-y.0 → 1.0.4-alpha.1

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.3-y.0",
+    "version": "1.0.4-alpha.1",
     "author": {
         "name": "Pradeep Mouli"
     },
@@ -73,5 +73,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "e28859e01d805f420d064c9c56e5e2f481cf5514"
+    "gitHead": "25bc1f98e239376a78bf7e78b852a5c25e2b964f"
 }

package/src/Devices/EndpointFor.ts

@@ -1,13 +1,14 @@
-import { Endpoint } from '@project-chip/matter.js/endpoint';
-import { SupportedBehaviors } from '@project-chip/matter.js/endpoint/properties';
+import { Endpoint, type EndpointType, type MutableEndpoint } from '@project-chip/matter.js/endpoint';
+
 import { Behavior } from '@project-chip/matter.js/behavior';
-import { MutableEndpoint, EndpointType } from '@project-chip/matter.js/endpoint/type';
+
 import type { ClusterBehavior } from '@project-chip/matter.js/behavior/cluster';
 import { type ClusterType } from '@project-chip/matter.js/cluster';
 import type { Constructor } from './Constructor.js';
 import type { ISYDeviceNode } from '../Devices/ISYDeviceNode.js';
 
 import { BridgedDeviceBasicInformationBehavior, BridgedDeviceBasicInformationServer } from '@project-chip/matter.js/behaviors/bridged-device-basic-information';
+import type { SupportedBehaviors } from '@matter/node';
 
 
 export type RelaxTypes<V> = V extends number

package/src/Devices/ISYDevice.ts

@@ -1,6 +1,7 @@
+import type { SupportedBehaviors } from '@matter/node';
 import { ClusterBehavior } from '@project-chip/matter.js/behavior/cluster';
 import type { Endpoint, EndpointType, MutableEndpoint } from '@project-chip/matter.js/endpoint';
-import type { SupportedBehaviors } from '@project-chip/matter.js/endpoint/properties';
+
 import 'winston';
 
 // export const ISYBinaryStateDevice = <K extends Family,D extends DriverSignatures, T extends Constructor<ISYDeviceNode<K,Driver.ToSignatures<'ST'>,any,any>>>(Base: T) => {

package/src/Devices/Insteon/InsteonDimmableDevice.ts

@@ -11,7 +11,8 @@ 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';
+import { DimmerLampSwitchNode } from './Generated/DimmerLampSwitch.js';
+
 
 // #region Type aliases (2)
 
@@ -23,7 +24,7 @@ type OnOffBehavior = typeof OOB;
 // #region Classes (1)
 
 //@ts-ignore
-export class InsteonDimmableDevice extends DimmerLampSwitch.Node{
+export class InsteonDimmableDevice extends DimmerLampSwitchNode{
 	// #region Constructors (1)
 
 	constructor(isy: ISY, node: NodeInfo) {

package/src/Devices/Insteon/InsteonRelayDevice.ts

@@ -7,20 +7,21 @@ 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';
 import { Properties } from '../../ISYConstants.js';
 
 import type { DriverState } from '../../Model/DriverState.js';
+import { RelayLampSwitch } from './Generated/RelayLampSwitch.js';
 
 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);
-		
+
 	}
 
 	// #endregion Constructors (1)

package/src/ISYNode.ts

@@ -1,4 +1,3 @@
-
 import { Logger } from 'winston';
 import { Driver } from './Definitions/Global/Drivers.js';
 import { Family } from './Definitions/Global/Families.js';
@@ -52,7 +51,7 @@ export class ISYNode<
 	public drivers: Driver.ForAll<D> = {} as Driver.ForAll<D>;
 	public enabled: boolean;
 	//TODO: add signature for non-command/non-driver events
-	public events: Merge<Event.NodeEventEmitter<this>,Event.FunctionSigFor<E, Event.NodeEventEmitter<this>>>;
+	public events: Merge<Event.NodeEventEmitter<this>, Event.FunctionSigFor<E, Event.NodeEventEmitter<this>>>;
 	//Event.FunctionSigFor<Event.ForAll<E,typeof this>> & Omit<EventEmitter,'on'>
 	/*{
 		[x in E]: x extends keyof D ? {name:`${D[x]["name"]}Changed`, driver: x, value: D[x]["value"], formatted: string, uom: UnitOfMeasure}
@@ -127,7 +126,6 @@ export class ISYNode<
 		}
 		this.events = Event.createEmitter(this);
 
-
 		//this.logger(this.nodeDefId);
 		this.lastChanged = new Date();
 	}
@@ -354,12 +352,25 @@ export class ISYNode<
 	}
 	public async sendCommand(command: StringKeys<C>): Promise<any>;
 	public async sendCommand(command: StringKeys<C>, value: string | number, parameters: Record<string | symbol, string | number | undefined>);
-	public async sendCommand(command: StringKeys<C>, parameters: Record<string | symbol, string | number | undefined> | string | number): Promise<any>;
-	async sendCommand(command: StringKeys<C>, value?: string | number, parameters?: Record<string | symbol, string | number | undefined> | string | number): Promise<any> {
-		if (value !== undefined && typeof parameters === 'object') {
-			return this.isy.sendNodeCommand(this, command, { default: value, ...parameters });
+	public async sendCommand(command: StringKeys<C>, value: string | number): Promise<any>;
+	public async sendCommand(command: StringKeys<C>, parameters: Record<string | symbol, string | number | undefined>): Promise<any>;
+	async sendCommand(command: StringKeys<C>, valueOrParameters?: string | number | Record<string | symbol, string | number | undefined>, parameters?: Record<string | symbol, string | number | undefined>): Promise<any> {
+		if (valueOrParameters === null || valueOrParameters === undefined) {
+			return this.isy.sendNodeCommand(this, command);
 		}
-		return this.isy.sendNodeCommand(this, command, parameters);
+
+			if(parameters === null || parameters === undefined) {
+				return this.isy.sendNodeCommand(this, command, valueOrParameters);
+			}
+			if(typeof valueOrParameters === 'object') {
+				return this.isy.sendNodeCommand(this, command, {...valueOrParameters,...parameters});
+			}
+			if(typeof valueOrParameters === 'string' || typeof valueOrParameters === 'number') {
+				return this.isy.sendNodeCommand(this, command, { default: valueOrParameters, ...parameters });
+			}
+
+		
+
 	}
 
 	public async updateProperty(propertyName: string, value: any): Promise<any> {

package/src/Matter/Behaviors/ISYBridgedDeviceBehavior.ts

@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */ import { Behavior } from '@project-chip/matter.js/behavior';
 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 internal from 'stream';
 import type { Driver } from '../../Definitions/Global/Drivers.js';

package/src/Model/NLS.ts

@@ -2,7 +2,7 @@ import { merge } from 'moderndash';
 import type { DriverType } from "../Definitions/Global/Drivers.js";
 import { Family } from "../Definitions/Global/Families.js";
 import "../Utils.js";
-import type { TransactionalInteractionServer } from '@project-chip/matter.js/node/server';
+
 
 export enum NLSRecordType {
   Generic = "GEN",