isy-nodejs 1.0.1-alpha.27 → 1.0.1-alpha.28

package/src/ISYNode.ts

@@ -3,7 +3,7 @@ import { Logger } from 'winston';
 import { Driver } from './Definitions/Global/Drivers.js';
 import { Family } from './Definitions/Global/Families.js';
 import { UnitOfMeasure } from './Definitions/Global/UOM.js';
-import { ISY, NodeType, type ISYScene } from './ISY.js';
+import { ISY } from './ISY.js';
 
 import { CliConfigSetLevels } from 'winston/lib/winston/config/index.js';
 import { Converter } from './Converters.js';
@@ -14,13 +14,15 @@ import type { DriverState } from './Model/DriverState.js';
 import { NodeInfo } from './Model/NodeInfo.js';
 import type { NodeNotes } from './Model/NodeNotes.js';
 import { type StringKeys } from './Utils.js';
+import { NodeType } from './ISYConstants.js';
+import type { ISYScene } from './ISYScene.js';
 
 //type DriverValues<DK extends string | number | symbol,V = any> = {[x in DK]?:V};
 
 export class ISYNode<
-	T extends Family,
-	D extends ISYNode.DriverSignatures,
-	C extends ISYNode.CommandSignatures,
+	T extends Family = 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 } }
 > {
 	// #region Properties (32)
@@ -219,7 +221,7 @@ export class ISYNode<
 
 	public async getNotes(): Promise<NodeNotes> {
 		try {
-			const result = await this.isy.sendRequest(`nodes/${this.address}/notes`, { trailingSlash: false, errorLogLevel: 'debug' });
+			const result = await this.isy.sendRequest(`nodes/${this.address}/notes`, { trailingSlash: false, errorLogLevel: 'debug', validateStatus(status) { return true; }});
 			if (result !== null && result !== undefined) {
 				return result.NodeProperties;
 			} else {

package/src/ISYScene.ts

@@ -32,7 +32,7 @@ export class ISYScene extends ISYNode<Family.Scene, Driver.Signatures<'ST'>,Comm
 	public members: ISYDevice<any,any,any>[];
 	public typeCode: string;
 	constructor(isy: ISY, scene: SceneInfo) {
-		super(isy, scene as SceneInfo);
+		super(isy, scene as NodeInfo);
 		// this.logger(JSON.stringify(scene));
 		this.typeCode = '';
 		this.connectionType = 'Insteon Wired';

package/src/Matter/Behaviors/ISYBridgedDeviceBehavior.ts

@@ -9,10 +9,12 @@ import { Internal } from '@project-chip/matter.js/behavior/state/managed';
 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';
+import { ISY } from '../../ISY.js';
 import type { ISYDevice } from '../../ISYDevice.js';
 import { DeviceToClusterMap, MappingRegistry, type ClusterMapping, type BehaviorMapping } from '../../Model/ClusterMap.js';
 import { server } from 'typescript';
+import type { ISYNode } from '../../ISYNode.js';
+import type { Family } from '../../Definitions/index.js';
 
 
 type ClusterForBehavior<B extends ClusterBehavior> = B extends ClusterBehavior.Type<infer C> ? C : never;
@@ -32,7 +34,7 @@ export class ISYBridgedDeviceBehavior<N extends ISYNode<any, D, any, any>, D ext
 		const d = ISY.instance.nodeMap.get(this.state.address);
 		this.internal.device = d;
 		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));

package/src/Matter/Behaviors/ISYClusterBehavior.ts

@@ -1,21 +1,11 @@
-import type { Behavior } from '@project-chip/matter.js/behavior';
-import type { ClusterBehavior, ClusterInterface } from '@project-chip/matter.js/behavior/cluster';
-import { BridgedDeviceBasicInformationServer } from '@project-chip/matter.js/behaviors/bridged-device-basic-information';
+import type { ClusterBehavior } from '@project-chip/matter.js/behavior/cluster';
 import type { LevelControlBehavior } from '@project-chip/matter.js/behaviors/level-control';
-import type { OnOffBehavior, OnOffServer } from '@project-chip/matter.js/behaviors/on-off';
-import type { Cluster, ClusterServerHandlers, ClusterType as CT } from '@project-chip/matter.js/cluster';
 import '@project-chip/matter.js/device';
-import { OnOffLightRequirements } from '@project-chip/matter.js/devices/OnOffLightDevice';
-import type { AnyMxRecord } from 'dns';
 import { Converter } from '../../Converters.js';
-import { Driver, DriverType } from '../../Definitions/Global/Drivers.js';
 import type { Constructor } from '../../Devices/Constructor.js';
-import type { RelaxTypes } from '../../Devices/MapsTo.js';
-import { ISY, type ISYDevice } from '../../ISY.js';
 import type { DriversOf, ISYNode } from '../../ISYNode.js';
-import { BehaviorMapping, MappingRegistry, type ClusterMapping, type DeviceToClusterMap } from '../../Model/ClusterMap.js';
+import { BehaviorMapping } from '../../Model/ClusterMap.js';
 import { ISYBridgedDeviceBehavior } from './ISYBridgedDeviceBehavior.js';
-import { loggers } from 'winston';
 
 // #region Type aliases (6)
 

package/src/Matter/Bridge/Server.ts

@@ -3,7 +3,7 @@ import { NodeJsEnvironment } from '@project-chip/matter-node.js/environment';
 import { StorageBackendDisk } from '@project-chip/matter-node.js/storage';
 import { BridgedDeviceBasicInformationServer } from '@project-chip/matter.js/behaviors/bridged-device-basic-information';
 import { VendorId } from '@project-chip/matter.js/datatype';
-import { logEndpoint } from '@project-chip/matter.js/device';
+import { Device, logEndpoint } from '@project-chip/matter.js/device';
 import { Endpoint, EndpointServer } from '@project-chip/matter.js/endpoint';
 import { DimmableLightDevice, OnOffLightDevice } from '@project-chip/matter.js/endpoint/definitions';
 import type { SupportedBehaviors } from '@project-chip/matter.js/endpoint/properties';
@@ -11,6 +11,8 @@ import { MutableEndpoint } from '@project-chip/matter.js/endpoint/type';
 import { AggregatorEndpoint } from '@project-chip/matter.js/endpoints/AggregatorEndpoint';
 import { StorageService } from '@project-chip/matter.js/environment';
 import { Level, levelFromString, Logger as MatterLogger } from '@project-chip/matter.js/log';
+import { Devices } from '../../Devices/index.js';
+
 import { ServerNode } from '@project-chip/matter.js/node';
 //@ts-ignore
 import PackageJson from '@project-chip/matter.js/package.json' with { type: 'json' };
@@ -18,7 +20,7 @@ import { QrCode } from '@project-chip/matter.js/schema';
 import path, { resolve } from 'path';
 import { format, loggers } from 'winston';
 import type { ISYDeviceNode } from '../../Devices/ISYDeviceNode.js';
-import { InsteonDimmableDevice, InsteonKeypadButtonDevice, InsteonRelayDevice, ISY } from '../../ISY.js';
+import { ISY } from '../../ISY.js';
 import { ISYBridgedDeviceBehavior } from '../Behaviors/ISYBridgedDeviceBehavior.js';
 import { ISYDimmableBehavior, ISYOnOffBehavior } from '../Behaviors/Insteon/ISYOnOffBehavior.js';
 import '../Mappings/Insteon.js';
@@ -152,24 +154,24 @@ export async function createMatterServer(isy?: ISY, config?: Config): Promise<Se
 
 	logger.info(`Bridge Aggregator Added`);
 
-	const endpoints: { 0: Endpoint; 1: InsteonRelayDevice }[] = [];
+
 
 	for (const node of isy.nodeMap.values()) {
 		let device = node as ISYDeviceNode<any, any, any>;
 		let serialNumber = `${device.address.replaceAll(' ', '_').replaceAll('.', '_')}`;
-		if (device.enabled && !(device instanceof InsteonKeypadButtonDevice)) {
+		if (device.enabled) {
 			//const name = `OnOff ${isASocket ? "Socket" : "Light"} ${i}`;
 
 			//@ts-ignore
 			let baseBehavior: MutableEndpoint.With<DimmableLightDevice | OnOffLightDevice, SupportedBehaviors.MapOf<[typeof BridgedDeviceBasicInformationServer, typeof ISYBridgedDeviceBehavior]>>;
 
-			if (device instanceof InsteonDimmableDevice) {
+			if (device instanceof Devices.Insteon.Dimmer || device instanceof Devices.Insteon.DimmerSwitch || device instanceof Devices.Insteon.KeypadDimmer) {
 				baseBehavior = DimmableLightDevice.with(BridgedDeviceBasicInformationServer, ISYBridgedDeviceBehavior, ISYOnOffBehavior, ISYDimmableBehavior);
 				// if(device instanceof InsteonSwitchDevice)
 				// {
 				//     baseBehavior = DimmerSwitchDevice.with(BridgedDeviceBasicInformationServer);
 				// }
-			} else if (device instanceof InsteonRelayDevice) {
+			} else if (device instanceof Devices.Insteon.Relay || device instanceof Devices.Insteon.RelaySwitch) {
 				baseBehavior = OnOffLightDevice.with(BridgedDeviceBasicInformationServer, ISYBridgedDeviceBehavior, ISYOnOffBehavior);
 				// if(device instanceof InsteonSwitchDevice)
 				// {

package/src/Model/ClusterMap.ts

@@ -13,11 +13,12 @@ import type { Converter } from '../Converters.js';
 import { Driver, DriverType } from '../Definitions/Global/Drivers.js';
 import { Devices, type ToDevice } from '../Devices/index.js';
 import { Insteon } from '../Devices/Insteon/index.js';
-import { Family, InsteonRelayDevice } from '../ISY.js';
+
 import type { ISYDevice } from '../ISYDevice.js';
 import type { CommandsOf, DriversOf, ISYNode } from '../ISYNode.js';
 import type { ClusterForBehavior } from '../Matter/Behaviors/ISYClusterBehavior.js';
 import { ClusterType } from './ClusterType.js';
+import type { Family } from '../Definitions/index.js';
 
 // #region Type aliases (16)
 
@@ -189,7 +190,7 @@ var clusterMap = {
 		moveToColor: { command: DriverType.CustomControl1, parameters: { colorX: { parameter: 'colorX' }, colorY: { parameter: 'colorY' }, colorTemperature: { parameter: 'colorTemperature' } } }
 	}
 };
-const map: EndpointMapping<OnOffLightDevice, InsteonRelayDevice> = {
+/*const map: EndpointMapping<OnOffLightDevice, InsteonRelayDevice> = {
 	Identify: {},
 	OnOff: {
 		attributes: {
@@ -199,6 +200,6 @@ const map: EndpointMapping<OnOffLightDevice, InsteonRelayDevice> = {
 			onWithTimedOff: { command: 'DON' }
 		}
 	}
-};
+};*/
 
 // #endregion Variables (3)

package/src/Model/NodeInfo.ts

@@ -1,10 +1,11 @@
-import { NodeClassRegistry } from '../Devices/NodeFactory.js';
-import { Family } from '../ISY.js';
+import { Family } from '../Definitions/index.js';
+
+
 import type { DriverState } from './DriverState.js';
 
 // #region Type aliases (1)
 
-export type NodeInfo<T extends Family = Family> = (T extends Family.ZWave ? DynamicNodeInfo : StaticNodeInfo) & { state?: { [x: string]: DriverState } };
+export type NodeInfo<T extends Family = Family> = (T extends Family.ZWave | Family.ZigBee ? DynamicNodeInfo : StaticNodeInfo) & { state?: { [x: string]: DriverState } };
 
 // #endregion Type aliases (1)
 

package/src/Utils.ts

@@ -1,24 +1,25 @@
-import axios, { AxiosRequestConfig } from 'axios';
 
 import * as log4js from '@log4js-node/log4js-api';
-import winston, { Logger, format } from 'winston';
+import winston, { Logger, format, type LeveledLogMethod, type LogMethod } from 'winston';
 
-import { Axios } from 'axios';
 import { EventEmitter as BaseEventEmitter } from 'events';
 import { Category } from './Definitions/Global/Categories.js';
 
 //import { get } from 'http';
 import type { PackageJson } from '@npmcli/package-json';
-import type { Identity } from '@project-chip/matter.js/util';
 import { existsSync } from 'fs';
 import { readFile } from 'fs/promises';
 import path from 'path';
-import { isBoxedPrimitive } from 'util/types';
-import { Family, type Driver, type DriverType, type EnumLiteral } from './Definitions/index.js';
+import { Family } from './Definitions/index.js';
 import { EventType } from './Events/EventType.js';
+import type { Axios, AxiosRequestConfig } from 'axios';
 
 export type StringKeys<T> = Extract<keyof T, string>;
 
+export type PickOfType<T, U> = { [K in keyof T]: T[K] extends U ? (any extends T[K] ? never : K) : undefined }[keyof T];
+
+
+
 export function getEnumValueByEnumKey<E extends { [index: string]: number }, T extends keyof E>(enumType: E, enumKey: T): E[T] {
 	return enumType[enumKey];
 }
@@ -27,6 +28,8 @@ export function getEnumKeyByEnumValue<E extends { [index: string]: number }, T e
 	return Object.keys(enumType).find((key) => enumType[key] === enumValue) as unknown as T;
 }
 
+
+export type LogLevel = PickOfType<winston.Logger, LeveledLogMethod>;
 export type ValuesOf<TEnum extends number | string | boolean | bigint> = `${TEnum}` extends `${infer R extends number}` ? R : `${TEnum}`;
 
 type s = ValuesOf<Family>;
@@ -53,6 +56,10 @@ export function fromArray<T>(...value: T[]): MaybeArray<T> {
 	return value;
 }
 
+export type BaseRequestConfig = Pick<AxiosRequestConfig, 'auth' | 'baseURL' | 'socketPath'>;
+
+export type ISYRequestConfig = Omit<AxiosRequestConfig, keyof BaseRequestConfig | 'method'>
+
 export function byteToPct(value) {
 	return Math.round((value * 100) / 255);
 }