@ecopoesis/homebridge-dmx 0.1.0 → 0.3.0

package/dist/zoneAccessory.js

@@ -0,0 +1,148 @@
+// ZoneFixture — virtual HomeKit Lightbulb that aggregates a set of member
+// fixtures.
+//
+// Reads: each .onGet returns the MAJORITY value of that characteristic
+// across the zone's members. Ties are broken in favour of the value held
+// by the alphabetically-first member. This gives a deterministic display
+// even when members are in split states.
+//
+// Writes: each .onSet updates every member's state in the registry (which
+// fires per-member change events so the individual fixture accessories
+// refresh their own HomeKit displays), then triggers the controller for
+// each member so the DMX wire reflects the change.
+//
+// When ANY member's state changes (by any path), the zone's HomeKit
+// characteristics push the new majority — so zones containing overlapping
+// members stay coherent with each other.
+import { CHARACTERISTIC_UPDATE_DELAY_MS } from './settings.js';
+import { pickMajority } from './stateRegistry.js';
+export class ZoneFixture {
+    platform;
+    zone;
+    controllers;
+    registry;
+    pending = null;
+    refreshPending = null;
+    bulb;
+    constructor(platform, accessory, zone, controllers, registry) {
+        this.platform = platform;
+        this.zone = zone;
+        this.controllers = controllers;
+        this.registry = registry;
+        const C = platform.Characteristic;
+        const info = accessory.getService(platform.Service.AccessoryInformation);
+        info?.setCharacteristic(C.Manufacturer, 'DMX')
+            ?.setCharacteristic(C.Model, `Zone (${zone.members.length} fixtures)`)
+            ?.setCharacteristic(C.SerialNumber, `zone-${zone.id}`);
+        this.bulb =
+            accessory.getService(platform.Service.Lightbulb)
+                ?? accessory.addService(platform.Service.Lightbulb, zone.name);
+        this.bulb.setCharacteristic(C.Name, zone.name);
+        const has = (k) => zone.characteristics.includes(k);
+        this.bulb.getCharacteristic(C.On)
+            .onGet(() => this.majorityState().on)
+            .onSet((v) => this.applyToMembers({ on: Boolean(v) }));
+        if (has('Brightness')) {
+            this.bulb.getCharacteristic(C.Brightness)
+                .onGet(() => this.majorityState().brightness)
+                .onSet((v) => this.applyToMembers({ brightness: Number(v) }));
+        }
+        if (has('Hue')) {
+            this.bulb.getCharacteristic(C.Hue)
+                .onGet(() => this.majorityState().hue ?? 0)
+                .onSet((v) => this.applyToMembers({ hue: Number(v) }));
+        }
+        if (has('Saturation')) {
+            this.bulb.getCharacteristic(C.Saturation)
+                .onGet(() => this.majorityState().saturation ?? 0)
+                .onSet((v) => this.applyToMembers({ saturation: Number(v) }));
+        }
+        if (has('ColorTemperature')) {
+            this.bulb.getCharacteristic(C.ColorTemperature)
+                .onGet(() => this.majorityState().colorTemperatureMireds ?? 200)
+                .onSet((v) => this.applyToMembers({
+                colorTemperatureMireds: Number(v),
+                saturation: 0,
+            }));
+        }
+        // Refresh on any member change.
+        const memberIds = new Set(zone.members.map((m) => m.id));
+        registry.onChange((id) => {
+            if (memberIds.has(id))
+                this.scheduleRefresh();
+        });
+    }
+    /** Compute majority state across members, per characteristic. */
+    majorityState() {
+        const ss = this.zone.members.map((m) => ({ id: m.id, state: this.registry.get(m.id) }));
+        return {
+            on: pickMajority(ss.map((s) => ({ id: s.id, v: s.state.on }))) ?? false,
+            brightness: pickMajority(ss.map((s) => ({ id: s.id, v: s.state.brightness }))) ?? 100,
+            hue: pickMajority(ss.map((s) => ({ id: s.id, v: s.state.hue }))),
+            saturation: pickMajority(ss.map((s) => ({ id: s.id, v: s.state.saturation }))),
+            colorTemperatureMireds: pickMajority(ss.map((s) => ({ id: s.id, v: s.state.colorTemperatureMireds }))),
+        };
+    }
+    /** A HomeKit set on the zone: build the new state from the current
+     *  majority + the patch the user is applying, write it into every
+     *  member, and trigger the controller after a small debounce so
+     *  multi-characteristic dispatch coalesces. */
+    applyToMembers(patch) {
+        const next = { ...this.majorityState(), ...patch };
+        // Push the next state into every member's registry entry. This fires
+        // per-fixture change events so the individual StickFixture accessories
+        // refresh their own HomeKit displays.
+        for (const m of this.zone.members) {
+            this.registry.update(m.id, next);
+        }
+        this.scheduleDispatch();
+    }
+    /** Debounced controller dispatch. Sends current registry state for each
+     *  member to the appropriate StickController. */
+    scheduleDispatch() {
+        if (this.pending)
+            clearTimeout(this.pending);
+        this.pending = setTimeout(() => {
+            this.pending = null;
+            const s = this.majorityState();
+            this.platform.log.info(`[zone:${this.zone.id}] HK set: on=${s.on} br=${s.brightness}` +
+                (s.hue != null ? ` h=${s.hue}` : '') +
+                (s.saturation != null ? ` s=${s.saturation}` : '') +
+                (s.colorTemperatureMireds != null ? ` ct=${s.colorTemperatureMireds}` : '') +
+                ` → ${this.zone.members.length} members`);
+            for (const m of this.zone.members) {
+                const c = this.controllers.get(m.controller.id);
+                if (!c) {
+                    this.platform.log.error(`zone "${this.zone.id}": no controller for "${m.id}"`);
+                    continue;
+                }
+                c.setFixture(m, this.registry.get(m.id));
+            }
+        }, CHARACTERISTIC_UPDATE_DELAY_MS);
+    }
+    /** Debounced refresh: when members change, push the new majority to
+     *  the zone's HomeKit characteristics. */
+    scheduleRefresh() {
+        if (this.refreshPending)
+            clearTimeout(this.refreshPending);
+        this.refreshPending = setTimeout(() => {
+            this.refreshPending = null;
+            const s = this.majorityState();
+            const C = this.platform.Characteristic;
+            this.bulb.updateCharacteristic(C.On, s.on);
+            if (this.zone.characteristics.includes('Brightness')) {
+                this.bulb.updateCharacteristic(C.Brightness, s.brightness);
+            }
+            if (this.zone.characteristics.includes('Hue') && s.hue != null) {
+                this.bulb.updateCharacteristic(C.Hue, s.hue);
+            }
+            if (this.zone.characteristics.includes('Saturation') && s.saturation != null) {
+                this.bulb.updateCharacteristic(C.Saturation, s.saturation);
+            }
+            if (this.zone.characteristics.includes('ColorTemperature') && s.colorTemperatureMireds != null) {
+                this.bulb.updateCharacteristic(C.ColorTemperature, s.colorTemperatureMireds);
+            }
+        }, CHARACTERISTIC_UPDATE_DELAY_MS);
+    }
+}
+//# sourceMappingURL=zoneAccessory.js.map

package/dist/zoneAccessory.js.map

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

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ecopoesis/homebridge-dmx",
   "displayName": "DMX",
-  "version": "0.1.0",
+  "version": "0.3.0",
   "description": "Homebridge platform for DMX controllers (currently Nicolaudie Stick-DE3)",
   "license": "Apache-2.0",
   "type": "module",

package/src/config.ts

@@ -37,7 +37,7 @@ import fs from 'node:fs';
 import path from 'node:path';
 import yaml from 'js-yaml';
 
-import { ChannelDef, ColorModel } from './color/types.js';
+import { ChannelDef, ColorModel, HKCharacteristic } from './color/types.js';
 import { getColorModel } from './color/index.js';
 import { parseChannelName } from './color/parsers.js';
 
@@ -62,12 +62,19 @@ export interface PatchSpec {
   start: number;         // 1-based DMX start address
 }
 
+export interface ZoneSpec {
+  id: string;            // unique handle (kebab-case)
+  name: string;          // human-friendly HomeKit name
+  members: string[];     // fixture ids included in this zone
+}
+
 export interface RawConfig {
   name?: string;
   yamlPath?: string;
   controllers?: ControllerSpec[];
   profiles?: ProfileSpec[];
   patch?: PatchSpec[];
+  zones?: ZoneSpec[];
 }
 
 export interface Profile {
@@ -95,10 +102,21 @@ export interface Fixture {
   nChannels: number;     // = channels.length
 }
 
+/** A virtual "zone" Lightbulb: appears as a single accessory in HomeKit;
+ *  setting its state dispatches to every member fixture. The intersection
+ *  of the members' color-model characteristics is what HomeKit sees. */
+export interface Zone {
+  id: string;
+  name: string;
+  members: Fixture[];
+  characteristics: HKCharacteristic[];   // intersection of member characteristics
+}
+
 export interface LoadedConfig {
   name: string;
   controllers: Controller[];
   fixtures: Fixture[];
+  zones: Zone[];
 }
 
 export const DEFAULT_PLATFORM_NAME = 'DMX';
@@ -240,9 +258,51 @@ export function loadConfig(rawJson: RawConfig, cwd?: string): LoadedConfig {
     });
   }
 
+  // Zones — virtual Lightbulb accessories. Each zone's members must be
+  // existing fixture ids. Zones never reference other zones (no recursion).
+  const fixturesById = new Map(fixtures.map((f) => [f.id, f]));
+  const zoneSpecs = raw.zones ?? [];
+  const zones: Zone[] = [];
+  const seenZoneIds = new Set<string>();
+  for (const zs of zoneSpecs) {
+    if (!zs.id) throw new Error('zone: missing id');
+    if (seenZoneIds.has(zs.id)) {
+      throw new Error(`zone: duplicate id "${zs.id}"`);
+    }
+    if (fixturesById.has(zs.id)) {
+      throw new Error(`zone id "${zs.id}" collides with fixture id`);
+    }
+    seenZoneIds.add(zs.id);
+    if (!Array.isArray(zs.members) || zs.members.length === 0) {
+      throw new Error(`zone "${zs.id}": members must be a non-empty array of fixture ids`);
+    }
+    const members: Fixture[] = [];
+    for (const m of zs.members) {
+      const fx = fixturesById.get(m);
+      if (!fx) {
+        throw new Error(`zone "${zs.id}": unknown fixture "${m}"`);
+      }
+      members.push(fx);
+    }
+    // Intersection of member characteristics — HomeKit only exposes what
+    // ALL members can do.
+    let chars = new Set<HKCharacteristic>(members[0].profile.model.characteristics);
+    for (let i = 1; i < members.length; i++) {
+      const mc = new Set<HKCharacteristic>(members[i].profile.model.characteristics);
+      chars = new Set([...chars].filter((c) => mc.has(c)));
+    }
+    zones.push({
+      id: zs.id,
+      name: zs.name || zs.id,
+      members,
+      characteristics: [...chars],
+    });
+  }
+
   return {
     name: raw.name ?? DEFAULT_PLATFORM_NAME,
     controllers: [...controllersById.values()],
     fixtures,
+    zones,
   };
 }

package/src/platform.ts

@@ -17,6 +17,8 @@ import type {
 import { Controller, LoadedConfig, loadConfig, RawConfig } from './config.js';
 import { StickController } from './controller.js';
 import { StickFixture } from './platformAccessory.js';
+import { StateRegistry } from './stateRegistry.js';
+import { ZoneFixture } from './zoneAccessory.js';
 import { PLATFORM_NAME, PLUGIN_NAME } from './settings.js';
 
 export class DmxPlatform implements DynamicPlatformPlugin {
@@ -26,6 +28,7 @@ export class DmxPlatform implements DynamicPlatformPlugin {
 
   private cfg: LoadedConfig | null = null;
   private controllers = new Map<string, StickController>();
+  private registry = new StateRegistry();
 
   constructor(
     public readonly log: Logger,
@@ -52,7 +55,8 @@ export class DmxPlatform implements DynamicPlatformPlugin {
     this.log.info(
       `DMX platform configured: ${this.cfg.controllers.length} controller` +
       `${this.cfg.controllers.length === 1 ? '' : 's'}, ` +
-      `${this.cfg.fixtures.length} fixture${this.cfg.fixtures.length === 1 ? '' : 's'}`,
+      `${this.cfg.fixtures.length} fixture${this.cfg.fixtures.length === 1 ? '' : 's'}, ` +
+      `${this.cfg.zones.length} zone${this.cfg.zones.length === 1 ? '' : 's'}`,
     );
 
     this.api.on('didFinishLaunching', () => this.discoverDevices());
@@ -94,12 +98,31 @@ export class DmxPlatform implements DynamicPlatformPlugin {
       if (existing) {
         this.log.debug(`wiring cached accessory ${fx.id}`);
         existing.context.fixture = { id: fx.id, controllerId: fx.controller.id };
-        new StickFixture(this, existing, fx, controller);
+        new StickFixture(this, existing, fx, controller, this.registry);
       } else {
         this.log.info(`registering new accessory: ${fx.name} (${fx.id})`);
         const accessory = new this.api.platformAccessory(fx.name, uuid);
         accessory.context.fixture = { id: fx.id, controllerId: fx.controller.id };
-        new StickFixture(this, accessory, fx, controller);
+        new StickFixture(this, accessory, fx, controller, this.registry);
+        this.api.registerPlatformAccessories(PLUGIN_NAME, PLATFORM_NAME, [accessory]);
+        this.accessories.push(accessory);
+      }
+    }
+
+    // Zones — virtual accessories that dispatch to their member fixtures.
+    for (const zone of this.cfg.zones) {
+      const uuid = this.api.hap.uuid.generate(`dmx-zone:${zone.id}`);
+      wantUuids.add(uuid);
+      const existing = this.accessories.find((a) => a.UUID === uuid);
+      if (existing) {
+        this.log.debug(`wiring cached zone ${zone.id}`);
+        existing.context.zone = { id: zone.id };
+        new ZoneFixture(this, existing, zone, this.controllers, this.registry);
+      } else {
+        this.log.info(`registering new zone: ${zone.name} (${zone.id}, ${zone.members.length} members)`);
+        const accessory = new this.api.platformAccessory(zone.name, uuid);
+        accessory.context.zone = { id: zone.id };
+        new ZoneFixture(this, accessory, zone, this.controllers, this.registry);
         this.api.registerPlatformAccessories(PLUGIN_NAME, PLATFORM_NAME, [accessory]);
         this.accessories.push(accessory);
       }

package/src/platformAccessory.ts

@@ -1,4 +1,8 @@
 // StickFixture — one HomeKit Lightbulb accessory per patched fixture.
+//
+// State is owned by the platform-wide StateRegistry. We read on .onGet,
+// write on .onSet, and subscribe to changes so the HomeKit-displayed
+// values track the registry (e.g. when a zone updates this fixture).
 
 import type {
   CharacteristicValue,
@@ -11,20 +15,18 @@ import { HomeKitLightState } from './color/types.js';
 import { StickController } from './controller.js';
 import type { DmxPlatform } from './platform.js';
 import { CHARACTERISTIC_UPDATE_DELAY_MS } from './settings.js';
+import { StateRegistry } from './stateRegistry.js';
 
 export class StickFixture {
-  /** Current HomeKit state we'll send to the Stick on the next push. */
-  private state: HomeKitLightState = { on: false, brightness: 100 };
-
-  /** Debounce timer for HomeKit's multi-characteristic dispatch
-   *  (Hue/Saturation/Brightness arrive as 3 separate set calls). */
   private pending: NodeJS.Timeout | null = null;
+  private bulb: Service;
 
   constructor(
     private readonly platform: DmxPlatform,
     private readonly accessory: PlatformAccessory,
     private readonly fixture: Fixture,
     private readonly controller: StickController,
+    private readonly registry: StateRegistry,
   ) {
     const C = platform.Characteristic;
     const info = accessory.getService(platform.Service.AccessoryInformation);
@@ -32,71 +34,91 @@ export class StickFixture {
         ?.setCharacteristic(C.Model, fixture.profile.name)
         ?.setCharacteristic(C.SerialNumber, fixture.id);
 
-    const bulb: Service =
+    this.bulb =
       accessory.getService(platform.Service.Lightbulb)
       ?? accessory.addService(platform.Service.Lightbulb, fixture.name);
 
-    bulb.setCharacteristic(C.Name, fixture.name);
+    this.bulb.setCharacteristic(C.Name, fixture.name);
 
     const chars = fixture.profile.model.characteristics;
 
-    bulb.getCharacteristic(C.On)
-      .onGet(() => this.state.on)
-      .onSet((v) => { this.state.on = Boolean(v); this.schedule(); });
+    this.bulb.getCharacteristic(C.On)
+      .onGet(() => registry.get(fixture.id).on)
+      .onSet((v) => {
+        registry.update(fixture.id, { on: Boolean(v) });
+        this.schedule();
+      });
 
     if (chars.includes('Brightness')) {
-      bulb.getCharacteristic(C.Brightness)
-        .onGet(() => this.state.brightness)
+      this.bulb.getCharacteristic(C.Brightness)
+        .onGet(() => registry.get(fixture.id).brightness)
         .onSet((v: CharacteristicValue) => {
-          this.state.brightness = Number(v);
+          registry.update(fixture.id, { brightness: Number(v) });
           this.schedule();
         });
     }
-
     if (chars.includes('Hue')) {
-      bulb.getCharacteristic(C.Hue)
-        .onGet(() => this.state.hue ?? 0)
+      this.bulb.getCharacteristic(C.Hue)
+        .onGet(() => registry.get(fixture.id).hue ?? 0)
         .onSet((v) => {
-          this.state.hue = Number(v);
-          // setting hue implies color mode (sat>0); leave saturation as-is
+          registry.update(fixture.id, { hue: Number(v) });
           this.schedule();
         });
     }
-
     if (chars.includes('Saturation')) {
-      bulb.getCharacteristic(C.Saturation)
-        .onGet(() => this.state.saturation ?? 0)
+      this.bulb.getCharacteristic(C.Saturation)
+        .onGet(() => registry.get(fixture.id).saturation ?? 0)
         .onSet((v) => {
-          this.state.saturation = Number(v);
+          registry.update(fixture.id, { saturation: Number(v) });
           this.schedule();
         });
     }
-
     if (chars.includes('ColorTemperature')) {
-      bulb.getCharacteristic(C.ColorTemperature)
-        .onGet(() => this.state.colorTemperatureMireds ?? 200)
+      this.bulb.getCharacteristic(C.ColorTemperature)
+        .onGet(() => registry.get(fixture.id).colorTemperatureMireds ?? 200)
         .onSet((v) => {
-          this.state.colorTemperatureMireds = Number(v);
-          // CCT mode: HomeKit toggles between color and white modes; we mirror
-          // by zeroing saturation when CCT is changed.
-          this.state.saturation = 0;
+          // CCT change implies white mode; zero saturation.
+          registry.update(fixture.id, {
+            colorTemperatureMireds: Number(v),
+            saturation: 0,
+          });
           this.schedule();
         });
     }
+
+    // Refresh HomeKit characteristics whenever this fixture's state changes
+    // in the registry (e.g. via a zone set, or another channel of itself).
+    registry.onChange((changedId) => {
+      if (changedId !== fixture.id) return;
+      this.pushFromRegistry();
+    });
+  }
+
+  private pushFromRegistry(): void {
+    const s = this.registry.get(this.fixture.id);
+    const C = this.platform.Characteristic;
+    const chars = this.fixture.profile.model.characteristics;
+    this.bulb.updateCharacteristic(C.On, s.on);
+    if (chars.includes('Brightness')) this.bulb.updateCharacteristic(C.Brightness, s.brightness);
+    if (chars.includes('Hue') && s.hue != null) this.bulb.updateCharacteristic(C.Hue, s.hue);
+    if (chars.includes('Saturation') && s.saturation != null) this.bulb.updateCharacteristic(C.Saturation, s.saturation);
+    if (chars.includes('ColorTemperature') && s.colorTemperatureMireds != null) {
+      this.bulb.updateCharacteristic(C.ColorTemperature, s.colorTemperatureMireds);
+    }
   }
 
   private schedule(): void {
     if (this.pending) clearTimeout(this.pending);
     this.pending = setTimeout(() => {
       this.pending = null;
-      const s = this.state;
+      const s = this.registry.get(this.fixture.id);
       this.platform.log.info(
         `[${this.fixture.id}] HK set: on=${s.on} br=${s.brightness}` +
         (s.hue != null ? ` h=${s.hue}` : '') +
         (s.saturation != null ? ` s=${s.saturation}` : '') +
         (s.colorTemperatureMireds != null ? ` ct=${s.colorTemperatureMireds}` : ''),
       );
-      this.controller.setFixture(this.fixture, this.state);
+      this.controller.setFixture(this.fixture, s);
     }, CHARACTERISTIC_UPDATE_DELAY_MS);
   }
 }

package/src/stateRegistry.ts

@@ -0,0 +1,71 @@
+// StateRegistry — central store of every fixture's HomeKit-visible state.
+//
+// Every StickFixture and ZoneFixture reads/writes through here. Whenever a
+// fixture's state changes, listeners fire so zones can refresh their own
+// HomeKit characteristics (and vice versa: setting a zone updates each
+// member's state in the registry, which fires events, which prompt the
+// per-fixture accessories to update their HomeKit-displayed state).
+//
+// Majority rule for zone state: see pickMajority() — count occurrences of
+// each value across (alphabetically-sorted) members; largest count wins;
+// ties are broken in favour of the value held by the alphabetically-first
+// member.
+
+import { HomeKitLightState } from './color/types.js';
+
+export type StateChangeListener = (fixtureId: string) => void;
+
+const DEFAULT_STATE: HomeKitLightState = { on: false, brightness: 100 };
+
+export class StateRegistry {
+  private states = new Map<string, HomeKitLightState>();
+  private listeners = new Set<StateChangeListener>();
+
+  get(id: string): HomeKitLightState {
+    return this.states.get(id) ?? { ...DEFAULT_STATE };
+  }
+
+  /** Replace a fixture's state and fire change listeners. */
+  set(id: string, state: HomeKitLightState): void {
+    this.states.set(id, { ...state });
+    for (const l of this.listeners) l(id);
+  }
+
+  /** Merge a partial update into a fixture's state, returning the new full
+   *  state. Fires listeners. */
+  update(id: string, patch: Partial<HomeKitLightState>): HomeKitLightState {
+    const next: HomeKitLightState = { ...this.get(id), ...patch };
+    this.set(id, next);
+    return next;
+  }
+
+  onChange(cb: StateChangeListener): () => void {
+    this.listeners.add(cb);
+    return () => this.listeners.delete(cb);
+  }
+}
+
+/** Bucket members' values; return the value with the largest bucket. Ties
+ *  break in favour of the value held by the first member in
+ *  alphabetical-id order. */
+export function pickMajority<T>(items: Array<{ id: string; v: T }>): T | undefined {
+  if (items.length === 0) return undefined;
+  const sorted = items.slice().sort((a, b) => a.id.localeCompare(b.id));
+  const counts = new Map<T, { count: number; firstIdx: number }>();
+  for (let i = 0; i < sorted.length; i++) {
+    const v = sorted[i].v;
+    const rec = counts.get(v);
+    if (rec) rec.count++;
+    else counts.set(v, { count: 1, firstIdx: i });
+  }
+  let bestV: T = sorted[0].v;
+  let bestRec = counts.get(bestV)!;
+  for (const [v, rec] of counts) {
+    if (rec.count > bestRec.count ||
+        (rec.count === bestRec.count && rec.firstIdx < bestRec.firstIdx)) {
+      bestV = v;
+      bestRec = rec;
+    }
+  }
+  return bestV;
+}