isy-nodejs 1.0.1-alpha.6 → 1.0.2-alpha.0

package/src/Matter/Behaviors/ISYOnOffBehavior.ts

@@ -1,80 +0,0 @@
-import { InsteonRelayDevice } from "../../Devices/Insteon/InsteonRelayDevice.js"
-import { OnOffLightRequirements } from "@project-chip/matter.js/devices/OnOffLightDevice";
-import { ISYClusterBehavior, ClusterForBehavior, type PropertyChange } from "./ISYClusterBehavior.js";
-import { OnOffLightSwitchDevice } from '@project-chip/matter.js/devices/OnOffLightSwitchDevice';
-import type { MaybePromise } from '@project-chip/matter.js/util';
-import { MappingRegistry } from '../../Model/ClusterMap.js';
-import type { MutableCluster, OnOffCluster } from '@project-chip/matter.js/cluster';
-import type { OnOffBehavior, OnOffServer } from '@project-chip/matter.js/behaviors/on-off';
-import type { LevelControlServer, LevelControlInterface } from '@project-chip/matter.js/behaviors/level-control';
-import { DriverType } from '../../Definitions/Global/Drivers.js';
-import { DimmableLightRequirements } from '@project-chip/matter.js/devices/DimmableLightDevice';
-import { InsteonDimmableDevice } from '../../Devices/Insteon/InsteonDimmableDevice.js';
-
-import {Converters} from '../../Converters.js';
-
-
-
-
-
-export class ISYOnOffBehavior extends ISYClusterBehavior(OnOffLightRequirements.OnOffServer, InsteonRelayDevice)
-{
-
-    override async initialize(_options?: {}) {
-        await super.initialize(_options);
-        //this.state.onOff = await this.device.state;
-
-
-
-    }
-
-
-  override on = async () => {
-    await super.on();
-
-
-     //this.device.commands.DON = true;
-  }
-
-  override async off() {
-    //await super.off();
-    // this.device.drivers = false;
-  }
-
-  override toggle =  async () => {
-    //this.device.state = !(await this.device.state);
-  }
-
-  override async handlePropertyChange({driver, newValue, oldValue, formattedValue}: PropertyChange<InsteonRelayDevice>) {
-    if (driver === "ST") {
-      this.state.onOff = newValue;
-
-    }
-
-    return super.handlePropertyChange({driver, newValue, oldValue, formattedValue});
-  }
-
-
-}
-
-
-export class ISYDimmableBehavior extends ISYClusterBehavior(DimmableLightRequirements.LevelControlServer, InsteonDimmableDevice) {
-  override async initialize(_options?: {}) {
-    await super.initialize(_options);
-    this.state.currentLevel = this.device.drivers.ST.value;
-    //this.state.onLevel = this.device.drivers.OL;
-
-  }
-
-  override setLevel(level: number): MaybePromise<void> {
-    level = Converters.Matter.LevelFrom0To255.LightingLevel.to(level);
-    if(level > 0)
-    {
-        return this.device.sendCommand('DON',level);
-    }
-    else
-    {
-        return this.device.sendCommand('DOF');
-    }
-  }
-}

package/src/Matter/Server/Server.ts

@@ -1,294 +0,0 @@
-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';
-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';
-import { EndpointType, MutableEndpoint } from '@project-chip/matter.js/endpoint/type';
-import { AggregatorEndpoint } from '@project-chip/matter.js/endpoints/AggregatorEndpoint';
-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 { CommissioningFlowType, QrCode } from '@project-chip/matter.js/schema';
-import { resolve } from 'path';
-import { config } from 'winston';
-import { InsteonDimmableDevice, InsteonKeypadButtonDevice, InsteonRelayDevice, ISY } from '../../ISY.js';
-import { ISYBridgedDeviceBehavior } from '../Behaviors/ISYBridgedDeviceBehavior.js';
-import { ISYDimmableBehavior, ISYOnOffBehavior } from '../Behaviors/ISYOnOffBehavior.js';
-
-// #region Functions (2)
-
-//import {clone} from 'isy-nodejs/Utils';
-//let { Utils } = await import ('isy-nodejs');
-
-// function plainLogFormatter(now: Date, level: Level, facility: string, prefix: string, values: any[]) {
-//     const creator = plaintextCreator();
-
-//     const formattedValues = renderDiagnostic(values, {
-//         ...creator,
-//         key: text => creator.text(`${text}: `),
-//         value: producer => creator.text(producer()),
-//         strong: producer => creator.text(`*${producer()}*`),
-//         weak: producer => creator.text(producer()),
-//         status: (status, producer) => `${creator.text(statusIcon(status))}${producer()}`,
-//         via: text => creator.text(text),
-//     });
-
-//     return `${formatTime(now)} ${Level[level]} ${facility} ${prefix}${formattedValues}`;
-//
-
-//let matterLogger = clone(logger,'matter.js');
-
-//2024-07-03 16:30:43.693
-export async function createServerNode(isy: ISY = ISY.instance): Promise<ServerNode> {
-	var logger = isy.logger;
-
-	try {
-		MatterLogger.addLogger(
-			'polyLogger',
-			(level, message) => logger.log(Level[level].toLowerCase().replace('notice', 'info'), message.slice(23).remove(Level[level]).trimStart()) /*Preserve existing formatting, but trim off date*/,
-			{
-				defaultLogLevel: levelFromString(logger.level),
-				logFormat: 'plain'
-			}
-		);
-	} finally {
-		MatterLogger.defaultLogLevel = levelFromString(logger.level);
-	}
-
-	var config = await getConfiguration(isy);
-
-	logger.info(`Matter config read: ${JSON.stringify(config)}`);
-
-	const server = await ServerNode.create({
-		// Required: Give the Node a unique ID which is used to store the state of this node
-		id: config.uniqueId,
-
-		// Provide Network relevant configuration like the port
-		// Optional when operating only one device on a host, Default port is 5540
-		network: {
-			port: config.port,
-
-			//ipv4: false,
-			discoveryCapabilities: {
-				onIpNetwork: true
-
-
-			}
-		},
-
-		// Provide Commissioning relevant settings
-		// Optional for development/testing purposes
-		commissioning: {
-			passcode: config.passcode,
-			discriminator: config.discriminator
-		},
-
-		// Provide Node announcement settings
-		// Optional: If Ommitted some development defaults are used
-		productDescription: {
-			name: isy.model,
-			deviceType: AggregatorEndpoint.deviceType
-		},
-
-		// Provide defaults for the BasicInformation cluster on the Root endpoint
-		// Optional: If Omitted some development defaults are used
-		basicInformation: {
-			vendorName: isy.vendorName,
-			vendorId: VendorId(config.vendorId),
-			nodeLabel: config.productName,
-			productName: config.productName,
-			productLabel: config.productName,
-			productId: config.productId,
-			serialNumber: isy.id,
-			uniqueId: config.uniqueId
-		}
-	});
-
-	logger.info(`Bridge Server Added`);
-
-	/**
-	 * Matter Nodes are a composition of endpoints. Create and add a single multiple endpoint to the node to make it a
-	 * composed device. This example uses the OnOffLightDevice or OnOffPlugInUnitDevice depending on the value of the type
-	 * parameter. It also assigns each Endpoint a unique ID to store the endpoint number for it in the storage to restore
-	 * the device on restart.
-	 *
-	 * In this case we directly use the default command implementation from matter.js. Check out the DeviceNodeFull example
-	 * to see how to customize the command handlers.
-	 */
-
-	const aggregator = new Endpoint(AggregatorEndpoint, { id: 'aggregator' });
-
-	await server.add(aggregator);
-
-	logger.info(`Bridge Aggregator Added`);
-
-	const endpoints: { 0: Endpoint; 1: InsteonRelayDevice }[] = [];
-
-	for (const device of isy.deviceList.values()) {
-		let serialNumber = `${device.address.replaceAll(' ', '_').replaceAll('.', '_')}`;
-		if (device.enabled && !(device instanceof InsteonKeypadButtonDevice)) {
-			//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) {
-				baseBehavior = DimmableLightDevice.with(BridgedDeviceBasicInformationServer, ISYBridgedDeviceBehavior, ISYOnOffBehavior, ISYDimmableBehavior);
-				// if(device instanceof InsteonSwitchDevice)
-				// {
-				//     baseBehavior = DimmerSwitchDevice.with(BridgedDeviceBasicInformationServer);
-				// }
-			} else if (device instanceof InsteonRelayDevice) {
-				baseBehavior = OnOffLightDevice.with(BridgedDeviceBasicInformationServer, ISYBridgedDeviceBehavior, ISYOnOffBehavior);
-				// if(device instanceof InsteonSwitchDevice)
-				// {
-				//     baseBehavior = OnOffLightSwitchDevice.with(BridgedDeviceBasicInformationServer);
-				// }
-			}
-
-			if (baseBehavior !== undefined) {
-				const endpoint = new Endpoint(baseBehavior, {
-					id: serialNumber,
-					isyNode: {
-						address: device.address
-					},
-
-					bridgedDeviceBasicInformation: {
-						nodeLabel: device.label.rightWithToken(32),
-						vendorName: 'Insteon Technologies, Inc.',
-						vendorId: VendorId(config.vendorId),
-						productName: device.productName.leftWithToken(32),
-						productLabel: device.model.leftWithToken(64),
-						hardwareVersion: Number(device.version),
-						hardwareVersionString: `v.${device.version}`,
-						softwareVersion: Number(device.version),
-						softwareVersionString: `v.${device.version}`,
-
-						serialNumber: serialNumber,
-						reachable: true,
-						uniqueId: device.address
-					}
-				});
-
-				await aggregator.add(endpoint);
-				logger.info(`Endpoint Added ${JSON.stringify(endpoint.id)} for ${device.label} (${device.address})`);
-				//endpoints.push({0:endpoint,1:device});
-			}
-			//endpoint.lifecycle.ready.on(()=> device.initialize(endpoint as any));
-		}
-
-		/**
-		 * Register state change handlers and events of the endpoint for identify and onoff states to react to the commands.
-		 *
-		 * If the code in these change handlers fail then the change is also rolled back and not executed and an error is
-		 * reported back to the controller.
-		 */
-	}
-
-	/**
-	 * In order to start the node and announce it into the network we use the run method which resolves when the node goes
-	 * offline again because we do not need anything more here. See the Full example for other starting options.
-	 * The QR Code is printed automatically.
-	 */
-
-	logger.info('Bringing server online');
-	await server.run();
-
-	logger.info('Matter Server is online');
-	/**
-	 * Log the endpoint structure for debugging reasons and to allow to verify anything is correct
-	 */
-
-	//MatterLogger.setLogger("EndpointStructureLogger", ((level, message) => logger.log(Level[level], message)));
-
-	//logEndpoint(EndpointServer.forEndpoint(server));
-	//if(logger.isTraceEnabled())
-	// logEndpoint(EndpointServer.forEndpoint(server), {logAttributePrimitiveValues: true, logAttributeObjectValues: true});
-	//else if(logger.isDebugEnabled())
-	// {
-	logEndpoint(EndpointServer.forEndpoint(server), { logAttributePrimitiveValues: true, logAttributeObjectValues: false });
-	// }
-	if (server.lifecycle.isOnline) {
-		const { qrPairingCode, manualPairingCode } = server.state.commissioning.pairingCodes;
-
-		logger.info(QrCode.get(qrPairingCode));
-		logger.info(`QR Code URL: https://project-chip.github.io/connectedhomeip/qrcode.html?data=${qrPairingCode}`);
-		logger.info(`Manual pairing code: ${manualPairingCode}`);
-	}
-	/*for(let e of endpoints)
-    {
-      e[1].initialize(e[0] as any);
-    }*/
-
-	return server;
-
-	function createBaseBehavior(): any {
-		let baseBehavior: any;
-		return baseBehavior;
-	}
-}
-
-async function getConfiguration(isy: ISY) {
-	var logger = isy.logger;
-	/**
-	 * Collect all needed data
-	 *
-	 * This block collects all needed data from cli, environment or storage. Replace this with where ever your data come from.
-	 *
-	 * Note: This example uses the matter.js process storage system to store the device parameter data for convenience
-	 * and easy reuse. When you also do that be careful to not overlap with Matter-Server own storage contexts
-	 * (so maybe better not do it ;-)).
-	 */
-
-	const environment = NodeJsEnvironment();
-
-	const storageService = environment.get(StorageService);
-	environment.vars.set('storage.path', ISY.instance.storagePath + '/matter');
-	environment.vars.use(() => {
-		const location = environment.vars.get('storage.path', environment.vars.get('path.root', '.'));
-		storageService.location = location;
-	});
-	storageService.factory = (namespace) => new StorageBackendDisk(resolve(storageService.location ?? '.', namespace), environment.vars.get('storage.clear', false));
-	logger.info(`Matter storage location: ${storageService.location} (Directory)`);
-
-	const deviceStorage = (await storageService.open('device')).createContext('data');
-
-	const vendorName = isy.vendorName;
-	const passcode = environment.vars.number('passcode') ?? (await deviceStorage.get('passcode', 20202021));
-	const discriminator = environment.vars.number('discriminator') ?? (await deviceStorage.get('discriminator', 3840));
-	// product name / id and vendor id should match what is in the device certificate
-	const vendorId = environment.vars.number('vendorid') ?? (await deviceStorage.get('vendorid', 0xfff1));
-	const productId = environment.vars.number('productid') ?? (await deviceStorage.get('productid', 0x8000));
-	const productName = isy.productName;
-	const port = environment.vars.number('port') ?? 5540;
-
-	const uniqueId = isy.id;
-	//environment.vars.string("uniqueid") ?? (await deviceStorage.get("uniqueid", Time.nowMs().toString()));
-
-	// Persist basic data to keep them also on restart
-	await deviceStorage.set({
-		passcode,
-		discriminator,
-		vendorid: vendorId,
-		productid: productId,
-		uniqueid: uniqueId
-	});
-
-	return {
-		//deviceName,
-		vendorName,
-		passcode,
-		discriminator,
-		vendorId,
-		productName,
-		productId,
-		port,
-		uniqueId
-	};
-}
-
-// #endregion Functions (2)