@camstack/types 1.2.161 → 1.2.162
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/dist/addon.js +10 -40
- package/dist/addon.mjs +10 -40
- package/dist/capabilities/storage-provider.cap.d.ts +0 -11
- package/dist/capabilities/storage.cap.d.ts +0 -22
- package/dist/generated/addon-api.d.ts +0 -7
- package/dist/generated/method-access-map.d.ts +1 -1
- package/dist/generated/system-proxy.d.ts +1 -1
- package/dist/index.d.ts +15 -15
- package/dist/index.js +717 -699
- package/dist/index.mjs +716 -700
- package/dist/interfaces/storage-location.d.ts +31 -4
- package/package.json +1 -1
package/dist/index.js
CHANGED
|
@@ -1432,378 +1432,6 @@ function logLevelAtMost(level, threshold) {
|
|
|
1432
1432
|
return LOG_LEVEL_RANK[level] <= LOG_LEVEL_RANK[threshold];
|
|
1433
1433
|
}
|
|
1434
1434
|
//#endregion
|
|
1435
|
-
//#region src/logging/log-channel.ts
|
|
1436
|
-
/**
|
|
1437
|
-
* Per-component log CHANNELS — the gate a hot path consults, and the registry
|
|
1438
|
-
* an addon declares its channels in.
|
|
1439
|
-
*
|
|
1440
|
-
* ## Two axes, deliberately separated
|
|
1441
|
-
*
|
|
1442
|
-
* - **DECLARATION** — which channels exist. Only the addon knows:
|
|
1443
|
-
* `stream-broker` knows webrtc/ICE/RTP, `provider-reolink` knows
|
|
1444
|
-
* baichuan/handshake. A hand-wired central list rots at the first addition,
|
|
1445
|
-
* and rots silently. So a channel is declared where it is consulted, and the
|
|
1446
|
-
* `log-channels` capability enumerates the declarations.
|
|
1447
|
-
* - **VALUE** — at which level, for which scope, until when. That stays ONE
|
|
1448
|
-
* thing: the logging settings document on the `system` cap. Two authorities
|
|
1449
|
-
* over the values is the exact defect
|
|
1450
|
-
* `docs/design/plans/2026-08-26-logging-per-componente.md` was written to
|
|
1451
|
-
* remove; re-introducing it from the cure side would be grotesque.
|
|
1452
|
-
*
|
|
1453
|
-
* Nothing in this file reads a clock, an env var or a store. The registry is
|
|
1454
|
-
* a MIRROR: it is moved only by {@link LogChannelRegistry.apply}, called off
|
|
1455
|
-
* the hot path with a value somebody actually read, and by
|
|
1456
|
-
* {@link LogChannelRegistry.tick}, called on a timer. A store read that fails
|
|
1457
|
-
* never reaches here, so it can neither disarm an armed channel nor arm a
|
|
1458
|
-
* disarmed one (D49).
|
|
1459
|
-
*
|
|
1460
|
-
* ## The canonical call shape
|
|
1461
|
-
*
|
|
1462
|
-
* ```ts
|
|
1463
|
-
* if (CH_RTP.on && CH_RTP.wants(deviceId)) {
|
|
1464
|
-
* CH_RTP.log(logger, 'rtp subscriber added', { tags: { deviceId }, meta: { ssrc } })
|
|
1465
|
-
* }
|
|
1466
|
-
* ```
|
|
1467
|
-
*
|
|
1468
|
-
* `on` is a plain boolean FIELD — never a getter — and it is the FIRST thing
|
|
1469
|
-
* read. Disarmed, a call site costs one load and one branch, and the `extras`
|
|
1470
|
-
* object literal is never constructed because it lives inside the branch. It
|
|
1471
|
-
* is the same shape already proven in production at `stream-broker.ts:1650`,
|
|
1472
|
-
* and the same discipline `LoggingGate.allowsDestination` uses for the
|
|
1473
|
-
* destination floor (measured at 1.93 ns/call when off).
|
|
1474
|
-
*
|
|
1475
|
-
* ## Why a channel emits at `info`
|
|
1476
|
-
*
|
|
1477
|
-
* `loki-logging.addon.ts` pins the destination default at `info` and
|
|
1478
|
-
* `loki-destination.ts` drops everything below it, so a line emitted at
|
|
1479
|
-
* `debug` never reaches Loki and the hub's in-memory ring only holds ~35
|
|
1480
|
-
* minutes. A diagnostic that cannot be read an hour later is worse than no
|
|
1481
|
-
* diagnostic, because it looks done. {@link LogChannelGate.log} therefore
|
|
1482
|
-
* emits at the channel's declared level, whose schema floor is `info`.
|
|
1483
|
-
*/
|
|
1484
|
-
/**
|
|
1485
|
-
* The level a channel writes at once armed.
|
|
1486
|
-
*
|
|
1487
|
-
* `debug` is absent ON PURPOSE and not by omission: below `info` the line does
|
|
1488
|
-
* not leave the process for Loki, and the whole point of arming a channel is
|
|
1489
|
-
* to read it later.
|
|
1490
|
-
*/
|
|
1491
|
-
var LogChannelLevelSchema = zod.z.enum([
|
|
1492
|
-
"info",
|
|
1493
|
-
"warn",
|
|
1494
|
-
"error"
|
|
1495
|
-
]);
|
|
1496
|
-
/**
|
|
1497
|
-
* What an addon declares about one channel. No value, no state — a
|
|
1498
|
-
* declaration is inert.
|
|
1499
|
-
*/
|
|
1500
|
-
var LogChannelDescriptorSchema = zod.z.object({
|
|
1501
|
-
/**
|
|
1502
|
-
* Dotted `area.thing`, unique across the workspace. `area` is conventionally
|
|
1503
|
-
* the addon's short name so an operator reading a channel list can tell who
|
|
1504
|
-
* owns it without a second lookup.
|
|
1505
|
-
*/
|
|
1506
|
-
name: zod.z.string().min(3).regex(/^[a-z0-9-]+(\.[a-z0-9-]+)+$/, "a channel name is dotted lower-kebab, e.g. area.thing"),
|
|
1507
|
-
/** One sentence: what the operator will SEE after arming it. */
|
|
1508
|
-
description: zod.z.string().min(1),
|
|
1509
|
-
/** The level its lines are emitted at. Never below `info`. */
|
|
1510
|
-
defaultLevel: LogChannelLevelSchema,
|
|
1511
|
-
/**
|
|
1512
|
-
* Whether this channel can be narrowed to a camera.
|
|
1513
|
-
*
|
|
1514
|
-
* `true` is a PROMISE with two halves, and both must hold: the gate is
|
|
1515
|
-
* consulted with the numeric device id, AND every line the channel admits
|
|
1516
|
-
* carries `tags: { deviceId }` with that same numeric id. The second half is
|
|
1517
|
-
* what makes `| json | deviceId="617"` work in Loki — `loki-payload.ts`
|
|
1518
|
-
* keeps `deviceId` out of the stream labels for cardinality, so the tag in
|
|
1519
|
-
* the body is the only way to filter.
|
|
1520
|
-
*
|
|
1521
|
-
* A channel whose lines carry the device only in `meta` (or not at all) is
|
|
1522
|
-
* declared `false`. Declaring it `true` anyway would be a lie the UI repeats:
|
|
1523
|
-
* the operator narrows to one camera, sees nothing, and concludes the code
|
|
1524
|
-
* path was never taken.
|
|
1525
|
-
*/
|
|
1526
|
-
perDevice: zod.z.boolean()
|
|
1527
|
-
});
|
|
1528
|
-
/**
|
|
1529
|
-
* An armed window over one channel, as the document hands it to a mirror.
|
|
1530
|
-
*
|
|
1531
|
-
* A window is a DEADLINE, never a flag (ADR-0244): a channel somebody forgot
|
|
1532
|
-
* expires by itself, which is the one failure a boolean cannot avoid.
|
|
1533
|
-
*/
|
|
1534
|
-
var LogChannelWindowSchema = zod.z.object({
|
|
1535
|
-
channel: zod.z.string().min(1),
|
|
1536
|
-
/** Epoch ms the window closes at. */
|
|
1537
|
-
armedUntilMs: zod.z.number(),
|
|
1538
|
-
/** `null` = every camera. A non-empty list narrows to those numeric ids. */
|
|
1539
|
-
deviceIds: zod.z.array(zod.z.number().int()).readonly().nullable()
|
|
1540
|
-
});
|
|
1541
|
-
/**
|
|
1542
|
-
* The gate a hot path holds.
|
|
1543
|
-
*
|
|
1544
|
-
* Obtain it ONCE — at module scope or in a constructor — and keep the
|
|
1545
|
-
* reference. Looking a channel up by name per line would put a Map lookup on
|
|
1546
|
-
* the path this class exists to keep free.
|
|
1547
|
-
*/
|
|
1548
|
-
var LogChannelGate = class {
|
|
1549
|
-
descriptor;
|
|
1550
|
-
/**
|
|
1551
|
-
* HOT PATH GUARD. A plain data FIELD, and it must stay one.
|
|
1552
|
-
*
|
|
1553
|
-
* `log-channel.spec.ts` asserts the property descriptor has no getter and
|
|
1554
|
-
* booby-traps the device set, so turning this into an accessor — or reading
|
|
1555
|
-
* anything before it — fails the spec instead of taxing every line the
|
|
1556
|
-
* process emits.
|
|
1557
|
-
*/
|
|
1558
|
-
on = false;
|
|
1559
|
-
/** `null` while armed for every camera. Never read while `on` is false. */
|
|
1560
|
-
devices = null;
|
|
1561
|
-
level;
|
|
1562
|
-
closesAtMs = 0;
|
|
1563
|
-
constructor(descriptor) {
|
|
1564
|
-
this.descriptor = descriptor;
|
|
1565
|
-
this.level = descriptor.defaultLevel;
|
|
1566
|
-
}
|
|
1567
|
-
/** Epoch ms this channel disarms itself at. 0 when disarmed. */
|
|
1568
|
-
get armedUntilMs() {
|
|
1569
|
-
return this.on ? this.closesAtMs : 0;
|
|
1570
|
-
}
|
|
1571
|
-
/**
|
|
1572
|
-
* Does this channel want a line about `deviceId`?
|
|
1573
|
-
*
|
|
1574
|
-
* Call it only behind `gate.on &&`. On its own it is still correct — the
|
|
1575
|
-
* guard is repeated inside — but the point of the prefix is that a disarmed
|
|
1576
|
-
* channel must not pay the call at all.
|
|
1577
|
-
*/
|
|
1578
|
-
wants(deviceId) {
|
|
1579
|
-
if (!this.on) return false;
|
|
1580
|
-
return this.devices === null || this.devices.has(deviceId);
|
|
1581
|
-
}
|
|
1582
|
-
/**
|
|
1583
|
-
* Emit one line on this channel, at the channel's declared level.
|
|
1584
|
-
*
|
|
1585
|
-
* The channel name is added as `tags.logChannel` so LogQL can select the
|
|
1586
|
-
* channel without matching on the message text, and whatever `tags` the
|
|
1587
|
-
* caller passed — `deviceId` above all — is preserved.
|
|
1588
|
-
*/
|
|
1589
|
-
log(logger, message, extras) {
|
|
1590
|
-
if (!this.on) return;
|
|
1591
|
-
const tags = {
|
|
1592
|
-
...extras.tags,
|
|
1593
|
-
logChannel: this.descriptor.name
|
|
1594
|
-
};
|
|
1595
|
-
const line = {
|
|
1596
|
-
...extras,
|
|
1597
|
-
tags
|
|
1598
|
-
};
|
|
1599
|
-
if (this.level === "error") logger.error(message, line);
|
|
1600
|
-
else if (this.level === "warn") logger.warn(message, line);
|
|
1601
|
-
else logger.info(message, line);
|
|
1602
|
-
}
|
|
1603
|
-
/**
|
|
1604
|
-
* Arm (or RE-arm, restarting) this channel. Off the hot path only.
|
|
1605
|
-
*
|
|
1606
|
-
* An empty `deviceIds` list is treated as "every camera" rather than "no
|
|
1607
|
-
* camera": a window that matches nothing is indistinguishable from a
|
|
1608
|
-
* disarmed one, and the operator who asked for it would wait for lines that
|
|
1609
|
-
* can never come.
|
|
1610
|
-
*/
|
|
1611
|
-
arm(window) {
|
|
1612
|
-
const ids = window.deviceIds;
|
|
1613
|
-
this.devices = ids === null || ids.length === 0 ? null : new Set(ids);
|
|
1614
|
-
this.closesAtMs = window.armedUntilMs;
|
|
1615
|
-
this.on = true;
|
|
1616
|
-
}
|
|
1617
|
-
/** Disarm. Off the hot path only. */
|
|
1618
|
-
disarm() {
|
|
1619
|
-
this.on = false;
|
|
1620
|
-
this.devices = null;
|
|
1621
|
-
this.closesAtMs = 0;
|
|
1622
|
-
}
|
|
1623
|
-
};
|
|
1624
|
-
/**
|
|
1625
|
-
* Every channel this PROCESS declares, and the mirror of what is armed on it.
|
|
1626
|
-
*
|
|
1627
|
-
* One per process. A forked runner has its own, and it is refreshed through
|
|
1628
|
-
* the `log-channels` capability by the hub that owns the document — the
|
|
1629
|
-
* registry never reaches for a value itself.
|
|
1630
|
-
*/
|
|
1631
|
-
var LogChannelRegistry = class {
|
|
1632
|
-
gates = /* @__PURE__ */ new Map();
|
|
1633
|
-
/**
|
|
1634
|
-
* Declare a channel and get its gate.
|
|
1635
|
-
*
|
|
1636
|
-
* A duplicate name throws. Two declarations of one name is a programming
|
|
1637
|
-
* error, not a merge: the operator would arm one and the other would stay
|
|
1638
|
-
* dark, which is the dead-knob shape (D62) with an extra step.
|
|
1639
|
-
*/
|
|
1640
|
-
declare(descriptor) {
|
|
1641
|
-
const parsed = LogChannelDescriptorSchema.parse(descriptor);
|
|
1642
|
-
if (this.gates.get(parsed.name) !== void 0) throw new Error(`log channel "${parsed.name}" is already declared in this process — two declarations of one name is a programming error, not a merge`);
|
|
1643
|
-
const gate = new LogChannelGate(parsed);
|
|
1644
|
-
this.gates.set(parsed.name, gate);
|
|
1645
|
-
return gate;
|
|
1646
|
-
}
|
|
1647
|
-
/** The declarations, sorted by name so a list is stable to read and diff. */
|
|
1648
|
-
list() {
|
|
1649
|
-
return [...this.gates.values()].map((gate) => gate.descriptor).sort((a, b) => a.name.localeCompare(b.name));
|
|
1650
|
-
}
|
|
1651
|
-
/** The gate for a declared channel, or `undefined`. */
|
|
1652
|
-
gate(name) {
|
|
1653
|
-
return this.gates.get(name);
|
|
1654
|
-
}
|
|
1655
|
-
/**
|
|
1656
|
-
* Apply the FULL set of armed windows. Off the hot path.
|
|
1657
|
-
*
|
|
1658
|
-
* Full, not incremental, and that is the whole design: the document is the
|
|
1659
|
-
* authority, so a channel the document does not name is disarmed here. An
|
|
1660
|
-
* incremental apply would let a disarm get lost in transit and leave a
|
|
1661
|
-
* channel running that nobody can see is running.
|
|
1662
|
-
*
|
|
1663
|
-
* A window already past its deadline is ignored rather than armed — a
|
|
1664
|
-
* restore that re-armed an expired window would make a forgotten diagnostic
|
|
1665
|
-
* immortal across restarts.
|
|
1666
|
-
*
|
|
1667
|
-
* Returns the names it could not place, so the caller can log them: a
|
|
1668
|
-
* channel named in the document that this process does not declare is
|
|
1669
|
-
* either a typo or an addon that has not booted yet, and both deserve a
|
|
1670
|
-
* line rather than silence.
|
|
1671
|
-
*/
|
|
1672
|
-
apply(windows, nowMs) {
|
|
1673
|
-
const wanted = /* @__PURE__ */ new Map();
|
|
1674
|
-
const unknown = [];
|
|
1675
|
-
for (const window of windows) {
|
|
1676
|
-
if (window.armedUntilMs <= nowMs) continue;
|
|
1677
|
-
if (!this.gates.has(window.channel)) {
|
|
1678
|
-
unknown.push(window.channel);
|
|
1679
|
-
continue;
|
|
1680
|
-
}
|
|
1681
|
-
wanted.set(window.channel, window);
|
|
1682
|
-
}
|
|
1683
|
-
for (const [name, gate] of this.gates) {
|
|
1684
|
-
const window = wanted.get(name);
|
|
1685
|
-
if (window === void 0) gate.disarm();
|
|
1686
|
-
else gate.arm(window);
|
|
1687
|
-
}
|
|
1688
|
-
return unknown;
|
|
1689
|
-
}
|
|
1690
|
-
/**
|
|
1691
|
-
* Disarm whatever has run out. Called on a timer, NEVER from a log path — a
|
|
1692
|
-
* diagnostic that adds a `Date.now()` to the path it is measuring measures
|
|
1693
|
-
* itself.
|
|
1694
|
-
*
|
|
1695
|
-
* Returns the names it closed, so the caller can write the one line that
|
|
1696
|
-
* says a window ended and stops "it went quiet" from reading as "the branch
|
|
1697
|
-
* was not taken".
|
|
1698
|
-
*/
|
|
1699
|
-
tick(nowMs) {
|
|
1700
|
-
const closed = [];
|
|
1701
|
-
for (const [name, gate] of this.gates) if (gate.on && gate.armedUntilMs <= nowMs) {
|
|
1702
|
-
gate.disarm();
|
|
1703
|
-
closed.push(name);
|
|
1704
|
-
}
|
|
1705
|
-
return closed;
|
|
1706
|
-
}
|
|
1707
|
-
/** The channels armed right now, as the document would describe them. */
|
|
1708
|
-
armed() {
|
|
1709
|
-
const out = [];
|
|
1710
|
-
for (const [name, gate] of this.gates) if (gate.on) out.push({
|
|
1711
|
-
channel: name,
|
|
1712
|
-
armedUntilMs: gate.armedUntilMs,
|
|
1713
|
-
deviceIds: null
|
|
1714
|
-
});
|
|
1715
|
-
return out;
|
|
1716
|
-
}
|
|
1717
|
-
};
|
|
1718
|
-
//#endregion
|
|
1719
|
-
//#region src/logging/log-channel.singleton.ts
|
|
1720
|
-
/**
|
|
1721
|
-
* Process-wide holder for the {@link LogChannelRegistry}.
|
|
1722
|
-
*
|
|
1723
|
-
* Three call sites that never meet need the SAME instance: the hot paths that
|
|
1724
|
-
* declare a gate at module scope, the `log-channels` provider that enumerates
|
|
1725
|
-
* the declarations for the hub, and the same provider applying the windows the
|
|
1726
|
-
* document hands down. A registry built inside any one of them would be
|
|
1727
|
-
* refreshed and collected — the shape of a knob that never does anything.
|
|
1728
|
-
*
|
|
1729
|
-
* Same idiom as `logging-gate.singleton.ts` and
|
|
1730
|
-
* `http-request-census.singleton.ts`.
|
|
1731
|
-
*/
|
|
1732
|
-
var instance = null;
|
|
1733
|
-
/** The process-wide log channel registry. Created empty on first use. */
|
|
1734
|
-
function getLogChannelRegistry() {
|
|
1735
|
-
instance ??= new LogChannelRegistry();
|
|
1736
|
-
return instance;
|
|
1737
|
-
}
|
|
1738
|
-
/**
|
|
1739
|
-
* Declare a channel on the process-wide registry and get its gate.
|
|
1740
|
-
*
|
|
1741
|
-
* The one call an addon makes. Keep the returned gate in a module-scope
|
|
1742
|
-
* `const`: looking a channel up by name per line would put a Map lookup on
|
|
1743
|
-
* exactly the path this mechanism exists to keep free.
|
|
1744
|
-
*
|
|
1745
|
-
* `scripts/check-log-channel-gated.ts` reads these call sites. It pairs the
|
|
1746
|
-
* declared name with the binding it is assigned to and refuses to let a
|
|
1747
|
-
* channel ship that no `<binding>.on` anywhere consults — a declared channel
|
|
1748
|
-
* nobody reads is a knob the operator turns with nothing happening, forever,
|
|
1749
|
-
* and without a line. That is D62, and this repo has now shipped it three
|
|
1750
|
-
* times (`audioThresholdDbfs`, the HA entities with no source, the second
|
|
1751
|
-
* per-camera switch that wrote a store nobody read).
|
|
1752
|
-
*/
|
|
1753
|
-
function declareLogChannel(descriptor) {
|
|
1754
|
-
return getLogChannelRegistry().declare(descriptor);
|
|
1755
|
-
}
|
|
1756
|
-
/** Test-only: drop the instance so a spec starts from an empty registry. */
|
|
1757
|
-
function __resetLogChannelRegistryForTests() {
|
|
1758
|
-
instance = null;
|
|
1759
|
-
}
|
|
1760
|
-
//#endregion
|
|
1761
|
-
//#region src/logging/log-channel-provider.ts
|
|
1762
|
-
/**
|
|
1763
|
-
* How often expiry is noticed. Coarse on purpose: the cost of a channel
|
|
1764
|
-
* running a few seconds past its deadline is a few extra lines, and the cost
|
|
1765
|
-
* of a tight timer in every addon process is paid forever.
|
|
1766
|
-
*/
|
|
1767
|
-
var LOG_CHANNEL_TICK_MS = 5e3;
|
|
1768
|
-
/**
|
|
1769
|
-
* Build the `log-channels` provider for this process.
|
|
1770
|
-
*
|
|
1771
|
-
* `logger` is used ONLY off the hot path — for the arm/expiry lines — so a
|
|
1772
|
-
* channel that is never armed costs this module nothing but a timer.
|
|
1773
|
-
*/
|
|
1774
|
-
function createLogChannelsProvider(logger, options = {}) {
|
|
1775
|
-
const registry = getLogChannelRegistry();
|
|
1776
|
-
const now = options.now ?? Date.now;
|
|
1777
|
-
const tickMs = options.tickMs ?? 5e3;
|
|
1778
|
-
const timer = setInterval(() => {
|
|
1779
|
-
const closed = registry.tick(now());
|
|
1780
|
-
for (const name of closed) logger.info("log channel window closed", {
|
|
1781
|
-
tags: { logChannel: name },
|
|
1782
|
-
meta: { channel: name }
|
|
1783
|
-
});
|
|
1784
|
-
}, tickMs);
|
|
1785
|
-
timer.unref?.();
|
|
1786
|
-
return {
|
|
1787
|
-
list: () => registry.list(),
|
|
1788
|
-
apply: (input) => {
|
|
1789
|
-
const unknown = registry.apply(input.windows, now());
|
|
1790
|
-
const armed = registry.armed();
|
|
1791
|
-
logger.info("log channels applied", { meta: {
|
|
1792
|
-
armed: armed.map((window) => window.channel),
|
|
1793
|
-
unknown,
|
|
1794
|
-
declared: registry.list().length
|
|
1795
|
-
} });
|
|
1796
|
-
return {
|
|
1797
|
-
armed: armed.length,
|
|
1798
|
-
unknown
|
|
1799
|
-
};
|
|
1800
|
-
},
|
|
1801
|
-
stop: () => {
|
|
1802
|
-
clearInterval(timer);
|
|
1803
|
-
}
|
|
1804
|
-
};
|
|
1805
|
-
}
|
|
1806
|
-
//#endregion
|
|
1807
1435
|
//#region src/interfaces/ops-log.ts
|
|
1808
1436
|
/**
|
|
1809
1437
|
* Ops-log — the durable, append-only operations audit shared by the
|
|
@@ -3041,8 +2669,11 @@ var StorageLocationTypeSchema = zod.z.string().regex(/^[a-z][a-zA-Z0-9-]*$/);
|
|
|
3041
2669
|
* `STORAGE_LOCATION_CARDINALITY` map has been removed.
|
|
3042
2670
|
*
|
|
3043
2671
|
* `id` is a stable namespaced string of the form `<type>:<slug>`.
|
|
3044
|
-
* The
|
|
3045
|
-
*
|
|
2672
|
+
* The seed names its first instance `<type>:default` — a NAME, not a flag.
|
|
2673
|
+
* There is no default location any more (D383): `enabled` is the whole write
|
|
2674
|
+
* model, and a bare type ref resolves to the sole location of the type, or —
|
|
2675
|
+
* transitionally, only while legacy NULL-stamped rows exist — to the row whose
|
|
2676
|
+
* slug is `default`.
|
|
3046
2677
|
*
|
|
3047
2678
|
* `isSystem` is a legacy persisted flag. Seed still creates the initial
|
|
3048
2679
|
* `<type>:default` locations; the flag is no longer a lock, a badge, or a
|
|
@@ -3063,21 +2694,20 @@ var StorageLocationSchema = zod.z.object({
|
|
|
3063
2694
|
* flag at upsert time, not here (the schema is provider-agnostic).
|
|
3064
2695
|
*/
|
|
3065
2696
|
nodeId: zod.z.string().optional(),
|
|
3066
|
-
isDefault: zod.z.boolean().default(false),
|
|
3067
2697
|
isSystem: zod.z.boolean().default(false),
|
|
3068
2698
|
/**
|
|
3069
|
-
*
|
|
3070
|
-
*
|
|
3071
|
-
*
|
|
3072
|
-
*
|
|
3073
|
-
*
|
|
2699
|
+
* THE write switch, and the only one (D383). `enabled: true` means every
|
|
2700
|
+
* consumer that chooses a write target for this type may write here, and all
|
|
2701
|
+
* enabled locations of a type are used TOGETHER; `false` means read-only —
|
|
2702
|
+
* still read, still played back, still age-swept, still drained, never
|
|
2703
|
+
* written.
|
|
3074
2704
|
*
|
|
3075
|
-
* OPTIONAL
|
|
3076
|
-
*
|
|
3077
|
-
*
|
|
3078
|
-
*
|
|
3079
|
-
*
|
|
3080
|
-
*
|
|
2705
|
+
* OPTIONAL only for the wire: an upsert that omits it means "leave what is
|
|
2706
|
+
* stored" on an update and "born inert unless it is the first location of its
|
|
2707
|
+
* type" on a create. On a PERSISTED row absence is legacy and it means
|
|
2708
|
+
* enabled — {@link isLocationEnabled} is the one place that says so, and the
|
|
2709
|
+
* orchestrator stamps every flagless row `true` once at hydrate so absence
|
|
2710
|
+
* stops existing rather than being re-derived on every read.
|
|
3081
2711
|
*/
|
|
3082
2712
|
enabled: zod.z.boolean().optional(),
|
|
3083
2713
|
/** COMPUTED at read time by the orchestrator (statfs of the backing volume
|
|
@@ -3091,9 +2721,31 @@ var StorageLocationSchema = zod.z.object({
|
|
|
3091
2721
|
updatedAt: zod.z.number()
|
|
3092
2722
|
});
|
|
3093
2723
|
/**
|
|
2724
|
+
* The retired `isDefault` key, DECLARED rather than dropped.
|
|
2725
|
+
*
|
|
2726
|
+
* A key removed from a non-strict `z.object` is stripped in silence (D380,
|
|
2727
|
+
* D381): a reader that still needs the old value gets `undefined` and cannot
|
|
2728
|
+
* tell "absent" from "never sent". The one reader that legitimately needs it —
|
|
2729
|
+
* the location store's boot migration, which turns the old default flag into
|
|
2730
|
+
* the `enabled` write set — parses THIS schema against the raw row instead, so
|
|
2731
|
+
* the migration is explicit and the live schema stays clean. Nothing else in
|
|
2732
|
+
* the repo may read it; `scripts/check-no-storage-default.ts` enforces that.
|
|
2733
|
+
*/
|
|
2734
|
+
var LegacyStorageLocationDefaultSchema = zod.z.object({ isDefault: zod.z.boolean().optional() });
|
|
2735
|
+
/**
|
|
2736
|
+
* Is this location a write target? THE one place that decides what an absent
|
|
2737
|
+
* `enabled` means on a persisted row — legacy rows predate the flag and were
|
|
2738
|
+
* active, so absence is enabled. Every consumer asks here rather than spelling
|
|
2739
|
+
* `enabled !== false` again, so the tri-state has exactly one interpretation.
|
|
2740
|
+
*/
|
|
2741
|
+
function isLocationEnabled(location) {
|
|
2742
|
+
return location.enabled !== false;
|
|
2743
|
+
}
|
|
2744
|
+
/**
|
|
3094
2745
|
* Reference accepted by consumer-facing `api.storage.*` calls.
|
|
3095
2746
|
* Either:
|
|
3096
|
-
* - a `StorageLocationType` (e.g. `'backups'`) →
|
|
2747
|
+
* - a `StorageLocationType` (e.g. `'backups'`) → the sole location of that type
|
|
2748
|
+
* (transitionally, the `<type>:default`-slugged row when several exist)
|
|
3097
2749
|
* - a fully-qualified id (e.g. `'backups:nas-01'`) → addresses a specific instance
|
|
3098
2750
|
*
|
|
3099
2751
|
* The orchestrator's `resolveRef(ref)` handles both cases.
|
|
@@ -3457,199 +3109,376 @@ function findTimezone(id) {
|
|
|
3457
3109
|
return TIMEZONES.find((tz) => tz.id === id);
|
|
3458
3110
|
}
|
|
3459
3111
|
//#endregion
|
|
3460
|
-
//#region src/
|
|
3461
|
-
function pickPreferredRtspEntry(entries, pref, deviceId, options = {}) {
|
|
3462
|
-
if (entries.length === 0) return null;
|
|
3463
|
-
const prefix = `${deviceId}/`;
|
|
3464
|
-
const toPicked = (e) => ({
|
|
3465
|
-
brokerId: e.brokerId,
|
|
3466
|
-
profileId: e.brokerId.startsWith(prefix) ? e.brokerId.slice(prefix.length) : e.brokerId,
|
|
3467
|
-
url: e.url,
|
|
3468
|
-
mutedUrl: e.mutedUrl,
|
|
3469
|
-
enabled: e.enabled,
|
|
3470
|
-
...e.codec !== void 0 ? { codec: e.codec } : {},
|
|
3471
|
-
...e.resolution !== void 0 ? { resolution: e.resolution } : {}
|
|
3472
|
-
});
|
|
3473
|
-
if (pref !== "auto") {
|
|
3474
|
-
const match = entries.find((e) => e.enabled && e.url.length > 0 && (e.profile === pref || e.brokerId === `${prefix}${pref}`));
|
|
3475
|
-
if (match) return toPicked(match);
|
|
3476
|
-
}
|
|
3477
|
-
const eligible = entries.filter((e) => e.enabled && e.url.length > 0);
|
|
3478
|
-
if (eligible.length === 0) return null;
|
|
3479
|
-
const target = options.targetResolution;
|
|
3480
|
-
if (target) {
|
|
3481
|
-
const withRes = eligible.filter((e) => e.resolution !== void 0);
|
|
3482
|
-
if (withRes.length > 0) {
|
|
3483
|
-
const picked = pickClosestResolution(withRes, target);
|
|
3484
|
-
if (picked) return toPicked(picked);
|
|
3485
|
-
}
|
|
3486
|
-
}
|
|
3487
|
-
return toPicked(eligible[0]);
|
|
3488
|
-
}
|
|
3112
|
+
//#region src/logging/log-channel.ts
|
|
3489
3113
|
/**
|
|
3490
|
-
*
|
|
3491
|
-
*
|
|
3492
|
-
*
|
|
3493
|
-
*
|
|
3494
|
-
*
|
|
3114
|
+
* Per-component log CHANNELS — the gate a hot path consults, and the registry
|
|
3115
|
+
* an addon declares its channels in.
|
|
3116
|
+
*
|
|
3117
|
+
* ## Two axes, deliberately separated
|
|
3118
|
+
*
|
|
3119
|
+
* - **DECLARATION** — which channels exist. Only the addon knows:
|
|
3120
|
+
* `stream-broker` knows webrtc/ICE/RTP, `provider-reolink` knows
|
|
3121
|
+
* baichuan/handshake. A hand-wired central list rots at the first addition,
|
|
3122
|
+
* and rots silently. So a channel is declared where it is consulted, and the
|
|
3123
|
+
* `log-channels` capability enumerates the declarations.
|
|
3124
|
+
* - **VALUE** — at which level, for which scope, until when. That stays ONE
|
|
3125
|
+
* thing: the logging settings document on the `system` cap. Two authorities
|
|
3126
|
+
* over the values is the exact defect
|
|
3127
|
+
* `docs/design/plans/2026-08-26-logging-per-componente.md` was written to
|
|
3128
|
+
* remove; re-introducing it from the cure side would be grotesque.
|
|
3129
|
+
*
|
|
3130
|
+
* Nothing in this file reads a clock, an env var or a store. The registry is
|
|
3131
|
+
* a MIRROR: it is moved only by {@link LogChannelRegistry.apply}, called off
|
|
3132
|
+
* the hot path with a value somebody actually read, and by
|
|
3133
|
+
* {@link LogChannelRegistry.tick}, called on a timer. A store read that fails
|
|
3134
|
+
* never reaches here, so it can neither disarm an armed channel nor arm a
|
|
3135
|
+
* disarmed one (D49).
|
|
3136
|
+
*
|
|
3137
|
+
* ## The canonical call shape
|
|
3138
|
+
*
|
|
3139
|
+
* ```ts
|
|
3140
|
+
* if (CH_RTP.on && CH_RTP.wants(deviceId)) {
|
|
3141
|
+
* CH_RTP.log(logger, 'rtp subscriber added', { tags: { deviceId }, meta: { ssrc } })
|
|
3142
|
+
* }
|
|
3143
|
+
* ```
|
|
3144
|
+
*
|
|
3145
|
+
* `on` is a plain boolean FIELD — never a getter — and it is the FIRST thing
|
|
3146
|
+
* read. Disarmed, a call site costs one load and one branch, and the `extras`
|
|
3147
|
+
* object literal is never constructed because it lives inside the branch. It
|
|
3148
|
+
* is the same shape already proven in production at `stream-broker.ts:1650`,
|
|
3149
|
+
* and the same discipline `LoggingGate.allowsDestination` uses for the
|
|
3150
|
+
* destination floor (measured at 1.93 ns/call when off).
|
|
3151
|
+
*
|
|
3152
|
+
* ## Why a channel emits at `info`
|
|
3153
|
+
*
|
|
3154
|
+
* `loki-logging.addon.ts` pins the destination default at `info` and
|
|
3155
|
+
* `loki-destination.ts` drops everything below it, so a line emitted at
|
|
3156
|
+
* `debug` never reaches Loki and the hub's in-memory ring only holds ~35
|
|
3157
|
+
* minutes. A diagnostic that cannot be read an hour later is worse than no
|
|
3158
|
+
* diagnostic, because it looks done. {@link LogChannelGate.log} therefore
|
|
3159
|
+
* emits at the channel's declared level, whose schema floor is `info`.
|
|
3495
3160
|
*/
|
|
3496
|
-
|
|
3497
|
-
|
|
3498
|
-
|
|
3499
|
-
|
|
3500
|
-
|
|
3501
|
-
|
|
3502
|
-
|
|
3503
|
-
|
|
3504
|
-
|
|
3505
|
-
|
|
3506
|
-
|
|
3507
|
-
|
|
3508
|
-
|
|
3509
|
-
|
|
3510
|
-
|
|
3161
|
+
/**
|
|
3162
|
+
* The level a channel writes at once armed.
|
|
3163
|
+
*
|
|
3164
|
+
* `debug` is absent ON PURPOSE and not by omission: below `info` the line does
|
|
3165
|
+
* not leave the process for Loki, and the whole point of arming a channel is
|
|
3166
|
+
* to read it later.
|
|
3167
|
+
*/
|
|
3168
|
+
var LogChannelLevelSchema = zod.z.enum([
|
|
3169
|
+
"info",
|
|
3170
|
+
"warn",
|
|
3171
|
+
"error"
|
|
3172
|
+
]);
|
|
3173
|
+
/**
|
|
3174
|
+
* What an addon declares about one channel. No value, no state — a
|
|
3175
|
+
* declaration is inert.
|
|
3176
|
+
*/
|
|
3177
|
+
var LogChannelDescriptorSchema = zod.z.object({
|
|
3178
|
+
/**
|
|
3179
|
+
* Dotted `area.thing`, unique across the workspace. `area` is conventionally
|
|
3180
|
+
* the addon's short name so an operator reading a channel list can tell who
|
|
3181
|
+
* owns it without a second lookup.
|
|
3182
|
+
*/
|
|
3183
|
+
name: zod.z.string().min(3).regex(/^[a-z0-9-]+(\.[a-z0-9-]+)+$/, "a channel name is dotted lower-kebab, e.g. area.thing"),
|
|
3184
|
+
/** One sentence: what the operator will SEE after arming it. */
|
|
3185
|
+
description: zod.z.string().min(1),
|
|
3186
|
+
/** The level its lines are emitted at. Never below `info`. */
|
|
3187
|
+
defaultLevel: LogChannelLevelSchema,
|
|
3188
|
+
/**
|
|
3189
|
+
* Whether this channel can be narrowed to a camera.
|
|
3190
|
+
*
|
|
3191
|
+
* `true` is a PROMISE with two halves, and both must hold: the gate is
|
|
3192
|
+
* consulted with the numeric device id, AND every line the channel admits
|
|
3193
|
+
* carries `tags: { deviceId }` with that same numeric id. The second half is
|
|
3194
|
+
* what makes `| json | deviceId="617"` work in Loki — `loki-payload.ts`
|
|
3195
|
+
* keeps `deviceId` out of the stream labels for cardinality, so the tag in
|
|
3196
|
+
* the body is the only way to filter.
|
|
3197
|
+
*
|
|
3198
|
+
* A channel whose lines carry the device only in `meta` (or not at all) is
|
|
3199
|
+
* declared `false`. Declaring it `true` anyway would be a lie the UI repeats:
|
|
3200
|
+
* the operator narrows to one camera, sees nothing, and concludes the code
|
|
3201
|
+
* path was never taken.
|
|
3202
|
+
*/
|
|
3203
|
+
perDevice: zod.z.boolean()
|
|
3204
|
+
});
|
|
3205
|
+
/**
|
|
3206
|
+
* An armed window over one channel, as the document hands it to a mirror.
|
|
3207
|
+
*
|
|
3208
|
+
* A window is a DEADLINE, never a flag (ADR-0244): a channel somebody forgot
|
|
3209
|
+
* expires by itself, which is the one failure a boolean cannot avoid.
|
|
3210
|
+
*/
|
|
3211
|
+
var LogChannelWindowSchema = zod.z.object({
|
|
3212
|
+
channel: zod.z.string().min(1),
|
|
3213
|
+
/** Epoch ms the window closes at. */
|
|
3214
|
+
armedUntilMs: zod.z.number(),
|
|
3215
|
+
/** `null` = every camera. A non-empty list narrows to those numeric ids. */
|
|
3216
|
+
deviceIds: zod.z.array(zod.z.number().int()).readonly().nullable()
|
|
3217
|
+
});
|
|
3218
|
+
/**
|
|
3219
|
+
* The gate a hot path holds.
|
|
3220
|
+
*
|
|
3221
|
+
* Obtain it ONCE — at module scope or in a constructor — and keep the
|
|
3222
|
+
* reference. Looking a channel up by name per line would put a Map lookup on
|
|
3223
|
+
* the path this class exists to keep free.
|
|
3224
|
+
*/
|
|
3225
|
+
var LogChannelGate = class {
|
|
3226
|
+
descriptor;
|
|
3227
|
+
/**
|
|
3228
|
+
* HOT PATH GUARD. A plain data FIELD, and it must stay one.
|
|
3229
|
+
*
|
|
3230
|
+
* `log-channel.spec.ts` asserts the property descriptor has no getter and
|
|
3231
|
+
* booby-traps the device set, so turning this into an accessor — or reading
|
|
3232
|
+
* anything before it — fails the spec instead of taxing every line the
|
|
3233
|
+
* process emits.
|
|
3234
|
+
*/
|
|
3235
|
+
on = false;
|
|
3236
|
+
/** `null` while armed for every camera. Never read while `on` is false. */
|
|
3237
|
+
devices = null;
|
|
3238
|
+
level;
|
|
3239
|
+
closesAtMs = 0;
|
|
3240
|
+
constructor(descriptor) {
|
|
3241
|
+
this.descriptor = descriptor;
|
|
3242
|
+
this.level = descriptor.defaultLevel;
|
|
3243
|
+
}
|
|
3244
|
+
/** Epoch ms this channel disarms itself at. 0 when disarmed. */
|
|
3245
|
+
get armedUntilMs() {
|
|
3246
|
+
return this.on ? this.closesAtMs : 0;
|
|
3247
|
+
}
|
|
3248
|
+
/**
|
|
3249
|
+
* Does this channel want a line about `deviceId`?
|
|
3250
|
+
*
|
|
3251
|
+
* Call it only behind `gate.on &&`. On its own it is still correct — the
|
|
3252
|
+
* guard is repeated inside — but the point of the prefix is that a disarmed
|
|
3253
|
+
* channel must not pay the call at all.
|
|
3254
|
+
*/
|
|
3255
|
+
wants(deviceId) {
|
|
3256
|
+
if (!this.on) return false;
|
|
3257
|
+
return this.devices === null || this.devices.has(deviceId);
|
|
3258
|
+
}
|
|
3259
|
+
/**
|
|
3260
|
+
* Emit one line on this channel, at the channel's declared level.
|
|
3261
|
+
*
|
|
3262
|
+
* The channel name is added as `tags.logChannel` so LogQL can select the
|
|
3263
|
+
* channel without matching on the message text, and whatever `tags` the
|
|
3264
|
+
* caller passed — `deviceId` above all — is preserved.
|
|
3265
|
+
*/
|
|
3266
|
+
log(logger, message, extras) {
|
|
3267
|
+
if (!this.on) return;
|
|
3268
|
+
const tags = {
|
|
3269
|
+
...extras.tags,
|
|
3270
|
+
logChannel: this.descriptor.name
|
|
3511
3271
|
};
|
|
3272
|
+
const line = {
|
|
3273
|
+
...extras,
|
|
3274
|
+
tags
|
|
3275
|
+
};
|
|
3276
|
+
if (this.level === "error") logger.error(message, line);
|
|
3277
|
+
else if (this.level === "warn") logger.warn(message, line);
|
|
3278
|
+
else logger.info(message, line);
|
|
3512
3279
|
}
|
|
3513
|
-
|
|
3514
|
-
|
|
3515
|
-
|
|
3516
|
-
|
|
3517
|
-
|
|
3518
|
-
|
|
3519
|
-
|
|
3520
|
-
|
|
3521
|
-
|
|
3522
|
-
|
|
3523
|
-
|
|
3524
|
-
|
|
3525
|
-
|
|
3526
|
-
|
|
3527
|
-
|
|
3528
|
-
|
|
3529
|
-
|
|
3530
|
-
|
|
3531
|
-
|
|
3532
|
-
}
|
|
3533
|
-
}
|
|
3534
|
-
/** Round to one decimal — the precision both producers already emit at. */
|
|
3535
|
-
function deci(value) {
|
|
3536
|
-
return Math.round(value * 10) / 10;
|
|
3537
|
-
}
|
|
3280
|
+
/**
|
|
3281
|
+
* Arm (or RE-arm, restarting) this channel. Off the hot path only.
|
|
3282
|
+
*
|
|
3283
|
+
* An empty `deviceIds` list is treated as "every camera" rather than "no
|
|
3284
|
+
* camera": a window that matches nothing is indistinguishable from a
|
|
3285
|
+
* disarmed one, and the operator who asked for it would wait for lines that
|
|
3286
|
+
* can never come.
|
|
3287
|
+
*/
|
|
3288
|
+
arm(window) {
|
|
3289
|
+
const ids = window.deviceIds;
|
|
3290
|
+
this.devices = ids === null || ids.length === 0 ? null : new Set(ids);
|
|
3291
|
+
this.closesAtMs = window.armedUntilMs;
|
|
3292
|
+
this.on = true;
|
|
3293
|
+
}
|
|
3294
|
+
/** Disarm. Off the hot path only. */
|
|
3295
|
+
disarm() {
|
|
3296
|
+
this.on = false;
|
|
3297
|
+
this.devices = null;
|
|
3298
|
+
this.closesAtMs = 0;
|
|
3299
|
+
}
|
|
3300
|
+
};
|
|
3538
3301
|
/**
|
|
3539
|
-
*
|
|
3302
|
+
* Every channel this PROCESS declares, and the mirror of what is armed on it.
|
|
3540
3303
|
*
|
|
3541
|
-
*
|
|
3542
|
-
*
|
|
3543
|
-
*
|
|
3304
|
+
* One per process. A forked runner has its own, and it is refreshed through
|
|
3305
|
+
* the `log-channels` capability by the hub that owns the document — the
|
|
3306
|
+
* registry never reaches for a value itself.
|
|
3544
3307
|
*/
|
|
3545
|
-
|
|
3546
|
-
|
|
3547
|
-
|
|
3548
|
-
|
|
3549
|
-
|
|
3550
|
-
|
|
3551
|
-
|
|
3552
|
-
|
|
3553
|
-
|
|
3554
|
-
|
|
3555
|
-
|
|
3556
|
-
|
|
3557
|
-
|
|
3558
|
-
|
|
3559
|
-
|
|
3560
|
-
kind: cur.kind,
|
|
3561
|
-
main: cur.main + (row.cpuMainPercent ?? 0),
|
|
3562
|
-
gc: cur.gc + (row.cpuGcPercent ?? 0),
|
|
3563
|
-
lifetime: cur.lifetime + row.cpuPercent,
|
|
3564
|
-
memory: cur.memory + row.memoryRssBytes,
|
|
3565
|
-
count: cur.count + 1,
|
|
3566
|
-
splitKnown: cur.splitKnown && known
|
|
3567
|
-
});
|
|
3308
|
+
var LogChannelRegistry = class {
|
|
3309
|
+
gates = /* @__PURE__ */ new Map();
|
|
3310
|
+
/**
|
|
3311
|
+
* Declare a channel and get its gate.
|
|
3312
|
+
*
|
|
3313
|
+
* A duplicate name throws. Two declarations of one name is a programming
|
|
3314
|
+
* error, not a merge: the operator would arm one and the other would stay
|
|
3315
|
+
* dark, which is the dead-knob shape (D62) with an extra step.
|
|
3316
|
+
*/
|
|
3317
|
+
declare(descriptor) {
|
|
3318
|
+
const parsed = LogChannelDescriptorSchema.parse(descriptor);
|
|
3319
|
+
if (this.gates.get(parsed.name) !== void 0) throw new Error(`log channel "${parsed.name}" is already declared in this process — two declarations of one name is a programming error, not a merge`);
|
|
3320
|
+
const gate = new LogChannelGate(parsed);
|
|
3321
|
+
this.gates.set(parsed.name, gate);
|
|
3322
|
+
return gate;
|
|
3568
3323
|
}
|
|
3569
|
-
|
|
3570
|
-
|
|
3571
|
-
|
|
3572
|
-
|
|
3573
|
-
|
|
3574
|
-
|
|
3575
|
-
|
|
3576
|
-
|
|
3577
|
-
|
|
3578
|
-
|
|
3579
|
-
|
|
3580
|
-
|
|
3581
|
-
|
|
3582
|
-
|
|
3583
|
-
|
|
3584
|
-
|
|
3585
|
-
|
|
3586
|
-
|
|
3587
|
-
|
|
3588
|
-
|
|
3324
|
+
/** The declarations, sorted by name so a list is stable to read and diff. */
|
|
3325
|
+
list() {
|
|
3326
|
+
return [...this.gates.values()].map((gate) => gate.descriptor).sort((a, b) => a.name.localeCompare(b.name));
|
|
3327
|
+
}
|
|
3328
|
+
/** The gate for a declared channel, or `undefined`. */
|
|
3329
|
+
gate(name) {
|
|
3330
|
+
return this.gates.get(name);
|
|
3331
|
+
}
|
|
3332
|
+
/**
|
|
3333
|
+
* Apply the FULL set of armed windows. Off the hot path.
|
|
3334
|
+
*
|
|
3335
|
+
* Full, not incremental, and that is the whole design: the document is the
|
|
3336
|
+
* authority, so a channel the document does not name is disarmed here. An
|
|
3337
|
+
* incremental apply would let a disarm get lost in transit and leave a
|
|
3338
|
+
* channel running that nobody can see is running.
|
|
3339
|
+
*
|
|
3340
|
+
* A window already past its deadline is ignored rather than armed — a
|
|
3341
|
+
* restore that re-armed an expired window would make a forgotten diagnostic
|
|
3342
|
+
* immortal across restarts.
|
|
3343
|
+
*
|
|
3344
|
+
* Returns the names it could not place, so the caller can log them: a
|
|
3345
|
+
* channel named in the document that this process does not declare is
|
|
3346
|
+
* either a typo or an addon that has not booted yet, and both deserve a
|
|
3347
|
+
* line rather than silence.
|
|
3348
|
+
*/
|
|
3349
|
+
apply(windows, nowMs) {
|
|
3350
|
+
const wanted = /* @__PURE__ */ new Map();
|
|
3351
|
+
const unknown = [];
|
|
3352
|
+
for (const window of windows) {
|
|
3353
|
+
if (window.armedUntilMs <= nowMs) continue;
|
|
3354
|
+
if (!this.gates.has(window.channel)) {
|
|
3355
|
+
unknown.push(window.channel);
|
|
3356
|
+
continue;
|
|
3589
3357
|
}
|
|
3590
|
-
|
|
3591
|
-
|
|
3592
|
-
|
|
3593
|
-
|
|
3594
|
-
|
|
3595
|
-
|
|
3596
|
-
|
|
3597
|
-
|
|
3598
|
-
|
|
3599
|
-
|
|
3600
|
-
|
|
3601
|
-
|
|
3602
|
-
|
|
3603
|
-
|
|
3604
|
-
|
|
3605
|
-
|
|
3606
|
-
|
|
3607
|
-
|
|
3608
|
-
|
|
3609
|
-
|
|
3610
|
-
|
|
3611
|
-
|
|
3612
|
-
|
|
3613
|
-
|
|
3614
|
-
|
|
3615
|
-
|
|
3616
|
-
|
|
3617
|
-
|
|
3358
|
+
wanted.set(window.channel, window);
|
|
3359
|
+
}
|
|
3360
|
+
for (const [name, gate] of this.gates) {
|
|
3361
|
+
const window = wanted.get(name);
|
|
3362
|
+
if (window === void 0) gate.disarm();
|
|
3363
|
+
else gate.arm(window);
|
|
3364
|
+
}
|
|
3365
|
+
return unknown;
|
|
3366
|
+
}
|
|
3367
|
+
/**
|
|
3368
|
+
* Disarm whatever has run out. Called on a timer, NEVER from a log path — a
|
|
3369
|
+
* diagnostic that adds a `Date.now()` to the path it is measuring measures
|
|
3370
|
+
* itself.
|
|
3371
|
+
*
|
|
3372
|
+
* Returns the names it closed, so the caller can write the one line that
|
|
3373
|
+
* says a window ended and stops "it went quiet" from reading as "the branch
|
|
3374
|
+
* was not taken".
|
|
3375
|
+
*/
|
|
3376
|
+
tick(nowMs) {
|
|
3377
|
+
const closed = [];
|
|
3378
|
+
for (const [name, gate] of this.gates) if (gate.on && gate.armedUntilMs <= nowMs) {
|
|
3379
|
+
gate.disarm();
|
|
3380
|
+
closed.push(name);
|
|
3381
|
+
}
|
|
3382
|
+
return closed;
|
|
3383
|
+
}
|
|
3384
|
+
/** The channels armed right now, as the document would describe them. */
|
|
3385
|
+
armed() {
|
|
3386
|
+
const out = [];
|
|
3387
|
+
for (const [name, gate] of this.gates) if (gate.on) out.push({
|
|
3388
|
+
channel: name,
|
|
3389
|
+
armedUntilMs: gate.armedUntilMs,
|
|
3390
|
+
deviceIds: null
|
|
3391
|
+
});
|
|
3392
|
+
return out;
|
|
3393
|
+
}
|
|
3394
|
+
};
|
|
3395
|
+
//#endregion
|
|
3396
|
+
//#region src/logging/log-channel.singleton.ts
|
|
3397
|
+
/**
|
|
3398
|
+
* Process-wide holder for the {@link LogChannelRegistry}.
|
|
3399
|
+
*
|
|
3400
|
+
* Three call sites that never meet need the SAME instance: the hot paths that
|
|
3401
|
+
* declare a gate at module scope, the `log-channels` provider that enumerates
|
|
3402
|
+
* the declarations for the hub, and the same provider applying the windows the
|
|
3403
|
+
* document hands down. A registry built inside any one of them would be
|
|
3404
|
+
* refreshed and collected — the shape of a knob that never does anything.
|
|
3405
|
+
*
|
|
3406
|
+
* Same idiom as `logging-gate.singleton.ts` and
|
|
3407
|
+
* `http-request-census.singleton.ts`.
|
|
3408
|
+
*/
|
|
3409
|
+
var instance = null;
|
|
3410
|
+
/** The process-wide log channel registry. Created empty on first use. */
|
|
3411
|
+
function getLogChannelRegistry() {
|
|
3412
|
+
instance ??= new LogChannelRegistry();
|
|
3413
|
+
return instance;
|
|
3618
3414
|
}
|
|
3619
3415
|
/**
|
|
3620
|
-
*
|
|
3621
|
-
* snapped up to a whole multiple of the sampling cadence.
|
|
3416
|
+
* Declare a channel on the process-wide registry and get its gate.
|
|
3622
3417
|
*
|
|
3623
|
-
*
|
|
3624
|
-
*
|
|
3625
|
-
*
|
|
3418
|
+
* The one call an addon makes. Keep the returned gate in a module-scope
|
|
3419
|
+
* `const`: looking a channel up by name per line would put a Map lookup on
|
|
3420
|
+
* exactly the path this mechanism exists to keep free.
|
|
3421
|
+
*
|
|
3422
|
+
* `scripts/check-log-channel-gated.ts` reads these call sites. It pairs the
|
|
3423
|
+
* declared name with the binding it is assigned to and refuses to let a
|
|
3424
|
+
* channel ship that no `<binding>.on` anywhere consults — a declared channel
|
|
3425
|
+
* nobody reads is a knob the operator turns with nothing happening, forever,
|
|
3426
|
+
* and without a line. That is D62, and this repo has now shipped it three
|
|
3427
|
+
* times (`audioThresholdDbfs`, the HA entities with no source, the second
|
|
3428
|
+
* per-camera switch that wrote a store nobody read).
|
|
3626
3429
|
*/
|
|
3627
|
-
function
|
|
3628
|
-
|
|
3629
|
-
const wanted = spanMs / maxPoints;
|
|
3630
|
-
if (wanted <= cadenceMs) return cadenceMs;
|
|
3631
|
-
return Math.ceil(wanted / cadenceMs) * cadenceMs;
|
|
3430
|
+
function declareLogChannel(descriptor) {
|
|
3431
|
+
return getLogChannelRegistry().declare(descriptor);
|
|
3632
3432
|
}
|
|
3433
|
+
/** Test-only: drop the instance so a spec starts from an empty registry. */
|
|
3434
|
+
function __resetLogChannelRegistryForTests() {
|
|
3435
|
+
instance = null;
|
|
3436
|
+
}
|
|
3437
|
+
//#endregion
|
|
3438
|
+
//#region src/logging/log-channel-provider.ts
|
|
3633
3439
|
/**
|
|
3634
|
-
*
|
|
3635
|
-
*
|
|
3440
|
+
* How often expiry is noticed. Coarse on purpose: the cost of a channel
|
|
3441
|
+
* running a few seconds past its deadline is a few extra lines, and the cost
|
|
3442
|
+
* of a tight timer in every addon process is paid forever.
|
|
3443
|
+
*/
|
|
3444
|
+
var LOG_CHANNEL_TICK_MS = 5e3;
|
|
3445
|
+
/**
|
|
3446
|
+
* Build the `log-channels` provider for this process.
|
|
3636
3447
|
*
|
|
3637
|
-
*
|
|
3638
|
-
*
|
|
3639
|
-
* value held over.
|
|
3448
|
+
* `logger` is used ONLY off the hot path — for the arm/expiry lines — so a
|
|
3449
|
+
* channel that is never armed costs this module nothing but a timer.
|
|
3640
3450
|
*/
|
|
3641
|
-
function
|
|
3642
|
-
|
|
3643
|
-
const
|
|
3644
|
-
|
|
3645
|
-
|
|
3646
|
-
const
|
|
3647
|
-
|
|
3648
|
-
|
|
3649
|
-
|
|
3650
|
-
}
|
|
3651
|
-
}
|
|
3652
|
-
|
|
3451
|
+
function createLogChannelsProvider(logger, options = {}) {
|
|
3452
|
+
const registry = getLogChannelRegistry();
|
|
3453
|
+
const now = options.now ?? Date.now;
|
|
3454
|
+
const tickMs = options.tickMs ?? 5e3;
|
|
3455
|
+
const timer = setInterval(() => {
|
|
3456
|
+
const closed = registry.tick(now());
|
|
3457
|
+
for (const name of closed) logger.info("log channel window closed", {
|
|
3458
|
+
tags: { logChannel: name },
|
|
3459
|
+
meta: { channel: name }
|
|
3460
|
+
});
|
|
3461
|
+
}, tickMs);
|
|
3462
|
+
timer.unref?.();
|
|
3463
|
+
return {
|
|
3464
|
+
list: () => registry.list(),
|
|
3465
|
+
apply: (input) => {
|
|
3466
|
+
const unknown = registry.apply(input.windows, now());
|
|
3467
|
+
const armed = registry.armed();
|
|
3468
|
+
logger.info("log channels applied", { meta: {
|
|
3469
|
+
armed: armed.map((window) => window.channel),
|
|
3470
|
+
unknown,
|
|
3471
|
+
declared: registry.list().length
|
|
3472
|
+
} });
|
|
3473
|
+
return {
|
|
3474
|
+
armed: armed.length,
|
|
3475
|
+
unknown
|
|
3476
|
+
};
|
|
3477
|
+
},
|
|
3478
|
+
stop: () => {
|
|
3479
|
+
clearInterval(timer);
|
|
3480
|
+
}
|
|
3481
|
+
};
|
|
3653
3482
|
}
|
|
3654
3483
|
//#endregion
|
|
3655
3484
|
//#region src/metrics/failure-counters.ts
|
|
@@ -3836,6 +3665,201 @@ function failureRate(sample) {
|
|
|
3836
3665
|
return (sample.attempts - sample.succeeded) / sample.attempts;
|
|
3837
3666
|
}
|
|
3838
3667
|
//#endregion
|
|
3668
|
+
//#region src/metrics/load-series-fold.ts
|
|
3669
|
+
/** Bucket key for rows no addon owns. Stable, so its series is continuous. */
|
|
3670
|
+
var UNATTRIBUTED_BUCKET_KEY = "__unattributed__";
|
|
3671
|
+
var ROOT_BUCKET_KEY = "__root__";
|
|
3672
|
+
function bucketFor(row) {
|
|
3673
|
+
if (row.addonId !== null) return {
|
|
3674
|
+
key: row.addonId,
|
|
3675
|
+
kind: "addon"
|
|
3676
|
+
};
|
|
3677
|
+
if (row.classification === "root") return {
|
|
3678
|
+
key: ROOT_BUCKET_KEY,
|
|
3679
|
+
kind: "root"
|
|
3680
|
+
};
|
|
3681
|
+
return {
|
|
3682
|
+
key: UNATTRIBUTED_BUCKET_KEY,
|
|
3683
|
+
kind: "unattributed"
|
|
3684
|
+
};
|
|
3685
|
+
}
|
|
3686
|
+
/** Round to one decimal — the precision both producers already emit at. */
|
|
3687
|
+
function deci(value) {
|
|
3688
|
+
return Math.round(value * 10) / 10;
|
|
3689
|
+
}
|
|
3690
|
+
/**
|
|
3691
|
+
* Fold one snapshot into one point per function.
|
|
3692
|
+
*
|
|
3693
|
+
* Produces a ONE-SAMPLE point: `min === max` on every field, `samples === 1`.
|
|
3694
|
+
* That is what lets a live event and a reduced server bucket sit in the same
|
|
3695
|
+
* series without the consumer knowing which is which.
|
|
3696
|
+
*/
|
|
3697
|
+
function foldSnapshotByFunction(rows, atMs) {
|
|
3698
|
+
const acc = /* @__PURE__ */ new Map();
|
|
3699
|
+
for (const row of rows) {
|
|
3700
|
+
const { key, kind } = bucketFor(row);
|
|
3701
|
+
const cur = acc.get(key) ?? {
|
|
3702
|
+
kind,
|
|
3703
|
+
main: 0,
|
|
3704
|
+
gc: 0,
|
|
3705
|
+
lifetime: 0,
|
|
3706
|
+
memory: 0,
|
|
3707
|
+
count: 0,
|
|
3708
|
+
splitKnown: true
|
|
3709
|
+
};
|
|
3710
|
+
const known = row.cpuMainPercent !== null && row.cpuGcPercent !== null;
|
|
3711
|
+
acc.set(key, {
|
|
3712
|
+
kind: cur.kind,
|
|
3713
|
+
main: cur.main + (row.cpuMainPercent ?? 0),
|
|
3714
|
+
gc: cur.gc + (row.cpuGcPercent ?? 0),
|
|
3715
|
+
lifetime: cur.lifetime + row.cpuPercent,
|
|
3716
|
+
memory: cur.memory + row.memoryRssBytes,
|
|
3717
|
+
count: cur.count + 1,
|
|
3718
|
+
splitKnown: cur.splitKnown && known
|
|
3719
|
+
});
|
|
3720
|
+
}
|
|
3721
|
+
return [...acc.entries()].map(([key, a]) => {
|
|
3722
|
+
const main = a.splitKnown ? deci(a.main) : null;
|
|
3723
|
+
const gc = a.splitKnown ? deci(a.gc) : null;
|
|
3724
|
+
const lifetime = deci(a.lifetime);
|
|
3725
|
+
return {
|
|
3726
|
+
key,
|
|
3727
|
+
kind: a.kind,
|
|
3728
|
+
point: {
|
|
3729
|
+
atMs,
|
|
3730
|
+
samples: 1,
|
|
3731
|
+
cpuMainPercent: main,
|
|
3732
|
+
cpuMainPercentMin: main,
|
|
3733
|
+
cpuGcPercent: gc,
|
|
3734
|
+
cpuGcPercentMin: gc,
|
|
3735
|
+
cpuLifetimePercent: lifetime,
|
|
3736
|
+
cpuLifetimePercentMin: lifetime,
|
|
3737
|
+
memoryRssBytes: a.memory,
|
|
3738
|
+
memoryRssBytesMin: a.memory,
|
|
3739
|
+
processCount: a.count,
|
|
3740
|
+
processCountMin: a.count
|
|
3741
|
+
}
|
|
3742
|
+
};
|
|
3743
|
+
});
|
|
3744
|
+
}
|
|
3745
|
+
/** The narrower of two bounds, treating `null` (UNKNOWN) as absorbing. */
|
|
3746
|
+
function minNullable(a, b) {
|
|
3747
|
+
if (a === null || b === null) return null;
|
|
3748
|
+
return a < b ? a : b;
|
|
3749
|
+
}
|
|
3750
|
+
function maxNullable(a, b) {
|
|
3751
|
+
if (a === null || b === null) return null;
|
|
3752
|
+
return a > b ? a : b;
|
|
3753
|
+
}
|
|
3754
|
+
/** Merge `next` into `held`, keeping the widest [min, max] of each field. */
|
|
3755
|
+
function mergePoints(held, next, atMs) {
|
|
3756
|
+
return {
|
|
3757
|
+
atMs,
|
|
3758
|
+
samples: held.samples + next.samples,
|
|
3759
|
+
cpuMainPercent: maxNullable(held.cpuMainPercent, next.cpuMainPercent),
|
|
3760
|
+
cpuMainPercentMin: minNullable(held.cpuMainPercentMin, next.cpuMainPercentMin),
|
|
3761
|
+
cpuGcPercent: maxNullable(held.cpuGcPercent, next.cpuGcPercent),
|
|
3762
|
+
cpuGcPercentMin: minNullable(held.cpuGcPercentMin, next.cpuGcPercentMin),
|
|
3763
|
+
cpuLifetimePercent: Math.max(held.cpuLifetimePercent, next.cpuLifetimePercent),
|
|
3764
|
+
cpuLifetimePercentMin: Math.min(held.cpuLifetimePercentMin, next.cpuLifetimePercentMin),
|
|
3765
|
+
memoryRssBytes: Math.max(held.memoryRssBytes, next.memoryRssBytes),
|
|
3766
|
+
memoryRssBytesMin: Math.min(held.memoryRssBytesMin, next.memoryRssBytesMin),
|
|
3767
|
+
processCount: Math.max(held.processCount, next.processCount),
|
|
3768
|
+
processCountMin: Math.min(held.processCountMin, next.processCountMin)
|
|
3769
|
+
};
|
|
3770
|
+
}
|
|
3771
|
+
/**
|
|
3772
|
+
* The bucket width that brings `spanMs` down to at most `maxPoints` points,
|
|
3773
|
+
* snapped up to a whole multiple of the sampling cadence.
|
|
3774
|
+
*
|
|
3775
|
+
* Returns `cadenceMs` (no reduction) when the span already fits. A caller that
|
|
3776
|
+
* asks for a `maxPoints` of 0 or less gets no reduction rather than an
|
|
3777
|
+
* infinite bucket — a nonsensical request must not produce a plausible chart.
|
|
3778
|
+
*/
|
|
3779
|
+
function resolveBucketMs(spanMs, cadenceMs, maxPoints) {
|
|
3780
|
+
if (maxPoints <= 0 || cadenceMs <= 0 || spanMs <= 0) return Math.max(cadenceMs, 1);
|
|
3781
|
+
const wanted = spanMs / maxPoints;
|
|
3782
|
+
if (wanted <= cadenceMs) return cadenceMs;
|
|
3783
|
+
return Math.ceil(wanted / cadenceMs) * cadenceMs;
|
|
3784
|
+
}
|
|
3785
|
+
/**
|
|
3786
|
+
* Reduce one function's points into buckets of `bucketMs`, preserving the
|
|
3787
|
+
* extremes.
|
|
3788
|
+
*
|
|
3789
|
+
* Points are expected oldest-first and are returned oldest-first. A bucket
|
|
3790
|
+
* with no samples is ABSENT — not zero, not interpolated, not the previous
|
|
3791
|
+
* value held over.
|
|
3792
|
+
*/
|
|
3793
|
+
function reducePoints(points, bucketMs, origin) {
|
|
3794
|
+
if (bucketMs <= 0 || points.length === 0) return points;
|
|
3795
|
+
const buckets = /* @__PURE__ */ new Map();
|
|
3796
|
+
for (const point of points) {
|
|
3797
|
+
const start = origin + Math.floor((point.atMs - origin) / bucketMs) * bucketMs;
|
|
3798
|
+
const held = buckets.get(start);
|
|
3799
|
+
buckets.set(start, held === void 0 ? {
|
|
3800
|
+
...point,
|
|
3801
|
+
atMs: start
|
|
3802
|
+
} : mergePoints(held, point, start));
|
|
3803
|
+
}
|
|
3804
|
+
return [...buckets.values()].toSorted((a, b) => a.atMs - b.atMs);
|
|
3805
|
+
}
|
|
3806
|
+
//#endregion
|
|
3807
|
+
//#region src/stream-selection.ts
|
|
3808
|
+
function pickPreferredRtspEntry(entries, pref, deviceId, options = {}) {
|
|
3809
|
+
if (entries.length === 0) return null;
|
|
3810
|
+
const prefix = `${deviceId}/`;
|
|
3811
|
+
const toPicked = (e) => ({
|
|
3812
|
+
brokerId: e.brokerId,
|
|
3813
|
+
profileId: e.brokerId.startsWith(prefix) ? e.brokerId.slice(prefix.length) : e.brokerId,
|
|
3814
|
+
url: e.url,
|
|
3815
|
+
mutedUrl: e.mutedUrl,
|
|
3816
|
+
enabled: e.enabled,
|
|
3817
|
+
...e.codec !== void 0 ? { codec: e.codec } : {},
|
|
3818
|
+
...e.resolution !== void 0 ? { resolution: e.resolution } : {}
|
|
3819
|
+
});
|
|
3820
|
+
if (pref !== "auto") {
|
|
3821
|
+
const match = entries.find((e) => e.enabled && e.url.length > 0 && (e.profile === pref || e.brokerId === `${prefix}${pref}`));
|
|
3822
|
+
if (match) return toPicked(match);
|
|
3823
|
+
}
|
|
3824
|
+
const eligible = entries.filter((e) => e.enabled && e.url.length > 0);
|
|
3825
|
+
if (eligible.length === 0) return null;
|
|
3826
|
+
const target = options.targetResolution;
|
|
3827
|
+
if (target) {
|
|
3828
|
+
const withRes = eligible.filter((e) => e.resolution !== void 0);
|
|
3829
|
+
if (withRes.length > 0) {
|
|
3830
|
+
const picked = pickClosestResolution(withRes, target);
|
|
3831
|
+
if (picked) return toPicked(picked);
|
|
3832
|
+
}
|
|
3833
|
+
}
|
|
3834
|
+
return toPicked(eligible[0]);
|
|
3835
|
+
}
|
|
3836
|
+
/**
|
|
3837
|
+
* Pick the entry whose `resolution` is closest to `target`. Prefer
|
|
3838
|
+
* entries ≥ target (downscale is cheap at the consumer; upscale is
|
|
3839
|
+
* lossy). Among the rest pick the LARGEST still ≤ target so the
|
|
3840
|
+
* consumer gets the best feasible quality. "Closeness" is the
|
|
3841
|
+
* `width × height` pixel delta.
|
|
3842
|
+
*/
|
|
3843
|
+
function pickClosestResolution(entries, target) {
|
|
3844
|
+
const targetPixels = target.width * target.height;
|
|
3845
|
+
let bestAbove;
|
|
3846
|
+
let bestBelow;
|
|
3847
|
+
for (const e of entries) {
|
|
3848
|
+
if (e.resolution === void 0) continue;
|
|
3849
|
+
const pixels = e.resolution.width * e.resolution.height;
|
|
3850
|
+
if (pixels >= targetPixels) {
|
|
3851
|
+
if (!bestAbove || pixels < bestAbove.pixels) bestAbove = {
|
|
3852
|
+
entry: e,
|
|
3853
|
+
pixels
|
|
3854
|
+
};
|
|
3855
|
+
} else if (!bestBelow || pixels > bestBelow.pixels) bestBelow = {
|
|
3856
|
+
entry: e,
|
|
3857
|
+
pixels
|
|
3858
|
+
};
|
|
3859
|
+
}
|
|
3860
|
+
return bestAbove?.entry ?? bestBelow?.entry;
|
|
3861
|
+
}
|
|
3862
|
+
//#endregion
|
|
3839
3863
|
//#region src/types/model-variant-groups.ts
|
|
3840
3864
|
var FORMAT_KEYS = [
|
|
3841
3865
|
"onnx",
|
|
@@ -23148,7 +23172,6 @@ var storageCapability = {
|
|
|
23148
23172
|
}), zod.z.instanceof(Uint8Array)),
|
|
23149
23173
|
endDownload: require_sleep.method(zod.z.object({ downloadId: zod.z.string() }), zod.z.void(), { kind: "mutation" }),
|
|
23150
23174
|
listLocations: require_sleep.method(zod.z.object({ type: StorageLocationTypeSchema.optional() }), zod.z.array(StorageLocationSchema).readonly()),
|
|
23151
|
-
getDefaultLocation: require_sleep.method(zod.z.object({ type: StorageLocationTypeSchema }), StorageLocationSchema.nullable()),
|
|
23152
23175
|
listLocationDeclarations: require_sleep.method(zod.z.void(), zod.z.array(StorageLocationDeclarationSchema).readonly()),
|
|
23153
23176
|
upsertLocation: require_sleep.method(StorageLocationSchema.omit({
|
|
23154
23177
|
createdAt: true,
|
|
@@ -36369,134 +36392,6 @@ var RUNTIME_DEFAULTS = {
|
|
|
36369
36392
|
"auth.tokenExpiry": "30d"
|
|
36370
36393
|
};
|
|
36371
36394
|
//#endregion
|
|
36372
|
-
//#region src/device/container-primary-child.ts
|
|
36373
|
-
/**
|
|
36374
|
-
* WHICH child a container stands for — one definition, for every consumer.
|
|
36375
|
-
*
|
|
36376
|
-
* A CONTAINER device has no controllable surface of its own: it groups entity
|
|
36377
|
-
* children (a Gree air-conditioner grouping a climate child plus light, x-fan
|
|
36378
|
-
* and health switches). Everything that has to show or act on a container has
|
|
36379
|
-
* to answer the same question — which child IS the container — and until now
|
|
36380
|
-
* three places answered it separately:
|
|
36381
|
-
*
|
|
36382
|
-
* - `ui-library/device-controls/primary-child.ts` (admin-ui rendering)
|
|
36383
|
-
* - `addon-provider-homeassistant` PARENT_TYPE_PRIORITY (adoption)
|
|
36384
|
-
* - the viewer's own `container-primary.ts` (linked-devices panel)
|
|
36385
|
-
*
|
|
36386
|
-
* Each carried the same list and a comment asking the others to stay in sync.
|
|
36387
|
-
* This is that list, in the one package all of them already depend on.
|
|
36388
|
-
*
|
|
36389
|
-
* `ui-library` and the server's linked-devices expansion IMPORT it. Two
|
|
36390
|
-
* consumers cannot, and keep a checked copy instead: the viewer resolves
|
|
36391
|
-
* `@camstack/types` from its own `node_modules` (an installed release, where a
|
|
36392
|
-
* newly added export simply is not there), and the Home Assistant provider
|
|
36393
|
-
* expresses the same precedence over the `DeviceType` enum because it answers
|
|
36394
|
-
* a different question from the same ordering. `scripts/check-container-
|
|
36395
|
-
* priority-in-sync.ts` fails the build when either drifts — the comment that
|
|
36396
|
-
* used to ask for this could not.
|
|
36397
|
-
*
|
|
36398
|
-
* The rule has two halves and the ORDER matters: an operator's explicit pick
|
|
36399
|
-
* wins outright, and only in its absence does type priority decide. The pick is
|
|
36400
|
-
* keyed on the child's re-sync-stable `entityId`, not its numeric id, so it
|
|
36401
|
-
* survives a re-sync that reallocates ids.
|
|
36402
|
-
*/
|
|
36403
|
-
/**
|
|
36404
|
-
* Type priority, most→least "primary". An actuator (climate / lock / cover / …)
|
|
36405
|
-
* outranks a bare `switch` so a container's defining child wins over its
|
|
36406
|
-
* auxiliary switches. Unknown or absent types sort after every entry.
|
|
36407
|
-
*
|
|
36408
|
-
* NB: `siren` deliberately sits BELOW `switch` — it is a switch-family
|
|
36409
|
-
* actuator, and a camera's siren must not out-rank the thing the container is.
|
|
36410
|
-
*
|
|
36411
|
-
* These strings are matched against a child's `DeviceType` VALUE, so they must
|
|
36412
|
-
* equal the enum's string values.
|
|
36413
|
-
*/
|
|
36414
|
-
var CONTAINER_CHILD_PRIORITY = [
|
|
36415
|
-
"media-player",
|
|
36416
|
-
"alarm-panel",
|
|
36417
|
-
"thermostat",
|
|
36418
|
-
"climate",
|
|
36419
|
-
"humidifier",
|
|
36420
|
-
"water-heater",
|
|
36421
|
-
"lock",
|
|
36422
|
-
"cover",
|
|
36423
|
-
"valve",
|
|
36424
|
-
"fan",
|
|
36425
|
-
"vacuum",
|
|
36426
|
-
"lawn-mower",
|
|
36427
|
-
"light",
|
|
36428
|
-
"switch",
|
|
36429
|
-
"siren",
|
|
36430
|
-
"button",
|
|
36431
|
-
"control",
|
|
36432
|
-
"notifier",
|
|
36433
|
-
"script",
|
|
36434
|
-
"automation",
|
|
36435
|
-
"update",
|
|
36436
|
-
"presence",
|
|
36437
|
-
"weather",
|
|
36438
|
-
"image",
|
|
36439
|
-
"sensor"
|
|
36440
|
-
];
|
|
36441
|
-
/**
|
|
36442
|
-
* Roles that say what a container IS, most→least defining. Consulted BEFORE
|
|
36443
|
-
* type priority, because `DeviceType` cannot tell them apart: Home Assistant
|
|
36444
|
-
* maps a door contact, a battery level, a temperature reading and a "last seen"
|
|
36445
|
-
* timestamp all to `DeviceType.Sensor`. Measured on container 4127 — children
|
|
36446
|
-
* `battery-sensor`, `temperature-sensor`, `datetime-sensor`, `contact-sensor`
|
|
36447
|
-
* and a role-less `button` — the type list ranked `button` above `sensor` and
|
|
36448
|
-
* the container stood for its "Identifica" button instead of the door contact
|
|
36449
|
-
* it is named after.
|
|
36450
|
-
*
|
|
36451
|
-
* Only STATE-DEFINING roles belong here. A diagnostic reading (battery,
|
|
36452
|
-
* temperature, humidity, signal, last-seen) is never what a container is, so
|
|
36453
|
-
* they are deliberately absent and fall through to type priority.
|
|
36454
|
-
*/
|
|
36455
|
-
var CONTAINER_CHILD_ROLE_PRIORITY = [
|
|
36456
|
-
"contact-sensor",
|
|
36457
|
-
"motion-sensor",
|
|
36458
|
-
"occupancy-sensor",
|
|
36459
|
-
"smoke-sensor",
|
|
36460
|
-
"co-sensor",
|
|
36461
|
-
"gas-sensor",
|
|
36462
|
-
"leak-sensor",
|
|
36463
|
-
"vibration-sensor",
|
|
36464
|
-
"tamper-sensor",
|
|
36465
|
-
"sound-sensor"
|
|
36466
|
-
];
|
|
36467
|
-
/**
|
|
36468
|
-
* NOT in the list, deliberately: `binary-sensor` and `binary-helper`. They are
|
|
36469
|
-
* GENERIC — they say "this reports a boolean", not what the container is — and
|
|
36470
|
-
* ranking them above type priority is a live regression, not a hypothetical:
|
|
36471
|
-
* container 1837 holds a real `lock` (features `['lock-open']`) alongside a
|
|
36472
|
-
* child named "Actuator" whose only role is `binary-sensor`, and the generic
|
|
36473
|
-
* role beat the lock. A role earns a place here by naming a SUBJECT (a contact,
|
|
36474
|
-
* a leak, smoke), never by naming a datatype.
|
|
36475
|
-
*/
|
|
36476
|
-
function roleRank(role) {
|
|
36477
|
-
if (role === void 0) return CONTAINER_CHILD_ROLE_PRIORITY.length;
|
|
36478
|
-
const i = CONTAINER_CHILD_ROLE_PRIORITY.indexOf(role);
|
|
36479
|
-
return i === -1 ? CONTAINER_CHILD_ROLE_PRIORITY.length : i;
|
|
36480
|
-
}
|
|
36481
|
-
function rank(type) {
|
|
36482
|
-
const i = CONTAINER_CHILD_PRIORITY.indexOf(type);
|
|
36483
|
-
return i === -1 ? CONTAINER_CHILD_PRIORITY.length : i;
|
|
36484
|
-
}
|
|
36485
|
-
/**
|
|
36486
|
-
* The child a container stands for: the operator's pick when it still exists,
|
|
36487
|
-
* else the highest-priority type. `null` for a childless container — a caller
|
|
36488
|
-
* must decide what an empty container means for it, rather than being handed a
|
|
36489
|
-
* child that is not there.
|
|
36490
|
-
*/
|
|
36491
|
-
function resolveContainerPrimaryChild(children, overrideEntityId, containerName) {
|
|
36492
|
-
if (overrideEntityId !== void 0 && overrideEntityId !== null) {
|
|
36493
|
-
const picked = children.find((c) => c.stableId === overrideEntityId) ?? children.find((c) => c.entityId !== void 0 && c.entityId === overrideEntityId);
|
|
36494
|
-
if (picked !== void 0) return picked;
|
|
36495
|
-
}
|
|
36496
|
-
const namesake = (c) => containerName !== void 0 && containerName.length > 0 && c.name !== void 0 && c.name.toLowerCase() === containerName.toLowerCase() ? 0 : 1;
|
|
36497
|
-
return [...children].toSorted((a, b) => roleRank(a.role) - roleRank(b.role) || namesake(a) - namesake(b) || rank(a.type) - rank(b.type))[0] ?? null;
|
|
36498
|
-
}
|
|
36499
|
-
//#endregion
|
|
36500
36395
|
//#region src/device/accessory.ts
|
|
36501
36396
|
/**
|
|
36502
36397
|
* Accessory device helpers — shared across drivers.
|
|
@@ -38082,6 +37977,134 @@ function isBatteryPresenceFault(presence) {
|
|
|
38082
37977
|
return presence === "unreachable";
|
|
38083
37978
|
}
|
|
38084
37979
|
//#endregion
|
|
37980
|
+
//#region src/device/container-primary-child.ts
|
|
37981
|
+
/**
|
|
37982
|
+
* WHICH child a container stands for — one definition, for every consumer.
|
|
37983
|
+
*
|
|
37984
|
+
* A CONTAINER device has no controllable surface of its own: it groups entity
|
|
37985
|
+
* children (a Gree air-conditioner grouping a climate child plus light, x-fan
|
|
37986
|
+
* and health switches). Everything that has to show or act on a container has
|
|
37987
|
+
* to answer the same question — which child IS the container — and until now
|
|
37988
|
+
* three places answered it separately:
|
|
37989
|
+
*
|
|
37990
|
+
* - `ui-library/device-controls/primary-child.ts` (admin-ui rendering)
|
|
37991
|
+
* - `addon-provider-homeassistant` PARENT_TYPE_PRIORITY (adoption)
|
|
37992
|
+
* - the viewer's own `container-primary.ts` (linked-devices panel)
|
|
37993
|
+
*
|
|
37994
|
+
* Each carried the same list and a comment asking the others to stay in sync.
|
|
37995
|
+
* This is that list, in the one package all of them already depend on.
|
|
37996
|
+
*
|
|
37997
|
+
* `ui-library` and the server's linked-devices expansion IMPORT it. Two
|
|
37998
|
+
* consumers cannot, and keep a checked copy instead: the viewer resolves
|
|
37999
|
+
* `@camstack/types` from its own `node_modules` (an installed release, where a
|
|
38000
|
+
* newly added export simply is not there), and the Home Assistant provider
|
|
38001
|
+
* expresses the same precedence over the `DeviceType` enum because it answers
|
|
38002
|
+
* a different question from the same ordering. `scripts/check-container-
|
|
38003
|
+
* priority-in-sync.ts` fails the build when either drifts — the comment that
|
|
38004
|
+
* used to ask for this could not.
|
|
38005
|
+
*
|
|
38006
|
+
* The rule has two halves and the ORDER matters: an operator's explicit pick
|
|
38007
|
+
* wins outright, and only in its absence does type priority decide. The pick is
|
|
38008
|
+
* keyed on the child's re-sync-stable `entityId`, not its numeric id, so it
|
|
38009
|
+
* survives a re-sync that reallocates ids.
|
|
38010
|
+
*/
|
|
38011
|
+
/**
|
|
38012
|
+
* Type priority, most→least "primary". An actuator (climate / lock / cover / …)
|
|
38013
|
+
* outranks a bare `switch` so a container's defining child wins over its
|
|
38014
|
+
* auxiliary switches. Unknown or absent types sort after every entry.
|
|
38015
|
+
*
|
|
38016
|
+
* NB: `siren` deliberately sits BELOW `switch` — it is a switch-family
|
|
38017
|
+
* actuator, and a camera's siren must not out-rank the thing the container is.
|
|
38018
|
+
*
|
|
38019
|
+
* These strings are matched against a child's `DeviceType` VALUE, so they must
|
|
38020
|
+
* equal the enum's string values.
|
|
38021
|
+
*/
|
|
38022
|
+
var CONTAINER_CHILD_PRIORITY = [
|
|
38023
|
+
"media-player",
|
|
38024
|
+
"alarm-panel",
|
|
38025
|
+
"thermostat",
|
|
38026
|
+
"climate",
|
|
38027
|
+
"humidifier",
|
|
38028
|
+
"water-heater",
|
|
38029
|
+
"lock",
|
|
38030
|
+
"cover",
|
|
38031
|
+
"valve",
|
|
38032
|
+
"fan",
|
|
38033
|
+
"vacuum",
|
|
38034
|
+
"lawn-mower",
|
|
38035
|
+
"light",
|
|
38036
|
+
"switch",
|
|
38037
|
+
"siren",
|
|
38038
|
+
"button",
|
|
38039
|
+
"control",
|
|
38040
|
+
"notifier",
|
|
38041
|
+
"script",
|
|
38042
|
+
"automation",
|
|
38043
|
+
"update",
|
|
38044
|
+
"presence",
|
|
38045
|
+
"weather",
|
|
38046
|
+
"image",
|
|
38047
|
+
"sensor"
|
|
38048
|
+
];
|
|
38049
|
+
/**
|
|
38050
|
+
* Roles that say what a container IS, most→least defining. Consulted BEFORE
|
|
38051
|
+
* type priority, because `DeviceType` cannot tell them apart: Home Assistant
|
|
38052
|
+
* maps a door contact, a battery level, a temperature reading and a "last seen"
|
|
38053
|
+
* timestamp all to `DeviceType.Sensor`. Measured on container 4127 — children
|
|
38054
|
+
* `battery-sensor`, `temperature-sensor`, `datetime-sensor`, `contact-sensor`
|
|
38055
|
+
* and a role-less `button` — the type list ranked `button` above `sensor` and
|
|
38056
|
+
* the container stood for its "Identifica" button instead of the door contact
|
|
38057
|
+
* it is named after.
|
|
38058
|
+
*
|
|
38059
|
+
* Only STATE-DEFINING roles belong here. A diagnostic reading (battery,
|
|
38060
|
+
* temperature, humidity, signal, last-seen) is never what a container is, so
|
|
38061
|
+
* they are deliberately absent and fall through to type priority.
|
|
38062
|
+
*/
|
|
38063
|
+
var CONTAINER_CHILD_ROLE_PRIORITY = [
|
|
38064
|
+
"contact-sensor",
|
|
38065
|
+
"motion-sensor",
|
|
38066
|
+
"occupancy-sensor",
|
|
38067
|
+
"smoke-sensor",
|
|
38068
|
+
"co-sensor",
|
|
38069
|
+
"gas-sensor",
|
|
38070
|
+
"leak-sensor",
|
|
38071
|
+
"vibration-sensor",
|
|
38072
|
+
"tamper-sensor",
|
|
38073
|
+
"sound-sensor"
|
|
38074
|
+
];
|
|
38075
|
+
/**
|
|
38076
|
+
* NOT in the list, deliberately: `binary-sensor` and `binary-helper`. They are
|
|
38077
|
+
* GENERIC — they say "this reports a boolean", not what the container is — and
|
|
38078
|
+
* ranking them above type priority is a live regression, not a hypothetical:
|
|
38079
|
+
* container 1837 holds a real `lock` (features `['lock-open']`) alongside a
|
|
38080
|
+
* child named "Actuator" whose only role is `binary-sensor`, and the generic
|
|
38081
|
+
* role beat the lock. A role earns a place here by naming a SUBJECT (a contact,
|
|
38082
|
+
* a leak, smoke), never by naming a datatype.
|
|
38083
|
+
*/
|
|
38084
|
+
function roleRank(role) {
|
|
38085
|
+
if (role === void 0) return CONTAINER_CHILD_ROLE_PRIORITY.length;
|
|
38086
|
+
const i = CONTAINER_CHILD_ROLE_PRIORITY.indexOf(role);
|
|
38087
|
+
return i === -1 ? CONTAINER_CHILD_ROLE_PRIORITY.length : i;
|
|
38088
|
+
}
|
|
38089
|
+
function rank(type) {
|
|
38090
|
+
const i = CONTAINER_CHILD_PRIORITY.indexOf(type);
|
|
38091
|
+
return i === -1 ? CONTAINER_CHILD_PRIORITY.length : i;
|
|
38092
|
+
}
|
|
38093
|
+
/**
|
|
38094
|
+
* The child a container stands for: the operator's pick when it still exists,
|
|
38095
|
+
* else the highest-priority type. `null` for a childless container — a caller
|
|
38096
|
+
* must decide what an empty container means for it, rather than being handed a
|
|
38097
|
+
* child that is not there.
|
|
38098
|
+
*/
|
|
38099
|
+
function resolveContainerPrimaryChild(children, overrideEntityId, containerName) {
|
|
38100
|
+
if (overrideEntityId !== void 0 && overrideEntityId !== null) {
|
|
38101
|
+
const picked = children.find((c) => c.stableId === overrideEntityId) ?? children.find((c) => c.entityId !== void 0 && c.entityId === overrideEntityId);
|
|
38102
|
+
if (picked !== void 0) return picked;
|
|
38103
|
+
}
|
|
38104
|
+
const namesake = (c) => containerName !== void 0 && containerName.length > 0 && c.name !== void 0 && c.name.toLowerCase() === containerName.toLowerCase() ? 0 : 1;
|
|
38105
|
+
return [...children].toSorted((a, b) => roleRank(a.role) - roleRank(b.role) || namesake(a) - namesake(b) || rank(a.type) - rank(b.type))[0] ?? null;
|
|
38106
|
+
}
|
|
38107
|
+
//#endregion
|
|
38085
38108
|
//#region src/device/declared-device.ts
|
|
38086
38109
|
/** Marker written to a declared integration's `info`. */
|
|
38087
38110
|
var DECLARED_INTEGRATION_FIXED_KEY = "fixed";
|
|
@@ -45648,12 +45671,6 @@ var METHOD_ACCESS_MAP = Object.freeze({
|
|
|
45648
45671
|
addonId: null,
|
|
45649
45672
|
access: "view"
|
|
45650
45673
|
},
|
|
45651
|
-
"storage.getDefaultLocation": {
|
|
45652
|
-
capName: "storage",
|
|
45653
|
-
capScope: "system",
|
|
45654
|
-
addonId: null,
|
|
45655
|
-
access: "view"
|
|
45656
|
-
},
|
|
45657
45674
|
"storage.list": {
|
|
45658
45675
|
capName: "storage",
|
|
45659
45676
|
capScope: "system",
|
|
@@ -50081,7 +50098,6 @@ function createSystemProxy(api) {
|
|
|
50081
50098
|
readChunk: (input) => dispatch("storage", "readChunk", "query", input),
|
|
50082
50099
|
endDownload: (input) => dispatch("storage", "endDownload", "mutation", input),
|
|
50083
50100
|
listLocations: (input) => dispatch("storage", "listLocations", "query", input),
|
|
50084
|
-
getDefaultLocation: (input) => dispatch("storage", "getDefaultLocation", "query", input),
|
|
50085
50101
|
listLocationDeclarations: (input) => dispatch("storage", "listLocationDeclarations", "query", input),
|
|
50086
50102
|
upsertLocation: (input) => dispatch("storage", "upsertLocation", "mutation", input),
|
|
50087
50103
|
deleteLocation: (input) => dispatch("storage", "deleteLocation", "mutation", input),
|
|
@@ -54549,6 +54565,7 @@ exports.LedgerWalkRefusalSchema = LedgerWalkRefusalSchema;
|
|
|
54549
54565
|
exports.LedgerWalkReportSchema = LedgerWalkReportSchema;
|
|
54550
54566
|
exports.LedgerWalkSkipCountsSchema = LedgerWalkSkipCountsSchema;
|
|
54551
54567
|
exports.LedgerWalkSkipReasonSchema = LedgerWalkSkipReasonSchema;
|
|
54568
|
+
exports.LegacyStorageLocationDefaultSchema = LegacyStorageLocationDefaultSchema;
|
|
54552
54569
|
exports.LinkedDeviceSchema = LinkedDeviceSchema;
|
|
54553
54570
|
exports.LinkedDevicesModeSchema = LinkedDevicesModeSchema;
|
|
54554
54571
|
exports.LlmDefaultSchema = LlmDefaultSchema;
|
|
@@ -55401,6 +55418,7 @@ exports.isDeviceScopedCap = require_sleep.isDeviceScopedCap;
|
|
|
55401
55418
|
exports.isEvent = require_sleep.isEvent;
|
|
55402
55419
|
exports.isFirstLevelMacroClass = isFirstLevelMacroClass;
|
|
55403
55420
|
exports.isIsolatedBuiltin = isIsolatedBuiltin;
|
|
55421
|
+
exports.isLocationEnabled = isLocationEnabled;
|
|
55404
55422
|
exports.isNode = isNode;
|
|
55405
55423
|
exports.isObjectInput = isObjectInput;
|
|
55406
55424
|
exports.isOccupancyRule = isOccupancyRule;
|