isy-nodejs 1.0.1-alpha.18 → 1.0.1-alpha.19

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.18",
+    "version": "1.0.1-alpha.19",
     "author": {
         "name": "Pradeep Mouli"
     },
@@ -69,5 +69,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "98360c70b5fe830599dcbc8fd9c7ad44dcd55085"
+    "gitHead": "e12b10c35ca86c8e6a2ffa9a286ffefff8ce3677"
 }

package/src/ISY.ts

@@ -6,7 +6,7 @@ import { parseBooleans, parseNumbers } from 'xml2js/lib/processors.js';
 
 import axios from 'axios';
 import { EventEmitter } from 'events';
-import winston, { format, Logger, loggers, type LeveledLogMethod } from 'winston';
+import { format, Logger, loggers } from 'winston';
 import { Category } from './Definitions/Global/Categories.js';
 import { Family } from './Definitions/Global/Families.js';
 import { DeviceFactory } from './Devices/DeviceFactory.js';

package/src/Matter/Behaviors/ISYOnOffBehavior.ts

@@ -30,13 +30,10 @@ export class ISYOnOffBehavior extends ISYClusterBehavior(OnOffLightRequirements.
 		await super.off();
 		await this.device.off();
 
-
-
 		// this.device.drivers = false;
 	}
 
 	override toggle = async () => {
-
 		//this.device.state = !(await this.device.state);
 	};
 
@@ -45,7 +42,6 @@ export class ISYOnOffBehavior extends ISYClusterBehavior(OnOffLightRequirements.
 			this.state.onOff = newValue;
 		}*/
 
-
 		return super.handlePropertyChange({ driver, newValue, oldValue, formattedValue });
 	}
 }
@@ -53,7 +49,8 @@ export class ISYOnOffBehavior extends ISYClusterBehavior(OnOffLightRequirements.
 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 = Converter.get('Level255toZero.LightingLevel').to(this.device.drivers.OL)*/
+		//this.state.currentLevel = this.device.drivers.ST.value;
 
 		//this.state.onLevel = this.device.drivers.OL;
 	}

package/src/Matter/Bridge/Server.ts

@@ -1,18 +1,18 @@
 import '@project-chip/matter-node.js';
 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 { 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';
-import { EndpointType, MutableEndpoint } from '@project-chip/matter.js/endpoint/type';
+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 { ServerNode } from '@project-chip/matter.js/node';
+import PackageJson from '@project-chip/matter.js/package.json';
 import { QrCode } from '@project-chip/matter.js/schema';
 import path, { resolve } from 'path';
 import type { ISYDeviceNode } from '../../Devices/ISYDeviceNode.js';
@@ -20,10 +20,14 @@ import { InsteonDimmableDevice, InsteonKeypadButtonDevice, InsteonRelayDevice, I
 import { ISYBridgedDeviceBehavior } from '../Behaviors/ISYBridgedDeviceBehavior.js';
 import { ISYDimmableBehavior, ISYOnOffBehavior } from '../Behaviors/ISYOnOffBehavior.js';
 import '../Mappings/Insteon.js';
+import { format, loggers } from 'winston';
 
 // #region Interfaces (1)
 
 export let instance: ServerNode;
+
+//@ts-ignore
+export let version: string = PackageJson.version;
 export interface Config {
 	// #region Properties (8)
 
@@ -47,8 +51,13 @@ export function create(isy?: ISY, config?: Config): Promise<ServerNode> {
 	return createMatterServer(isy, config);
 }
 
+
 export async function createMatterServer(isy?: ISY, config?: Config): Promise<ServerNode> {
-	var logger = isy.logger;
+	var logger = loggers.add('matter', {
+	transports: isy.logger.transports,
+	levels: isy.logger.levels,
+	format: format.label({ label: 'Matter' })
+});
 	if (isy === undefined) {
 		isy = ISY.instance;
 	}
@@ -70,7 +79,6 @@ export async function createMatterServer(isy?: ISY, config?: Config): Promise<Se
 				logFormat: 'plain'
 			}
 		);
-
 	} finally {
 		MatterLogger.defaultLogLevel = levelFromString(logger.level);
 	}
@@ -231,7 +239,7 @@ export async function createMatterServer(isy?: ISY, config?: Config): Promise<Se
 	if (server.lifecycle.isOnline) {
 		const { qrPairingCode, manualPairingCode } = server.state.commissioning.pairingCodes;
 
-		logger.info('/n' + QrCode.get(qrPairingCode));
+		logger.info('\n' + QrCode.get(qrPairingCode));
 		logger.info(`QR Code URL: https://project-chip.github.io/connectedhomeip/qrcode.html?data=${qrPairingCode}`);
 		logger.info(`Manual pairing code: ${manualPairingCode}`);
 	}

package/src/Utils.ts

@@ -15,6 +15,7 @@ import path from 'path';
 import { isBoxedPrimitive } from 'util/types';
 import { Family, type Driver, type DriverType, type EnumLiteral } from './Definitions/index.js';
 import { EventType } from './Events/EventType.js';
+import { readFile } from 'fs/promises';
 
 export type StringKeys<T> = Extract<keyof T, string>;
 
@@ -276,20 +277,19 @@ function getImportMeta() {
 		return { dirname, filename };
 	}
 }
-export async function findPackageJson(currentPath: string = './'): Promise<PackageJson> {
+export async function findPackageJson(currentPath: string = getImportMeta().dirname): Promise<PackageJson> {
 	try {
 		while (currentPath !== '/') {
 			const packageJsonPath = path.join(currentPath, 'package.json');
 			if (existsSync(packageJsonPath)) {
-				try {
-					return await import(packageJsonPath);
-				} catch {}
+				return JSON.parse(await readFile(packageJsonPath, 'utf8'));
 			}
 			currentPath = path.join(currentPath, '..');
 		}
 	} catch {
+	
 		//@ts-expect-error
-		return await import('package.json');
+		return (await import ('package.json')).default;
 	}
 	return null;
 }