isy-nodejs 1.0.6-alpha.0 → 1.0.6-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.6-alpha.0",
+    "version": "1.0.6-alpha.1",
     "author": {
         "name": "Pradeep Mouli"
     },
@@ -63,6 +63,7 @@
         "faye-websocket": "^0.11.4",
         "mocha": "^10.8.2",
         "p-queue": "^8.0.1",
+        "type-fest": "4.28.0",
         "winston": "^3.17.0",
         "ws": "^8.18.0",
         "xml2js": "^0.6.2"
@@ -73,5 +74,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "5d625f624978b697bd1212a415587fee331d713d"
+    "gitHead": "ad2041ab8c841c6b22ae49d28a0cfc45482ccf87"
 }

package/src/CodeGeneration/EnumFactory.ts

@@ -1,5 +1,5 @@
 import { factory } from "typescript";
-import { createWrappedNode, ts, type EnumDeclaration, EnumMember, Identifier} from 'ts-morph'
+import ts from "typescript";
 import { UnitOfMeasure } from "../Definitions/Global/UOM.js";
 
 import type {

package/src/CodeGeneration/NodeClassFactory.ts

@@ -1,5 +1,7 @@
-import { createWrappedNode, IndentationText, Project, QuoteKind, SourceFile, ts, type Node } from 'ts-morph';
+import { createWrappedNode, IndentationText, Project, QuoteKind, ScriptTarget, SourceFile, type Node } from 'ts-morph';
 import { factory, Statement, type Declaration } from 'typescript';
+import ts from 'typescript';
+
 import type { Driver } from '../Definitions/Global/Drivers.js';
 import { UnitOfMeasure } from '../Definitions/Global/UOM.js';
 
@@ -28,7 +30,7 @@ export class NodeClassFactory extends CodeFactory {
 
 	public static _basePath: string;
 	public static project = new Project({
-		compilerOptions: { target: ts.ScriptTarget.ESNext, module: ts.ModuleKind.ESNext },
+		compilerOptions: { target: ScriptTarget.ESNext, module: ts.ModuleKind.ESNext },
 		manipulationSettings: {
 			usePrefixAndSuffixTextForRename: true,
 			quoteKind: QuoteKind.Single,
@@ -474,11 +476,12 @@ export class NodeClassFactory extends CodeFactory {
 		});
 		let currentKind = ts.SyntaxKind.Unknown;
 		for (const s of f.getStatements()) {
-			if (currentKind != s.getKind()) {
+
+			if (currentKind.valueOf() != s.getKind().valueOf()) {
 				if (currentKind != ts.SyntaxKind.Unknown) {
 					s.prependWhitespace('\n');
 				}
-				currentKind = s.getKind();
+				currentKind = s.getKind().valueOf();
 			}
 		}
 		f.insertText(0, '/* THIS FILE WAS AUTOMATICALLY GENERATED. DO NOT EDIT DIRECTLY. */\n\n');

package/src/Converters.ts

@@ -1,5 +1,6 @@
 import { UnitOfMeasure } from './Definitions/Global/UOM.js';
-import { type Leaves, type Paths, type PathsWithLimit, type StringKeys } from './Utils.js';
+import {type PathsWithLimit, type StringKeys } from './Utils.js';
+import {Paths} from 'type-fest'
 
 let BooleanPercentage: Converter<boolean, number>;
 let NullConverter: Converter<any, any>;
@@ -112,17 +113,19 @@ export namespace Converter {
 
 	export type ConverterTypes = `${StringKeys<typeof StandardConverters>}`;
 
-	export type StandardConverters = `${StringKeys<typeof StandardConverters>}.${StringKeys<typeof StandardConverters>}`;
+	type StandardConverters = Paths<typeof StandardConverters, {maxRecursionDepth: 1, bracketNotation: false}>
 
+	type Invert<K extends string> = K extends `${infer T}.${infer U}` ? `${U}.${T}` | K  : never;
 	//export type StandardConvertersList = PathsWithLimit<typeof StandardConverters, 1>;
 
+
 	export type MatterISYConvertibleTypes = `${StringKeys<(typeof Matter)[`${keyof typeof Matter}`]>}`;
 
 	export type ISYMatterConvertibleTypes = `${StringKeys<typeof Matter>}`;
 
-	export type MatterConverters = `${MatterISYConvertibleTypes}.${ISYMatterConvertibleTypes}` | `${ISYMatterConvertibleTypes}.${MatterISYConvertibleTypes}`;
+	export type MatterConverters = Paths<typeof Matter, {maxRecursionDepth: 1, bracketNotation: false}>
 
-	export type KnownConverters = StandardConverters | MatterConverters;
+	export type KnownConverters = Invert<StandardConverters> | Invert<MatterConverters>;
 	const cache: { [x: string]: Converter<any, any> } = {};
 	export function get(label: KnownConverters): Converter<any, any>;
 	export function get(from: UnitOfMeasure, to: UnitOfMeasure): Converter<any,any>

package/src/Definitions/Global/Drivers.ts

@@ -365,7 +365,7 @@ export namespace Driver {
 		};
 	};
 
-	
+
 	export type For<D extends string, T, S extends boolean = false> = T extends Signature<infer U, infer V, infer SU, infer N, infer L> ? StatelessOrStateful<D, U, V, N, L, S> : never;
 
 	export type ForAll<T, S extends boolean = false> = {
@@ -398,10 +398,11 @@ export namespace Driver {
 			return {
 				id: driver as D,
 				stateless: true,
-				uom: initState.uom as U,
+				uom: driverSignature.uom as U,
+				serverUom: initState?.uom != driverSignature.uom ? initState?.uom : undefined,
 				state: {
 					initial: true,
-					value: node.convertFrom(initState?.value, initState?.uom, driver as D) as T,
+					value: initState?.value, //TODO include converter
 					formattedValue: initState.formatted,
 					pendingValue: null
 				},
@@ -422,16 +423,17 @@ export namespace Driver {
 				value:
 					initState ?
 						converter ? converter.from(initState.value)
-						:	(node.convertFrom(initState?.value, initState?.uom, driver as D) as T)
-					:	null,
+						: driverSignature?.uom && initState?.uom != driverSignature?.uom ? Converter.convert(initState.uom, driverSignature.uom, initState.value)
+					:	initState.value : null,
 				rawValue: initState ? initState.value : null,
 				formattedValue: initState ? initState.formatted : null,
 				pendingValue: null
 			},
 			async query() {
 				let s = await query();
-				this.state.value = converter ? converter.from(s.value) : node.convertFrom(s.value, s.uom, driver as D);
+				this.state.value = converter ? converter.from(s.value) : this.uom !== s.uom ? Converter.convert(s.value, s.uom, this.uom) : s.value;
 				this.state.formattedValue = s.formatted;
+				this.state.rawValue = s.value;
 				return s;
 			},
 			apply(state: DriverState, notify = false) {

package/src/Devices/DynamicNode.ts

@@ -0,0 +1,37 @@
+import { Driver, type Family } from '../Definitions/index.js';
+import type { ISY } from '../ISY.js';
+import { ISYNode } from '../ISYNode.js';
+import type { DriverState } from '../Model/DriverState.js';
+import type { NodeDef } from '../Model/NodeDef.js';
+import type { NodeInfo } from '../Model/NodeInfo.js';
+import { ISYDeviceNode } from './ISYDeviceNode.js';
+
+export abstract class DynamicNode<T extends Family.ZWave | Family.ZigBee,D extends ISYNode.DriverSignatures,C,E extends ISYNode.EventSignatures> extends ISYDeviceNode<T,D,C,E> {
+
+	abstract getNodeDef() : Promise<NodeDef>;
+
+	constructor(isy: ISY, node: NodeInfo<T>) {
+		super(isy, node);
+		this.getNodeDef().then((def) => {
+			for(let st in this.drivers) {
+				if(!((def.sts.st) as Array<any>).find((s) => s.id === st)) {
+					delete this.drivers[st];
+				}
+			}
+			for(let cmd in this.commands) {
+				if(!((def.cmds.accepts.cmd) as Array<any>).find((c) => c.id === cmd)) {
+					delete this.commands[cmd];
+				}
+			}
+		});
+
+	}
+
+	/*override handleEvent(event: { control?: any; data?: any; node?: any; action?: any; fmtAct?: any; }): boolean {
+		if(event.node !== this.address) {
+			return false;
+		}
+		if()
+		return false;
+	}*/
+}

package/src/Devices/GenericNode.ts

@@ -0,0 +1,31 @@
+import { Driver } from '../Definitions/index.js';
+import type { ISY } from '../ISY.js';
+import { ISYNode } from '../ISYNode.js';
+import type { DriverState } from '../Model/DriverState.js';
+import type { NodeInfo } from '../Model/NodeInfo.js';
+import { ISYDeviceNode } from './ISYDeviceNode.js';
+
+export class GenericNode extends ISYDeviceNode<any,any,any,any> {
+	constructor(isy: ISY, node: NodeInfo) {
+		super(isy, node);
+		for(const prop in node.state) {
+			this.drivers[prop] = Driver.create(prop as never, this,node.state[prop]);
+		}
+
+	}
+
+	override applyStatus(prop: DriverState): void {
+		if(!this.drivers[prop.id]) {
+			this.drivers[prop.id] = Driver.create(prop.id as never, this,prop,{uom: prop.uom, label: prop.name  as string ?? prop.id as string, name: prop.name as string ?? prop.id as string});
+		}
+		super.applyStatus(prop);
+	}
+
+	/*override handleEvent(event: { control?: any; data?: any; node?: any; action?: any; fmtAct?: any; }): boolean {
+		if(event.node !== this.address) {
+			return false;
+		}
+		if()
+		return false;
+	}*/
+}

package/src/Devices/Insteon/InsteonDevice.ts

@@ -1,9 +1,6 @@
 import { ISY } from '../../ISY.js';
 
-import { Insteon } from '../../Definitions/Global/Families.js';
-import { Commands } from '../../ISYConstants.js'
 import { Constructor } from '../Constructor.js';
-import { InsteonKeypadButtonDevice } from './InsteonKeypadDevice.js';
 import { InsteonRelayDevice } from './InsteonRelayDevice.js';
 import 'winston';
 import type { InsteonBaseDevice } from './InsteonBaseDevice.js';