node-red-contrib-knx-ultimate 6.0.4 → 6.0.5

package/nodes/utils/matterBridgeEngine.mjs

@@ -71,27 +71,31 @@ class classMatterBridge extends EventEmitter {
     try {
       api.Logger.level = api.LogLevel.ERROR
     } catch (error) { /* empty */ }
-    const environment = api.Environment.default
-    // Same storage root as the Matter controller engine: instances are separated by their id.
-    environment.vars.set('storage.path', this.storagePath)
-
-    this.server = await api.ServerNode.create({
-      id: this.instanceId,
-      network: { port: this.options.port },
-      productDescription: {
-        name: this.options.deviceName,
-        deviceType: api.AggregatorEndpoint.deviceType
-      },
-      basicInformation: {
-        vendorName: 'KNX-Ultimate',
-        vendorId: api.VendorId(0xFFF1), // Test vendor ID
-        nodeLabel: this.options.deviceName,
-        productName: this.options.deviceName,
-        productLabel: this.options.deviceName,
-        productId: 0x8000,
-        serialNumber: `knxu-${this.instanceId}`.slice(0, 32),
-        uniqueId: this.instanceId.slice(-32)
-      }
+    const { withEnvironmentLock } = await import('./matterEnvironmentLock.mjs')
+    // Environment.default (and its 'storage.path' var) is a process-wide singleton shared
+    // with the Matter Controller engine: serialize the set+create critical section so a
+    // concurrent startup can never observe another engine's storage path mid-flight.
+    this.server = await withEnvironmentLock(async () => {
+      const environment = api.Environment.default
+      environment.vars.set('storage.path', this.storagePath)
+      return api.ServerNode.create({
+        id: this.instanceId,
+        network: { port: this.options.port },
+        productDescription: {
+          name: this.options.deviceName,
+          deviceType: api.AggregatorEndpoint.deviceType
+        },
+        basicInformation: {
+          vendorName: 'KNX-Ultimate',
+          vendorId: api.VendorId(0xFFF1), // Test vendor ID
+          nodeLabel: this.options.deviceName,
+          productName: this.options.deviceName,
+          productLabel: this.options.deviceName,
+          productId: 0x8000,
+          serialNumber: `knxu-${this.instanceId}`.slice(0, 32),
+          uniqueId: this.instanceId.slice(-32)
+        }
+      })
     })
 
     this.aggregator = new api.Endpoint(api.AggregatorEndpoint, { id: 'aggregator' })
@@ -171,7 +175,8 @@ class classMatterBridge extends EventEmitter {
       const needsRecreate = newDef !== undefined && oldDef !== undefined &&
         (newDef.type !== oldDef.type ||
           (newDef.invertPosition === true) !== (oldDef.invertPosition === true) ||
-          (newDef.coverExposeAsDimmableLight === true) !== (oldDef.coverExposeAsDimmableLight === true))
+          (newDef.hasHeatingSetpoint !== false) !== (oldDef.hasHeatingSetpoint !== false) ||
+          (newDef.hasCoolingSetpoint === true) !== (oldDef.hasCoolingSetpoint === true))
       if (newDef === undefined || needsRecreate) {
         await this.removeDeviceEndpoint(id)
       }

package/nodes/utils/matterEngine.mjs

@@ -175,14 +175,20 @@ class classMatter extends EventEmitter {
       // Quiet down the very verbose default matter.js console logging.
       api.Logger.level = api.LogLevel.ERROR
     } catch (error) { /* empty */ }
-    const environment = api.Environment.default
-    environment.vars.set('storage.path', this.storagePath)
-    this.controller = new api.CommissioningController({
-      environment: { environment, id: this.instanceId },
-      autoConnect: false,
-      adminFabricLabel: this.fabricLabel
+    const { withEnvironmentLock } = await import('./matterEnvironmentLock.mjs')
+    // Serialize with the Matter Bridge engine: both write Environment.default.vars
+    // ('storage.path') before creating their matter.js node, and that Environment is a
+    // process-wide singleton. See matterEnvironmentLock.mjs for why this matters.
+    await withEnvironmentLock(async () => {
+      const environment = api.Environment.default
+      environment.vars.set('storage.path', this.storagePath)
+      this.controller = new api.CommissioningController({
+        environment: { environment, id: this.instanceId },
+        autoConnect: false,
+        adminFabricLabel: this.fabricLabel
+      })
+      await this.controller.start()
     })
-    await this.controller.start()
     this.matterConnectionStatus = 'connected'
     this.emit('connected')
     // Connect all already commissioned nodes and hook their events.

package/nodes/utils/matterEnvironmentLock.mjs

@@ -0,0 +1,32 @@
+/* eslint-disable max-len */
+// matter.js keeps its runtime configuration (including 'storage.path') on
+// Environment.default, a SINGLE process-wide object shared by every ServerNode /
+// CommissioningController instance (the KNX Matter Bridge engine AND the Matter
+// Controller engine both read/write it). Today every engine instance in this
+// package happens to set the same 'storage.path' value, so the two engines
+// racing on Environment.default.vars.set() before their own create() call has
+// historically been harmless in practice. It is still a shared-mutable-global
+// access pattern: if a future change ever gives two engines different paths
+// (e.g. per-instance storage isolation), an unguarded interleaving could make
+// engine A's ServerNode.create() observe engine B's path.
+//
+// This module offers a tiny FIFO async mutex so callers can wrap
+// "set the env var(s) then create the node" as one atomic critical section,
+// regardless of how many bridge/controller config nodes start concurrently.
+let queue = Promise.resolve()
+
+/**
+ * Runs `fn` exclusively with respect to every other call to withEnvironmentLock
+ * in this process. Calls are queued FIFO; a throwing/rejecting `fn` does not
+ * block subsequent queued calls.
+ * @param {() => Promise<any>} fn
+ * @returns {Promise<any>} whatever `fn` resolves to
+ */
+function withEnvironmentLock (fn) {
+  const run = queue.then(fn, fn)
+  // Keep the chain alive even if `fn` rejects, so later callers still run.
+  queue = run.then(() => undefined, () => undefined)
+  return run
+}
+
+export { withEnvironmentLock }

package/package.json

@@ -3,7 +3,7 @@
   "engines": {
     "node": ">=20.18.1"
   },
-  "version": "6.0.4",
+  "version": "6.0.5",
   "description": "Control your KNX and KNX Secure intallation via Node-Red! A bunch of KNX nodes, with integrated Philips HUE control, ETS group address importer, KNX AI for diagnosticsand KNX routing between interfaces. Easy to use and highly configurable.",
   "files": [
     "nodes/",