@ecopoesis/homebridge-dmx 0.4.0 → 0.5.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +4 -3
- package/config.schema.json +55 -7
- package/dist/color/hsvcct.d.ts.map +1 -1
- package/dist/color/hsvcct.js +42 -0
- package/dist/color/hsvcct.js.map +1 -1
- package/dist/config.d.ts +5 -1
- package/dist/config.d.ts.map +1 -1
- package/dist/config.js +12 -3
- package/dist/config.js.map +1 -1
- package/dist/controller.d.ts +2 -1
- package/dist/controller.d.ts.map +1 -1
- package/dist/controller.js.map +1 -1
- package/dist/dmxController.d.ts +11 -0
- package/dist/dmxController.d.ts.map +1 -0
- package/dist/dmxController.js +4 -0
- package/dist/dmxController.js.map +1 -0
- package/dist/ethergate.d.ts +5 -0
- package/dist/ethergate.d.ts.map +1 -0
- package/dist/ethergate.js +50 -0
- package/dist/ethergate.js.map +1 -0
- package/dist/platform.d.ts +8 -0
- package/dist/platform.d.ts.map +1 -1
- package/dist/platform.js +63 -1
- package/dist/platform.js.map +1 -1
- package/dist/platformAccessory.d.ts +2 -2
- package/dist/platformAccessory.d.ts.map +1 -1
- package/dist/platformAccessory.js.map +1 -1
- package/dist/sacn.d.ts +33 -0
- package/dist/sacn.d.ts.map +1 -0
- package/dist/sacn.js +147 -0
- package/dist/sacn.js.map +1 -0
- package/dist/settings.d.ts +14 -0
- package/dist/settings.d.ts.map +1 -1
- package/dist/settings.js +15 -0
- package/dist/settings.js.map +1 -1
- package/dist/zoneAccessory.d.ts +2 -2
- package/dist/zoneAccessory.d.ts.map +1 -1
- package/dist/zoneAccessory.js.map +1 -1
- package/examples/dmx.yaml +15 -4
- package/package.json +1 -1
- package/src/color/hsvcct.ts +36 -0
- package/src/config.ts +18 -5
- package/src/controller.ts +2 -1
- package/src/dmxController.ts +14 -0
- package/src/ethergate.ts +51 -0
- package/src/platform.ts +66 -4
- package/src/platformAccessory.ts +2 -2
- package/src/sacn.ts +154 -0
- package/src/settings.ts +21 -0
- package/src/zoneAccessory.ts +2 -2
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"platformAccessory.js","sourceRoot":"","sources":["../src/platformAccessory.ts"],"names":[],"mappings":"AAAA,sEAAsE;AACtE,EAAE;AACF,wEAAwE;AACxE,qEAAqE;AACrE,qEAAqE;AAYrE,OAAO,EAAE,8BAA8B,EAAE,MAAM,eAAe,CAAC;AAG/D,MAAM,OAAO,YAAY;IAKJ;IACA;IACA;IACA;IACA;IARX,OAAO,GAA0B,IAAI,CAAC;IACtC,IAAI,CAAU;IAEtB,YACmB,QAAqB,EACrB,SAA4B,EAC5B,OAAgB,EAChB,
|
|
1
|
+
{"version":3,"file":"platformAccessory.js","sourceRoot":"","sources":["../src/platformAccessory.ts"],"names":[],"mappings":"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"}
|
package/dist/sacn.d.ts
ADDED
|
@@ -0,0 +1,33 @@
|
|
|
1
|
+
import type { Logger } from 'homebridge';
|
|
2
|
+
import { Fixture } from './config.js';
|
|
3
|
+
import { HomeKitLightState } from './color/types.js';
|
|
4
|
+
import { DmxController } from './dmxController.js';
|
|
5
|
+
export declare class SacnController implements DmxController {
|
|
6
|
+
private readonly ip;
|
|
7
|
+
private readonly log;
|
|
8
|
+
private readonly priority;
|
|
9
|
+
private universes;
|
|
10
|
+
private seq;
|
|
11
|
+
private dirty;
|
|
12
|
+
private coalesceTimer;
|
|
13
|
+
private keepaliveTimer;
|
|
14
|
+
/** When setFixture last staged a change (keepalive re-sends excluded).
|
|
15
|
+
* Read by the platform's state-poll guard so a read-back never clobbers
|
|
16
|
+
* an in-flight HomeKit change. */
|
|
17
|
+
lastChangeAt: number;
|
|
18
|
+
private readonly socket;
|
|
19
|
+
private readonly cid;
|
|
20
|
+
private closed;
|
|
21
|
+
constructor(ip: string, log: Logger, priority?: number);
|
|
22
|
+
setFixture(fixture: Fixture, state: HomeKitLightState): void;
|
|
23
|
+
private universeBuf;
|
|
24
|
+
/** Coalesce the burst of setFixture calls a zone set produces into one
|
|
25
|
+
* packet per universe. */
|
|
26
|
+
private scheduleSend;
|
|
27
|
+
private sendAll;
|
|
28
|
+
private sendUniverse;
|
|
29
|
+
/** ANSI E1.31 data packet: root layer + framing layer + DMP layer. */
|
|
30
|
+
private buildPacket;
|
|
31
|
+
shutdown(): void;
|
|
32
|
+
}
|
|
33
|
+
//# sourceMappingURL=sacn.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sacn.d.ts","sourceRoot":"","sources":["../src/sacn.ts"],"names":[],"mappings":"AAmBA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AAIzC,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AACtC,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAYnD,qBAAa,cAAe,YAAW,aAAa;IAehD,OAAO,CAAC,QAAQ,CAAC,EAAE;IACnB,OAAO,CAAC,QAAQ,CAAC,GAAG;IACpB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAhB3B,OAAO,CAAC,SAAS,CAAiC;IAClD,OAAO,CAAC,GAAG,CAA6B;IACxC,OAAO,CAAC,KAAK,CAAqB;IAClC,OAAO,CAAC,aAAa,CAA+B;IACpD,OAAO,CAAC,cAAc,CAA+B;IACrD;;uCAEmC;IAC5B,YAAY,SAAK;IACxB,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAe;IACtC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAmB;IACvC,OAAO,CAAC,MAAM,CAAS;gBAGJ,EAAE,EAAE,MAAM,EACV,GAAG,EAAE,MAAM,EACX,QAAQ,GAAE,MAA8B;IAM3D,UAAU,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,iBAAiB,GAAG,IAAI;IAiB5D,OAAO,CAAC,WAAW;IAMnB;+BAC2B;IAC3B,OAAO,CAAC,YAAY;IASpB,OAAO,CAAC,OAAO;IAIf,OAAO,CAAC,YAAY;IAYpB,sEAAsE;IACtE,OAAO,CAAC,WAAW;IA8BnB,QAAQ,IAAI,IAAI;CAYjB"}
|
package/dist/sacn.js
ADDED
|
@@ -0,0 +1,147 @@
|
|
|
1
|
+
// SacnController — streams DMX to a network gateway over sACN (E1.31).
|
|
2
|
+
//
|
|
3
|
+
// Built for the ENTTEC DIN Ethergate Mk2 (PoE) but speaks plain
|
|
4
|
+
// ANSI E1.31, so any sACN node works. Unlike the Stick there is no
|
|
5
|
+
// session, no crypto, and sends are ~free, so the model is simple:
|
|
6
|
+
//
|
|
7
|
+
// - setFixture() renders into a per-universe 512-byte buffer and marks
|
|
8
|
+
// the universe dirty; a short coalescing timer batches the burst of
|
|
9
|
+
// per-member calls a zone set produces into one packet per universe
|
|
10
|
+
// - a 1 Hz keepalive re-sends every universe we have state for: E1.31
|
|
11
|
+
// receivers drop a source after 2.5 s of silence, and the steady
|
|
12
|
+
// trickle keeps the gateway holding our look
|
|
13
|
+
// - shutdown() sends the spec's stream-terminated packets so the
|
|
14
|
+
// gateway drops the source cleanly (its DMX output holds last values)
|
|
15
|
+
//
|
|
16
|
+
// Universe numbering: patch universes A/B (internal 0/1) map to sACN
|
|
17
|
+
// universes 1/2 — sACN has no universe 0. Set the Ethergate ports to
|
|
18
|
+
// sACN universes 1 and 2. Packets are unicast to the configured ip.
|
|
19
|
+
import dgram from 'node:dgram';
|
|
20
|
+
import { randomBytes } from 'node:crypto';
|
|
21
|
+
import { SACN_COALESCE_MS, SACN_KEEPALIVE_MS, SACN_PORT, SACN_PRIORITY_DEFAULT, SACN_SOURCE_NAME, } from './settings.js';
|
|
22
|
+
const PACKET_LEN = 638; // full 512-slot E1.31 data packet
|
|
23
|
+
const OPT_STREAM_TERMINATED = 0x40;
|
|
24
|
+
export class SacnController {
|
|
25
|
+
ip;
|
|
26
|
+
log;
|
|
27
|
+
priority;
|
|
28
|
+
universes = new Map(); // internal idx (0=A,1=B) → slots
|
|
29
|
+
seq = new Map();
|
|
30
|
+
dirty = new Set();
|
|
31
|
+
coalesceTimer = null;
|
|
32
|
+
keepaliveTimer = null;
|
|
33
|
+
/** When setFixture last staged a change (keepalive re-sends excluded).
|
|
34
|
+
* Read by the platform's state-poll guard so a read-back never clobbers
|
|
35
|
+
* an in-flight HomeKit change. */
|
|
36
|
+
lastChangeAt = 0;
|
|
37
|
+
socket;
|
|
38
|
+
cid = randomBytes(16);
|
|
39
|
+
closed = false;
|
|
40
|
+
constructor(ip, log, priority = SACN_PRIORITY_DEFAULT) {
|
|
41
|
+
this.ip = ip;
|
|
42
|
+
this.log = log;
|
|
43
|
+
this.priority = priority;
|
|
44
|
+
this.socket = dgram.createSocket('udp4');
|
|
45
|
+
this.socket.on('error', (e) => this.log.error('sACN socket error:', e.message));
|
|
46
|
+
}
|
|
47
|
+
setFixture(fixture, state) {
|
|
48
|
+
const arr = this.universeBuf(fixture.universe);
|
|
49
|
+
const bytes = fixture.profile.model.render(state, fixture.profile.channels);
|
|
50
|
+
for (let i = 0; i < bytes.length; i++) {
|
|
51
|
+
arr[fixture.startCh - 1 + i] = bytes[i];
|
|
52
|
+
}
|
|
53
|
+
this.dirty.add(fixture.universe);
|
|
54
|
+
this.lastChangeAt = Date.now();
|
|
55
|
+
const hex = Array.from(bytes).map((b) => b.toString(16).padStart(2, '0')).join('');
|
|
56
|
+
this.log.info(`setFixture ${fixture.id}@DMX${fixture.startCh}/U${fixture.universe + 1}=${hex}`);
|
|
57
|
+
this.scheduleSend();
|
|
58
|
+
if (!this.keepaliveTimer) {
|
|
59
|
+
this.keepaliveTimer = setInterval(() => this.sendAll(), SACN_KEEPALIVE_MS);
|
|
60
|
+
this.keepaliveTimer.unref?.();
|
|
61
|
+
}
|
|
62
|
+
}
|
|
63
|
+
universeBuf(u) {
|
|
64
|
+
let arr = this.universes.get(u);
|
|
65
|
+
if (!arr) {
|
|
66
|
+
arr = new Uint8Array(512);
|
|
67
|
+
this.universes.set(u, arr);
|
|
68
|
+
}
|
|
69
|
+
return arr;
|
|
70
|
+
}
|
|
71
|
+
/** Coalesce the burst of setFixture calls a zone set produces into one
|
|
72
|
+
* packet per universe. */
|
|
73
|
+
scheduleSend() {
|
|
74
|
+
if (this.coalesceTimer)
|
|
75
|
+
return;
|
|
76
|
+
this.coalesceTimer = setTimeout(() => {
|
|
77
|
+
this.coalesceTimer = null;
|
|
78
|
+
for (const u of this.dirty)
|
|
79
|
+
this.sendUniverse(u);
|
|
80
|
+
this.dirty.clear();
|
|
81
|
+
}, SACN_COALESCE_MS);
|
|
82
|
+
}
|
|
83
|
+
sendAll() {
|
|
84
|
+
for (const u of this.universes.keys())
|
|
85
|
+
this.sendUniverse(u);
|
|
86
|
+
}
|
|
87
|
+
sendUniverse(u, options = 0) {
|
|
88
|
+
if (this.closed)
|
|
89
|
+
return;
|
|
90
|
+
const slots = this.universes.get(u);
|
|
91
|
+
if (!slots)
|
|
92
|
+
return;
|
|
93
|
+
const seq = (this.seq.get(u) ?? 0) & 0xff;
|
|
94
|
+
this.seq.set(u, seq + 1);
|
|
95
|
+
const pkt = this.buildPacket(u + 1, seq, slots, options);
|
|
96
|
+
this.socket.send(pkt, SACN_PORT, this.ip, (e) => {
|
|
97
|
+
if (e)
|
|
98
|
+
this.log.error(`sACN send U${u + 1} failed:`, e.message);
|
|
99
|
+
});
|
|
100
|
+
}
|
|
101
|
+
/** ANSI E1.31 data packet: root layer + framing layer + DMP layer. */
|
|
102
|
+
buildPacket(sacnUniverse, seq, slots, options) {
|
|
103
|
+
const buf = Buffer.alloc(PACKET_LEN);
|
|
104
|
+
// Root layer
|
|
105
|
+
buf.writeUInt16BE(0x0010, 0); // RLP preamble size
|
|
106
|
+
buf.writeUInt16BE(0x0000, 2); // RLP postamble size
|
|
107
|
+
buf.write('ASC-E1.17', 4, 'ascii'); // ACN packet identifier (12 bytes, zero-padded)
|
|
108
|
+
buf.writeUInt16BE(0x7000 | (PACKET_LEN - 16), 16); // flags + length
|
|
109
|
+
buf.writeUInt32BE(0x00000004, 18); // VECTOR_ROOT_E131_DATA
|
|
110
|
+
this.cid.copy(buf, 22);
|
|
111
|
+
// Framing layer
|
|
112
|
+
buf.writeUInt16BE(0x7000 | (PACKET_LEN - 38), 38);
|
|
113
|
+
buf.writeUInt32BE(0x00000002, 40); // VECTOR_E131_DATA_PACKET
|
|
114
|
+
buf.write(SACN_SOURCE_NAME.slice(0, 63), 44, 'utf8');
|
|
115
|
+
buf.writeUInt8(this.priority, 108);
|
|
116
|
+
buf.writeUInt16BE(0x0000, 109); // sync address (none)
|
|
117
|
+
buf.writeUInt8(seq, 111);
|
|
118
|
+
buf.writeUInt8(options, 112);
|
|
119
|
+
buf.writeUInt16BE(sacnUniverse, 113);
|
|
120
|
+
// DMP layer
|
|
121
|
+
buf.writeUInt16BE(0x7000 | (PACKET_LEN - 115), 115);
|
|
122
|
+
buf.writeUInt8(0x02, 117); // VECTOR_DMP_SET_PROPERTY
|
|
123
|
+
buf.writeUInt8(0xa1, 118); // address & data type
|
|
124
|
+
buf.writeUInt16BE(0x0000, 119); // first property address
|
|
125
|
+
buf.writeUInt16BE(0x0001, 121); // address increment
|
|
126
|
+
buf.writeUInt16BE(1 + 512, 123); // property value count
|
|
127
|
+
buf.writeUInt8(0x00, 125); // DMX start code
|
|
128
|
+
buf.set(slots, 126);
|
|
129
|
+
return buf;
|
|
130
|
+
}
|
|
131
|
+
shutdown() {
|
|
132
|
+
if (this.coalesceTimer)
|
|
133
|
+
clearTimeout(this.coalesceTimer);
|
|
134
|
+
if (this.keepaliveTimer)
|
|
135
|
+
clearInterval(this.keepaliveTimer);
|
|
136
|
+
// Spec-polite goodbye: three stream-terminated packets per universe.
|
|
137
|
+
// The gateway drops the source immediately instead of waiting out the
|
|
138
|
+
// 2.5 s network-loss timeout; its DMX output holds the last values.
|
|
139
|
+
for (const u of this.universes.keys()) {
|
|
140
|
+
for (let i = 0; i < 3; i++)
|
|
141
|
+
this.sendUniverse(u, OPT_STREAM_TERMINATED);
|
|
142
|
+
}
|
|
143
|
+
this.closed = true;
|
|
144
|
+
setTimeout(() => this.socket.close(), 100).unref?.();
|
|
145
|
+
}
|
|
146
|
+
}
|
|
147
|
+
//# sourceMappingURL=sacn.js.map
|
package/dist/sacn.js.map
ADDED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sacn.js","sourceRoot":"","sources":["../src/sacn.ts"],"names":[],"mappings":"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"}
|
package/dist/settings.d.ts
CHANGED
|
@@ -20,4 +20,18 @@ export declare const REFRESH_CHECK_MS = 60000;
|
|
|
20
20
|
* subprocess controller — send_dmx.mjs's own FRAME_HZ env knob is what
|
|
21
21
|
* matters now. */
|
|
22
22
|
export declare const FRAME_INTERVAL_MS = 40;
|
|
23
|
+
/** UDP port sACN receivers listen on (ANSI E1.31). */
|
|
24
|
+
export declare const SACN_PORT = 5568;
|
|
25
|
+
/** Coalescing window for the burst of setFixture calls a zone set
|
|
26
|
+
* produces: one packet per universe per burst. */
|
|
27
|
+
export declare const SACN_COALESCE_MS = 25;
|
|
28
|
+
/** Keepalive stream rate. E1.31 receivers drop a source after 2.5 s of
|
|
29
|
+
* silence; a 1 Hz re-send keeps the gateway holding our look and
|
|
30
|
+
* re-asserts state cheaply. */
|
|
31
|
+
export declare const SACN_KEEPALIVE_MS = 1000;
|
|
32
|
+
/** Default E1.31 priority (spec range 0-200, 100 = default). Only matters
|
|
33
|
+
* if a second source ever targets the same universe. */
|
|
34
|
+
export declare const SACN_PRIORITY_DEFAULT = 100;
|
|
35
|
+
/** Source name advertised in every E1.31 framing layer (max 63 chars). */
|
|
36
|
+
export declare const SACN_SOURCE_NAME = "homebridge-dmx";
|
|
23
37
|
//# sourceMappingURL=settings.d.ts.map
|
package/dist/settings.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"settings.d.ts","sourceRoot":"","sources":["../src/settings.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,aAAa,QAAQ,CAAC;AACnC,eAAO,MAAM,WAAW,8BAA8B,CAAC;AAEvD;6EAC6E;AAC7E,eAAO,MAAM,8BAA8B,KAAK,CAAC;AAEjD;;wCAEwC;AACxC,eAAO,MAAM,WAAW,MAAM,CAAC;AAE/B;;;;;qEAKqE;AACrE,eAAO,MAAM,uBAAuB,KAAK,CAAC;AAE1C,0EAA0E;AAC1E,eAAO,MAAM,gBAAgB,QAAS,CAAC;AAEvC;;mBAEmB;AACnB,eAAO,MAAM,iBAAiB,KAAK,CAAC"}
|
|
1
|
+
{"version":3,"file":"settings.d.ts","sourceRoot":"","sources":["../src/settings.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,aAAa,QAAQ,CAAC;AACnC,eAAO,MAAM,WAAW,8BAA8B,CAAC;AAEvD;6EAC6E;AAC7E,eAAO,MAAM,8BAA8B,KAAK,CAAC;AAEjD;;wCAEwC;AACxC,eAAO,MAAM,WAAW,MAAM,CAAC;AAE/B;;;;;qEAKqE;AACrE,eAAO,MAAM,uBAAuB,KAAK,CAAC;AAE1C,0EAA0E;AAC1E,eAAO,MAAM,gBAAgB,QAAS,CAAC;AAEvC;;mBAEmB;AACnB,eAAO,MAAM,iBAAiB,KAAK,CAAC;AAIpC,sDAAsD;AACtD,eAAO,MAAM,SAAS,OAAO,CAAC;AAE9B;mDACmD;AACnD,eAAO,MAAM,gBAAgB,KAAK,CAAC;AAEnC;;gCAEgC;AAChC,eAAO,MAAM,iBAAiB,OAAO,CAAC;AAEtC;yDACyD;AACzD,eAAO,MAAM,qBAAqB,MAAM,CAAC;AAEzC,0EAA0E;AAC1E,eAAO,MAAM,gBAAgB,mBAAmB,CAAC"}
|
package/dist/settings.js
CHANGED
|
@@ -21,4 +21,19 @@ export const REFRESH_CHECK_MS = 60_000;
|
|
|
21
21
|
* subprocess controller — send_dmx.mjs's own FRAME_HZ env knob is what
|
|
22
22
|
* matters now. */
|
|
23
23
|
export const FRAME_INTERVAL_MS = 40;
|
|
24
|
+
// ── sACN (E1.31) controller ────────────────────────────────────────────────
|
|
25
|
+
/** UDP port sACN receivers listen on (ANSI E1.31). */
|
|
26
|
+
export const SACN_PORT = 5568;
|
|
27
|
+
/** Coalescing window for the burst of setFixture calls a zone set
|
|
28
|
+
* produces: one packet per universe per burst. */
|
|
29
|
+
export const SACN_COALESCE_MS = 25;
|
|
30
|
+
/** Keepalive stream rate. E1.31 receivers drop a source after 2.5 s of
|
|
31
|
+
* silence; a 1 Hz re-send keeps the gateway holding our look and
|
|
32
|
+
* re-asserts state cheaply. */
|
|
33
|
+
export const SACN_KEEPALIVE_MS = 1000;
|
|
34
|
+
/** Default E1.31 priority (spec range 0-200, 100 = default). Only matters
|
|
35
|
+
* if a second source ever targets the same universe. */
|
|
36
|
+
export const SACN_PRIORITY_DEFAULT = 100;
|
|
37
|
+
/** Source name advertised in every E1.31 framing layer (max 63 chars). */
|
|
38
|
+
export const SACN_SOURCE_NAME = 'homebridge-dmx';
|
|
24
39
|
//# sourceMappingURL=settings.js.map
|
package/dist/settings.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"settings.js","sourceRoot":"","sources":["../src/settings.ts"],"names":[],"mappings":"AAAA,+BAA+B;AAE/B,MAAM,CAAC,MAAM,aAAa,GAAG,KAAK,CAAC;AACnC,MAAM,CAAC,MAAM,WAAW,GAAG,2BAA2B,CAAC;AAEvD;6EAC6E;AAC7E,MAAM,CAAC,MAAM,8BAA8B,GAAG,EAAE,CAAC;AAEjD;;wCAEwC;AACxC,MAAM,CAAC,MAAM,WAAW,GAAG,GAAG,CAAC;AAE/B;;;;;qEAKqE;AACrE,MAAM,CAAC,MAAM,uBAAuB,GAAG,EAAE,CAAC;AAE1C,0EAA0E;AAC1E,MAAM,CAAC,MAAM,gBAAgB,GAAG,MAAM,CAAC;AAEvC;;mBAEmB;AACnB,MAAM,CAAC,MAAM,iBAAiB,GAAG,EAAE,CAAC"}
|
|
1
|
+
{"version":3,"file":"settings.js","sourceRoot":"","sources":["../src/settings.ts"],"names":[],"mappings":"AAAA,+BAA+B;AAE/B,MAAM,CAAC,MAAM,aAAa,GAAG,KAAK,CAAC;AACnC,MAAM,CAAC,MAAM,WAAW,GAAG,2BAA2B,CAAC;AAEvD;6EAC6E;AAC7E,MAAM,CAAC,MAAM,8BAA8B,GAAG,EAAE,CAAC;AAEjD;;wCAEwC;AACxC,MAAM,CAAC,MAAM,WAAW,GAAG,GAAG,CAAC;AAE/B;;;;;qEAKqE;AACrE,MAAM,CAAC,MAAM,uBAAuB,GAAG,EAAE,CAAC;AAE1C,0EAA0E;AAC1E,MAAM,CAAC,MAAM,gBAAgB,GAAG,MAAM,CAAC;AAEvC;;mBAEmB;AACnB,MAAM,CAAC,MAAM,iBAAiB,GAAG,EAAE,CAAC;AAEpC,8EAA8E;AAE9E,sDAAsD;AACtD,MAAM,CAAC,MAAM,SAAS,GAAG,IAAI,CAAC;AAE9B;mDACmD;AACnD,MAAM,CAAC,MAAM,gBAAgB,GAAG,EAAE,CAAC;AAEnC;;gCAEgC;AAChC,MAAM,CAAC,MAAM,iBAAiB,GAAG,IAAI,CAAC;AAEtC;yDACyD;AACzD,MAAM,CAAC,MAAM,qBAAqB,GAAG,GAAG,CAAC;AAEzC,0EAA0E;AAC1E,MAAM,CAAC,MAAM,gBAAgB,GAAG,gBAAgB,CAAC"}
|
package/dist/zoneAccessory.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { PlatformAccessory } from 'homebridge';
|
|
2
2
|
import { Fixture, Zone } from './config.js';
|
|
3
|
-
import {
|
|
3
|
+
import { DmxController } from './dmxController.js';
|
|
4
4
|
import type { DmxPlatform } from './platform.js';
|
|
5
5
|
import { StateRegistry } from './stateRegistry.js';
|
|
6
6
|
export declare class ZoneFixture {
|
|
@@ -11,7 +11,7 @@ export declare class ZoneFixture {
|
|
|
11
11
|
private pending;
|
|
12
12
|
private refreshPending;
|
|
13
13
|
private bulb;
|
|
14
|
-
constructor(platform: DmxPlatform, accessory: PlatformAccessory, zone: Zone, controllers: Map<string,
|
|
14
|
+
constructor(platform: DmxPlatform, accessory: PlatformAccessory, zone: Zone, controllers: Map<string, DmxController>, registry: StateRegistry);
|
|
15
15
|
/** Compute majority state across members, per characteristic. */
|
|
16
16
|
private majorityState;
|
|
17
17
|
/** A HomeKit set on the zone: build the new state from the current
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"zoneAccessory.d.ts","sourceRoot":"","sources":["../src/zoneAccessory.ts"],"names":[],"mappings":"AAiBA,OAAO,KAAK,EAEV,iBAAiB,EAElB,MAAM,YAAY,CAAC;AAEpB,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,aAAa,CAAC;AAE5C,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"zoneAccessory.d.ts","sourceRoot":"","sources":["../src/zoneAccessory.ts"],"names":[],"mappings":"AAiBA,OAAO,KAAK,EAEV,iBAAiB,EAElB,MAAM,YAAY,CAAC;AAEpB,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,aAAa,CAAC;AAE5C,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAEjD,OAAO,EAAE,aAAa,EAAgB,MAAM,oBAAoB,CAAC;AAEjE,qBAAa,WAAW;IAMpB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAEzB,OAAO,CAAC,QAAQ,CAAC,IAAI;IACrB,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAT3B,OAAO,CAAC,OAAO,CAA+B;IAC9C,OAAO,CAAC,cAAc,CAA+B;IACrD,OAAO,CAAC,IAAI,CAAU;gBAGH,QAAQ,EAAE,WAAW,EACtC,SAAS,EAAE,iBAAiB,EACX,IAAI,EAAE,IAAI,EACV,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,EACvC,QAAQ,EAAE,aAAa;IAmD1C,iEAAiE;IACjE,OAAO,CAAC,aAAa;IAWrB;;;mDAG+C;IAC/C,OAAO,CAAC,cAAc;IAWtB;qDACiD;IACjD,OAAO,CAAC,gBAAgB;IAuBxB;8CAC0C;IAC1C,OAAO,CAAC,eAAe;CAqBxB;AAGD,MAAM,MAAM,UAAU,GAAG,OAAO,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"zoneAccessory.js","sourceRoot":"","sources":["../src/zoneAccessory.ts"],"names":[],"mappings":"AAAA,0EAA0E;AAC1E,YAAY;AACZ,EAAE;AACF,uEAAuE;AACvE,yEAAyE;AACzE,yEAAyE;AACzE,yCAAyC;AACzC,EAAE;AACF,0EAA0E;AAC1E,uEAAuE;AACvE,wEAAwE;AACxE,mDAAmD;AACnD,EAAE;AACF,oEAAoE;AACpE,0EAA0E;AAC1E,yCAAyC;AAYzC,OAAO,EAAE,8BAA8B,EAAE,MAAM,eAAe,CAAC;AAC/D,OAAO,EAAiB,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAEjE,MAAM,OAAO,WAAW;IAMH;IAEA;IACA;IACA;IATX,OAAO,GAA0B,IAAI,CAAC;IACtC,cAAc,GAA0B,IAAI,CAAC;IAC7C,IAAI,CAAU;IAEtB,YACmB,QAAqB,EACtC,SAA4B,EACX,IAAU,EACV,
|
|
1
|
+
{"version":3,"file":"zoneAccessory.js","sourceRoot":"","sources":["../src/zoneAccessory.ts"],"names":[],"mappings":"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"}
|
package/examples/dmx.yaml
CHANGED
|
@@ -10,13 +10,24 @@
|
|
|
10
10
|
# }]
|
|
11
11
|
|
|
12
12
|
controllers:
|
|
13
|
-
# One entry per physical DMX controller.
|
|
14
|
-
#
|
|
15
|
-
#
|
|
13
|
+
# One entry per physical DMX controller. Supported types:
|
|
14
|
+
# sACN — any E1.31 gateway (e.g. ENTTEC DIN Ethergate Mk2). Packets
|
|
15
|
+
# are unicast to `ip`; patch universes A/B map to sACN
|
|
16
|
+
# universes 1/2, so set the gateway's ports to match.
|
|
17
|
+
# Optional `priority` (0-200, default 100) is the E1.31
|
|
18
|
+
# source priority. On an ENTTEC Ethergate Mk2, HomeKit state
|
|
19
|
+
# is seeded from the gateway's live buffers at startup;
|
|
20
|
+
# optional `statePollSeconds` re-reads every N seconds.
|
|
21
|
+
# StickDE3 — Nicolaudie Stick-DE3 (legacy; subprocess transactions).
|
|
22
|
+
# Optional `refreshMinutes` idle keepalive (default 30).
|
|
16
23
|
- id: main
|
|
17
|
-
type:
|
|
24
|
+
type: sACN
|
|
18
25
|
ip: 192.168.96.2
|
|
19
26
|
|
|
27
|
+
# - id: stick
|
|
28
|
+
# type: StickDE3
|
|
29
|
+
# ip: 192.168.96.2
|
|
30
|
+
|
|
20
31
|
profiles:
|
|
21
32
|
# Fixture types. Each profile names a color model + the order its DMX
|
|
22
33
|
# channels appear in. "(Fine)" makes a channel the low byte of a 16-bit
|
package/package.json
CHANGED
package/src/color/hsvcct.ts
CHANGED
|
@@ -56,4 +56,40 @@ export const hsvcct: ColorModel = {
|
|
|
56
56
|
}
|
|
57
57
|
return out;
|
|
58
58
|
},
|
|
59
|
+
/** Inverse of render, for state read-back from a live universe buffer.
|
|
60
|
+
* A dark fixture parses as on:false with brightness 100 so the next
|
|
61
|
+
* HomeKit "on" restores full rather than 0%. */
|
|
62
|
+
parse(bytes: Uint8Array, channels: ChannelDef[]): HomeKitLightState {
|
|
63
|
+
const state: HomeKitLightState = { on: false, brightness: 100 };
|
|
64
|
+
let i = 0;
|
|
65
|
+
while (i < channels.length) {
|
|
66
|
+
const ch = channels[i];
|
|
67
|
+
if (ch.fine) { i++; continue; }
|
|
68
|
+
switch (ch.role) {
|
|
69
|
+
case 'intensity': {
|
|
70
|
+
const hasFine = channels[i + 1]?.fine && channels[i + 1].role === 'intensity';
|
|
71
|
+
const v16 = hasFine ? (bytes[i] << 8) | bytes[i + 1] : bytes[i] * 257;
|
|
72
|
+
if (v16 > 0) {
|
|
73
|
+
state.on = true;
|
|
74
|
+
state.brightness = Math.max(1, Math.round((v16 / 65535) * 100));
|
|
75
|
+
}
|
|
76
|
+
if (hasFine) { i += 2; continue; }
|
|
77
|
+
break;
|
|
78
|
+
}
|
|
79
|
+
case 'cct': {
|
|
80
|
+
const k = ch.kMin! + (bytes[i] / 255) * (ch.kMax! - ch.kMin!);
|
|
81
|
+
state.colorTemperatureMireds = Math.round(clamp(1_000_000 / k, 50, 400));
|
|
82
|
+
break;
|
|
83
|
+
}
|
|
84
|
+
case 'saturation':
|
|
85
|
+
state.saturation = Math.round(clamp(bytes[i] / 2.55, 0, 100));
|
|
86
|
+
break;
|
|
87
|
+
case 'hue':
|
|
88
|
+
state.hue = Math.round((bytes[i] / 255) * 360) % 360;
|
|
89
|
+
break;
|
|
90
|
+
}
|
|
91
|
+
i++;
|
|
92
|
+
}
|
|
93
|
+
return state;
|
|
94
|
+
},
|
|
59
95
|
};
|
package/src/config.ts
CHANGED
|
@@ -38,15 +38,17 @@ import path from 'node:path';
|
|
|
38
38
|
import yaml from 'js-yaml';
|
|
39
39
|
|
|
40
40
|
import { ChannelDef, ColorModel, HKCharacteristic } from './color/types.js';
|
|
41
|
-
import { REFRESH_MINUTES_DEFAULT } from './settings.js';
|
|
41
|
+
import { REFRESH_MINUTES_DEFAULT, SACN_PRIORITY_DEFAULT } from './settings.js';
|
|
42
42
|
import { getColorModel } from './color/index.js';
|
|
43
43
|
import { parseChannelName } from './color/parsers.js';
|
|
44
44
|
|
|
45
45
|
export interface ControllerSpec {
|
|
46
46
|
id: string; // unique handle, referenced from patch entries
|
|
47
|
-
type: string; // 'StickDE3'
|
|
47
|
+
type: string; // 'StickDE3' | 'sACN'
|
|
48
48
|
ip: string; // controller's static IP
|
|
49
|
-
refreshMinutes?: number; // idle keepalive: re-send state every N min (0 = off)
|
|
49
|
+
refreshMinutes?: number; // StickDE3 idle keepalive: re-send state every N min (0 = off)
|
|
50
|
+
priority?: number; // sACN only: E1.31 priority 0-200 (default 100)
|
|
51
|
+
statePollSeconds?: number; // sACN/Ethergate only: re-read device state every N s (0 = startup only)
|
|
50
52
|
}
|
|
51
53
|
|
|
52
54
|
export interface ProfileSpec {
|
|
@@ -85,7 +87,7 @@ export interface Profile {
|
|
|
85
87
|
channels: ChannelDef[];
|
|
86
88
|
}
|
|
87
89
|
|
|
88
|
-
export const CONTROLLER_TYPES = ['StickDE3'] as const;
|
|
90
|
+
export const CONTROLLER_TYPES = ['StickDE3', 'sACN'] as const;
|
|
89
91
|
export type ControllerType = typeof CONTROLLER_TYPES[number];
|
|
90
92
|
|
|
91
93
|
export interface Controller {
|
|
@@ -93,6 +95,8 @@ export interface Controller {
|
|
|
93
95
|
type: ControllerType;
|
|
94
96
|
ip: string;
|
|
95
97
|
refreshMinutes: number;
|
|
98
|
+
priority: number; // E1.31 priority; only the sACN controller reads it
|
|
99
|
+
statePollSeconds: number; // Ethergate read-back interval; 0 = seed at startup only
|
|
96
100
|
}
|
|
97
101
|
|
|
98
102
|
export interface Fixture {
|
|
@@ -166,8 +170,17 @@ export function loadConfig(rawJson: RawConfig, cwd?: string): LoadedConfig {
|
|
|
166
170
|
if (typeof refreshMinutes !== 'number' || refreshMinutes < 0) {
|
|
167
171
|
throw new Error(`controller "${cs.id}": refreshMinutes must be a number >= 0 (0 disables)`);
|
|
168
172
|
}
|
|
173
|
+
const priority = cs.priority ?? SACN_PRIORITY_DEFAULT;
|
|
174
|
+
if (!Number.isInteger(priority) || priority < 0 || priority > 200) {
|
|
175
|
+
throw new Error(`controller "${cs.id}": priority must be an integer 0..200`);
|
|
176
|
+
}
|
|
177
|
+
const statePollSeconds = cs.statePollSeconds ?? 0;
|
|
178
|
+
if (typeof statePollSeconds !== 'number' || statePollSeconds < 0) {
|
|
179
|
+
throw new Error(`controller "${cs.id}": statePollSeconds must be a number >= 0`);
|
|
180
|
+
}
|
|
169
181
|
controllersById.set(cs.id, {
|
|
170
|
-
id: cs.id, type: cs.type as ControllerType, ip: cs.ip, refreshMinutes,
|
|
182
|
+
id: cs.id, type: cs.type as ControllerType, ip: cs.ip, refreshMinutes, priority,
|
|
183
|
+
statePollSeconds,
|
|
171
184
|
});
|
|
172
185
|
}
|
|
173
186
|
|
package/src/controller.ts
CHANGED
|
@@ -15,6 +15,7 @@ import path from 'node:path';
|
|
|
15
15
|
|
|
16
16
|
import { Fixture } from './config.js';
|
|
17
17
|
import { HomeKitLightState } from './color/types.js';
|
|
18
|
+
import { DmxController } from './dmxController.js';
|
|
18
19
|
import { DEBOUNCE_MS, REFRESH_CHECK_MS } from './settings.js';
|
|
19
20
|
import { sleep } from './stick/protocol.js';
|
|
20
21
|
|
|
@@ -23,7 +24,7 @@ const __dirname = path.dirname(__filename);
|
|
|
23
24
|
// dist/controller.js → ../tools/send_dmx.mjs
|
|
24
25
|
const SEND_DMX_PATH = path.resolve(__dirname, '..', 'tools', 'send_dmx.mjs');
|
|
25
26
|
|
|
26
|
-
export class StickController {
|
|
27
|
+
export class StickController implements DmxController {
|
|
27
28
|
private targets = new Map<number, Uint8Array>();
|
|
28
29
|
private lastChangeAt = 0;
|
|
29
30
|
private lastTxEndAt = 0;
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
// DmxController — the contract the platform and accessories program against.
|
|
2
|
+
// One implementation per controller `type` (StickDE3, sACN, ...).
|
|
3
|
+
|
|
4
|
+
import { Fixture } from './config.js';
|
|
5
|
+
import { HomeKitLightState } from './color/types.js';
|
|
6
|
+
|
|
7
|
+
export interface DmxController {
|
|
8
|
+
/** Render `state` through the fixture's color model into the universe
|
|
9
|
+
* buffer and (eventually) put it on the wire. Must be safe to call at
|
|
10
|
+
* HomeKit interaction rates. */
|
|
11
|
+
setFixture(fixture: Fixture, state: HomeKitLightState): void;
|
|
12
|
+
/** Homebridge shutdown hook: stop timers, close sockets. */
|
|
13
|
+
shutdown(): void;
|
|
14
|
+
}
|
package/src/ethergate.ts
ADDED
|
@@ -0,0 +1,51 @@
|
|
|
1
|
+
// Ethergate Mk2 state read-back.
|
|
2
|
+
//
|
|
3
|
+
// The ENTTEC DIN Ethergate Mk2 exposes its live per-port DMX output
|
|
4
|
+
// buffers over a bare CGI-ish HTTP API. Responses have NO status line or
|
|
5
|
+
// headers (raw body only), which Node's http/fetch clients reject — so we
|
|
6
|
+
// speak over a raw TCP socket.
|
|
7
|
+
//
|
|
8
|
+
// Buffer indexing is per universe-SLOT, not per port (8 Overdrive slots
|
|
9
|
+
// per port on fw V1.3): port N slot k = buffer((N-1)*8 + k).cgi. We assume
|
|
10
|
+
// the plugin's own convention of port N carrying sACN universe N, so
|
|
11
|
+
// internal universe u (0=A, 1=B) reads buffer(u*8 + 1).
|
|
12
|
+
//
|
|
13
|
+
// Body format: 64 lines "rowR=v,v,v,v,v,v,v,v" covering slots 1..512.
|
|
14
|
+
|
|
15
|
+
import net from 'node:net';
|
|
16
|
+
|
|
17
|
+
const READ_TIMEOUT_MS = 4000;
|
|
18
|
+
|
|
19
|
+
/** Fetch the live 512-slot output buffer for an internal universe index
|
|
20
|
+
* (0=A, 1=B). Returns null on any failure — callers treat read-back as
|
|
21
|
+
* best-effort. */
|
|
22
|
+
export function readEthergateUniverse(ip: string, universe: number): Promise<Uint8Array | null> {
|
|
23
|
+
const bufferIdx = universe * 8 + 1;
|
|
24
|
+
return new Promise((resolve) => {
|
|
25
|
+
const chunks: Buffer[] = [];
|
|
26
|
+
const sock = net.connect(80, ip);
|
|
27
|
+
const fail = (): void => { sock.destroy(); resolve(null); };
|
|
28
|
+
sock.setTimeout(READ_TIMEOUT_MS, fail);
|
|
29
|
+
sock.on('error', fail);
|
|
30
|
+
sock.on('connect', () => {
|
|
31
|
+
sock.write(`GET /index.html?buffer${bufferIdx}.cgi HTTP/1.0\r\nHost: ${ip}\r\n\r\n`);
|
|
32
|
+
});
|
|
33
|
+
sock.on('data', (d) => chunks.push(d));
|
|
34
|
+
sock.on('close', () => {
|
|
35
|
+
const body = Buffer.concat(chunks).toString('latin1');
|
|
36
|
+
const slots = new Uint8Array(512);
|
|
37
|
+
let seen = 0;
|
|
38
|
+
for (const line of body.split('\n')) {
|
|
39
|
+
const m = /^row(\d+)=([\d,]+)/.exec(line.trim());
|
|
40
|
+
if (!m) continue;
|
|
41
|
+
const base = (Number(m[1]) - 1) * 8;
|
|
42
|
+
const vals = m[2].split(',').map(Number);
|
|
43
|
+
for (let i = 0; i < vals.length && base + i < 512; i++) {
|
|
44
|
+
slots[base + i] = vals[i] & 0xff;
|
|
45
|
+
seen++;
|
|
46
|
+
}
|
|
47
|
+
}
|
|
48
|
+
resolve(seen === 512 ? slots : null);
|
|
49
|
+
});
|
|
50
|
+
});
|
|
51
|
+
}
|