isy-nodejs 1.0.1-alpha.2 → 1.0.1-alpha.20

package/dist/esm/ISYNode.js

@@ -1,6 +1,6 @@
 import { UnitOfMeasure } from './Definitions/Global/UOM.js';
 import { NodeType } from './ISY.js';
-import { Converters } from './Converters.js';
+import { Converter } from './Converters.js';
 import { Event } from './Definitions/Global/Events.js';
 //type DriverValues<DK extends string | number | symbol,V = any> = {[x in DK]?:V};
 export class ISYNode {
@@ -74,7 +74,7 @@ export class ISYNode {
             .trim();
         if (this.parentType === NodeType.Folder) {
             this.folder = isy.folderMap.get(this.parent._);
-            isy.logger.info(`${this.name} this node is in folder ${this.folder}`);
+            isy.logger.debug(`${this.name} is in folder ${this.folder}`);
             this.logger = (msg, level = 'debug', ...meta) => {
                 isy.logger[level](`${this.folder} ${this.name} (${this.address}): ${msg}`, meta);
                 return isy.logger;
@@ -126,7 +126,7 @@ export class ISYNode {
             return value;
         else {
             try {
-                return Converters.Standard[from][to].from(value);
+                return Converter.Standard[from][to].from(value);
             }
             catch {
                 this.isy.logger.error(`Conversion from ${UnitOfMeasure[from]} to ${UnitOfMeasure[to]} not supported.`);
@@ -173,7 +173,7 @@ export class ISYNode {
     }
     async getNotes() {
         try {
-            const result = await this.isy.sendRequest(`nodes/${this.address}/notes`);
+            const result = await this.isy.sendRequest(`nodes/${this.address}/notes`, { trailingSlash: false, errorLogLevel: 'debug' });
             if (result !== null && result !== undefined) {
                 return result.NodeProperties;
             }
@@ -187,7 +187,7 @@ export class ISYNode {
     }
     handleControlTrigger(controlName) {
         //this.lastChanged = new Date();
-        this.events.emit('ControlTriggered', controlName);
+        this.events.emit('controlTriggered', controlName);
         return true;
     }
     handleEvent(event) {
@@ -209,23 +209,26 @@ export class ISYNode {
         else {
             // this.logger(event.control);
             const e = event.control;
-            const dispName = this.commands[e].name;
+            const dispName = this.commands[e]?.name;
             if (dispName !== undefined && dispName !== null) {
-                this.logger(`Command ${dispName} (${e}) triggered.`);
+                this.logger(`Command ${dispName} (${e}) event sent.`);
             }
             else {
-                this.logger(`Command ${e} triggered.`);
+                this.logger(`Command ${e} event sent.`);
             }
             this.handleControlTrigger(e);
             return true;
         }
     }
-    handlePropertyChange(propertyName, value, uom, formattedValue, prec) {
+    handlePropertyChange(propertyName, value, uom, prec, formattedValue) {
         this.lastChanged = new Date();
-        const oldValue = this.drivers[propertyName].value;
-        if (this.drivers[propertyName].patch(value, formattedValue, uom, prec)) {
-            this.emit('PropertyChanged', propertyName, value, oldValue, formattedValue);
-            this.scenes.forEach((element) => {
+        let driver = this.drivers[propertyName];
+        this.logger(`Driver ${propertyName} (${driver?.label} value update ${value} (${formattedValue}) uom: ${UnitOfMeasure[uom]} event received.`);
+        const oldValue = driver?.value;
+        if (driver?.patch(value, formattedValue, uom, prec)) {
+            this.logger(`Driver ${driver.label} updated from ${oldValue} to ${value} (${formattedValue})`);
+            this.emit('propertyChanged', propertyName, value, oldValue, formattedValue);
+            this.scenes?.forEach((element) => {
                 this.logger(`Recalulating ${element.deviceFriendlyName}`);
                 element.recalculateState();
             });

package/dist/esm/ISYNode.js.map

@@ -1 +1 @@
-{"version":3,"file":"ISYNode.js","sourceRoot":"","sources":["../../src/ISYNode.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ISYNode.js","sourceRoot":"","sources":["../../src/ISYNode.ts"],"names":[],"mappings":"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"}

package/dist/esm/ISYScene.js

@@ -59,7 +59,7 @@ export class ISYScene extends ISYNode {
     get isOn() {
         for (const device of this.members) {
             if (device instanceof Insteon.Relay) {
-                if (device.drivers.ST?.value === 1) {
+                if (device.drivers.ST?.value != 0) {
                     return true;
                 }
             }
@@ -93,9 +93,9 @@ export class ISYScene extends ISYNode {
     }
     markAsChanged() {
         this.lastChanged = new Date();
-        this.emit('PropertyChanged', 'isOn', this.isOn, this.isOn, this.isOn ? 'on' : 'off');
+        this.emit('propertyChanged', 'isOn', this.isOn, this.isOn, this.isOn ? 'on' : 'off');
         if (this.isDimmable) {
-            this.emit('PropertyChanged', 'brightnesslevel', this.brightnessLevel, this.brightnessLevel, this.brightnessLevel + '%');
+            this.emit('propertyChanged', 'brightnesslevel', this.brightnessLevel, this.brightnessLevel, this.brightnessLevel + '%');
         }
     }
     async updateIsOn(lightState) {

package/dist/esm/ISYScene.js.map

@@ -1 +1 @@
-{"version":3,"file":"ISYScene.js","sourceRoot":"","sources":["../../src/ISYScene.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ISYScene.js","sourceRoot":"","sources":["../../src/ISYScene.ts"],"names":[],"mappings":"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"}

package/dist/esm/Matter/Behaviors/ISYBridgedDeviceBehavior.js

@@ -12,11 +12,18 @@ export class ISYBridgedDeviceBehavior extends Behavior {
     async initialize(_options) {
         await super.initialize(_options);
         var address = this.state.address;
-        this.internal.device = ISY.instance.nodeMap.get(this.state.address);
+        const d = ISY.instance.nodeMap.get(this.state.address);
+        this.internal.device = d;
         this.internal.map = MappingRegistry.getMapping(this.internal.device);
         ISY.instance.logger.debug(`Initializing ${this.constructor.name} for ${this.internal.device.constructor.name} ${this.internal.device.name} with address ${address}`);
-        if (this.internal.device) {
-            this.internal.device.events.on('PropertyChanged', this.handlePropertyChange.bind(this));
+        if (d) {
+            d.events.on('PropertyChanged', this.handlePropertyChange.bind(this));
+            for (const f in d.drivers) {
+                let evt = `${d.drivers[f].name}Changed`;
+                this.events[evt] = Observable();
+                //@ts-ignore
+                d.events.on(evt, (driver, newValue, oldValue, formattedValue) => this.events.emit(evt, { driver, newValue, oldValue, formattedValue }));
+            }
         }
     }
     get device() {
@@ -26,7 +33,7 @@ export class ISYBridgedDeviceBehavior extends Behavior {
         return this.internal.map;
     }
     mapForBehavior(behavior) {
-        return this.map[behavior.cluster['name']];
+        return this.map.mapping[behavior.cluster['name']];
     }
     handlePropertyChange(driver, newValue, oldValue, formattedValue) {
         this.events.propertyChanged.emit({ driver, newValue, oldValue, formattedValue });

package/dist/esm/Matter/Behaviors/ISYBridgedDeviceBehavior.js.map

@@ -1 +1 @@
-{"version":3,"file":"ISYBridgedDeviceBehavior.js","sourceRoot":"","sources":["../../../../src/Matter/Behaviors/ISYBridgedDeviceBehavior.ts"],"names":[],"mappings":"AAAA;;;;GAIG,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,kCAAkC,CAAC;AAIhE,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAGxE,OAAO,EAAE,GAAG,EAA6B,MAAM,cAAc,CAAC;AAE9D,OAAO,EAAsB,eAAe,EAAuB,MAAM,2BAA2B,CAAC;AAIrG,MAAM,OAAO,wBAAyB,SAAQ,QAAQ;IACrD,MAAM,CAAmB,EAAE,GAAG,SAAS,CAAC;IAExC,MAAM,CAAmB,KAAK,GAAG,IAAI,CAAC;IAO7B,KAAK,CAAC,UAAU,CAAC,QAAa;QACtC,MAAM,KAAK,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;QACjC,IAAI,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC;QACjC,IAAI,CAAC,QAAQ,CAAC,MAAM,GAAG,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QACpE,IAAI,CAAC,QAAQ,CAAC,GAAG,GAAG,eAAe,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAqD,CAAC,CAAC;QACpH,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,gBAAgB,IAAI,CAAC,WAAW,CAAC,IAAI,QAAQ,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,iBAAiB,OAAO,EAAE,CAAC,CAAC;QACrK,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;YAC1B,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,iBAAiB,EAAE,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QACzF,CAAC;IACF,CAAC;IAED,IAAI,MAAM;QACT,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,IAAI,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;IAClG,CAAC;IAED,IAAI,GAAG;QACN,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC;IAC1B,CAAC;IAED,cAAc,CAAiC,QAAW;QACzD,OAAO,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC;IAC3C,CAAC;IAED,oBAAoB,CAAC,MAAc,EAAE,QAAa,EAAE,QAAa,EAAE,cAAsB;QACxF,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,cAAc,EAAE,CAAC,CAAC;IAClF,CAAC;IAED,CAAC,MAAM,CAAC,YAAY,CAAC;QACpB,IAAI,CAAC,QAAQ,CAAC,MAAM,GAAG,IAAI,CAAC;QAC5B,OAAO,KAAK,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE,CAAC;IACrC,CAAC;;AAGF,WAAiB,wBAAwB;IACxC,MAAa,QAAQ;QACpB,MAAM,CAA+B;QACrC,GAAG,CAA+C;KAClD;IAHY,iCAAQ,WAGpB,CAAA;IAED,MAAa,MAAO,SAAQ,YAAY;QACvC,eAAe,GAAG,UAAU,EAA8E,CAAC;KAC3G;IAFY,+BAAM,SAElB,CAAA;IAED,MAAa,KAAK;QACjB,OAAO,GAAG,EAAE,CAAC;KACb;IAFY,8BAAK,QAEjB,CAAA;AACF,CAAC,EAbgB,wBAAwB,KAAxB,wBAAwB,QAaxC"}
+{"version":3,"file":"ISYBridgedDeviceBehavior.js","sourceRoot":"","sources":["../../../../src/Matter/Behaviors/ISYBridgedDeviceBehavior.ts"],"names":[],"mappings":"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"}

package/dist/esm/Matter/Behaviors/ISYClusterBehavior.js

@@ -1,31 +1,49 @@
 import '@project-chip/matter.js/device';
+import { Converter } from '../../Converters.js';
 import { ISYBridgedDeviceBehavior } from './ISYBridgedDeviceBehavior.js';
+// #endregion Type aliases (6)
+// #region Functions (1)
 export function ISYClusterBehavior(base, p) {
     return class ISYClusterBehavior extends base {
         _device;
         handlers = {};
+        bridgedDeviceBehavior;
         ///public map: ClusterMapping<ToClusterTypeByName<ClusterForBehavior<ConstructedType<typeof base>>["name"]>,ISYDeviceNode<any, any, any>>;
         map;
         async initialize(_options) {
             await super.initialize(_options);
-            var behavior = await this.agent.load(ISYBridgedDeviceBehavior);
+            var behavior = (await this.agent.load(ISYBridgedDeviceBehavior));
+            this.bridgedDeviceBehavior = behavior;
             //var behavior = this.agent.get(ISYBridgedDeviceBehavior);
             this._device = behavior.device;
+            //@ts-ignore
             this.map = behavior.mapForBehavior(this);
             for (const key2 in this.map.attributes) {
-                if (typeof this.map.attributes[key2] === 'string') {
-                    this.handlers[this.map.attributes[key2]] = (newValue, oldValue, formattedValue) => {
+                let val = this.map.attributes[key2];
+                let driverObj = null;
+                if (typeof val === 'string' || typeof val === 'symbol' || typeof val === 'number') {
+                    driverObj = this._device.drivers[val];
+                    this.handlers[val] = (newValue, oldValue, formattedValue) => {
                         this.state[key2] = newValue;
                     };
                 }
-                else if (this.map.attributes[key2].driver) {
-                    let { driver, converter } = this.map.attributes[key2];
+                else if (val.driver) {
+                    driverObj = this._device.drivers[val.driver];
+                    let { driver, converter } = val;
+                    const convFunc = Converter.get(converter)?.from;
                     this.handlers[driver] = (newValue, oldValue, formattedValue) => {
-                        this.state[key2] = converter(newValue);
+                        if (convFunc)
+                            this.state[key2] = convFunc(newValue);
+                        else
+                            this.state[key2] = newValue;
                     };
                 }
+                if (driverObj) {
+                    let evt = `${driverObj.name}Changed`;
+                    this.reactTo(behavior.events[evt], this.handlePropertyChange.bind(this), { lock: false });
+                }
             }
-            this.reactTo(behavior.events.propertyChanged, this.handlePropertyChange, { lock: false });
+            //this.reactTo(behavior.events.propertyChanged, this.handlePropertyChange, { lock: false });
             //this._device.on("PropertyChanged", this.handlePropertyChange.bind(this));
         }
         get device() {
@@ -50,4 +68,5 @@ export function ISYClusterBehavior(base, p) {
         }
     };
 }
+// #endregion Functions (1)
 //# sourceMappingURL=ISYClusterBehavior.js.map

package/dist/esm/Matter/Behaviors/ISYClusterBehavior.js.map

@@ -1 +1 @@
-{"version":3,"file":"ISYClusterBehavior.js","sourceRoot":"","sources":["../../../../src/Matter/Behaviors/ISYClusterBehavior.ts"],"names":[],"mappings":"AASA,OAAO,gCAAgC,CAAC;AAQxC,OAAO,EAAE,wBAAwB,EAAE,MAAM,+BAA+B,CAAC;AAiBzE,MAAM,UAAU,kBAAkB,CACjC,IAAO,EACP,CAAiB;IAEjB,OAAO,MAAM,kBAAmB,SAAQ,IAAI;QAC3C,OAAO,CAAI;QAEX,QAAQ,GAAgF,EAAS,CAAC;QAElG,0IAA0I;QAE1I,GAAG,CAAkC;QAE5B,KAAK,CAAC,UAAU,CAAC,QAAa;YACtC,MAAM,KAAK,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;YACjC,IAAI,QAAQ,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC;YAC/D,0DAA0D;YAC1D,IAAI,CAAC,OAAO,GAAG,QAAQ,CAAC,MAAW,CAAC;YACpC,IAAI,CAAC,GAAG,GAAG,QAAQ,CAAC,cAAc,CAAI,IAAoB,CAAC,CAAC;YAC5D,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE,CAAC;gBACxC,IAAI,OAAO,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,QAAQ,EAAE,CAAC;oBACnD,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,QAAQ,EAAE,QAAQ,EAAE,cAAc,EAAE,EAAE;wBACjF,IAAI,CAAC,KAAK,CAAC,IAAc,CAAC,GAAG,QAAQ,CAAC;oBACvC,CAAC,CAAC;gBACH,CAAC;qBAAM,IAAI,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,CAAC;oBAC7C,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;oBACtD,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,EAAE,QAAQ,EAAE,cAAc,EAAE,EAAE;wBAC9D,IAAI,CAAC,KAAK,CAAC,IAAc,CAAC,GAAG,SAAS,CAAC,QAAQ,CAAC,CAAC;oBAClD,CAAC,CAAC;gBACH,CAAC;YACF,CAAC;YAED,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,eAAe,EAAE,IAAI,CAAC,oBAAoB,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;YAE1F,2EAA2E;QAC5E,CAAC;QAED,IAAI,MAAM;YACT,OAAO,CAAC,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,IAAK,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,wBAAwB,CAAC,CAAC,MAAY,CAAC,CAAC;QAChG,CAAC;QAED,oBAAoB,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,cAAc,EAAqB;YACrF,4CAA4C;YAE5C,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;gBAC3B,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,QAAQ,EAAE,cAAc,CAAC,CAAC;YAC3D,CAAC;YACD,yDAAyD;YACzD,8CAA8C;YAC9C,QAAQ;YACR,iDAAiD;YACjD,kBAAkB;YAElB,8DAA8D;YAC9D,yDAAyD;YACzD,oFAAoF;YAEpF,QAAQ;YACR,MAAM;YACN,IAAI;QACL,CAAC;KACD,CAAC;AACH,CAAC"}
+{"version":3,"file":"ISYClusterBehavior.js","sourceRoot":"","sources":["../../../../src/Matter/Behaviors/ISYClusterBehavior.ts"],"names":[],"mappings":"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"}

package/dist/esm/Matter/Behaviors/ISYOnOffBehavior.js

@@ -1,9 +1,9 @@
-import { InsteonRelayDevice } from "../../Devices/Insteon/InsteonRelayDevice.js";
-import { OnOffLightRequirements } from "@project-chip/matter.js/devices/OnOffLightDevice";
-import { ISYClusterBehavior } from "./ISYClusterBehavior.js";
 import { DimmableLightRequirements } from '@project-chip/matter.js/devices/DimmableLightDevice';
+import { OnOffLightRequirements } from '@project-chip/matter.js/devices/OnOffLightDevice';
 import { InsteonDimmableDevice } from '../../Devices/Insteon/InsteonDimmableDevice.js';
-import { Converters } from '../../Converters.js';
+import { InsteonRelayDevice } from '../../Devices/Insteon/InsteonRelayDevice.js';
+import { ISYClusterBehavior } from './ISYClusterBehavior.js';
+import { Converter } from '../../Converters.js';
 export class ISYOnOffBehavior extends ISYClusterBehavior(OnOffLightRequirements.OnOffServer, InsteonRelayDevice) {
     async initialize(_options) {
         await super.initialize(_options);
@@ -11,30 +11,33 @@ export class ISYOnOffBehavior extends ISYClusterBehavior(OnOffLightRequirements.
     }
     on = async () => {
         await super.on();
+        await this.device.on();
         //this.device.commands.DON = true;
     };
     async off() {
-        //await super.off();
+        await super.off();
+        await this.device.off();
         // this.device.drivers = false;
     }
     toggle = async () => {
         //this.device.state = !(await this.device.state);
     };
     async handlePropertyChange({ driver, newValue, oldValue, formattedValue }) {
-        if (driver === "ST") {
+        /*if (driver === 'ST') {
             this.state.onOff = newValue;
-        }
+        }*/
         return super.handlePropertyChange({ driver, newValue, oldValue, formattedValue });
     }
 }
 export class ISYDimmableBehavior extends ISYClusterBehavior(DimmableLightRequirements.LevelControlServer, InsteonDimmableDevice) {
     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;
     }
     setLevel(level) {
-        level = Converters.Matter.LevelFrom0To255.LightingLevel.to(level);
+        level = Converter.Matter.LevelFrom0To255.LightingLevel.from(level);
         if (level > 0) {
             return this.device.sendCommand('DON', level);
         }

package/dist/esm/Matter/Behaviors/ISYOnOffBehavior.js.map

@@ -1 +1 @@
-{"version":3,"file":"ISYOnOffBehavior.js","sourceRoot":"","sources":["../../../../src/Matter/Behaviors/ISYOnOffBehavior.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,6CAA6C,CAAA;AAChF,OAAO,EAAE,sBAAsB,EAAE,MAAM,kDAAkD,CAAC;AAC1F,OAAO,EAAE,kBAAkB,EAA2C,MAAM,yBAAyB,CAAC;AAQtG,OAAO,EAAE,yBAAyB,EAAE,MAAM,qDAAqD,CAAC;AAChG,OAAO,EAAE,qBAAqB,EAAE,MAAM,gDAAgD,CAAC;AAEvF,OAAO,EAAC,UAAU,EAAC,MAAM,qBAAqB,CAAC;AAM/C,MAAM,OAAO,gBAAiB,SAAQ,kBAAkB,CAAC,sBAAsB,CAAC,WAAW,EAAE,kBAAkB,CAAC;IAGnG,KAAK,CAAC,UAAU,CAAC,QAAa;QACnC,MAAM,KAAK,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;QACjC,6CAA6C;IAIjD,CAAC;IAGM,EAAE,GAAG,KAAK,IAAI,EAAE;QACvB,MAAM,KAAK,CAAC,EAAE,EAAE,CAAC;QAGhB,kCAAkC;IACrC,CAAC,CAAA;IAEQ,KAAK,CAAC,GAAG;QAChB,oBAAoB;QACpB,+BAA+B;IACjC,CAAC;IAEQ,MAAM,GAAI,KAAK,IAAI,EAAE;QAC5B,iDAAiD;IACnD,CAAC,CAAA;IAEQ,KAAK,CAAC,oBAAoB,CAAC,EAAC,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,cAAc,EAAqC;QAClH,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;YACpB,IAAI,CAAC,KAAK,CAAC,KAAK,GAAG,QAAQ,CAAC;QAE9B,CAAC;QAED,OAAO,KAAK,CAAC,oBAAoB,CAAC,EAAC,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,cAAc,EAAC,CAAC,CAAC;IAClF,CAAC;CAGF;AAGD,MAAM,OAAO,mBAAoB,SAAQ,kBAAkB,CAAC,yBAAyB,CAAC,kBAAkB,EAAE,qBAAqB,CAAC;IACrH,KAAK,CAAC,UAAU,CAAC,QAAa;QACrC,MAAM,KAAK,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;QACjC,IAAI,CAAC,KAAK,CAAC,YAAY,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,KAAK,CAAC;QACvD,8CAA8C;IAEhD,CAAC;IAEQ,QAAQ,CAAC,KAAa;QAC7B,KAAK,GAAG,UAAU,CAAC,MAAM,CAAC,eAAe,CAAC,aAAa,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC;QAClE,IAAG,KAAK,GAAG,CAAC,EACZ,CAAC;YACG,OAAO,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,KAAK,EAAC,KAAK,CAAC,CAAC;QAChD,CAAC;aAED,CAAC;YACG,OAAO,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;QAC1C,CAAC;IACH,CAAC;CACF"}
+{"version":3,"file":"ISYOnOffBehavior.js","sourceRoot":"","sources":["../../../../src/Matter/Behaviors/ISYOnOffBehavior.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,yBAAyB,EAAE,MAAM,qDAAqD,CAAC;AAChG,OAAO,EAAE,sBAAsB,EAAE,MAAM,kDAAkD,CAAC;AAI1F,OAAO,EAAE,qBAAqB,EAAE,MAAM,gDAAgD,CAAC;AACvF,OAAO,EAAE,kBAAkB,EAAE,MAAM,6CAA6C,CAAC;AAEjF,OAAO,EAAsB,kBAAkB,EAAuB,MAAM,yBAAyB,CAAC;AAEtG,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAEhD,MAAM,OAAO,gBAAiB,SAAQ,kBAAkB,CAAC,sBAAsB,CAAC,WAAW,EAAE,kBAAkB,CAAC;IACtG,KAAK,CAAC,UAAU,CAAC,QAAa;QACtC,MAAM,KAAK,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;QACjC,6CAA6C;IAC9C,CAAC;IAEQ,EAAE,GAAG,KAAK,IAAI,EAAE;QACxB,MAAM,KAAK,CAAC,EAAE,EAAE,CAAC;QACjB,MAAM,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC;QAEvB,kCAAkC;IACnC,CAAC,CAAC;IAEO,KAAK,CAAC,GAAG;QACjB,MAAM,KAAK,CAAC,GAAG,EAAE,CAAC;QAClB,MAAM,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC;QAExB,+BAA+B;IAChC,CAAC;IAEQ,MAAM,GAAG,KAAK,IAAI,EAAE;QAC5B,iDAAiD;IAClD,CAAC,CAAC;IAEO,KAAK,CAAC,oBAAoB,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,cAAc,EAAsC;QACrH;;WAEG;QAEH,OAAO,KAAK,CAAC,oBAAoB,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,cAAc,EAAE,CAAC,CAAC;IACnF,CAAC;CACD;AAED,MAAM,OAAO,mBAAoB,SAAQ,kBAAkB,CAAC,yBAAyB,CAAC,kBAAkB,EAAE,qBAAqB,CAAC;IACtH,KAAK,CAAC,UAAU,CAAC,QAAa;QACtC,MAAM,KAAK,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;QACjC,iGAAiG;QACjG,yDAAyD;QAEzD,8CAA8C;IAC/C,CAAC;IAEQ,QAAQ,CAAC,KAAa;QAC9B,KAAK,GAAG,SAAS,CAAC,MAAM,CAAC,eAAe,CAAC,aAAa,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACnE,IAAI,KAAK,GAAG,CAAC,EAAE,CAAC;YACf,OAAO,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;QAC9C,CAAC;aAAM,CAAC;YACP,OAAO,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;QACvC,CAAC;IACF,CAAC;CACD"}

package/dist/esm/Matter/{Server → Bridge}/Server.js

@@ -1,3 +1,4 @@
+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 { BridgedDeviceBasicInformationServer } from '@project-chip/matter.js/behaviors/bridged-device-basic-information';
@@ -9,33 +10,45 @@ import { AggregatorEndpoint } from '@project-chip/matter.js/endpoints/Aggregator
 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';
+//@ts-ignore
+import PackageJson from '@project-chip/matter.js/package.json' with { type: 'json' };
 import { QrCode } from '@project-chip/matter.js/schema';
-import { resolve } from 'path';
+import path, { resolve } from 'path';
+import { format, loggers } 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.instance) {
-    var logger = isy.logger;
+import '../Mappings/Insteon.js';
+// #region Interfaces (1)
+export let instance;
+//@ts-ignore
+export let version = PackageJson.version;
+// #endregion Interfaces (1)
+// #region Functions (3)
+export function create(isy, config) {
+    return createMatterServer(isy, config);
+}
+export async function createMatterServer(isy, config) {
+    var logger = loggers.add('matter', {
+        transports: isy.logger.transports,
+        levels: isy.logger.levels,
+        format: format.label({ label: 'Matter' })
+    });
+    if (isy === undefined) {
+        isy = ISY.instance;
+    }
     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*/, {
+        MatterLogger.addLogger('polyLogger', (lvl, message) => {
+            let msg = message.slice(23).remove(Level[lvl]).trimStart();
+            let level = Level[lvl].toLowerCase().replace('notice', 'info');
+            if (msg.startsWith('EndpointStructureLogger')) {
+                if (lvl === Level.INFO)
+                    level = 'debug';
+            }
+            logger.log(level, msg);
+        }, 
+        /*Preserve existing formatting, but trim off date*/
+        {
             defaultLogLevel: levelFromString(logger.level),
             logFormat: 'plain'
         });
@@ -43,9 +56,10 @@ export async function createServerNode(isy = ISY.instance) {
     finally {
         MatterLogger.defaultLogLevel = levelFromString(logger.level);
     }
-    var config = await getConfiguration(isy);
+    config = await initializeConfiguration(isy, config);
     logger.info(`Matter config read: ${JSON.stringify(config)}`);
-    const server = await ServerNode.create({
+    MatterLogger.removeLogger('default');
+    let 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
@@ -96,7 +110,8 @@ export async function createServerNode(isy = ISY.instance) {
     await server.add(aggregator);
     logger.info(`Bridge Aggregator Added`);
     const endpoints = [];
-    for (const device of isy.deviceList.values()) {
+    for (const node of isy.nodeMap.values()) {
+        let device = node;
         let serialNumber = `${device.address.replaceAll(' ', '_').replaceAll('.', '_')}`;
         if (device.enabled && !(device instanceof InsteonKeypadButtonDevice)) {
             //const name = `OnOff ${isASocket ? "Socket" : "Light"} ${i}`;
@@ -117,6 +132,7 @@ export async function createServerNode(isy = ISY.instance) {
                 // }
             }
             if (baseBehavior !== undefined) {
+                //@ts-ignore
                 const endpoint = new Endpoint(baseBehavior, {
                     id: serialNumber,
                     isyNode: {
@@ -156,7 +172,7 @@ export async function createServerNode(isy = ISY.instance) {
      * The QR Code is printed automatically.
      */
     logger.info('Bringing server online');
-    await server.bringOnline();
+    await server.start();
     logger.info('Matter Server is online');
     /**
      * Log the endpoint structure for debugging reasons and to allow to verify anything is correct
@@ -167,11 +183,11 @@ export async function createServerNode(isy = ISY.instance) {
     // logEndpoint(EndpointServer.forEndpoint(server), {logAttributePrimitiveValues: true, logAttributeObjectValues: true});
     //else if(logger.isDebugEnabled())
     // {
-    logEndpoint(EndpointServer.forEndpoint(server), { logAttributePrimitiveValues: true, logAttributeObjectValues: false });
+    logEndpoint(EndpointServer.forEndpoint(server), { logAttributePrimitiveValues: true, logAttributeObjectValues: false, logClusterGlobalAttributes: false });
     // }
     if (server.lifecycle.isOnline) {
         const { qrPairingCode, manualPairingCode } = server.state.commissioning.pairingCodes;
-        logger.info(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}`);
     }
@@ -179,26 +195,20 @@ export async function createServerNode(isy = ISY.instance) {
     {
       e[1].initialize(e[0] as any);
     }*/
+    instance = server;
     return server;
-    function createBaseBehavior() {
-        let baseBehavior;
-        return baseBehavior;
-    }
 }
-async function getConfiguration(isy) {
+export function getPairingCode(server = instance) {
+    let codes = server.state.commissioning.pairingCodes;
+    codes.renderedQrPairingCode = QrCode.get(codes.qrPairingCode);
+    codes.url = `https://project-chip.github.io/connectedhomeip/qrcode.html?data=${codes.qrPairingCode}`;
+    return codes;
+}
+async function initializeConfiguration(isy, config) {
     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.set('storage.path', path.resolve(isy.storagePath, 'matter'));
     environment.vars.use(() => {
         const location = environment.vars.get('storage.path', environment.vars.get('path.root', '.'));
         storageService.location = location;
@@ -207,14 +217,14 @@ async function getConfiguration(isy) {
     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));
+    const passcode = config.passcode ?? environment.vars.number('passcode') ?? (await deviceStorage.get('passcode', 20202021));
+    const discriminator = config.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 vendorId = config.vendorId ?? environment.vars.number('vendorid') ?? (await deviceStorage.get('vendorid', 0xfff1));
+    const productId = config.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;
+    const port = config.port ?? environment.vars.number('port') ?? 5540;
+    const uniqueId = isy.id.replaceAll(':', '_');
     //environment.vars.string("uniqueid") ?? (await deviceStorage.get("uniqueid", Time.nowMs().toString()));
     // Persist basic data to keep them also on restart
     await deviceStorage.set({
@@ -236,5 +246,5 @@ async function getConfiguration(isy) {
         uniqueId
     };
 }
-// #endregion Functions (2)
+// #endregion Functions (3)
 //# sourceMappingURL=Server.js.map

package/dist/esm/Matter/Bridge/Server.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Server.js","sourceRoot":"","sources":["../../../../src/Matter/Bridge/Server.ts"],"names":[],"mappings":"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"}