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

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

@@ -2,33 +2,51 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ISYClusterBehavior = ISYClusterBehavior;
 require("@project-chip/matter.js/device");
+const Converters_js_1 = require("../../Converters.js");
 const ISYBridgedDeviceBehavior_js_1 = require("./ISYBridgedDeviceBehavior.js");
+// #endregion Type aliases (6)
+// #region Functions (1)
 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_js_1.ISYBridgedDeviceBehavior);
+            var behavior = (await this.agent.load(ISYBridgedDeviceBehavior_js_1.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 = Converters_js_1.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() {
@@ -53,4 +71,5 @@ function ISYClusterBehavior(base, p) {
         }
     };
 }
+// #endregion Functions (1)
 //# sourceMappingURL=ISYClusterBehavior.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"ISYClusterBehavior.js","sourceRoot":"","sources":["../../../../src/Matter/Behaviors/ISYClusterBehavior.ts"],"names":[],"mappings":";;AAkCA,gDA8DC;AAvFD,0CAAwC;AAQxC,+EAAyE;AAiBzE,SAAgB,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,sDAAwB,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,sDAAwB,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/cjs/Matter/Behaviors/ISYOnOffBehavior.js

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ISYDimmableBehavior = exports.ISYOnOffBehavior = void 0;
-const InsteonRelayDevice_js_1 = require("../../Devices/Insteon/InsteonRelayDevice.js");
-const OnOffLightDevice_1 = require("@project-chip/matter.js/devices/OnOffLightDevice");
-const ISYClusterBehavior_js_1 = require("./ISYClusterBehavior.js");
 const DimmableLightDevice_1 = require("@project-chip/matter.js/devices/DimmableLightDevice");
+const OnOffLightDevice_1 = require("@project-chip/matter.js/devices/OnOffLightDevice");
 const InsteonDimmableDevice_js_1 = require("../../Devices/Insteon/InsteonDimmableDevice.js");
+const InsteonRelayDevice_js_1 = require("../../Devices/Insteon/InsteonRelayDevice.js");
+const ISYClusterBehavior_js_1 = require("./ISYClusterBehavior.js");
 const Converters_js_1 = require("../../Converters.js");
 class ISYOnOffBehavior extends (0, ISYClusterBehavior_js_1.ISYClusterBehavior)(OnOffLightDevice_1.OnOffLightRequirements.OnOffServer, InsteonRelayDevice_js_1.InsteonRelayDevice) {
     async initialize(_options) {
@@ -14,19 +14,21 @@ class ISYOnOffBehavior extends (0, ISYClusterBehavior_js_1.ISYClusterBehavior)(O
     }
     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 });
     }
 }
@@ -34,11 +36,12 @@ exports.ISYOnOffBehavior = ISYOnOffBehavior;
 class ISYDimmableBehavior extends (0, ISYClusterBehavior_js_1.ISYClusterBehavior)(DimmableLightDevice_1.DimmableLightRequirements.LevelControlServer, InsteonDimmableDevice_js_1.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_js_1.Converters.Matter.LevelFrom0To255.LightingLevel.to(level);
+        level = Converters_js_1.Converter.Matter.LevelFrom0To255.LightingLevel.from(level);
         if (level > 0) {
             return this.device.sendCommand('DON', level);
         }

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

@@ -1 +1 @@
-{"version":3,"file":"ISYOnOffBehavior.js","sourceRoot":"","sources":["../../../../src/Matter/Behaviors/ISYOnOffBehavior.ts"],"names":[],"mappings":";;;AAAA,uFAAgF;AAChF,uFAA0F;AAC1F,mEAAsG;AAQtG,6FAAgG;AAChG,6FAAuF;AAEvF,uDAA+C;AAM/C,MAAa,gBAAiB,SAAQ,IAAA,0CAAkB,EAAC,yCAAsB,CAAC,WAAW,EAAE,0CAAkB,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;AAtCD,4CAsCC;AAGD,MAAa,mBAAoB,SAAQ,IAAA,0CAAkB,EAAC,+CAAyB,CAAC,kBAAkB,EAAE,gDAAqB,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,0BAAU,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;AAnBD,kDAmBC"}
+{"version":3,"file":"ISYOnOffBehavior.js","sourceRoot":"","sources":["../../../../src/Matter/Behaviors/ISYOnOffBehavior.ts"],"names":[],"mappings":";;;AAGA,6FAAgG;AAChG,uFAA0F;AAI1F,6FAAuF;AACvF,uFAAiF;AAEjF,mEAAsG;AAEtG,uDAAgD;AAEhD,MAAa,gBAAiB,SAAQ,IAAA,0CAAkB,EAAC,yCAAsB,CAAC,WAAW,EAAE,0CAAkB,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;AA/BD,4CA+BC;AAED,MAAa,mBAAoB,SAAQ,IAAA,0CAAkB,EAAC,+CAAyB,CAAC,kBAAkB,EAAE,gDAAqB,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,yBAAS,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;AAjBD,kDAiBC"}

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

@@ -1,6 +1,36 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createServerNode = createServerNode;
+exports.version = exports.instance = void 0;
+exports.create = create;
+exports.createMatterServer = createMatterServer;
+exports.getPairingCode = getPairingCode;
+require("@project-chip/matter-node.js");
 const environment_1 = require("@project-chip/matter-node.js/environment");
 const storage_1 = require("@project-chip/matter-node.js/storage");
 const bridged_device_basic_information_1 = require("@project-chip/matter.js/behaviors/bridged-device-basic-information");
@@ -12,33 +42,43 @@ const AggregatorEndpoint_1 = require("@project-chip/matter.js/endpoints/Aggregat
 const environment_2 = require("@project-chip/matter.js/environment");
 const log_1 = require("@project-chip/matter.js/log");
 const node_1 = require("@project-chip/matter.js/node");
+//@ts-ignore
+const package_json_1 = __importDefault(require("@project-chip/matter.js/package.json"));
 const schema_1 = require("@project-chip/matter.js/schema");
-const path_1 = require("path");
+const path_1 = __importStar(require("path"));
+const winston_1 = require("winston");
 const ISY_js_1 = require("../../ISY.js");
 const ISYBridgedDeviceBehavior_js_1 = require("../Behaviors/ISYBridgedDeviceBehavior.js");
 const ISYOnOffBehavior_js_1 = require("../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
-async function createServerNode(isy = ISY_js_1.ISY.instance) {
-    var logger = isy.logger;
+require("../Mappings/Insteon.js");
+//@ts-ignore
+exports.version = package_json_1.default.version;
+// #endregion Interfaces (1)
+// #region Functions (3)
+function create(isy, config) {
+    return createMatterServer(isy, config);
+}
+async function createMatterServer(isy, config) {
+    var logger = winston_1.loggers.add('matter', {
+        transports: isy.logger.transports,
+        levels: isy.logger.levels,
+        format: winston_1.format.label({ label: 'Matter' })
+    });
+    if (isy === undefined) {
+        isy = ISY_js_1.ISY.instance;
+    }
     try {
-        log_1.Logger.addLogger('polyLogger', (level, message) => logger.log(log_1.Level[level].toLowerCase().replace('notice', 'info'), message.slice(23).remove(log_1.Level[level]).trimStart()) /*Preserve existing formatting, but trim off date*/, {
+        log_1.Logger.addLogger('polyLogger', (lvl, message) => {
+            let msg = message.slice(23).remove(log_1.Level[lvl]).trimStart();
+            let level = log_1.Level[lvl].toLowerCase().replace('notice', 'info');
+            if (msg.startsWith('EndpointStructureLogger')) {
+                if (lvl === log_1.Level.INFO)
+                    level = 'debug';
+            }
+            logger.log(level, msg);
+        }, 
+        /*Preserve existing formatting, but trim off date*/
+        {
             defaultLogLevel: (0, log_1.levelFromString)(logger.level),
             logFormat: 'plain'
         });
@@ -46,9 +86,10 @@ async function createServerNode(isy = ISY_js_1.ISY.instance) {
     finally {
         log_1.Logger.defaultLogLevel = (0, log_1.levelFromString)(logger.level);
     }
-    var config = await getConfiguration(isy);
+    config = await initializeConfiguration(isy, config);
     logger.info(`Matter config read: ${JSON.stringify(config)}`);
-    const server = await node_1.ServerNode.create({
+    log_1.Logger.removeLogger('default');
+    let server = await node_1.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
@@ -99,7 +140,8 @@ async function createServerNode(isy = ISY_js_1.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 ISY_js_1.InsteonKeypadButtonDevice)) {
             //const name = `OnOff ${isASocket ? "Socket" : "Light"} ${i}`;
@@ -120,6 +162,7 @@ async function createServerNode(isy = ISY_js_1.ISY.instance) {
                 // }
             }
             if (baseBehavior !== undefined) {
+                //@ts-ignore
                 const endpoint = new endpoint_1.Endpoint(baseBehavior, {
                     id: serialNumber,
                     isyNode: {
@@ -159,7 +202,7 @@ async function createServerNode(isy = ISY_js_1.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
@@ -170,11 +213,11 @@ async function createServerNode(isy = ISY_js_1.ISY.instance) {
     // logEndpoint(EndpointServer.forEndpoint(server), {logAttributePrimitiveValues: true, logAttributeObjectValues: true});
     //else if(logger.isDebugEnabled())
     // {
-    (0, device_1.logEndpoint)(endpoint_1.EndpointServer.forEndpoint(server), { logAttributePrimitiveValues: true, logAttributeObjectValues: false });
+    (0, device_1.logEndpoint)(endpoint_1.EndpointServer.forEndpoint(server), { logAttributePrimitiveValues: true, logAttributeObjectValues: false, logClusterGlobalAttributes: false });
     // }
     if (server.lifecycle.isOnline) {
         const { qrPairingCode, manualPairingCode } = server.state.commissioning.pairingCodes;
-        logger.info(schema_1.QrCode.get(qrPairingCode));
+        logger.info('\n' + schema_1.QrCode.get(qrPairingCode));
         logger.info(`QR Code URL: https://project-chip.github.io/connectedhomeip/qrcode.html?data=${qrPairingCode}`);
         logger.info(`Manual pairing code: ${manualPairingCode}`);
     }
@@ -182,26 +225,20 @@ async function createServerNode(isy = ISY_js_1.ISY.instance) {
     {
       e[1].initialize(e[0] as any);
     }*/
+    exports.instance = server;
     return server;
-    function createBaseBehavior() {
-        let baseBehavior;
-        return baseBehavior;
-    }
 }
-async function getConfiguration(isy) {
+function getPairingCode(server = exports.instance) {
+    let codes = server.state.commissioning.pairingCodes;
+    codes.renderedQrPairingCode = schema_1.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 = (0, environment_1.NodeJsEnvironment)();
     const storageService = environment.get(environment_2.StorageService);
-    environment.vars.set('storage.path', ISY_js_1.ISY.instance.storagePath + '/matter');
+    environment.vars.set('storage.path', path_1.default.resolve(isy.storagePath, 'matter'));
     environment.vars.use(() => {
         const location = environment.vars.get('storage.path', environment.vars.get('path.root', '.'));
         storageService.location = location;
@@ -210,14 +247,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({
@@ -239,5 +276,5 @@ async function getConfiguration(isy) {
         uniqueId
     };
 }
-// #endregion Functions (2)
+// #endregion Functions (3)
 //# sourceMappingURL=Server.js.map

package/dist/cjs/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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"}

package/dist/cjs/Matter/Mappings/Insteon.js

@@ -1,20 +1,22 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const OnOffLightDevice_1 = require("@project-chip/matter.js/devices/OnOffLightDevice");
 const Drivers_js_1 = require("../../Definitions/Global/Drivers.js");
+const Families_js_1 = require("../../Definitions/Global/Families.js");
 const ClusterMap_js_1 = require("../../Model/ClusterMap.js");
-const OnOffLightDevice_1 = require("@project-chip/matter.js/devices/OnOffLightDevice");
 //import InsteonMap from "./Insteon.json";
 const DimmableLightDevice_1 = require("@project-chip/matter.js/devices/DimmableLightDevice");
 const map = {
+    Family: Families_js_1.Family.Insteon,
     Relay: {
         deviceType: OnOffLightDevice_1.OnOffLightDevice,
         mapping: {
             OnOff: {
                 attributes: {
-                    onOff: { driver: "ST" },
+                    onOff: { driver: 'ST', converter: 'Percent.Boolean' }
                 },
-                commands: { on: 'DON' },
-            },
+                commands: { on: 'DON' }
+            }
         }
     },
     RelaySwitch: {
@@ -22,29 +24,31 @@ const map = {
         mapping: {
             OnOff: {
                 attributes: {
-                    onOff: "ST",
+                    onOff: 'ST'
                 },
-                commands: { on: "DON" },
-            },
-        },
+                commands: { on: 'DON' }
+            }
+        }
     },
     Dimmer: {
         deviceType: DimmableLightDevice_1.DimmableLightDevice,
         mapping: {
             OnOff: {
                 attributes: {
-                    onOff: { driver: "ST" },
+                    onOff: { driver: 'ST', converter: 'LevelFrom0To255.Boolean' }
                 },
-                commands: { on: "DON" },
+                commands: { on: 'DON' }
             },
             LevelControl: {
                 attributes: {
-                    currentLevel: { driver: Drivers_js_1.DriverType.Status },
+                    currentLevel: { driver: Drivers_js_1.DriverType.Status, converter: 'LevelFrom0To255.LightingLevel' }
                 },
-                commands: { moveToLevel: { command: 'DON' } },
-            },
-        },
-    },
+                commands: { moveToLevel: { command: 'DON' } }
+            }
+        }
+    }
 };
+map.KeypadDimmer = map.Dimmer;
+map.DimmerSwitch = map.Dimmer;
 ClusterMap_js_1.MappingRegistry.register(map);
 //# sourceMappingURL=Insteon.js.map

package/dist/cjs/Matter/Mappings/Insteon.js.map

@@ -1 +1 @@
-{"version":3,"file":"Insteon.js","sourceRoot":"","sources":["../../../../src/Matter/Mappings/Insteon.ts"],"names":[],"mappings":";;AACA,oEAAiE;AAIjE,6DAKmC;AAEnC,uFAAoF;AAEpF,0CAA0C;AAC1C,6FAA0F;AAM1F,MAAM,GAAG,GAAuC;IAC9C,KAAK,EAAE;QACL,UAAU,EAAE,mCAAgB;QAC5B,OAAO,EAAG;YAER,KAAK,EAAE;gBACL,UAAU,EAAE;oBACV,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,EAAC;iBACvB;gBACD,QAAQ,EAAE,EAAE,EAAE,EAAE,KAAK,EAAC;aACvB;SAIF;KACF;IACD,WAAW,EAAE;QACX,UAAU,EAAE,mCAAgB;QAC5B,OAAO,EAAE;YACP,KAAK,EAAE;gBACL,UAAU,EAAE;oBACV,KAAK,EAAE,IAAI;iBACZ;gBACD,QAAQ,EAAE,EAAE,EAAE,EAAE,KAAK,EAAC;aACvB;SACF;KACF;IACD,MAAM,EAAE;QACN,UAAU,EAAE,yCAAmB;QAC/B,OAAO,EAAE;YACP,KAAK,EAAE;gBACL,UAAU,EAAE;oBACV,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE;iBACxB;gBACD,QAAQ,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE;aACxB;YACD,YAAY,EAAE;gBACZ,UAAU,EAAE;oBACV,YAAY,EAAE,EAAE,MAAM,EAAE,uBAAU,CAAC,MAAM,EAAE;iBAC5C;gBACD,QAAQ,EAAE,EAAE,WAAW,EAAE,EAAC,OAAO,EAAE,KAAK,EAAC,EAAC;aAC3C;SACF;KACF;CACF,CAAC;AAEF,+BAAe,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC"}
+{"version":3,"file":"Insteon.js","sourceRoot":"","sources":["../../../../src/Matter/Mappings/Insteon.ts"],"names":[],"mappings":";;AAEA,uFAAoF;AACpF,oEAAiE;AACjE,sEAAsE;AAGtE,6DAAoI;AAEpI,0CAA0C;AAC1C,6FAA0F;AAI1F,MAAM,GAAG,GAAuC;IAC/C,MAAM,EAAE,oBAAM,CAAC,OAAO;IACtB,KAAK,EAAE;QACN,UAAU,EAAE,mCAAgB;QAC5B,OAAO,EAAE;YACR,KAAK,EAAE;gBACN,UAAU,EAAE;oBACX,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,iBAAiB,EAAE;iBACrD;gBACD,QAAQ,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE;aACvB;SACmD;KACrD;IACD,WAAW,EAAE;QACZ,UAAU,EAAE,mCAAgB;QAC5B,OAAO,EAAE;YACR,KAAK,EAAE;gBACN,UAAU,EAAE;oBACX,KAAK,EAAE,IAAI;iBACX;gBACD,QAAQ,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE;aACvB;SACD;KACD;IACD,MAAM,EAAE;QACP,UAAU,EAAE,yCAAmB;QAC/B,OAAO,EAAE;YACR,KAAK,EAAE;gBACN,UAAU,EAAE;oBACX,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,yBAAyB,EAAE;iBAC7D;gBACD,QAAQ,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE;aACvB;YACD,YAAY,EAAE;gBACb,UAAU,EAAE;oBACX,YAAY,EAAE,EAAE,MAAM,EAAE,uBAAU,CAAC,MAAM,EAAE,SAAS,EAAE,+BAA+B,EAAE;iBACvF;gBACD,QAAQ,EAAE,EAAE,WAAW,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE;aAC7C;SACD;KACD;CACD,CAAC;AAEF,GAAG,CAAC,YAAY,GAAG,GAAG,CAAC,MAAM,CAAC;AAC9B,GAAG,CAAC,YAAY,GAAG,GAAG,CAAC,MAAM,CAAC;AAE9B,+BAAe,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC"}

package/dist/cjs/Matter/Mappings/register.js

@@ -0,0 +1 @@
+//# sourceMappingURL=register.js.map

package/dist/cjs/Matter/Mappings/register.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"register.js","sourceRoot":"","sources":["../../../../src/Matter/Mappings/register.ts"],"names":[],"mappings":""}

package/dist/cjs/Model/ClusterMap.js

@@ -2,8 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MappingRegistry = void 0;
 const Drivers_js_1 = require("../Definitions/Global/Drivers.js");
+const index_js_1 = require("../Devices/Insteon/index.js");
 const ClusterType_js_1 = require("./ClusterType.js");
-// #endregion Type aliases (15)
+// #endregion Type aliases (16)
 // #region Classes (1)
 class MappingRegistry {
     // #region Properties (1)
@@ -14,17 +15,19 @@ class MappingRegistry {
         return MappingRegistry.map.get(device.constructor.name);
     }
     static getMappingForBehavior(device, behavior) {
-        var m = MappingRegistry.getMapping(device);
-        return m[behavior.cluster.name];
-        // for(var m in MappingRegistry.getMapping(device).mapping)
-        // {
-        //   if(behavior.cluster.name === m)
-        //     return MappingRegistry.getMapping(device).mapping[m];
-        // }
+        //var m = MappingRegistry.getMapping(device);
+        //return m[behavior.cluster.name];
+        for (var m in MappingRegistry.getMapping(device).mapping) {
+            if (behavior.cluster.name === m)
+                return MappingRegistry.getMapping(device).mapping[m];
+        }
     }
     static register(map) {
         for (var key in map) {
-            MappingRegistry.map.set(key, map[key]);
+            if (key !== 'Family') {
+                MappingRegistry.map.set(key, map[key]);
+                MappingRegistry.map.set(index_js_1.Insteon[key].name, map[key]);
+            }
         }
     }
 }

package/dist/cjs/Model/ClusterMap.js.map

@@ -1 +1 @@
-{"version":3,"file":"ClusterMap.js","sourceRoot":"","sources":["../../../src/Model/ClusterMap.ts"],"names":[],"mappings":";;;AACA,iEAAsE;AAetE,qDAA+C;AAoH/C,+BAA+B;AAE/B,sBAAsB;AAEtB,MAAa,eAAe;IAC3B,yBAAyB;IAElB,MAAM,CAAC,GAAG,GAA8C,IAAI,GAAG,EAAE,CAAC;IAEzE,4BAA4B;IAE5B,oCAAoC;IAE7B,MAAM,CAAC,UAAU,CAAqC,MAAS;QACrE,OAAO,eAAe,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;IACzD,CAAC;IAEM,MAAM,CAAC,qBAAqB,CAAgE,MAAS,EAAE,QAAW;QACxH,IAAI,CAAC,GAAG,eAAe,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;QAE3C,OAAO,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAChC,2DAA2D;QAC3D,IAAI;QACJ,oCAAoC;QACpC,4DAA4D;QAE5D,IAAI;IACL,CAAC;IAEM,MAAM,CAAC,QAAQ,CAAC,GAAqC;QAC3D,KAAK,IAAI,GAAG,IAAI,GAAG,EAAE,CAAC;YACrB,eAAe,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;QACxC,CAAC;IACF,CAAC;;AA7BF,0CAgCC;AAED,yBAAyB;AAEzB,wBAAwB;AAExB,IAAI,KAAQ,CAAC;AACb,IAAI,UAAU,GAAG;IAChB,OAAO,EAAE,4BAAW,CAAC,YAAY;IACjC,UAAU,EAAE,EAAE,sBAAsB,EAAE,EAAE,MAAM,EAAE,uBAAU,CAAC,MAAM,EAAE,EAAE;IACrE,QAAQ,EAAE;QACT,WAAW,EAAE,EAAE,OAAO,EAAE,uBAAU,CAAC,cAAc,EAAE,UAAU,EAAE,EAAE,MAAM,EAAE,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE,MAAM,EAAE,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE,gBAAgB,EAAE,EAAE,SAAS,EAAE,kBAAkB,EAAE,EAAE,EAAE;KAC1L;CACD,CAAC;AACF,MAAM,GAAG,GAA0D;IAClE,QAAQ,EAAE,EAAE;IACZ,KAAK,EAAE;QACN,UAAU,EAAE;YACX,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE;SACvB;QACD,QAAQ,EAAE;YACT,cAAc,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE;SAClC;KACD;CACD,CAAC;AAEF,2BAA2B"}
+{"version":3,"file":"ClusterMap.js","sourceRoot":"","sources":["../../../src/Model/ClusterMap.ts"],"names":[],"mappings":";;;AAYA,iEAAsE;AAEtE,0DAAsD;AAKtD,qDAA+C;AA0H/C,+BAA+B;AAE/B,sBAAsB;AAEtB,MAAa,eAAe;IAC3B,yBAAyB;IAElB,MAAM,CAAC,GAAG,GAA8C,IAAI,GAAG,EAAE,CAAC;IAEzE,4BAA4B;IAE5B,oCAAoC;IAE7B,MAAM,CAAC,UAAU,CAAwC,MAAS;QACxE,OAAO,eAAe,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;IACzD,CAAC;IAEM,MAAM,CAAC,qBAAqB,CAAmE,MAAS,EAAE,QAAW;QAC3H,6CAA6C;QAE7C,kCAAkC;QAClC,KAAK,IAAI,CAAC,IAAI,eAAe,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,CAAC;YAC1D,IAAI,QAAQ,CAAC,OAAO,CAAC,IAAI,KAAK,CAAC;gBAAE,OAAO,eAAe,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,CAAqC,CAAC;QAC3H,CAAC;IACF,CAAC;IAEM,MAAM,CAAC,QAAQ,CAAC,GAAqC;QAC3D,KAAK,IAAI,GAAG,IAAI,GAAG,EAAE,CAAC;YACrB,IAAI,GAAG,KAAK,QAAQ,EAAE,CAAC;gBACtB,eAAe,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;gBACvC,eAAe,CAAC,GAAG,CAAC,GAAG,CAAC,kBAAO,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;YACtD,CAAC;QACF,CAAC;IACF,CAAC;;AA7BF,0CAgCC;AAED,yBAAyB;AAEzB,wBAAwB;AAExB,IAAI,KAAQ,CAAC;AACb,IAAI,UAAU,GAAG;IAChB,OAAO,EAAE,4BAAW,CAAC,YAAY;IACjC,UAAU,EAAE,EAAE,sBAAsB,EAAE,EAAE,MAAM,EAAE,uBAAU,CAAC,MAAM,EAAE,EAAE;IACrE,QAAQ,EAAE;QACT,WAAW,EAAE,EAAE,OAAO,EAAE,uBAAU,CAAC,cAAc,EAAE,UAAU,EAAE,EAAE,MAAM,EAAE,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE,MAAM,EAAE,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE,gBAAgB,EAAE,EAAE,SAAS,EAAE,kBAAkB,EAAE,EAAE,EAAE;KAC1L;CACD,CAAC;AACF,MAAM,GAAG,GAA0D;IAClE,QAAQ,EAAE,EAAE;IACZ,KAAK,EAAE;QACN,UAAU,EAAE;YACX,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE;SACvB;QACD,QAAQ,EAAE;YACT,cAAc,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE;SAClC;KACD;CACD,CAAC;AAEF,2BAA2B"}

package/dist/cjs/Utils.js

@@ -22,11 +22,13 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EventEmitter = void 0;
 exports.getEnumValueByEnumKey = getEnumValueByEnumKey;
 exports.getEnumKeyByEnumValue = getEnumKeyByEnumValue;
-exports.invert = invert;
 exports.toArray = toArray;
 exports.fromArray = fromArray;
 exports.byteToPct = byteToPct;
@@ -43,23 +45,20 @@ exports.removeAll = removeAll;
 exports.parseTypeCode = parseTypeCode;
 exports.getCategory = getCategory;
 exports.getSubcategory = getSubcategory;
+exports.findPackageJson = findPackageJson;
+exports.logStringify = logStringify;
 const winston_1 = __importStar(require("winston"));
 const events_1 = require("events");
 const Categories_js_1 = require("./Definitions/Global/Categories.js");
+const fs_1 = require("fs");
+const promises_1 = require("fs/promises");
+const path_1 = __importDefault(require("path"));
 function getEnumValueByEnumKey(enumType, enumKey) {
     return enumType[enumKey];
 }
 function getEnumKeyByEnumValue(enumType, enumValue) {
     return Object.keys(enumType).find((key) => enumType[key] === enumValue);
 }
-//onst D: d = 'ST';
-//type DriverLabel = Values<IdentityOf<DriverType>>;
-function invert(converter) {
-    return {
-        from: converter.to,
-        to: converter.from
-    };
-}
 function toArray(value) {
     if (undefined === value)
         return [];
@@ -196,4 +195,56 @@ function getSubcategory(device) {
         return Categories_js_1.Category.Unknown;
     }
 }
+function getImportMeta() {
+    try {
+        //@ts-ignore
+        return import.meta;
+    }
+    catch (err) {
+        //@ts-ignore
+        let { dirname, filename } = { dirname: __dirname, filename: __filename };
+        return { dirname, filename };
+    }
+}
+async function findPackageJson(currentPath = getImportMeta().dirname) {
+    try {
+        while (currentPath !== '/') {
+            const packageJsonPath = path_1.default.join(currentPath, 'package.json');
+            if ((0, fs_1.existsSync)(packageJsonPath)) {
+                return JSON.parse(await (0, promises_1.readFile)(packageJsonPath, 'utf8'));
+            }
+            currentPath = path_1.default.join(currentPath, '..');
+        }
+    }
+    catch {
+        //@ts-expect-error
+        return (await Promise.resolve().then(() => __importStar(require('../../package.json')))).default;
+    }
+    return null;
+}
+function logStringify(obj, indent = 2) {
+    let cache = [];
+    const retVal = JSON.stringify(obj, (key, value) => {
+        if (typeof value === 'object' && value !== null) {
+            if (cache.includes(value)) {
+                // Circular reference found, discard key
+                return;
+            }
+            // Store value in our collection
+            cache.push(value);
+        }
+        if (value instanceof Map) {
+            return [...value];
+        }
+        if (value instanceof Set) {
+            return [...value];
+        }
+        if (key.toLowerCase().includes('password')) {
+            return '********';
+        }
+        return value;
+    }, indent);
+    cache = null;
+    return retVal;
+}
 //# sourceMappingURL=Utils.js.map