isy-nodejs 1.0.4-alpha.1 → 1.0.5-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.4-alpha.1",
+    "version": "1.0.5-alpha.1",
     "author": {
         "name": "Pradeep Mouli"
     },
@@ -73,5 +73,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "25bc1f98e239376a78bf7e78b852a5c25e2b964f"
+    "gitHead": "098727cb35d99e11fcbad8026cd2f32ebcfacc29"
 }

package/src/Devices/Insteon/InsteonDeviceFactory.ts

@@ -2,6 +2,7 @@ import { Category } from '../../Definitions/Global/Categories.js';
 
 import { parseTypeCode } from '../../Utils.js';
 import { NodeInfo } from '../../Model/NodeInfo.js';
+import * as Insteon from './index.js';
 import { InsteonDimmableDevice } from './InsteonDimmableDevice.js';
 import { InsteonDimmerOutletDevice } from './InsteonDimmerOutletDevice.js';
 import { InsteonDimmerSwitchDevice } from './InsteonDimmerSwitchDevice.js';

package/src/Devices/Insteon/InsteonDimmableDevice.ts

@@ -1,15 +1,11 @@
-import { Identity } from '@project-chip/matter.js/util';
-import { ISY } from '../../ISY.js';
+import type { ISY } from '../../ISY.js';
+
 
 
-import { InsteonRelayDevice } from './InsteonRelayDevice.js';
 //
 import type { DimmableLightRequirements } from '@project-chip/matter.js/devices/DimmableLightDevice';
-import { ClusterBehavior } from '@project-chip/matter.js/behavior/cluster';
-import { OnOffBehavior as OOB, OnOffInterface } from '@project-chip/matter.js/behaviors/on-off';
-import { OnOff, ClusterType } from '@project-chip/matter.js/cluster';
+import { OnOffBehavior as OOB } from '@project-chip/matter.js/behaviors/on-off';
 import 'winston';
-import { UnitOfMeasure } from '../../Definitions/Global/UOM.js';
 import type { NodeInfo } from '../../Model/NodeInfo.js';
 import { DimmerLampSwitchNode } from './Generated/DimmerLampSwitch.js';
 

package/src/Devices/Insteon/InsteonDimmerOutletDevice.ts

@@ -1,8 +1,8 @@
 import type { NodeInfo } from '../../Model/NodeInfo.js';
 import type { ISY } from '../../ISY.js';
-import { InsteonDimmableDevice } from './InsteonDimmableDevice.js';
+import { DimmerLampNode } from './Generated/DimmerLamp.js';
 
-export class InsteonDimmerOutletDevice extends InsteonDimmableDevice {
+export class InsteonDimmerOutletDevice extends DimmerLampNode {
 	constructor (isy: ISY, deviceNode: NodeInfo) {
 		super(isy, deviceNode);
 	}

package/src/Devices/Insteon/index.ts

@@ -1,23 +1,16 @@
-import { InsteonLeakSensorDevice } from "./InsteonLeakSensorDevice.js";
+
 //import Base from "./InsteonBaseDevice.js"
-import { InsteonLockDevice } from "./InsteonLockDevice.js";
-import { InsteonFanDevice } from "./InsteonFanDevice.js";
-import { InsteonRelayDevice } from "./InsteonRelayDevice.js";
-import { InsteonDimmableDevice } from "./InsteonDimmableDevice.js";
-import { InsteonKeypadDimmerDevice } from "./InsteonKeypadDimmerDevice.js";
-import { InsteonMotionSensorDevice } from "./InsteonMotionSensorDevice.js";
-import { InsteonDimmerSwitchDevice } from "./InsteonDimmerSwitchDevice.js";
-import { InsteonSmokeSensorDevice } from "./InsteonSmokeSensorDevice.js";
-import { InsteonDimmerOutletDevice } from "./InsteonDimmerOutletDevice.js";
-import { InsteonRelaySwitchDevice } from "./InsteonRelaySwitchDevice.js";
-import { InsteonThermostatDevice } from "./InsteonThermostatDevice.js";
-import { InsteonDoorWindowSensorDevice } from './InsteonDoorWindowSensorDevice.js';
-
-import { ISYNode } from '../../ISYNode.js';
-import type * as GeneratedTypes from "./Generated/index.js";
+
+
 
 export {InsteonBaseDevice as Base} from  "./InsteonBaseDevice.js";
 
+export * from './Generated/index.js';
+
+export {InsteonDimmableDevice as Dimmable} from "./InsteonDimmableDevice.js";
+
+export {InsteonRelayDevice as Relay} from "./InsteonRelayDevice.js";
+
 export {InsteonLeakSensorDevice as LeakSensor} from "./InsteonLeakSensorDevice.js";
 
 export {InsteonMotionSensorDevice as MotionSensor} from "./InsteonMotionSensorDevice.js";
@@ -38,6 +31,3 @@ export {InsteonDimmerOutletDevice as DimmerOutlet} from "./InsteonDimmerOutletDe
   Lock: InsteonLockDevice,
   Fan: InsteonFanDevice,
 ...Generated */
-
-
-export * from './Generated/index.js';

package/src/Matter/Bridge/Server.ts

@@ -1,32 +1,19 @@
-import { Endpoint, EndpointServer, Environment, MutableEndpoint, ServerNode, StorageService, Time, VendorId, type SupportedBehaviors } from '@matter/main';
-import { StorageBackendDisk } from '@project-chip/matter-node.js/storage';
-import { BridgedDeviceBasicInformationServer, type BridgedDeviceBasicInformationBehavior } from '@project-chip/matter.js/behaviors/bridged-device-basic-information';
-import { logEndpoint } from '@matter/main/protocol';
-import { DimmableLightDevice, OnOffLightDevice } from '@matter/main/devices';
+import { LogLevel, logLevelFromString, Logger as MatterLogger } from '@matter/general';
+import { Endpoint, EndpointServer, Environment, MutableEndpoint, ServerNode, StorageService, VendorId } from '@matter/main';
 import { AggregatorEndpoint } from '@matter/main/endpoints/aggregator';
-import { LogLevel, logLevelFromString, Logger as MatterLogger, toHex } from '@matter/general';
-import { Devices } from '../../Devices/index.js';
-//@ts-ignore
+import { logEndpoint } from '@matter/main/protocol';
 import PackageJson from '@project-chip/matter.js/package.json' with { type: 'json' };
-import { QrCode } from '@project-chip/matter.js/schema';
-import path, { resolve } from 'path';
+import path from 'path';
 import { format, loggers } from 'winston';
 import { ISYDeviceNode } from '../../Devices/ISYDeviceNode.js';
 import { ISY } from '../../ISY.js';
-import { ISYBridgedDeviceBehavior } from '../Behaviors/ISYBridgedDeviceBehavior.js';
-import { ISYDimmableBehavior, ISYOnOffBehavior } from '../Behaviors/Insteon/ISYOnOffBehavior.js';
-import '../Mappings/Insteon.js';
 import type { ISYNode } from '../../ISYNode.js';
-
-import { Options } from '../../Definitions/ZWave/index.js';
-import { InsteonBaseDevice } from '../../Devices/Insteon/InsteonBaseDevice.js';
-import { DimmerLamp } from '../../Devices/Insteon/Generated/DimmerLamp.js';
-import { Family } from '../../Definitions/index.js';
-import { RelayLamp } from '../../Devices/Insteon/index.js';
-import type { DeviceTypeDefinition } from '@project-chip/matter.js/device';
+import { ISYDimmableBehavior, ISYOnOffBehavior } from '../Behaviors/Insteon/ISYOnOffBehavior.js';
+import '../Mappings/index.js';
+import { RelayLamp, DimmerLamp } from '../../Devices/Insteon/index.js';
 import { MappingRegistry } from '../Mappings/MappingRegistry.js';
-import type { BridgedISYNodeInformationServer } from '../../Devices/EndpointFor.js';
-import { BasicInformation } from '@project-chip/matter.js/cluster';
+import { QrCode } from '@matter/main/types';
+
 
 
 // #region Interfaces (1)
@@ -57,7 +44,7 @@ export interface Config {
 }
 
 export interface DeviceOptions {
-	applyTo:
+		applyTo:
 		| {
 				classes: (typeof ISYNode<any, any, any, any>)[];
 		  }
@@ -276,9 +263,9 @@ export async function createMatterServer(isy?: ISY, config?: Config): Promise<Se
 						softwareVersion: Number(device.version),
 						softwareVersionString: `v.${device.version}`,
 
-						serialNumber: device.address,
+						serialNumber: uniqueId,
 						reachable: true,
-						uniqueId: uniqueId
+						uniqueId: device.address
 
 					},
 
@@ -366,8 +353,8 @@ async function initializeConfiguration(isy: ISY, config?: Config): Promise<Confi
 		storageService.location = storagePath;
 	});
 
-	storageService.factory = (namespace) => new StorageBackendDisk(path.resolve(storageService.location ?? '.', namespace), environment.vars.get('storage.clear', false));
 	logger.info(`Matter storage location: ${storageService.location} (Directory)`);
+	logger.info(`Matter storage service type: ${storageService.factory.name}`);
 
 	const deviceStorage = (await storageService.open('bridge')).createContext('data');
 
@@ -390,7 +377,7 @@ async function initializeConfiguration(isy: ISY, config?: Config): Promise<Confi
 
 	environment.vars.set('uniqueid', isy.id.replaceAll(':', '_'));
 
-
+	//logger.info(`Matter configuration: ${JSON.stringify(environment.vars)}`);
 
 	const vendorName = isy.vendorName;
 	const passcode = environment.vars.number('passcode') ?? (await deviceStorage.get('passcode', 20202021));

package/src/Matter/Mappings/Insteon.ts

@@ -44,11 +44,12 @@ export const map: FamilyToClusterMap<Family.Insteon> = {
 				},
 				commands: { on: 'DON' }
 			},
+			//@ts-ignore
 			LevelControl: {
 				// @ts-ignore
 				attributes: {
 					currentLevel: { driver: 'ST', converter: 'Percent.LightingLevel' },
-					startUpCurrentLevel: { driver: 'OL', converter: 'Percent.LightingLevel' },
+					//startUpCurrentLevel: { driver: 'OL', converter: 'Percent.LightingLevel' },
 					onLevel: { driver: 'OL', converter: 'Percent.LightingLevel' }
 				},
 				commands: { setLevel: { command: 'DON' } }
@@ -67,11 +68,12 @@ export const map: FamilyToClusterMap<Family.Insteon> = {
 				commands: { on: 'DON' }
 			},
 			LevelControl: {
-				// @ts-ignore
+
 				attributes: {
 					currentLevel: { driver: 'ST', converter: 'Percent.LightingLevel' },
-					startUpCurrentLevel: { driver: 'OL', converter: 'Percent.LightingLevel' },
+					//startUpCurrentLevel: { driver: 'OL', converter: 'Percent.LightingLevel' },
 					onLevel: { driver: 'OL', converter: 'Percent.LightingLevel' }
+
 				},
 				commands: { setLevel: { command: 'DON' } }
 			}
@@ -79,6 +81,12 @@ export const map: FamilyToClusterMap<Family.Insteon> = {
 	}
 };
 
+map.KeypadDimmer = map.DimmerLamp;
+map.KeypadRelay = map.RelayLampSwitch;
+
+
+
+
 /*let newMap = add(map, Insteon.DimmerLamp.Node, {
 	deviceType: DimmableLightDevice,
 	// @ts-ignore

package/src/Matter/Mappings/index.ts

@@ -0,0 +1 @@
+import './Insteon.js';