@camstack/addon-auth 1.2.131 → 1.2.132
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/{hub-browser-origin-BRU-HVqq.mjs → dist-DbaYwR-N.mjs} +1781 -66
- package/dist/{hub-browser-origin-CCWSbHYb.js → dist-DjCeMP9o.js} +1780 -71
- package/dist/hub-browser-origin-DohQUFPz.js +16 -0
- package/dist/hub-browser-origin-LBBO5r05.mjs +11 -0
- package/dist/magic-link/auth-magic-link.addon.js +13 -12
- package/dist/magic-link/auth-magic-link.addon.mjs +3 -2
- package/dist/oidc/auth-oidc.addon.js +158 -19
- package/dist/oidc/auth-oidc.addon.mjs +149 -10
- package/dist/webauthn/_stub.js +1 -1
- package/dist/webauthn/{_virtual_mf-localSharedImportMap___mfe_internal__addon_auth_webauthn_widgets-DjJfFQA5.mjs → _virtual_mf-localSharedImportMap___mfe_internal__addon_auth_webauthn_widgets-Cy2WCjhX.mjs} +2 -2
- package/dist/webauthn/_virtual_mf___mfe_internal__addon_auth_webauthn_widgets__loadShare___mf_0_camstack_mf_1_ui_mf_2_library__loadShare__.js-DBsbNmPW.mjs +26 -0
- package/dist/webauthn/auth-webauthn.addon.js +13 -12
- package/dist/webauthn/auth-webauthn.addon.mjs +2 -1
- package/dist/webauthn/{hostInit-BCMxziLA.mjs → hostInit-3W0iPRJ_.mjs} +2 -2
- package/dist/webauthn/remoteEntry.js +1 -1
- package/package.json +1 -1
- package/dist/webauthn/_virtual_mf___mfe_internal__addon_auth_webauthn_widgets__loadShare___mf_0_camstack_mf_1_ui_mf_2_library__loadShare__.js-CMFCCqdv.mjs +0 -26
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
require("node:crypto");
|
|
2
|
-
//#region ../types/dist/event-category-
|
|
2
|
+
//#region ../types/dist/event-category-DaIZi00R.mjs
|
|
3
3
|
var EventCategory = /* @__PURE__ */ function(EventCategory) {
|
|
4
4
|
EventCategory["SystemBoot"] = "system.boot";
|
|
5
5
|
EventCategory["SystemAddonsReady"] = "system.addons-ready";
|
|
@@ -78,6 +78,13 @@ var EventCategory = /* @__PURE__ */ function(EventCategory) {
|
|
|
78
78
|
*/
|
|
79
79
|
EventCategory["AddonLoadFailed"] = "addon.load-failed";
|
|
80
80
|
/**
|
|
81
|
+
* A keychain value was stored or removed (D787). Carries the ref, its
|
|
82
|
+
* owner and the new version — NEVER the value. A process holding the ref
|
|
83
|
+
* drops its cached copy and the owning `BaseAddon` re-resolves its config.
|
|
84
|
+
* Telemetry (D8): a process that misses it still revalidates by version.
|
|
85
|
+
*/
|
|
86
|
+
EventCategory["KeychainChanged"] = "keychain.changed";
|
|
87
|
+
/**
|
|
81
88
|
* Addon recovered from a previous failure. Emitted when an addon
|
|
82
89
|
* transitions from `failed` back to `healthy` (typically via the
|
|
83
90
|
* monitor's auto-retry loop, or after manual `addons.retryLoad`).
|
|
@@ -5370,7 +5377,7 @@ var ZodIssueCode = {
|
|
|
5370
5377
|
var ZodFirstPartyTypeKind;
|
|
5371
5378
|
ZodFirstPartyTypeKind || (ZodFirstPartyTypeKind = {});
|
|
5372
5379
|
//#endregion
|
|
5373
|
-
//#region ../types/dist/sleep-
|
|
5380
|
+
//#region ../types/dist/sleep-Cr5YOk3m.mjs
|
|
5374
5381
|
/**
|
|
5375
5382
|
* The audio chunk plane's byte format, and the ONE expansion from a coded
|
|
5376
5383
|
* window to float samples (D455).
|
|
@@ -5449,6 +5456,97 @@ function buildAlawTable() {
|
|
|
5449
5456
|
}
|
|
5450
5457
|
buildUlawTable();
|
|
5451
5458
|
buildAlawTable();
|
|
5459
|
+
/** Is this field's stored value a credential? */
|
|
5460
|
+
function isSecretConfigField(field) {
|
|
5461
|
+
if (field.type === "password") return true;
|
|
5462
|
+
return "secret" in field && field.secret === true;
|
|
5463
|
+
}
|
|
5464
|
+
/**
|
|
5465
|
+
* Is this field's value stored in the KEYCHAIN (D787)? Every secret field is,
|
|
5466
|
+
* by its TYPE, unless it opts out with `storage: 'inline'` — never by its name.
|
|
5467
|
+
*/
|
|
5468
|
+
function isKeychainStoredField(field) {
|
|
5469
|
+
if (!isSecretConfigField(field)) return false;
|
|
5470
|
+
if (field.type === "textarea" && field.isJson === true) return false;
|
|
5471
|
+
return !("storage" in field && field.storage === "inline");
|
|
5472
|
+
}
|
|
5473
|
+
/**
|
|
5474
|
+
* What a settings blob holds where a secret used to be.
|
|
5475
|
+
*
|
|
5476
|
+
* A keychain-stored field never holds its value. It holds a self-describing
|
|
5477
|
+
* MARKER, `{"$secret":"secret://…","v":1}` — an object, never a string, so no
|
|
5478
|
+
* code can mistake it for a credential and no form can send it to a camera as
|
|
5479
|
+
* a password. The empty state is `null` / absent, never `''`.
|
|
5480
|
+
*
|
|
5481
|
+
* The same shapes travel to and from the admin UI:
|
|
5482
|
+
*
|
|
5483
|
+
* - read: `hydrateSchema` hands a secret field a {@link SecretFieldView}
|
|
5484
|
+
* (`{ $secret, v, set: true }`) or `null` — the browser learns whether a
|
|
5485
|
+
* value is set, never the value.
|
|
5486
|
+
* - write: an untouched field submits the view back unchanged (KEEP); a typed
|
|
5487
|
+
* value is a plain non-empty string (CHANGE); the Clear button submits
|
|
5488
|
+
* {@link SECRET_CLEAR} (CLEAR). `''`, `null` and the legacy redaction tokens
|
|
5489
|
+
* are KEEP — an empty string is what a defaults-fallback pushes back, and
|
|
5490
|
+
* treating it as "clear" is how a save destroyed a stored credential before.
|
|
5491
|
+
*
|
|
5492
|
+
* Pure and browser-safe.
|
|
5493
|
+
*/
|
|
5494
|
+
var SECRET_CLEAR = { $secretClear: true };
|
|
5495
|
+
/** The `'***'` token D634 redaction writes for non-admins. */
|
|
5496
|
+
var LEGACY_DEVICE_REDACTION = "***";
|
|
5497
|
+
function isRecord$1(value) {
|
|
5498
|
+
return typeof value === "object" && value !== null && !Array.isArray(value);
|
|
5499
|
+
}
|
|
5500
|
+
function makeSecretMarker(ref) {
|
|
5501
|
+
return {
|
|
5502
|
+
$secret: ref,
|
|
5503
|
+
v: 1
|
|
5504
|
+
};
|
|
5505
|
+
}
|
|
5506
|
+
/** A stored marker: an object whose `$secret` is a non-empty string. */
|
|
5507
|
+
function isSecretMarker(value) {
|
|
5508
|
+
if (!isRecord$1(value)) return false;
|
|
5509
|
+
const ref = value["$secret"];
|
|
5510
|
+
return typeof ref === "string" && ref.length > 0;
|
|
5511
|
+
}
|
|
5512
|
+
function isSecretClear(value) {
|
|
5513
|
+
return isRecord$1(value) && value["$secretClear"] === true;
|
|
5514
|
+
}
|
|
5515
|
+
/**
|
|
5516
|
+
* The UI view of a stored secret field value: a marker becomes "set", inline
|
|
5517
|
+
* plaintext becomes "set (inline)", nothing becomes `null`. A value never
|
|
5518
|
+
* survives this function.
|
|
5519
|
+
*/
|
|
5520
|
+
function toSecretFieldView(stored) {
|
|
5521
|
+
if (isSecretMarker(stored)) return {
|
|
5522
|
+
$secret: stored.$secret,
|
|
5523
|
+
v: 1,
|
|
5524
|
+
set: true
|
|
5525
|
+
};
|
|
5526
|
+
if (typeof stored === "string" && stored.length > 0) return {
|
|
5527
|
+
$secret: null,
|
|
5528
|
+
v: 1,
|
|
5529
|
+
set: true,
|
|
5530
|
+
inline: true
|
|
5531
|
+
};
|
|
5532
|
+
return null;
|
|
5533
|
+
}
|
|
5534
|
+
/**
|
|
5535
|
+
* Classify an incoming value for a secret path. Only a non-empty string that is
|
|
5536
|
+
* not a redaction token sets a value; only {@link SECRET_CLEAR} clears.
|
|
5537
|
+
* Everything else — a marker (ours or anyone's), a UI view, `''`, `null`,
|
|
5538
|
+
* `undefined`, a redaction token, a non-string — keeps what is stored.
|
|
5539
|
+
*/
|
|
5540
|
+
function classifySecretWrite(incoming) {
|
|
5541
|
+
if (isSecretClear(incoming)) return { kind: "clear" };
|
|
5542
|
+
if (typeof incoming !== "string") return { kind: "keep" };
|
|
5543
|
+
if (incoming.length === 0) return { kind: "keep" };
|
|
5544
|
+
if (incoming === "__camstack_redacted__" || incoming === LEGACY_DEVICE_REDACTION) return { kind: "keep" };
|
|
5545
|
+
return {
|
|
5546
|
+
kind: "set",
|
|
5547
|
+
value: incoming
|
|
5548
|
+
};
|
|
5549
|
+
}
|
|
5452
5550
|
Object.fromEntries([
|
|
5453
5551
|
{
|
|
5454
5552
|
id: "overview",
|
|
@@ -5620,33 +5718,19 @@ Object.fromEntries([
|
|
|
5620
5718
|
function isValuelessField(field) {
|
|
5621
5719
|
return field.type === "separator" || field.type === "info" || field.type === "qr-code" || field.type === "button" || field.type === "object-array" || field.type === "widget" || field.type === "addon-action-button" || field.type === "device-action-button";
|
|
5622
5720
|
}
|
|
5623
|
-
|
|
5624
|
-
* Merge a `ConfigUISchema` with a raw `values` record into a
|
|
5625
|
-
* `ConfigUISchemaWithValues`. Used by every `get*Settings` backend endpoint
|
|
5626
|
-
* before returning to the admin UI. Groups are walked recursively.
|
|
5627
|
-
*
|
|
5628
|
-
* For each leaf field:
|
|
5629
|
-
* - structural fields (`separator`, `info`, `button`) pass through unchanged
|
|
5630
|
-
* - other fields get `value = values[key] ?? field.default ?? null`
|
|
5631
|
-
*
|
|
5632
|
-
* Unknown keys in `values` (keys not declared in the schema) are silently
|
|
5633
|
-
* ignored — they don't contribute to the output. Missing keys fall back to
|
|
5634
|
-
* the schema default or `null`. This mirrors the old backend behaviour where
|
|
5635
|
-
* `FormBuilder` rendered `values[key] ?? field.default`.
|
|
5636
|
-
*/
|
|
5637
|
-
function hydrateSchema(schema, values) {
|
|
5721
|
+
function hydrateSchema(schema, values, options = {}) {
|
|
5638
5722
|
return {
|
|
5639
5723
|
...schema.tabs ? { tabs: [...schema.tabs] } : {},
|
|
5640
5724
|
sections: schema.sections.map((section) => ({
|
|
5641
5725
|
...section,
|
|
5642
|
-
fields: section.fields.map((field) => hydrateField(field, values))
|
|
5726
|
+
fields: section.fields.map((field) => hydrateField(field, values, options))
|
|
5643
5727
|
}))
|
|
5644
5728
|
};
|
|
5645
5729
|
}
|
|
5646
|
-
function hydrateField(field, values) {
|
|
5730
|
+
function hydrateField(field, values, options) {
|
|
5647
5731
|
if (isValuelessField(field)) return field;
|
|
5648
5732
|
if (field.type === "group") {
|
|
5649
|
-
const hydratedChildren = field.fields.map((child) => hydrateField(child, values));
|
|
5733
|
+
const hydratedChildren = field.fields.map((child) => hydrateField(child, values, options));
|
|
5650
5734
|
return {
|
|
5651
5735
|
...field,
|
|
5652
5736
|
fields: hydratedChildren
|
|
@@ -5655,7 +5739,7 @@ function hydrateField(field, values) {
|
|
|
5655
5739
|
if (field.type === "sub-tabs") {
|
|
5656
5740
|
const hydratedTabs = field.tabs.map((tab) => ({
|
|
5657
5741
|
...tab,
|
|
5658
|
-
fields: tab.fields.map((child) => hydrateField(child, values))
|
|
5742
|
+
fields: tab.fields.map((child) => hydrateField(child, values, options))
|
|
5659
5743
|
}));
|
|
5660
5744
|
return {
|
|
5661
5745
|
...field,
|
|
@@ -5665,6 +5749,33 @@ function hydrateField(field, values) {
|
|
|
5665
5749
|
const key = field.key;
|
|
5666
5750
|
const storedValue = Object.prototype.hasOwnProperty.call(values, key) ? values[key] : void 0;
|
|
5667
5751
|
const defaultValue = field.default;
|
|
5752
|
+
const asView = (v) => isSecretMarker(v) || options.inlineSecretsAsViews === true && v !== void 0;
|
|
5753
|
+
if (isKeychainStoredField(field) && asView(storedValue)) return {
|
|
5754
|
+
...field,
|
|
5755
|
+
value: toSecretFieldView(storedValue)
|
|
5756
|
+
};
|
|
5757
|
+
if (isKeychainStoredField(field) && options.inlineSecretsAsViews === true) return {
|
|
5758
|
+
...field,
|
|
5759
|
+
value: null
|
|
5760
|
+
};
|
|
5761
|
+
if (field.type === "editable-array" && Array.isArray(storedValue)) {
|
|
5762
|
+
const secretItemKeys = field.itemFields.filter((item) => "key" in item && isKeychainStoredField(item)).map((item) => "key" in item ? item.key : "");
|
|
5763
|
+
if (secretItemKeys.length > 0) {
|
|
5764
|
+
const rows = storedValue.map((row) => {
|
|
5765
|
+
if (row === null || typeof row !== "object" || Array.isArray(row)) return row;
|
|
5766
|
+
const out = { ...row };
|
|
5767
|
+
for (const k of secretItemKeys) {
|
|
5768
|
+
const v = Reflect.get(row, k);
|
|
5769
|
+
if (asView(v)) out[k] = toSecretFieldView(v);
|
|
5770
|
+
}
|
|
5771
|
+
return out;
|
|
5772
|
+
});
|
|
5773
|
+
return {
|
|
5774
|
+
...field,
|
|
5775
|
+
value: rows
|
|
5776
|
+
};
|
|
5777
|
+
}
|
|
5778
|
+
}
|
|
5668
5779
|
if (field.multiple) {
|
|
5669
5780
|
const stored = Array.isArray(storedValue) ? storedValue : storedValue !== void 0 && storedValue !== null ? [storedValue] : [];
|
|
5670
5781
|
const itemFallback = field.multiple.itemDefault !== void 0 ? field.multiple.itemDefault : defaultValue !== void 0 ? defaultValue : typeOf(field) === "string" ? "" : null;
|
|
@@ -5907,6 +6018,431 @@ function projectStore(store, perNodeKeys, nodeId) {
|
|
|
5907
6018
|
}
|
|
5908
6019
|
return out;
|
|
5909
6020
|
}
|
|
6021
|
+
var GLOBAL_SCOPE = { kind: "global" };
|
|
6022
|
+
/** The scope every addon-wide (not per-node, not per-device) setting lives in. */
|
|
6023
|
+
function globalSecretScope() {
|
|
6024
|
+
return GLOBAL_SCOPE;
|
|
6025
|
+
}
|
|
6026
|
+
function encodeSegment(value) {
|
|
6027
|
+
return encodeURIComponent(value);
|
|
6028
|
+
}
|
|
6029
|
+
/**
|
|
6030
|
+
* The field path of a value inside an array item, addressed by the item's id:
|
|
6031
|
+
* `arrayItemFieldPath('providers', 'authentik', 'clientSecret')` →
|
|
6032
|
+
* `providers[authentik].clientSecret`.
|
|
6033
|
+
*/
|
|
6034
|
+
function arrayItemFieldPath(arrayKey, itemId, fieldKey) {
|
|
6035
|
+
return `${arrayKey}[${encodeSegment(itemId)}].${fieldKey}`;
|
|
6036
|
+
}
|
|
6037
|
+
/** A write to a secret path could not be stored in the keychain, so it was refused. */
|
|
6038
|
+
var KeychainWriteRefusedError = class extends Error {
|
|
6039
|
+
fieldPath;
|
|
6040
|
+
constructor(fieldPath, cause) {
|
|
6041
|
+
super(`secret "${fieldPath}" was not saved: the keychain could not store it (${cause instanceof Error ? cause.message : String(cause)}). Nothing was written.`);
|
|
6042
|
+
this.fieldPath = fieldPath;
|
|
6043
|
+
this.name = "KeychainWriteRefusedError";
|
|
6044
|
+
}
|
|
6045
|
+
};
|
|
6046
|
+
var KEEP = { kind: "keep" };
|
|
6047
|
+
function isRecord(value) {
|
|
6048
|
+
return typeof value === "object" && value !== null && !Array.isArray(value);
|
|
6049
|
+
}
|
|
6050
|
+
function defaultMintId() {
|
|
6051
|
+
return globalThis.crypto.randomUUID();
|
|
6052
|
+
}
|
|
6053
|
+
/** Every marker ref anywhere under `value`. */
|
|
6054
|
+
function collectSecretMarkerRefs(value, out = []) {
|
|
6055
|
+
if (isSecretMarker(value)) {
|
|
6056
|
+
out.push(value.$secret);
|
|
6057
|
+
return out;
|
|
6058
|
+
}
|
|
6059
|
+
if (Array.isArray(value)) for (const item of value) collectSecretMarkerRefs(item, out);
|
|
6060
|
+
else if (isRecord(value)) for (const child of Object.values(value)) collectSecretMarkerRefs(child, out);
|
|
6061
|
+
return out;
|
|
6062
|
+
}
|
|
6063
|
+
async function storedValueEquals(secrets, marker, candidate) {
|
|
6064
|
+
const resolved = (await secrets.resolve([marker.$secret]))[marker.$secret];
|
|
6065
|
+
return resolved?.kind === "value" && resolved.value === candidate;
|
|
6066
|
+
}
|
|
6067
|
+
async function writeLeaf(ctx, incoming, stored, fieldPath) {
|
|
6068
|
+
const intent = classifySecretWrite(incoming);
|
|
6069
|
+
const ref = ctx.secrets.ref(ctx.scope, fieldPath);
|
|
6070
|
+
const storedIsOurs = isSecretMarker(stored) && stored.$secret === ref;
|
|
6071
|
+
if (intent.kind === "keep") return KEEP;
|
|
6072
|
+
if (intent.kind === "set" && !ctx.operatorWrite && typeof stored === "string" && stored === intent.value) return KEEP;
|
|
6073
|
+
if (intent.kind === "clear") {
|
|
6074
|
+
if (storedIsOurs) ctx.deletes.push(ref);
|
|
6075
|
+
return {
|
|
6076
|
+
kind: "value",
|
|
6077
|
+
value: null
|
|
6078
|
+
};
|
|
6079
|
+
}
|
|
6080
|
+
if (storedIsOurs && await storedValueEquals(ctx.secrets, stored, intent.value)) return {
|
|
6081
|
+
kind: "value",
|
|
6082
|
+
value: stored
|
|
6083
|
+
};
|
|
6084
|
+
try {
|
|
6085
|
+
await ctx.secrets.put(ref, intent.value);
|
|
6086
|
+
} catch (err) {
|
|
6087
|
+
throw new KeychainWriteRefusedError(fieldPath, err);
|
|
6088
|
+
}
|
|
6089
|
+
return {
|
|
6090
|
+
kind: "value",
|
|
6091
|
+
value: makeSecretMarker(ref)
|
|
6092
|
+
};
|
|
6093
|
+
}
|
|
6094
|
+
/** Apply a member result onto `out`: KEEP restores the stored member, or removes it. */
|
|
6095
|
+
function applyMember(out, key, result, storedParent) {
|
|
6096
|
+
if (result.kind === "value") {
|
|
6097
|
+
out[key] = result.value;
|
|
6098
|
+
return;
|
|
6099
|
+
}
|
|
6100
|
+
if (Object.prototype.hasOwnProperty.call(storedParent, key)) out[key] = storedParent[key];
|
|
6101
|
+
else delete out[key];
|
|
6102
|
+
}
|
|
6103
|
+
async function writeMembers(ctx, children, incoming, stored, pathOf) {
|
|
6104
|
+
const out = { ...incoming };
|
|
6105
|
+
for (const [member, node] of children) applyMember(out, member, await writeNode(ctx, node, incoming[member], stored[member], pathOf(member)), stored);
|
|
6106
|
+
return out;
|
|
6107
|
+
}
|
|
6108
|
+
function rowId(row, idKey) {
|
|
6109
|
+
const raw = row[idKey];
|
|
6110
|
+
if (typeof raw === "string" && raw.length > 0) return raw;
|
|
6111
|
+
if (typeof raw === "number" && Number.isFinite(raw)) return String(raw);
|
|
6112
|
+
return null;
|
|
6113
|
+
}
|
|
6114
|
+
async function writeArray(ctx, node, incoming, stored, fieldPath) {
|
|
6115
|
+
const storedRows = Array.isArray(stored) ? stored.filter(isRecord) : [];
|
|
6116
|
+
if (!Array.isArray(incoming)) {
|
|
6117
|
+
ctx.deletes.push(...collectSecretMarkerRefs(storedRows));
|
|
6118
|
+
return {
|
|
6119
|
+
kind: "value",
|
|
6120
|
+
value: incoming
|
|
6121
|
+
};
|
|
6122
|
+
}
|
|
6123
|
+
const storedById = /* @__PURE__ */ new Map();
|
|
6124
|
+
for (const row of storedRows) {
|
|
6125
|
+
const id = rowId(row, node.idKey);
|
|
6126
|
+
if (id !== null) storedById.set(id, row);
|
|
6127
|
+
}
|
|
6128
|
+
const kept = /* @__PURE__ */ new Set();
|
|
6129
|
+
const rows = [];
|
|
6130
|
+
for (const row of incoming) {
|
|
6131
|
+
if (!isRecord(row)) {
|
|
6132
|
+
rows.push(row);
|
|
6133
|
+
continue;
|
|
6134
|
+
}
|
|
6135
|
+
const id = rowId(row, node.idKey) ?? ctx.mintId();
|
|
6136
|
+
kept.add(id);
|
|
6137
|
+
const withId = {
|
|
6138
|
+
...row,
|
|
6139
|
+
[node.idKey]: row[node.idKey] ?? id
|
|
6140
|
+
};
|
|
6141
|
+
if (rowId(withId, node.idKey) === null) withId[node.idKey] = id;
|
|
6142
|
+
const storedRow = storedById.get(id) ?? {};
|
|
6143
|
+
rows.push(await writeMembers(ctx, node.item, withId, storedRow, (member) => arrayItemFieldPath(fieldPath, id, member)));
|
|
6144
|
+
}
|
|
6145
|
+
for (const [id, row] of storedById) if (!kept.has(id)) ctx.deletes.push(...collectSecretMarkerRefs(row));
|
|
6146
|
+
return {
|
|
6147
|
+
kind: "value",
|
|
6148
|
+
value: rows
|
|
6149
|
+
};
|
|
6150
|
+
}
|
|
6151
|
+
async function writeNode(ctx, node, incoming, stored, fieldPath) {
|
|
6152
|
+
switch (node.kind) {
|
|
6153
|
+
case "leaf": return writeLeaf(ctx, incoming, stored, fieldPath);
|
|
6154
|
+
case "array": return writeArray(ctx, node, incoming, stored, fieldPath);
|
|
6155
|
+
case "object": {
|
|
6156
|
+
if (!isRecord(incoming)) {
|
|
6157
|
+
if (incoming === void 0) return KEEP;
|
|
6158
|
+
ctx.deletes.push(...collectSecretMarkerRefs(stored));
|
|
6159
|
+
return {
|
|
6160
|
+
kind: "value",
|
|
6161
|
+
value: incoming
|
|
6162
|
+
};
|
|
6163
|
+
}
|
|
6164
|
+
const storedObj = isRecord(stored) ? stored : {};
|
|
6165
|
+
return {
|
|
6166
|
+
kind: "value",
|
|
6167
|
+
value: await writeMembers(ctx, node.children, incoming, storedObj, (m) => `${fieldPath}.${m}`)
|
|
6168
|
+
};
|
|
6169
|
+
}
|
|
6170
|
+
}
|
|
6171
|
+
}
|
|
6172
|
+
/** Split a perNode-scoped key (`key@nodeId`). */
|
|
6173
|
+
function splitNodeKey(key) {
|
|
6174
|
+
const at = key.indexOf("@");
|
|
6175
|
+
return at <= 0 ? {
|
|
6176
|
+
base: key,
|
|
6177
|
+
nodeId: null
|
|
6178
|
+
} : {
|
|
6179
|
+
base: key.slice(0, at),
|
|
6180
|
+
nodeId: key.slice(at + 1)
|
|
6181
|
+
};
|
|
6182
|
+
}
|
|
6183
|
+
/** Rewrite a settings patch so no secret value reaches the blob. See the file doc. */
|
|
6184
|
+
async function transformSecretWrite(input) {
|
|
6185
|
+
const deletes = [];
|
|
6186
|
+
const base = {
|
|
6187
|
+
secrets: input.secrets,
|
|
6188
|
+
mintId: input.mintId ?? defaultMintId,
|
|
6189
|
+
deletes,
|
|
6190
|
+
operatorWrite: input.operatorWrite === true
|
|
6191
|
+
};
|
|
6192
|
+
const out = {};
|
|
6193
|
+
for (const [key, incoming] of Object.entries(input.patch)) {
|
|
6194
|
+
const { base: baseKey, nodeId } = splitNodeKey(key);
|
|
6195
|
+
const node = input.tree.get(baseKey);
|
|
6196
|
+
if (node === void 0) {
|
|
6197
|
+
out[key] = incoming;
|
|
6198
|
+
continue;
|
|
6199
|
+
}
|
|
6200
|
+
const scope = nodeId !== null && nodeId.length > 0 ? {
|
|
6201
|
+
kind: "node",
|
|
6202
|
+
nodeId
|
|
6203
|
+
} : input.scope ?? globalSecretScope();
|
|
6204
|
+
const result = await writeNode({
|
|
6205
|
+
...base,
|
|
6206
|
+
scope
|
|
6207
|
+
}, node, incoming, input.stored[key], baseKey);
|
|
6208
|
+
if (result.kind === "value") out[key] = result.value;
|
|
6209
|
+
}
|
|
6210
|
+
return {
|
|
6211
|
+
patch: out,
|
|
6212
|
+
afterWrite: async () => {
|
|
6213
|
+
if (deletes.length === 0) return { orphaned: [] };
|
|
6214
|
+
try {
|
|
6215
|
+
await input.secrets.delete([...new Set(deletes)]);
|
|
6216
|
+
return { orphaned: [] };
|
|
6217
|
+
} catch {
|
|
6218
|
+
return { orphaned: [...new Set(deletes)] };
|
|
6219
|
+
}
|
|
6220
|
+
}
|
|
6221
|
+
};
|
|
6222
|
+
}
|
|
6223
|
+
/**
|
|
6224
|
+
* Replace every marker in `value` with its keychain value. Returns the SAME
|
|
6225
|
+
* reference when there is no marker (no allocation, no keychain call).
|
|
6226
|
+
*/
|
|
6227
|
+
async function resolveSecretMarkers(value, secrets) {
|
|
6228
|
+
const refs = collectSecretMarkerRefs(value);
|
|
6229
|
+
if (refs.length === 0) return {
|
|
6230
|
+
value,
|
|
6231
|
+
unresolved: []
|
|
6232
|
+
};
|
|
6233
|
+
const answers = await secrets.resolve(refs);
|
|
6234
|
+
const unresolved = [];
|
|
6235
|
+
for (const ref of new Set(refs)) {
|
|
6236
|
+
const answer = answers[ref];
|
|
6237
|
+
if (answer === void 0) unresolved.push({
|
|
6238
|
+
ref,
|
|
6239
|
+
reason: "not-initialized"
|
|
6240
|
+
});
|
|
6241
|
+
else if (answer.kind === "unavailable") unresolved.push({
|
|
6242
|
+
ref,
|
|
6243
|
+
reason: answer.reason
|
|
6244
|
+
});
|
|
6245
|
+
else if (answer.kind === "missing" || answer.kind === "forbidden") unresolved.push({
|
|
6246
|
+
ref,
|
|
6247
|
+
reason: answer.kind
|
|
6248
|
+
});
|
|
6249
|
+
}
|
|
6250
|
+
const substitute = (v) => {
|
|
6251
|
+
if (isSecretMarker(v)) {
|
|
6252
|
+
const answer = answers[v.$secret];
|
|
6253
|
+
return answer?.kind === "value" ? {
|
|
6254
|
+
keep: true,
|
|
6255
|
+
value: answer.value
|
|
6256
|
+
} : {
|
|
6257
|
+
keep: false,
|
|
6258
|
+
value: void 0
|
|
6259
|
+
};
|
|
6260
|
+
}
|
|
6261
|
+
if (Array.isArray(v)) {
|
|
6262
|
+
const items = [];
|
|
6263
|
+
for (const item of v) {
|
|
6264
|
+
const s = substitute(item);
|
|
6265
|
+
if (s.keep) items.push(s.value);
|
|
6266
|
+
}
|
|
6267
|
+
return {
|
|
6268
|
+
keep: true,
|
|
6269
|
+
value: items
|
|
6270
|
+
};
|
|
6271
|
+
}
|
|
6272
|
+
if (isRecord(v)) {
|
|
6273
|
+
const out = {};
|
|
6274
|
+
for (const [k, child] of Object.entries(v)) {
|
|
6275
|
+
const s = substitute(child);
|
|
6276
|
+
if (s.keep) out[k] = s.value;
|
|
6277
|
+
}
|
|
6278
|
+
return {
|
|
6279
|
+
keep: true,
|
|
6280
|
+
value: out
|
|
6281
|
+
};
|
|
6282
|
+
}
|
|
6283
|
+
return {
|
|
6284
|
+
keep: true,
|
|
6285
|
+
value: v
|
|
6286
|
+
};
|
|
6287
|
+
};
|
|
6288
|
+
return {
|
|
6289
|
+
value: substitute(value).value,
|
|
6290
|
+
unresolved
|
|
6291
|
+
};
|
|
6292
|
+
}
|
|
6293
|
+
function touchesTree(tree, patch) {
|
|
6294
|
+
if (tree.size === 0) return false;
|
|
6295
|
+
for (const key of Object.keys(patch)) {
|
|
6296
|
+
const at = key.indexOf("@");
|
|
6297
|
+
if (tree.has(at > 0 ? key.slice(0, at) : key)) return true;
|
|
6298
|
+
}
|
|
6299
|
+
return false;
|
|
6300
|
+
}
|
|
6301
|
+
/** The blob as stored now; a failed read REFUSES the write instead of guessing. */
|
|
6302
|
+
async function readStoredAddonBlob(raw) {
|
|
6303
|
+
const threeWay = raw.readAddonStoreResult;
|
|
6304
|
+
if (threeWay === void 0) return raw.readAddonStore();
|
|
6305
|
+
const result = await threeWay.call(raw);
|
|
6306
|
+
if (result.kind === "failed") throw new Error(`settings write refused: the stored blob could not be read (${result.error})`);
|
|
6307
|
+
return result.kind === "missing" ? {} : result.value;
|
|
6308
|
+
}
|
|
6309
|
+
function createSecretAwareSettings(raw, opts) {
|
|
6310
|
+
const chains = /* @__PURE__ */ new Map();
|
|
6311
|
+
const serialize = (key, fn) => {
|
|
6312
|
+
const next = (chains.get(key) ?? Promise.resolve()).then(fn, fn);
|
|
6313
|
+
const tail = next.catch(() => void 0);
|
|
6314
|
+
chains.set(key, tail);
|
|
6315
|
+
tail.then(() => {
|
|
6316
|
+
if (chains.get(key) === tail) chains.delete(key);
|
|
6317
|
+
});
|
|
6318
|
+
return next;
|
|
6319
|
+
};
|
|
6320
|
+
const write = async (chainKey, tree, scope, patch, readStored, rawWrite) => {
|
|
6321
|
+
if (!touchesTree(tree, patch)) return rawWrite(patch);
|
|
6322
|
+
return serialize(chainKey, async () => {
|
|
6323
|
+
const stored = await readStored();
|
|
6324
|
+
const result = await transformSecretWrite({
|
|
6325
|
+
tree,
|
|
6326
|
+
secrets: opts.secrets,
|
|
6327
|
+
patch,
|
|
6328
|
+
stored,
|
|
6329
|
+
...scope !== void 0 ? { scope } : {},
|
|
6330
|
+
operatorWrite: opts.isOperatorWrite?.() === true
|
|
6331
|
+
});
|
|
6332
|
+
if (Object.keys(result.patch).length > 0) await rawWrite(result.patch);
|
|
6333
|
+
const { orphaned } = await result.afterWrite();
|
|
6334
|
+
if (orphaned.length > 0) opts.onOrphaned(orphaned);
|
|
6335
|
+
});
|
|
6336
|
+
};
|
|
6337
|
+
const wrapped = {
|
|
6338
|
+
writeAddonStore: (patch) => write("addon", opts.addonTree(), void 0, patch, () => readStoredAddonBlob(raw), (p) => raw.writeAddonStore(p)),
|
|
6339
|
+
writeDeviceStore: (deviceId, patch) => write(`device:${deviceId}`, opts.deviceTree(), {
|
|
6340
|
+
kind: "device",
|
|
6341
|
+
deviceId
|
|
6342
|
+
}, patch, () => raw.readDeviceStore(deviceId), (p) => raw.writeDeviceStore(deviceId, p))
|
|
6343
|
+
};
|
|
6344
|
+
return new Proxy(raw, { get(target, prop, receiver) {
|
|
6345
|
+
if (prop === "writeAddonStore") return wrapped.writeAddonStore;
|
|
6346
|
+
if (prop === "writeDeviceStore") return wrapped.writeDeviceStore;
|
|
6347
|
+
const value = Reflect.get(target, prop, receiver);
|
|
6348
|
+
return typeof value === "function" ? value.bind(target) : value;
|
|
6349
|
+
} });
|
|
6350
|
+
}
|
|
6351
|
+
/** The context the addon sees: identical, except that its settings writes are secret-aware. */
|
|
6352
|
+
function withSecretAwareSettings(context, opts) {
|
|
6353
|
+
const raw = context.settings;
|
|
6354
|
+
if (raw === void 0) return context;
|
|
6355
|
+
const settings = createSecretAwareSettings(raw, opts);
|
|
6356
|
+
return new Proxy(context, { get(target, prop, receiver) {
|
|
6357
|
+
if (prop === "settings") return settings;
|
|
6358
|
+
return Reflect.get(target, prop, receiver);
|
|
6359
|
+
} });
|
|
6360
|
+
}
|
|
6361
|
+
var LEAF = { kind: "leaf" };
|
|
6362
|
+
var DEFAULT_ITEM_ID_KEY = "id";
|
|
6363
|
+
function collectFields(fields, out) {
|
|
6364
|
+
for (const field of fields) {
|
|
6365
|
+
if (field.type === "group") {
|
|
6366
|
+
collectFields(field.fields, out);
|
|
6367
|
+
continue;
|
|
6368
|
+
}
|
|
6369
|
+
if (field.type === "sub-tabs") {
|
|
6370
|
+
for (const tab of field.tabs) collectFields(tab.fields, out);
|
|
6371
|
+
continue;
|
|
6372
|
+
}
|
|
6373
|
+
if (field.type === "editable-array") {
|
|
6374
|
+
const item = /* @__PURE__ */ new Map();
|
|
6375
|
+
for (const itemField of field.itemFields) if ("key" in itemField && isKeychainStoredField(itemField)) item.set(itemField.key, LEAF);
|
|
6376
|
+
if (item.size > 0) out.set(field.key, {
|
|
6377
|
+
kind: "array",
|
|
6378
|
+
idKey: field.itemIdKey ?? DEFAULT_ITEM_ID_KEY,
|
|
6379
|
+
item
|
|
6380
|
+
});
|
|
6381
|
+
continue;
|
|
6382
|
+
}
|
|
6383
|
+
if (!("key" in field) || typeof field.key !== "string") continue;
|
|
6384
|
+
if (isKeychainStoredField(field)) out.set(field.key, LEAF);
|
|
6385
|
+
}
|
|
6386
|
+
}
|
|
6387
|
+
/** The secret tree a settings schema declares. */
|
|
6388
|
+
function secretTreeFromSchema(schema) {
|
|
6389
|
+
const out = /* @__PURE__ */ new Map();
|
|
6390
|
+
if (schema === null) return out;
|
|
6391
|
+
for (const section of schema.sections) collectFields(section.fields, out);
|
|
6392
|
+
return out;
|
|
6393
|
+
}
|
|
6394
|
+
/** Parse `a.b[id].c` into segments; throws on a malformed path (a declaration bug). */
|
|
6395
|
+
function parseSecretStatePath(path) {
|
|
6396
|
+
const segments = [];
|
|
6397
|
+
for (const raw of path.split(".")) {
|
|
6398
|
+
const m = /^([^[\]]+)(?:\[([^[\]]+)\])?$/.exec(raw);
|
|
6399
|
+
if (m === null || m[1] === void 0) throw new Error(`secretStatePaths: malformed path "${path}"`);
|
|
6400
|
+
segments.push(m[2] !== void 0 ? {
|
|
6401
|
+
key: m[1],
|
|
6402
|
+
idKey: m[2]
|
|
6403
|
+
} : { key: m[1] });
|
|
6404
|
+
}
|
|
6405
|
+
if (segments.length === 0) throw new Error(`secretStatePaths: empty path`);
|
|
6406
|
+
if (segments[segments.length - 1]?.idKey !== void 0) throw new Error(`secretStatePaths: "${path}" ends on an array — name the member that is secret`);
|
|
6407
|
+
return segments;
|
|
6408
|
+
}
|
|
6409
|
+
function insert(into, segments) {
|
|
6410
|
+
const [head, ...rest] = segments;
|
|
6411
|
+
if (head === void 0) return;
|
|
6412
|
+
if (rest.length === 0) {
|
|
6413
|
+
into.set(head.key, LEAF);
|
|
6414
|
+
return;
|
|
6415
|
+
}
|
|
6416
|
+
const existing = into.get(head.key);
|
|
6417
|
+
if (head.idKey !== void 0) {
|
|
6418
|
+
const item = new Map(existing?.kind === "array" ? existing.item : []);
|
|
6419
|
+
insert(item, rest);
|
|
6420
|
+
into.set(head.key, {
|
|
6421
|
+
kind: "array",
|
|
6422
|
+
idKey: head.idKey,
|
|
6423
|
+
item
|
|
6424
|
+
});
|
|
6425
|
+
return;
|
|
6426
|
+
}
|
|
6427
|
+
const children = new Map(existing?.kind === "object" ? existing.children : []);
|
|
6428
|
+
insert(children, rest);
|
|
6429
|
+
into.set(head.key, {
|
|
6430
|
+
kind: "object",
|
|
6431
|
+
children
|
|
6432
|
+
});
|
|
6433
|
+
}
|
|
6434
|
+
/** Add hidden-state paths (`secretStatePaths`) to a schema-derived tree. */
|
|
6435
|
+
function mergeSecretStatePaths(tree, paths) {
|
|
6436
|
+
if (paths.length === 0) return tree;
|
|
6437
|
+
const out = new Map(tree);
|
|
6438
|
+
for (const path of paths) insert(out, parseSecretStatePath(path));
|
|
6439
|
+
return out;
|
|
6440
|
+
}
|
|
6441
|
+
/** First retry of a secret the keychain could not serve; doubles to {@link SECRET_RETRY_MAX_MS}. */
|
|
6442
|
+
var SECRET_RETRY_FIRST_MS = 5e3;
|
|
6443
|
+
var SECRET_RETRY_MAX_MS = 5 * 6e4;
|
|
6444
|
+
/** Coalesces a burst of `keychain.changed` events into one re-resolve. */
|
|
6445
|
+
var SECRET_CHANGE_DEBOUNCE_MS = 250;
|
|
5910
6446
|
/**
|
|
5911
6447
|
* Base class for CamStack addons. Eliminates settings boilerplate:
|
|
5912
6448
|
*
|
|
@@ -5976,6 +6512,25 @@ var BaseAddon = class {
|
|
|
5976
6512
|
settingsStoreReady = false;
|
|
5977
6513
|
/** Default config values. Provided via constructor. */
|
|
5978
6514
|
defaults;
|
|
6515
|
+
/**
|
|
6516
|
+
* Hidden-state paths that hold secrets (D787) — values the addon writes
|
|
6517
|
+
* itself (`updateGlobalSettings`, `state()`) that no form field declares.
|
|
6518
|
+
* Stored in the keychain exactly like a `password` field. Syntax:
|
|
6519
|
+
* `'snapshotSigningKey'`, `'identity.pincode'`, `'tokens[userId].accessToken'`
|
|
6520
|
+
* (`key[<id field>]` addresses array items by id, never by index).
|
|
6521
|
+
*/
|
|
6522
|
+
secretStatePaths = [];
|
|
6523
|
+
_addonSecretTree = null;
|
|
6524
|
+
_deviceSecretTree = null;
|
|
6525
|
+
/** Refs the last resolved config pointed at — a change to one re-resolves. */
|
|
6526
|
+
_configSecretRefs = /* @__PURE__ */ new Set();
|
|
6527
|
+
_unresolvedSecrets = [];
|
|
6528
|
+
_secretRetryTimer = null;
|
|
6529
|
+
_secretRetryDelayMs = SECRET_RETRY_FIRST_MS;
|
|
6530
|
+
_secretChangeTimer = null;
|
|
6531
|
+
_secretChangeUnsub = null;
|
|
6532
|
+
/** >0 while an OPERATOR's settings write is being applied. */
|
|
6533
|
+
_operatorWriteDepth = 0;
|
|
5979
6534
|
constructor(defaults) {
|
|
5980
6535
|
this.defaults = defaults;
|
|
5981
6536
|
this._config = { ...defaults };
|
|
@@ -6011,8 +6566,18 @@ var BaseAddon = class {
|
|
|
6011
6566
|
return this._config;
|
|
6012
6567
|
}
|
|
6013
6568
|
async initialize(context) {
|
|
6014
|
-
|
|
6569
|
+
const secrets = context.secrets;
|
|
6570
|
+
this._ctx = secrets !== void 0 ? withSecretAwareSettings(context, {
|
|
6571
|
+
secrets,
|
|
6572
|
+
addonTree: () => this.addonSecretTree(),
|
|
6573
|
+
deviceTree: () => this.deviceSecretTree(),
|
|
6574
|
+
onOrphaned: (refs) => context.logger.warn("keychain refs dropped by a settings write could not be deleted", { meta: { refs: [...refs] } }),
|
|
6575
|
+
isOperatorWrite: () => this._operatorWriteDepth > 0
|
|
6576
|
+
}) : context;
|
|
6015
6577
|
await this.resolveConfig();
|
|
6578
|
+
if (secrets !== void 0) this._secretChangeUnsub = secrets.onChange((ref) => {
|
|
6579
|
+
if (this._configSecretRefs.has(ref)) this.scheduleSecretReresolve(SECRET_CHANGE_DEBOUNCE_MS);
|
|
6580
|
+
});
|
|
6016
6581
|
const result = await this.onInitialize();
|
|
6017
6582
|
this.emitLifecycle(EventCategory.AddonStarted);
|
|
6018
6583
|
const normalized = normalizeAddonInitResult(result);
|
|
@@ -6045,6 +6610,12 @@ var BaseAddon = class {
|
|
|
6045
6610
|
*/
|
|
6046
6611
|
async onHubReachable() {}
|
|
6047
6612
|
async shutdown() {
|
|
6613
|
+
this._secretChangeUnsub?.();
|
|
6614
|
+
this._secretChangeUnsub = null;
|
|
6615
|
+
if (this._secretRetryTimer !== null) clearTimeout(this._secretRetryTimer);
|
|
6616
|
+
if (this._secretChangeTimer !== null) clearTimeout(this._secretChangeTimer);
|
|
6617
|
+
this._secretRetryTimer = null;
|
|
6618
|
+
this._secretChangeTimer = null;
|
|
6048
6619
|
this.emitLifecycle(EventCategory.AddonStopped);
|
|
6049
6620
|
if (this.autoEmitReadiness) this.emitReadinessForProviders("down");
|
|
6050
6621
|
await this.onShutdown();
|
|
@@ -6123,7 +6694,7 @@ var BaseAddon = class {
|
|
|
6123
6694
|
return hydrateSchema(schema, overlay ? {
|
|
6124
6695
|
...projected,
|
|
6125
6696
|
...overlay
|
|
6126
|
-
} : projected);
|
|
6697
|
+
} : projected, { inlineSecretsAsViews: true });
|
|
6127
6698
|
}
|
|
6128
6699
|
/**
|
|
6129
6700
|
* The integration-level view of this addon's settings: exactly the sections
|
|
@@ -6172,7 +6743,7 @@ var BaseAddon = class {
|
|
|
6172
6743
|
return hydrateSchema({
|
|
6173
6744
|
...schema,
|
|
6174
6745
|
sections
|
|
6175
|
-
}, projected);
|
|
6746
|
+
}, projected, { inlineSecretsAsViews: true });
|
|
6176
6747
|
}
|
|
6177
6748
|
/**
|
|
6178
6749
|
* The raw addon store PROJECTED onto the target node's bare per-node keys:
|
|
@@ -6226,18 +6797,50 @@ var BaseAddon = class {
|
|
|
6226
6797
|
value: result.value[key]
|
|
6227
6798
|
};
|
|
6228
6799
|
}
|
|
6800
|
+
/**
|
|
6801
|
+
* The OPERATOR's write — a settings form or an admin API call, dispatched by
|
|
6802
|
+
* the kernel. Identical to {@link updateGlobalSettings}, except that a secret
|
|
6803
|
+
* the operator sends is stored as sent even when it equals a pre-keychain
|
|
6804
|
+
* inline value: the operator re-entering a password is a change, an addon
|
|
6805
|
+
* writing back what it read is not (D787).
|
|
6806
|
+
*/
|
|
6807
|
+
async updateGlobalSettingsAsOperator(patch, nodeId) {
|
|
6808
|
+
this._operatorWriteDepth++;
|
|
6809
|
+
try {
|
|
6810
|
+
await this.applyGlobalPatch(patch, nodeId);
|
|
6811
|
+
} finally {
|
|
6812
|
+
this._operatorWriteDepth--;
|
|
6813
|
+
}
|
|
6814
|
+
}
|
|
6229
6815
|
async updateGlobalSettings(patch, nodeId) {
|
|
6816
|
+
await this.applyGlobalPatch(patch, nodeId);
|
|
6817
|
+
}
|
|
6818
|
+
/**
|
|
6819
|
+
* REMOVE stored secrets — their keychain values and their markers (D787).
|
|
6820
|
+
*
|
|
6821
|
+
* Writing `''` to a secret field KEEPS what is stored (an empty string is
|
|
6822
|
+
* what a defaults fallback writes back, and it must never destroy a
|
|
6823
|
+
* credential), so code that means "forget this token" says so here. Without
|
|
6824
|
+
* a keychain (an older kernel) it writes `''`, as such code always did.
|
|
6825
|
+
*/
|
|
6826
|
+
async clearSecrets(keys, nodeId) {
|
|
6827
|
+
const tree = this.addonSecretTree();
|
|
6828
|
+
const keychain = this._ctx?.secrets !== void 0;
|
|
6829
|
+
const patch = {};
|
|
6830
|
+
for (const key of keys) patch[key] = keychain && tree.has(key) ? SECRET_CLEAR : "";
|
|
6831
|
+
await this.applyGlobalPatch(patch, nodeId);
|
|
6832
|
+
}
|
|
6833
|
+
async applyGlobalPatch(barePatch, nodeId) {
|
|
6230
6834
|
const keys = this.perNodeKeys();
|
|
6231
6835
|
const localNode = normalizeNodeId(this._ctx?.kernel?.localNodeId);
|
|
6232
6836
|
const target = normalizeNodeId(nodeId ?? this._ctx?.kernel?.localNodeId);
|
|
6233
|
-
const barePatch = patch;
|
|
6234
6837
|
const scoped = keys.size > 0 ? scopePatch(barePatch, keys, target) : barePatch;
|
|
6235
6838
|
await this._ctx?.settings?.writeAddonStore(scoped);
|
|
6236
6839
|
if (target !== localNode) return;
|
|
6237
6840
|
await this.resolveConfig();
|
|
6238
6841
|
await this.onConfigChanged();
|
|
6239
6842
|
this.emitLifecycle(EventCategory.AddonUpdated, { level: "global" });
|
|
6240
|
-
this.maybeAutoRestart(
|
|
6843
|
+
this.maybeAutoRestart(Object.keys(barePatch), this.globalSettingsSchema());
|
|
6241
6844
|
}
|
|
6242
6845
|
/**
|
|
6243
6846
|
* The set of field keys the global settings schema declares `perNode: true`
|
|
@@ -6262,7 +6865,7 @@ var BaseAddon = class {
|
|
|
6262
6865
|
* time to return its response before the addon is torn down and
|
|
6263
6866
|
* re-initialised by `AddonRegistryService.restartAddon`.
|
|
6264
6867
|
*/
|
|
6265
|
-
maybeAutoRestart(
|
|
6868
|
+
maybeAutoRestart(patchKeys, schema) {
|
|
6266
6869
|
if (!schema) return;
|
|
6267
6870
|
const restartKeys = /* @__PURE__ */ new Set();
|
|
6268
6871
|
for (const section of schema.sections) for (const field of section.fields) {
|
|
@@ -6270,13 +6873,13 @@ var BaseAddon = class {
|
|
|
6270
6873
|
if (field.requiresRestart) restartKeys.add(field.key);
|
|
6271
6874
|
}
|
|
6272
6875
|
if (restartKeys.size === 0) return;
|
|
6273
|
-
if (!
|
|
6876
|
+
if (!patchKeys.some((k) => restartKeys.has(k))) return;
|
|
6274
6877
|
const ctx = this._ctx;
|
|
6275
6878
|
if (!ctx) return;
|
|
6276
6879
|
const addonId = ctx.id;
|
|
6277
6880
|
setImmediate(() => {
|
|
6278
6881
|
ctx.api.addons?.restartAddon?.mutate({ addonId }).then(() => {
|
|
6279
|
-
ctx.logger.info("addon auto-restart triggered by restart-required setting change", { meta: { changedFields:
|
|
6882
|
+
ctx.logger.info("addon auto-restart triggered by restart-required setting change", { meta: { changedFields: patchKeys.filter((k) => restartKeys.has(k)) } });
|
|
6280
6883
|
}).catch((err) => {
|
|
6281
6884
|
ctx.logger.error("addon auto-restart failed", { meta: { error: err instanceof Error ? err.message : String(err) } });
|
|
6282
6885
|
});
|
|
@@ -6285,7 +6888,7 @@ var BaseAddon = class {
|
|
|
6285
6888
|
async getDeviceSettings(deviceId) {
|
|
6286
6889
|
const schema = this.deviceSettingsSchema();
|
|
6287
6890
|
if (!schema) return { sections: [] };
|
|
6288
|
-
return hydrateSchema(schema, await this._ctx?.settings?.readDeviceStore(deviceId) ?? {});
|
|
6891
|
+
return hydrateSchema(schema, await this._ctx?.settings?.readDeviceStore(deviceId) ?? {}, { inlineSecretsAsViews: true });
|
|
6289
6892
|
}
|
|
6290
6893
|
async updateDeviceSettings(deviceId, patch) {
|
|
6291
6894
|
await this._ctx?.settings?.writeDeviceStore(deviceId, patch);
|
|
@@ -6415,7 +7018,7 @@ var BaseAddon = class {
|
|
|
6415
7018
|
* selection at boot (absent scoped key ⇒ the constructor default wins).
|
|
6416
7019
|
*/
|
|
6417
7020
|
async resolveConfig() {
|
|
6418
|
-
const stored = await this.readAddonStoreWithRetry();
|
|
7021
|
+
const stored = await this.resolveStoredSecrets(await this.readAddonStoreWithRetry());
|
|
6419
7022
|
const perNode = this.perNodeKeys();
|
|
6420
7023
|
const localNode = normalizeNodeId(this._ctx?.kernel?.localNodeId);
|
|
6421
7024
|
const resolved = { ...this.defaults };
|
|
@@ -6440,7 +7043,7 @@ var BaseAddon = class {
|
|
|
6440
7043
|
key,
|
|
6441
7044
|
schema,
|
|
6442
7045
|
fallback,
|
|
6443
|
-
read: () => this.readAddonStoreWithRetry(),
|
|
7046
|
+
read: async () => this.resolveStoredSecrets(await this.readAddonStoreWithRetry()),
|
|
6444
7047
|
write: async (patch) => {
|
|
6445
7048
|
await this._ctx?.settings?.writeAddonStore(patch);
|
|
6446
7049
|
},
|
|
@@ -6457,7 +7060,7 @@ var BaseAddon = class {
|
|
|
6457
7060
|
key,
|
|
6458
7061
|
schema,
|
|
6459
7062
|
fallback,
|
|
6460
|
-
read: async () => await this._ctx?.settings?.readDeviceStore(deviceId) ?? {},
|
|
7063
|
+
read: async () => this.resolveStoredSecrets(await this._ctx?.settings?.readDeviceStore(deviceId) ?? {}, false),
|
|
6461
7064
|
write: async (patch) => {
|
|
6462
7065
|
await this._ctx?.settings?.writeDeviceStore(deviceId, patch);
|
|
6463
7066
|
},
|
|
@@ -6469,6 +7072,70 @@ var BaseAddon = class {
|
|
|
6469
7072
|
} })
|
|
6470
7073
|
});
|
|
6471
7074
|
}
|
|
7075
|
+
/** The addon store's secret tree: schema fields by TYPE, plus `secretStatePaths`. */
|
|
7076
|
+
addonSecretTree() {
|
|
7077
|
+
this._addonSecretTree ??= mergeSecretStatePaths(secretTreeFromSchema(this.globalSettingsSchema()), this.secretStatePaths);
|
|
7078
|
+
return this._addonSecretTree;
|
|
7079
|
+
}
|
|
7080
|
+
deviceSecretTree() {
|
|
7081
|
+
this._deviceSecretTree ??= secretTreeFromSchema(this.deviceSettingsSchema());
|
|
7082
|
+
return this._deviceSecretTree;
|
|
7083
|
+
}
|
|
7084
|
+
/**
|
|
7085
|
+
* Secrets of this addon's stored config that could not be resolved on the
|
|
7086
|
+
* last read, with why. Non-empty means the addon is running WITHOUT them —
|
|
7087
|
+
* an addon whose function needs one should report itself degraded rather
|
|
7088
|
+
* than start on an empty credential.
|
|
7089
|
+
*/
|
|
7090
|
+
get unresolvedSecrets() {
|
|
7091
|
+
return this._unresolvedSecrets;
|
|
7092
|
+
}
|
|
7093
|
+
/**
|
|
7094
|
+
* Substitute every keychain marker in a stored blob with its value. With no
|
|
7095
|
+
* keychain (no `ctx.secrets`) or no marker, the blob comes back unchanged.
|
|
7096
|
+
* An unresolvable value is LEFT OUT (never `''`), logged by ref — never by
|
|
7097
|
+
* value — and, when the cause can pass, retried with backoff. Nothing is
|
|
7098
|
+
* ever written back from here.
|
|
7099
|
+
*/
|
|
7100
|
+
async resolveStoredSecrets(blob, trackForConfig = true) {
|
|
7101
|
+
const secrets = this._ctx?.secrets;
|
|
7102
|
+
if (secrets === void 0) return blob;
|
|
7103
|
+
const refs = collectSecretMarkerRefs(blob);
|
|
7104
|
+
if (trackForConfig) this._configSecretRefs = new Set(refs);
|
|
7105
|
+
if (refs.length === 0) {
|
|
7106
|
+
if (trackForConfig) this._unresolvedSecrets = [];
|
|
7107
|
+
return blob;
|
|
7108
|
+
}
|
|
7109
|
+
const { value, unresolved } = await resolveSecretMarkers(blob, secrets);
|
|
7110
|
+
if (trackForConfig) {
|
|
7111
|
+
this._unresolvedSecrets = unresolved;
|
|
7112
|
+
if (unresolved.length > 0) {
|
|
7113
|
+
this._ctx?.logger?.error?.("secret unavailable — running without it, will retry", { meta: { secrets: unresolved.map((u) => ({
|
|
7114
|
+
ref: u.ref,
|
|
7115
|
+
reason: u.reason
|
|
7116
|
+
})) } });
|
|
7117
|
+
if (unresolved.some((u) => u.reason !== "missing" && u.reason !== "forbidden")) {
|
|
7118
|
+
this.scheduleSecretReresolve(this._secretRetryDelayMs);
|
|
7119
|
+
this._secretRetryDelayMs = Math.min(this._secretRetryDelayMs * 2, SECRET_RETRY_MAX_MS);
|
|
7120
|
+
}
|
|
7121
|
+
} else this._secretRetryDelayMs = SECRET_RETRY_FIRST_MS;
|
|
7122
|
+
}
|
|
7123
|
+
return value;
|
|
7124
|
+
}
|
|
7125
|
+
/** Re-resolve the config (a keychain-only change, or a retry) and apply it. */
|
|
7126
|
+
scheduleSecretReresolve(delayMs) {
|
|
7127
|
+
const timerOf = delayMs === SECRET_CHANGE_DEBOUNCE_MS ? "_secretChangeTimer" : "_secretRetryTimer";
|
|
7128
|
+
if (this[timerOf] !== null) return;
|
|
7129
|
+
const timer = setTimeout(() => {
|
|
7130
|
+
this[timerOf] = null;
|
|
7131
|
+
if (this._ctx === null) return;
|
|
7132
|
+
this.resolveConfig().then(() => this.onConfigChanged()).catch((err) => {
|
|
7133
|
+
this._ctx?.logger?.error?.("re-resolving secrets failed", { meta: { error: err instanceof Error ? err.message : String(err) } });
|
|
7134
|
+
});
|
|
7135
|
+
}, delayMs);
|
|
7136
|
+
timer.unref?.();
|
|
7137
|
+
this[timerOf] = timer;
|
|
7138
|
+
}
|
|
6472
7139
|
/**
|
|
6473
7140
|
* Wrap `ctx.settings.readAddonStore()` with a short retry budget so a
|
|
6474
7141
|
* transient settings-store outage (mid-restart of sqlite-settings, tsx-watch
|
|
@@ -14136,6 +14803,196 @@ id: union([string(), number()]) }), {
|
|
|
14136
14803
|
kind: "mutation",
|
|
14137
14804
|
auth: "admin"
|
|
14138
14805
|
});
|
|
14806
|
+
/**
|
|
14807
|
+
* `keychain` — the hub's encrypted store of secret values (D787).
|
|
14808
|
+
*
|
|
14809
|
+
* Settings blobs never hold a secret: they hold a marker
|
|
14810
|
+
* `{"$secret":"secret://<owner>/<scope>/<fieldPath>","v":1}` and the value
|
|
14811
|
+
* lives here, AES-256-GCM under a data key that a master key wraps. This cap
|
|
14812
|
+
* is the OWNER's door to its own values: every method is owner-checked
|
|
14813
|
+
* against the CALLER, never against anything the caller claims.
|
|
14814
|
+
*
|
|
14815
|
+
* Who the caller is: the transport stamps `callerAddonId` into the args of a
|
|
14816
|
+
* call that crossed a process (the parent `LocalChildRegistry` from the UDS
|
|
14817
|
+
* connection, the agent from its child's connection carried in
|
|
14818
|
+
* `$hub-cap-fwd`'s envelope). A stamp always overwrites; a wire call with no
|
|
14819
|
+
* stamp has its claim stripped. Only a hub in-process caller may state its own
|
|
14820
|
+
* identity — `ctx.secrets` does that with the addon id closed over. This is
|
|
14821
|
+
* identity against BUGS and misrouting, not against a malicious addon (every
|
|
14822
|
+
* runner is the same OS user): see the threat model in
|
|
14823
|
+
* `docs/design/2026-10-08-secrets-keychain.md`.
|
|
14824
|
+
*
|
|
14825
|
+
* `callerAddonId` is deliberately NOT in any input schema: the tRPC router
|
|
14826
|
+
* parses the input, so a session can never supply it, and the internal mount
|
|
14827
|
+
* floors every method to admin anyway (D240).
|
|
14828
|
+
*
|
|
14829
|
+
* Internal: addons reach it through `ctx.secrets`, never directly.
|
|
14830
|
+
*/
|
|
14831
|
+
/** Why a value cannot be served right now. Never folded into "missing". */
|
|
14832
|
+
var KeychainUnavailableReasonSchema = _enum([
|
|
14833
|
+
"key-missing",
|
|
14834
|
+
"wrong-key",
|
|
14835
|
+
"key-file-unreadable",
|
|
14836
|
+
"store-unavailable",
|
|
14837
|
+
"not-initialized",
|
|
14838
|
+
"decrypt-failed"
|
|
14839
|
+
]);
|
|
14840
|
+
var KeychainStateSchema = discriminatedUnion("state", [object({ state: literal("ready") }), object({
|
|
14841
|
+
state: literal("locked"),
|
|
14842
|
+
reason: KeychainUnavailableReasonSchema
|
|
14843
|
+
})]);
|
|
14844
|
+
var KeychainResolveEntrySchema = discriminatedUnion("kind", [
|
|
14845
|
+
object({
|
|
14846
|
+
kind: literal("value"),
|
|
14847
|
+
value: string(),
|
|
14848
|
+
version: number().int()
|
|
14849
|
+
}),
|
|
14850
|
+
object({ kind: literal("missing") }),
|
|
14851
|
+
object({
|
|
14852
|
+
kind: literal("unavailable"),
|
|
14853
|
+
reason: KeychainUnavailableReasonSchema
|
|
14854
|
+
}),
|
|
14855
|
+
object({ kind: literal("forbidden") })
|
|
14856
|
+
]);
|
|
14857
|
+
var KeychainResolveResultSchema = record(string(), KeychainResolveEntrySchema);
|
|
14858
|
+
/** Metadata of one stored value — never the value. */
|
|
14859
|
+
var KeychainSecretMetaSchema = object({
|
|
14860
|
+
ref: string(),
|
|
14861
|
+
owner: string(),
|
|
14862
|
+
/** Formatted scope (`global`, `node/<id>`, `device/<id>`, …). */
|
|
14863
|
+
scope: string(),
|
|
14864
|
+
fieldPath: string(),
|
|
14865
|
+
version: number().int(),
|
|
14866
|
+
createdAt: number(),
|
|
14867
|
+
updatedAt: number(),
|
|
14868
|
+
/** `addon:<id>` | `user:<id>` | `system`. */
|
|
14869
|
+
updatedBy: string(),
|
|
14870
|
+
/** Coarse — written at most once an hour per ref. `null` = never read. */
|
|
14871
|
+
lastReadAt: number().nullable()
|
|
14872
|
+
});
|
|
14873
|
+
var RefListSchema = array(string().min(1)).max(512);
|
|
14874
|
+
method(object({
|
|
14875
|
+
ref: string().min(1),
|
|
14876
|
+
value: string().min(1)
|
|
14877
|
+
}), object({
|
|
14878
|
+
ref: string(),
|
|
14879
|
+
version: number().int()
|
|
14880
|
+
}), {
|
|
14881
|
+
kind: "mutation",
|
|
14882
|
+
auth: "admin"
|
|
14883
|
+
}), method(object({ refs: RefListSchema }), KeychainResolveResultSchema, { auth: "admin" }), method(object({ refs: RefListSchema }), object({ deleted: number().int() }), {
|
|
14884
|
+
kind: "mutation",
|
|
14885
|
+
auth: "admin"
|
|
14886
|
+
}), method(object({}), array(KeychainSecretMetaSchema).readonly(), { auth: "admin" }), method(object({}), KeychainStateSchema, { auth: "admin" });
|
|
14887
|
+
var KeychainKeySourceSchema = object({
|
|
14888
|
+
kind: _enum([
|
|
14889
|
+
"config-file",
|
|
14890
|
+
"previous-config-file",
|
|
14891
|
+
"platform",
|
|
14892
|
+
"default-file"
|
|
14893
|
+
]),
|
|
14894
|
+
/** File sources only — a path is not a secret. */
|
|
14895
|
+
path: string().optional(),
|
|
14896
|
+
/**
|
|
14897
|
+
* True when a whole-volume backup of the data directory carries this key
|
|
14898
|
+
* next to the database it protects (the default file). The page warns.
|
|
14899
|
+
*/
|
|
14900
|
+
sharesBackupWithDatabase: boolean()
|
|
14901
|
+
});
|
|
14902
|
+
var KeychainStatusSchema = object({
|
|
14903
|
+
keychain: KeychainStateSchema,
|
|
14904
|
+
/** The source of the master key in use; `null` while locked. */
|
|
14905
|
+
keySource: KeychainKeySourceSchema.nullable(),
|
|
14906
|
+
/** The source configured to be primary — differs from `keySource` while a rotation is pending. */
|
|
14907
|
+
configuredSource: KeychainKeySourceSchema,
|
|
14908
|
+
/** Short fingerprint of the master key in use (`HMAC(KEK, label)`, 16 hex). */
|
|
14909
|
+
fingerprint: string().nullable(),
|
|
14910
|
+
activeKeyId: string().nullable(),
|
|
14911
|
+
/**
|
|
14912
|
+
* The keychain unlocked with a NON-primary source: the configured primary
|
|
14913
|
+
* key is not the one that wraps the data key yet. `rotateMasterKey` moves it.
|
|
14914
|
+
*/
|
|
14915
|
+
rotationPending: boolean(),
|
|
14916
|
+
/** Wrapped copies of the data key under a previous master key, kept until purged. */
|
|
14917
|
+
retiredWraps: number().int(),
|
|
14918
|
+
recoveryKeyDownloadedAt: number().nullable(),
|
|
14919
|
+
secretCount: number().int()
|
|
14920
|
+
});
|
|
14921
|
+
/**
|
|
14922
|
+
* Whether a stored value is still pointed at by its owner's settings.
|
|
14923
|
+
* `unknown` is a first-class answer: a scope whose blob could not be read is
|
|
14924
|
+
* never reported as an orphan (and never deleted as one).
|
|
14925
|
+
*/
|
|
14926
|
+
var KeychainSecretUsageSchema = _enum([
|
|
14927
|
+
"in-use",
|
|
14928
|
+
"orphan",
|
|
14929
|
+
"unknown"
|
|
14930
|
+
]);
|
|
14931
|
+
var KeychainAdminSecretSchema = KeychainSecretMetaSchema.extend({ usage: KeychainSecretUsageSchema });
|
|
14932
|
+
var KeychainAuditActionSchema = _enum([
|
|
14933
|
+
"put",
|
|
14934
|
+
"delete",
|
|
14935
|
+
"reveal",
|
|
14936
|
+
"rotate-master-key",
|
|
14937
|
+
"purge-retired-keys",
|
|
14938
|
+
"download-recovery-key",
|
|
14939
|
+
"delete-orphans",
|
|
14940
|
+
"reset",
|
|
14941
|
+
"initialize"
|
|
14942
|
+
]);
|
|
14943
|
+
var KeychainAuditEntrySchema = object({
|
|
14944
|
+
id: string(),
|
|
14945
|
+
at: number(),
|
|
14946
|
+
action: KeychainAuditActionSchema,
|
|
14947
|
+
/** `addon:<id>` | `user:<id>` | `system`. */
|
|
14948
|
+
actor: string(),
|
|
14949
|
+
ref: string().nullable(),
|
|
14950
|
+
detail: string().nullable()
|
|
14951
|
+
});
|
|
14952
|
+
method(object({}), KeychainStatusSchema, { auth: "admin" }), method(object({}), array(KeychainAdminSecretSchema).readonly(), { auth: "admin" }), method(object({ limit: number().int().min(1).max(500).optional() }), array(KeychainAuditEntrySchema).readonly(), { auth: "admin" }), method(object({ ref: string().min(1) }), object({
|
|
14953
|
+
value: string(),
|
|
14954
|
+
version: number().int()
|
|
14955
|
+
}), {
|
|
14956
|
+
kind: "mutation",
|
|
14957
|
+
auth: "admin",
|
|
14958
|
+
caller: "required"
|
|
14959
|
+
}), method(object({ refs: array(string().min(1)).max(1e3) }), object({
|
|
14960
|
+
deleted: array(string()).readonly(),
|
|
14961
|
+
kept: array(object({
|
|
14962
|
+
ref: string(),
|
|
14963
|
+
usage: KeychainSecretUsageSchema
|
|
14964
|
+
})).readonly()
|
|
14965
|
+
}), {
|
|
14966
|
+
kind: "mutation",
|
|
14967
|
+
auth: "admin",
|
|
14968
|
+
caller: "required"
|
|
14969
|
+
}), method(object({}), object({
|
|
14970
|
+
fingerprint: string(),
|
|
14971
|
+
keySource: KeychainKeySourceSchema
|
|
14972
|
+
}), {
|
|
14973
|
+
kind: "mutation",
|
|
14974
|
+
auth: "admin",
|
|
14975
|
+
caller: "required"
|
|
14976
|
+
}), method(object({}), object({ purged: number().int() }), {
|
|
14977
|
+
kind: "mutation",
|
|
14978
|
+
auth: "admin",
|
|
14979
|
+
caller: "required"
|
|
14980
|
+
}), method(object({}), object({
|
|
14981
|
+
key: string(),
|
|
14982
|
+
fingerprint: string(),
|
|
14983
|
+
keySource: KeychainKeySourceSchema
|
|
14984
|
+
}), {
|
|
14985
|
+
kind: "mutation",
|
|
14986
|
+
auth: "admin",
|
|
14987
|
+
caller: "required"
|
|
14988
|
+
}), method(object({ confirm: literal("RESET KEYCHAIN") }), object({
|
|
14989
|
+
archivedCollection: string().nullable(),
|
|
14990
|
+
archived: number().int()
|
|
14991
|
+
}), {
|
|
14992
|
+
kind: "mutation",
|
|
14993
|
+
auth: "admin",
|
|
14994
|
+
caller: "required"
|
|
14995
|
+
});
|
|
14139
14996
|
method(_void(), object({
|
|
14140
14997
|
id: string(),
|
|
14141
14998
|
name: string(),
|
|
@@ -15173,7 +16030,11 @@ var DeviceRegisterPayloadSchema = object({
|
|
|
15173
16030
|
var DeviceRemovePayloadSchema = object({ deviceId: number() });
|
|
15174
16031
|
var DevicePersistConfigPayloadSchema = object({
|
|
15175
16032
|
deviceId: number(),
|
|
15176
|
-
data: record(string(), unknown())
|
|
16033
|
+
data: record(string(), unknown()),
|
|
16034
|
+
/** The paths the device's schema declares secret (D783), when the caller
|
|
16035
|
+
* knows them — those values are kept in the keychain, not the blob (D787).
|
|
16036
|
+
* Absent: the paths the device last reported at `registerDevice` apply. */
|
|
16037
|
+
secretConfigPaths: array(string()).optional()
|
|
15177
16038
|
});
|
|
15178
16039
|
/** What a migration actually did, per switch. `unreachable` is a first-class
|
|
15179
16040
|
* answer: a camera that could not be asked is not a camera that was silenced. */
|
|
@@ -22160,8 +23021,23 @@ var RetrainMacroClassSchema = _enum([
|
|
|
22160
23021
|
]);
|
|
22161
23022
|
/** A subject to learn, or a phantom to unlearn (taught by OMISSION). */
|
|
22162
23023
|
var RetrainAnnotationKindSchema = _enum(["subject", "model_error"]);
|
|
22163
|
-
/**
|
|
22164
|
-
|
|
23024
|
+
/**
|
|
23025
|
+
* Where a box came from. A machine-sourced box is a DRAFT on the page until
|
|
23026
|
+
* the operator confirms it; once saved it keeps its source as provenance.
|
|
23027
|
+
*
|
|
23028
|
+
* - `operator` — drawn by hand.
|
|
23029
|
+
* - `assist` — proposed by a detector run on the copy (the camera's own
|
|
23030
|
+
* model, or a larger teacher model).
|
|
23031
|
+
* - `pipeline` — the box the live pipeline actually drew on that frame, read
|
|
23032
|
+
* back from the track store (never a re-run).
|
|
23033
|
+
* - `llm` — proposed by a vision-capable LLM profile.
|
|
23034
|
+
*/
|
|
23035
|
+
var RetrainAnnotationSourceSchema = _enum([
|
|
23036
|
+
"operator",
|
|
23037
|
+
"assist",
|
|
23038
|
+
"pipeline",
|
|
23039
|
+
"llm"
|
|
23040
|
+
]);
|
|
22165
23041
|
/** Normalised `[0,1]` rectangle against the FULL frame — the canonical form. */
|
|
22166
23042
|
var RetrainBboxSchema = object({
|
|
22167
23043
|
x: number(),
|
|
@@ -22179,7 +23055,8 @@ var RetrainBboxSchema = object({
|
|
|
22179
23055
|
*/
|
|
22180
23056
|
var RetrainAnnotationSchema = object({
|
|
22181
23057
|
id: string(),
|
|
22182
|
-
|
|
23058
|
+
/** The frame's track. Absent on a recording still, which has none. */
|
|
23059
|
+
trackId: string().optional(),
|
|
22183
23060
|
deviceId: number(),
|
|
22184
23061
|
/** The COPY in retrain storage — never the source track's media key. */
|
|
22185
23062
|
mediaKey: string(),
|
|
@@ -22228,13 +23105,47 @@ var RetrainFrameCandidateSchema = object({
|
|
|
22228
23105
|
* fail, whatever became of the original. */
|
|
22229
23106
|
copied: boolean()
|
|
22230
23107
|
});
|
|
23108
|
+
/**
|
|
23109
|
+
* One box the live pipeline drew on a copied frame — what a correction starts
|
|
23110
|
+
* from. Derived when the frame is listed, from the track store: the subject
|
|
23111
|
+
* box recorded on the source media row when there is one, else the track
|
|
23112
|
+
* position nearest the frame's capture time. Never stored as an annotation
|
|
23113
|
+
* until the operator confirms it.
|
|
23114
|
+
*/
|
|
23115
|
+
var RetrainPipelineBoxSchema = object({
|
|
23116
|
+
/** Normalised `[0,1]` against the full frame. */
|
|
23117
|
+
bbox: RetrainBboxSchema,
|
|
23118
|
+
macroClass: RetrainMacroClassSchema,
|
|
23119
|
+
label: string().optional(),
|
|
23120
|
+
subLabel: string().optional(),
|
|
23121
|
+
/** The detection score of the position used, when it was recorded. */
|
|
23122
|
+
score: number().optional(),
|
|
23123
|
+
/** The root model that produced the track, when it was recorded. */
|
|
23124
|
+
modelId: string().optional(),
|
|
23125
|
+
trackId: string(),
|
|
23126
|
+
/** `subject-box`: recorded on this very frame. `position`: the track's
|
|
23127
|
+
* position nearest the capture time, `deltaMs` away. */
|
|
23128
|
+
basis: _enum(["subject-box", "position"]),
|
|
23129
|
+
deltaMs: number()
|
|
23130
|
+
});
|
|
23131
|
+
/**
|
|
23132
|
+
* Where a retrain frame came from: a TRACK's stored media (copy-on-select),
|
|
23133
|
+
* or the RECORDING at an instant — the frame a model saw nothing in has no
|
|
23134
|
+
* track at all.
|
|
23135
|
+
*/
|
|
23136
|
+
var RetrainFrameOriginSchema = _enum(["track", "recording"]);
|
|
22231
23137
|
/** A frame the dataset OWNS: bytes copied at selection time. */
|
|
22232
23138
|
var RetrainFrameSchema = object({
|
|
22233
23139
|
frameId: string(),
|
|
22234
23140
|
deviceId: number(),
|
|
22235
|
-
|
|
22236
|
-
/**
|
|
22237
|
-
|
|
23141
|
+
origin: RetrainFrameOriginSchema,
|
|
23142
|
+
/** The track it was copied from. Absent on a recording still. */
|
|
23143
|
+
trackId: string().optional(),
|
|
23144
|
+
/** Provenance only. It may already point at nothing — that is expected.
|
|
23145
|
+
* Absent on a recording still. */
|
|
23146
|
+
sourceMediaId: number().int().optional(),
|
|
23147
|
+
/** A recording still: the playhead instant it was taken at. */
|
|
23148
|
+
epochMs: number().optional(),
|
|
22238
23149
|
sourceKind: MediaFileKindEnum,
|
|
22239
23150
|
sizeBytes: number().int(),
|
|
22240
23151
|
width: number().int(),
|
|
@@ -22245,7 +23156,12 @@ var RetrainFrameSchema = object({
|
|
|
22245
23156
|
/** The operator's "every subject in this frame is boxed". Detector
|
|
22246
23157
|
* evaluation keeps only complete frames: an unboxed subject would count as
|
|
22247
23158
|
* a false positive. */
|
|
22248
|
-
complete: boolean()
|
|
23159
|
+
complete: boolean(),
|
|
23160
|
+
/** The boxes the pipeline drew on this frame. Present on list answers;
|
|
23161
|
+
* empty when nothing the track store holds can be placed on it. */
|
|
23162
|
+
pipelineBoxes: array(RetrainPipelineBoxSchema).readonly().optional(),
|
|
23163
|
+
/** The named collections this frame belongs to. Present on list answers. */
|
|
23164
|
+
collectionIds: array(string()).readonly().optional()
|
|
22249
23165
|
});
|
|
22250
23166
|
/** Why a copy-on-select could not be honoured — named, never a silent skip. */
|
|
22251
23167
|
var RetrainCopyRefusalSchema = _enum([
|
|
@@ -22276,6 +23192,8 @@ var RetrainFrameListSchema = object({
|
|
|
22276
23192
|
var RetrainExportFilterSchema = object({
|
|
22277
23193
|
deviceIds: array(number()).optional(),
|
|
22278
23194
|
frameIds: array(string()).max(2e4).optional(),
|
|
23195
|
+
/** Only frames in at least one of these named collections. */
|
|
23196
|
+
collectionIds: array(string()).max(200).optional(),
|
|
22279
23197
|
batchId: string().optional(),
|
|
22280
23198
|
/** Only frames the operator marked complete (all subjects boxed). */
|
|
22281
23199
|
completeOnly: boolean().optional()
|
|
@@ -22340,6 +23258,109 @@ var RetrainAssistResultSchema = discriminatedUnion("kind", [object({
|
|
|
22340
23258
|
reason: string(),
|
|
22341
23259
|
detail: string().optional()
|
|
22342
23260
|
})]);
|
|
23261
|
+
/** A named set over the retrain corpus — membership only, it owns no pixels. */
|
|
23262
|
+
var RetrainCollectionSchema = object({
|
|
23263
|
+
id: string(),
|
|
23264
|
+
name: string(),
|
|
23265
|
+
createdAt: number(),
|
|
23266
|
+
frameCount: number().int()
|
|
23267
|
+
});
|
|
23268
|
+
var RetrainCollectionCreateResultSchema = discriminatedUnion("kind", [object({
|
|
23269
|
+
kind: literal("created"),
|
|
23270
|
+
collection: RetrainCollectionSchema
|
|
23271
|
+
}), object({
|
|
23272
|
+
kind: literal("refused"),
|
|
23273
|
+
reason: _enum(["empty-name", "duplicate-name"])
|
|
23274
|
+
})]);
|
|
23275
|
+
var RetrainCollectionRenameResultSchema = discriminatedUnion("kind", [object({
|
|
23276
|
+
kind: literal("renamed"),
|
|
23277
|
+
collection: RetrainCollectionSchema
|
|
23278
|
+
}), object({
|
|
23279
|
+
kind: literal("refused"),
|
|
23280
|
+
reason: _enum([
|
|
23281
|
+
"empty-name",
|
|
23282
|
+
"duplicate-name",
|
|
23283
|
+
"unknown-collection"
|
|
23284
|
+
])
|
|
23285
|
+
})]);
|
|
23286
|
+
/**
|
|
23287
|
+
* The outcome of adding the frame at a recording instant. Every refusal is
|
|
23288
|
+
* named: `still-unavailable` (not recording, a gap, or an undecodable frame —
|
|
23289
|
+
* `detail` says which), `still-busy` (the recorder is at its decode bound; try
|
|
23290
|
+
* again), `unreadable-image`, `write-failed`, `unknown-collection`.
|
|
23291
|
+
*/
|
|
23292
|
+
var AddRetrainFrameFromRecordingResultSchema = discriminatedUnion("kind", [object({
|
|
23293
|
+
kind: literal("added"),
|
|
23294
|
+
collectionId: string(),
|
|
23295
|
+
frame: RetrainFrameSchema,
|
|
23296
|
+
/** The moment was already in the dataset; nothing was decoded. */
|
|
23297
|
+
reused: boolean()
|
|
23298
|
+
}), object({
|
|
23299
|
+
kind: literal("refused"),
|
|
23300
|
+
reason: _enum([
|
|
23301
|
+
"unknown-collection",
|
|
23302
|
+
"still-unavailable",
|
|
23303
|
+
"still-busy",
|
|
23304
|
+
"unreadable-image",
|
|
23305
|
+
"write-failed"
|
|
23306
|
+
]),
|
|
23307
|
+
detail: string().optional()
|
|
23308
|
+
})]);
|
|
23309
|
+
/** A vision LLM profile the AI assist may use, and where it sends the frame. */
|
|
23310
|
+
var RetrainAssistProfileSchema = object({
|
|
23311
|
+
id: string(),
|
|
23312
|
+
name: string(),
|
|
23313
|
+
model: string(),
|
|
23314
|
+
kind: string(),
|
|
23315
|
+
/** `true` when the frame would leave the house (a cloud vendor, or an
|
|
23316
|
+
* endpoint that is not on the local network). The page confirms each such
|
|
23317
|
+
* run, and the provider refuses one without `allowCloud`. */
|
|
23318
|
+
leavesHouse: boolean()
|
|
23319
|
+
});
|
|
23320
|
+
/** A box the AI assist proposed: a draft, plus the model's own reason. */
|
|
23321
|
+
var RetrainLlmProposalSchema = RetrainAnnotationDraftSchema.extend({ reason: string() });
|
|
23322
|
+
/** What the AI assist said about a box that was already on the canvas. */
|
|
23323
|
+
var RetrainLlmReviewSchema = object({
|
|
23324
|
+
/** The `ref` the page sent the box under. */
|
|
23325
|
+
ref: string(),
|
|
23326
|
+
verdict: _enum([
|
|
23327
|
+
"confirmed",
|
|
23328
|
+
"wrong-class",
|
|
23329
|
+
"not-an-object",
|
|
23330
|
+
"uncertain"
|
|
23331
|
+
]),
|
|
23332
|
+
suggestedClass: RetrainMacroClassSchema.optional(),
|
|
23333
|
+
reason: string()
|
|
23334
|
+
});
|
|
23335
|
+
/**
|
|
23336
|
+
* The AI assist's answer. `proposed` carries drafts (`source: 'llm'`, the
|
|
23337
|
+
* model and its confidence) and reviews; items the model got wrong (a box off
|
|
23338
|
+
* the frame, an unasked class, an unknown ref) are dropped and counted in
|
|
23339
|
+
* `rejected`. A whole answer that is not the schema is `malformed-answer`.
|
|
23340
|
+
*/
|
|
23341
|
+
var RetrainLlmAssistResultSchema = discriminatedUnion("kind", [object({
|
|
23342
|
+
kind: literal("proposed"),
|
|
23343
|
+
profileId: string(),
|
|
23344
|
+
model: string(),
|
|
23345
|
+
/** The frame was sent outside the house for this answer. */
|
|
23346
|
+
leftHouse: boolean(),
|
|
23347
|
+
proposals: array(RetrainLlmProposalSchema).readonly(),
|
|
23348
|
+
reviews: array(RetrainLlmReviewSchema).readonly(),
|
|
23349
|
+
rejected: number().int()
|
|
23350
|
+
}), object({
|
|
23351
|
+
kind: literal("refused"),
|
|
23352
|
+
reason: _enum([
|
|
23353
|
+
"unknown-frame",
|
|
23354
|
+
"unreadable-frame",
|
|
23355
|
+
"unknown-profile",
|
|
23356
|
+
"profile-disabled",
|
|
23357
|
+
"no-vision",
|
|
23358
|
+
"cloud-not-confirmed",
|
|
23359
|
+
"llm-error",
|
|
23360
|
+
"malformed-answer"
|
|
23361
|
+
]),
|
|
23362
|
+
detail: string().optional()
|
|
23363
|
+
})]);
|
|
22343
23364
|
/** The outcome of a lifecycle move owned by the retrain page. */
|
|
22344
23365
|
var RetrainTransitionResultSchema = object({
|
|
22345
23366
|
trackId: string(),
|
|
@@ -23057,7 +24078,7 @@ DeviceType.Camera, method(object({ deviceId: number() }), array(TrackSchema).rea
|
|
|
23057
24078
|
auth: "admin"
|
|
23058
24079
|
}), method(object({
|
|
23059
24080
|
deviceId: number(),
|
|
23060
|
-
trackId: string(),
|
|
24081
|
+
trackId: string().optional(),
|
|
23061
24082
|
frameId: string()
|
|
23062
24083
|
}), object({
|
|
23063
24084
|
removed: boolean(),
|
|
@@ -23074,7 +24095,8 @@ DeviceType.Camera, method(object({ deviceId: number() }), array(TrackSchema).rea
|
|
|
23074
24095
|
auth: "admin"
|
|
23075
24096
|
}), method(object({
|
|
23076
24097
|
deviceId: number(),
|
|
23077
|
-
|
|
24098
|
+
/** The frame's track, when it has one — checked against the frame. */
|
|
24099
|
+
trackId: string().optional(),
|
|
23078
24100
|
frameId: string(),
|
|
23079
24101
|
subject: RetrainAssistSubjectSchema,
|
|
23080
24102
|
/** Which node runs it. Absent ⇒ wherever an unowned call lands. */
|
|
@@ -23082,12 +24104,16 @@ DeviceType.Camera, method(object({ deviceId: number() }), array(TrackSchema).rea
|
|
|
23082
24104
|
}), RetrainAssistResultSchema, {
|
|
23083
24105
|
kind: "mutation",
|
|
23084
24106
|
auth: "admin"
|
|
23085
|
-
}), method(object({
|
|
24107
|
+
}), method(object({
|
|
24108
|
+
trackId: string().optional(),
|
|
24109
|
+
frameIds: array(string()).max(2e3).optional()
|
|
24110
|
+
}), array(RetrainAnnotationSchema).readonly(), {
|
|
23086
24111
|
kind: "query",
|
|
23087
24112
|
auth: "admin"
|
|
23088
24113
|
}), method(object({
|
|
23089
24114
|
deviceId: number(),
|
|
23090
|
-
|
|
24115
|
+
/** The frame's track, when it has one — checked against the frame. */
|
|
24116
|
+
trackId: string().optional(),
|
|
23091
24117
|
frameId: string(),
|
|
23092
24118
|
annotations: array(RetrainAnnotationDraftSchema)
|
|
23093
24119
|
}), array(RetrainAnnotationSchema).readonly(), {
|
|
@@ -23110,7 +24136,7 @@ DeviceType.Camera, method(object({ deviceId: number() }), array(TrackSchema).rea
|
|
|
23110
24136
|
auth: "admin"
|
|
23111
24137
|
}), method(object({
|
|
23112
24138
|
deviceId: number(),
|
|
23113
|
-
trackId: string(),
|
|
24139
|
+
trackId: string().optional(),
|
|
23114
24140
|
frameId: string(),
|
|
23115
24141
|
complete: boolean()
|
|
23116
24142
|
}), RetrainFrameSchema, {
|
|
@@ -23124,6 +24150,74 @@ DeviceType.Camera, method(object({ deviceId: number() }), array(TrackSchema).rea
|
|
|
23124
24150
|
kind: "mutation",
|
|
23125
24151
|
auth: "admin",
|
|
23126
24152
|
timeoutMs: 60 * 6e4
|
|
24153
|
+
}), method(object({}), array(RetrainAssistProfileSchema).readonly(), {
|
|
24154
|
+
kind: "query",
|
|
24155
|
+
auth: "admin"
|
|
24156
|
+
}), method(object({
|
|
24157
|
+
deviceId: number(),
|
|
24158
|
+
trackId: string().optional(),
|
|
24159
|
+
frameId: string(),
|
|
24160
|
+
profileId: string(),
|
|
24161
|
+
classes: array(RetrainMacroClassSchema).min(1),
|
|
24162
|
+
boxes: array(object({
|
|
24163
|
+
ref: string(),
|
|
24164
|
+
bbox: RetrainBboxSchema,
|
|
24165
|
+
macroClass: RetrainMacroClassSchema,
|
|
24166
|
+
label: string().optional()
|
|
24167
|
+
})).max(50),
|
|
24168
|
+
allowCloud: boolean()
|
|
24169
|
+
}), RetrainLlmAssistResultSchema, {
|
|
24170
|
+
kind: "mutation",
|
|
24171
|
+
auth: "admin",
|
|
24172
|
+
timeoutMs: 18e4
|
|
24173
|
+
}), method(object({ name: string().max(120) }), RetrainCollectionCreateResultSchema, {
|
|
24174
|
+
kind: "mutation",
|
|
24175
|
+
auth: "admin"
|
|
24176
|
+
}), method(object({}), array(RetrainCollectionSchema).readonly(), {
|
|
24177
|
+
kind: "query",
|
|
24178
|
+
auth: "admin"
|
|
24179
|
+
}), method(object({
|
|
24180
|
+
id: string(),
|
|
24181
|
+
name: string().max(120)
|
|
24182
|
+
}), RetrainCollectionRenameResultSchema, {
|
|
24183
|
+
kind: "mutation",
|
|
24184
|
+
auth: "admin"
|
|
24185
|
+
}), method(object({ id: string() }), object({
|
|
24186
|
+
deleted: boolean(),
|
|
24187
|
+
removedFrames: number().int()
|
|
24188
|
+
}), {
|
|
24189
|
+
kind: "mutation",
|
|
24190
|
+
auth: "admin"
|
|
24191
|
+
}), method(object({
|
|
24192
|
+
collectionId: string(),
|
|
24193
|
+
deviceId: number(),
|
|
24194
|
+
epochMs: number()
|
|
24195
|
+
}), AddRetrainFrameFromRecordingResultSchema, {
|
|
24196
|
+
kind: "mutation",
|
|
24197
|
+
auth: "admin",
|
|
24198
|
+
timeoutMs: 6e4
|
|
24199
|
+
}), method(object({
|
|
24200
|
+
collectionId: string(),
|
|
24201
|
+
frameIds: array(string()).min(1).max(500)
|
|
24202
|
+
}), object({
|
|
24203
|
+
added: number().int(),
|
|
24204
|
+
alreadyMember: number().int(),
|
|
24205
|
+
unknownFrameIds: array(string()).readonly()
|
|
24206
|
+
}), {
|
|
24207
|
+
kind: "mutation",
|
|
24208
|
+
auth: "admin"
|
|
24209
|
+
}), method(object({
|
|
24210
|
+
collectionId: string(),
|
|
24211
|
+
frameId: string()
|
|
24212
|
+
}), object({
|
|
24213
|
+
removed: boolean(),
|
|
24214
|
+
deletedFrame: boolean()
|
|
24215
|
+
}), {
|
|
24216
|
+
kind: "mutation",
|
|
24217
|
+
auth: "admin"
|
|
24218
|
+
}), method(object({ collectionId: string() }), array(RetrainFrameSchema).readonly(), {
|
|
24219
|
+
kind: "query",
|
|
24220
|
+
auth: "admin"
|
|
23127
24221
|
}), method(object({
|
|
23128
24222
|
/** Which of the three event tables owns the row. */
|
|
23129
24223
|
ownerType: EventOwnerTypeSchema,
|
|
@@ -23747,13 +24841,31 @@ var RecommendationReasonSchema = discriminatedUnion("kind", [
|
|
|
23747
24841
|
object({
|
|
23748
24842
|
kind: literal("no-family-build"),
|
|
23749
24843
|
format: ModelFormatSchema$1
|
|
24844
|
+
}),
|
|
24845
|
+
object({
|
|
24846
|
+
kind: literal("kept-custom-pin"),
|
|
24847
|
+
modelId: string(),
|
|
24848
|
+
deviceKey: string()
|
|
23750
24849
|
})
|
|
23751
24850
|
]);
|
|
24851
|
+
/** Why a device is left exactly as it is, whatever the plan would pick (D786). */
|
|
24852
|
+
var KeptReasonSchema = _enum(["custom-pin"]);
|
|
24853
|
+
/**
|
|
24854
|
+
* Where a choice's latency came from (D791): this node's own benchmark
|
|
24855
|
+
* result, or the hardware-class table. Measured on the node beats the table.
|
|
24856
|
+
*/
|
|
24857
|
+
var LatencySourceSchema = discriminatedUnion("kind", [object({ kind: literal("table") }), object({
|
|
24858
|
+
kind: literal("node-benchmark"),
|
|
24859
|
+
resultId: string(),
|
|
24860
|
+
measuredAtMs: number()
|
|
24861
|
+
})]);
|
|
23752
24862
|
var DeviceModelChoiceSchema = object({
|
|
23753
24863
|
modelId: string(),
|
|
23754
24864
|
p50Ms: number(),
|
|
23755
24865
|
fps: number(),
|
|
23756
24866
|
measured: boolean(),
|
|
24867
|
+
/** Absent on a plan from before D791 — read as the table. */
|
|
24868
|
+
source: LatencySourceSchema.optional(),
|
|
23757
24869
|
/** Parallel sessions at the camera rate with the headroom kept free: ⌊fps × (1 − headroom) / camera fps⌋. */
|
|
23758
24870
|
capacitySessions: number(),
|
|
23759
24871
|
personRecall: number()
|
|
@@ -23764,6 +24876,8 @@ var DeviceRecommendationSchema = object({
|
|
|
23764
24876
|
enabled: boolean(),
|
|
23765
24877
|
available: boolean(),
|
|
23766
24878
|
chosen: DeviceModelChoiceSchema.nullable(),
|
|
24879
|
+
/** Present when the device is kept as is: Apply writes nothing on it. */
|
|
24880
|
+
kept: KeptReasonSchema.optional(),
|
|
23767
24881
|
reasons: array(RecommendationReasonSchema).readonly()
|
|
23768
24882
|
});
|
|
23769
24883
|
var NodeRecommendationSchema = object({
|
|
@@ -23817,6 +24931,17 @@ var AutoTuneWarningSchema = discriminatedUnion("kind", [
|
|
|
23817
24931
|
kind: literal("coral-enabled"),
|
|
23818
24932
|
nodeId: string(),
|
|
23819
24933
|
deviceKey: string()
|
|
24934
|
+
}),
|
|
24935
|
+
object({
|
|
24936
|
+
kind: literal("custom-pin-kept"),
|
|
24937
|
+
nodeId: string(),
|
|
24938
|
+
deviceKey: string().nullable(),
|
|
24939
|
+
deviceId: number().nullable(),
|
|
24940
|
+
modelId: string()
|
|
24941
|
+
}),
|
|
24942
|
+
object({
|
|
24943
|
+
kind: literal("custom-registry-unreadable"),
|
|
24944
|
+
error: string()
|
|
23820
24945
|
})
|
|
23821
24946
|
]);
|
|
23822
24947
|
var AutoTuneOptionsSchema = object({
|
|
@@ -23995,13 +25120,14 @@ var SuggestSharesResultSchema = object({
|
|
|
23995
25120
|
nodes: array(SuggestedNodeShareSchema).readonly()
|
|
23996
25121
|
});
|
|
23997
25122
|
/**
|
|
23998
|
-
* Where the node and device shares come from (D750, D755).
|
|
23999
|
-
* - `
|
|
24000
|
-
*
|
|
24001
|
-
*
|
|
24002
|
-
*
|
|
24003
|
-
*
|
|
24004
|
-
*
|
|
25123
|
+
* Where the node and device shares come from (D750, D755, D791).
|
|
25124
|
+
* - `benchmark` (default since D791) — each node's capacity as its own node
|
|
25125
|
+
* benchmark measured it; a node without fresh results is sized from
|
|
25126
|
+
* `hardware` and says so. Measured on the node beats the table.
|
|
25127
|
+
* - `hardware` — computed from each node's static capacity only (its
|
|
25128
|
+
* accelerators at their Auto tune models, from the latency table).
|
|
25129
|
+
* Both are recomputed whenever a node or device joins, leaves, is switched
|
|
25130
|
+
* on or off, changes model, or a benchmark result is written. No load input.
|
|
24005
25131
|
* - `manual` — the operator's stored sliders.
|
|
24006
25132
|
* Either way a node or device that cannot take sessions gives its share to
|
|
24007
25133
|
* the others in proportion; the stored values are never rewritten for that.
|
|
@@ -24050,6 +25176,362 @@ var EffectiveSharesSchema = object({
|
|
|
24050
25176
|
nodeWeights: record(string(), number()),
|
|
24051
25177
|
deviceWeights: record(string(), record(string(), number()))
|
|
24052
25178
|
});
|
|
25179
|
+
/**
|
|
25180
|
+
* Wire shapes of the node benchmark (D791): the operator's plan, the
|
|
25181
|
+
* preflight the confirmation shows, the run the orchestrator owns, what the
|
|
25182
|
+
* measuring runner reports, and the result rows Auto tune and the automatic
|
|
25183
|
+
* shares read.
|
|
25184
|
+
*
|
|
25185
|
+
* ONE node at a time, owned by the pipeline orchestrator. While a run is
|
|
25186
|
+
* active the cluster is in BENCHMARK MODE for that node: it is not a
|
|
25187
|
+
* detection candidate, camera pins naming it are ignored so its sessions move
|
|
25188
|
+
* elsewhere, and both come back when the mode ends — after a crash or a hub
|
|
25189
|
+
* restart too (a persisted manifest, reconciled against the registry).
|
|
25190
|
+
*
|
|
25191
|
+
* Two measurements, both on the node, driven by its own runner (frames never
|
|
25192
|
+
* cross a process at frame rate, D9):
|
|
25193
|
+
* - `device` — one accelerator × one candidate detector, root only, open
|
|
25194
|
+
* loop: how many streams at the camera rate it carries inside the frame
|
|
25195
|
+
* interval;
|
|
25196
|
+
* - `pipeline` — the chosen detector plus the operator's detail steps
|
|
25197
|
+
* (faces, plates, classifiers, CLIP…), on varied frames from the bench
|
|
25198
|
+
* clip: how many parallel sessions the node carries before latency, drops,
|
|
25199
|
+
* CPU, RAM or the event loop give out.
|
|
25200
|
+
*/
|
|
25201
|
+
/** Defaults and bounds, one place. */
|
|
25202
|
+
var NODE_BENCHMARK_DEFAULTS = {
|
|
25203
|
+
fpsPerStream: 10,
|
|
25204
|
+
budgetMinutes: 45,
|
|
25205
|
+
minBudgetMinutes: 10,
|
|
25206
|
+
maxBudgetMinutes: 120,
|
|
25207
|
+
/** A result older than this no longer beats the table. */
|
|
25208
|
+
staleAfterDays: 30,
|
|
25209
|
+
/** Warm-in per ramp step (not accounted). */
|
|
25210
|
+
settleSec: 5,
|
|
25211
|
+
/** Accounted window per ramp step. */
|
|
25212
|
+
measureSec: 20,
|
|
25213
|
+
/** Longest the drain may take before the run is refused. */
|
|
25214
|
+
drainTimeoutSec: 120,
|
|
25215
|
+
/** Candidate models per device in one run. */
|
|
25216
|
+
maxModelsPerDevice: 6
|
|
25217
|
+
};
|
|
25218
|
+
/** The two measurements a run can make. */
|
|
25219
|
+
var NodeBenchmarkPhaseSchema = _enum(["device", "pipeline"]);
|
|
25220
|
+
var NodeBenchmarkDevicePlanSchema = object({
|
|
25221
|
+
/** `<backend>:<device>` — `openvino:npu`, `coreml:all`, `cpu`. */
|
|
25222
|
+
deviceKey: string().min(1),
|
|
25223
|
+
/**
|
|
25224
|
+
* Root detector candidates for the `device` measurement, in the order
|
|
25225
|
+
* measured. The FIRST is the one the `pipeline` measurement runs.
|
|
25226
|
+
*/
|
|
25227
|
+
modelIds: array(string().min(1)).min(1).max(NODE_BENCHMARK_DEFAULTS.maxModelsPerDevice)
|
|
25228
|
+
});
|
|
25229
|
+
/** What the operator confirmed. */
|
|
25230
|
+
var NodeBenchmarkPlanSchema = object({
|
|
25231
|
+
nodeId: string().min(1),
|
|
25232
|
+
devices: array(NodeBenchmarkDevicePlanSchema).min(1),
|
|
25233
|
+
/** Which measurements run. At least one. */
|
|
25234
|
+
phases: array(NodeBenchmarkPhaseSchema).min(1).default(["device", "pipeline"]),
|
|
25235
|
+
/**
|
|
25236
|
+
* Detail steps (catalog step ids under the root: faces, plates,
|
|
25237
|
+
* classifiers, CLIP…) the `pipeline` measurement enables. The root
|
|
25238
|
+
* detector always runs.
|
|
25239
|
+
*/
|
|
25240
|
+
steps: array(string().min(1)).default([]),
|
|
25241
|
+
/** Offered rate of one stream / session. */
|
|
25242
|
+
fpsPerStream: number().int().min(1).max(30).default(NODE_BENCHMARK_DEFAULTS.fpsPerStream),
|
|
25243
|
+
/** Hard deadline: the mode ends and the cluster is restored when it passes. */
|
|
25244
|
+
budgetMinutes: number().int().min(NODE_BENCHMARK_DEFAULTS.minBudgetMinutes).max(NODE_BENCHMARK_DEFAULTS.maxBudgetMinutes).default(NODE_BENCHMARK_DEFAULTS.budgetMinutes),
|
|
25245
|
+
/** Keep the models the run downloaded (default: delete what was not installed before). */
|
|
25246
|
+
keepDownloadedModels: boolean().default(false),
|
|
25247
|
+
/** Start although the other nodes' capacity does not cover the sessions running now. */
|
|
25248
|
+
acceptInsufficientHeadroom: boolean().default(false)
|
|
25249
|
+
});
|
|
25250
|
+
var NodeBenchmarkRefusalSchema = object({
|
|
25251
|
+
kind: _enum([
|
|
25252
|
+
"benchmark-active",
|
|
25253
|
+
"node-offline",
|
|
25254
|
+
"unknown-device",
|
|
25255
|
+
"no-phase",
|
|
25256
|
+
"insufficient-headroom"
|
|
25257
|
+
]),
|
|
25258
|
+
detail: string(),
|
|
25259
|
+
overridable: boolean()
|
|
25260
|
+
});
|
|
25261
|
+
/** A camera whose detection leaves the node for the run. */
|
|
25262
|
+
var NodeBenchmarkMovingCameraSchema = object({
|
|
25263
|
+
deviceId: number(),
|
|
25264
|
+
/** Placed on the node now (a standing attach or a running session). */
|
|
25265
|
+
placedOnNode: boolean(),
|
|
25266
|
+
/** A node pin naming this node, ignored for the run. */
|
|
25267
|
+
pinnedToNode: boolean()
|
|
25268
|
+
});
|
|
25269
|
+
/** A camera that cannot leave: no other node can obtain its frames. */
|
|
25270
|
+
var NodeBenchmarkStayingCameraSchema = object({
|
|
25271
|
+
deviceId: number(),
|
|
25272
|
+
reason: literal("only-frame-source")
|
|
25273
|
+
});
|
|
25274
|
+
var NodeBenchmarkPreflightSchema = object({
|
|
25275
|
+
nodeId: string(),
|
|
25276
|
+
online: boolean(),
|
|
25277
|
+
moving: array(NodeBenchmarkMovingCameraSchema).readonly(),
|
|
25278
|
+
/** Keep running on the node during the run; the result is flagged contaminated. */
|
|
25279
|
+
staying: array(NodeBenchmarkStayingCameraSchema).readonly(),
|
|
25280
|
+
estimatedDurationMs: number(),
|
|
25281
|
+
/** The run ends and the cluster is restored at the latest after this long. */
|
|
25282
|
+
budgetMs: number(),
|
|
25283
|
+
phases: array(NodeBenchmarkPhaseSchema).readonly(),
|
|
25284
|
+
steps: array(string()).readonly(),
|
|
25285
|
+
devices: array(NodeBenchmarkDevicePlanSchema).readonly(),
|
|
25286
|
+
/** Parallel sessions the cluster runs now, and what the other nodes can carry. */
|
|
25287
|
+
headroom: object({
|
|
25288
|
+
sessionsNow: number(),
|
|
25289
|
+
otherNodesCapacitySessions: number().nullable()
|
|
25290
|
+
}),
|
|
25291
|
+
refusals: array(NodeBenchmarkRefusalSchema).readonly(),
|
|
25292
|
+
canStart: boolean()
|
|
25293
|
+
});
|
|
25294
|
+
/** Where the measuring runner is. */
|
|
25295
|
+
var NodeBenchProgressSchema = object({
|
|
25296
|
+
phase: _enum([
|
|
25297
|
+
"preparing",
|
|
25298
|
+
"device",
|
|
25299
|
+
"pipeline",
|
|
25300
|
+
"cleanup"
|
|
25301
|
+
]),
|
|
25302
|
+
deviceKey: string().nullable(),
|
|
25303
|
+
modelId: string().nullable(),
|
|
25304
|
+
/** Streams (device) or sessions (pipeline) of the step running now. */
|
|
25305
|
+
load: number().nullable(),
|
|
25306
|
+
cellsDone: number(),
|
|
25307
|
+
cellsTotal: number(),
|
|
25308
|
+
message: string()
|
|
25309
|
+
});
|
|
25310
|
+
/** What limited a ramp. `none` = the ramp ran out of steps still passing. */
|
|
25311
|
+
var NodeBenchLimitSchema = _enum([
|
|
25312
|
+
"p95",
|
|
25313
|
+
"drops",
|
|
25314
|
+
"errors",
|
|
25315
|
+
"stall",
|
|
25316
|
+
"cpu",
|
|
25317
|
+
"ram",
|
|
25318
|
+
"none"
|
|
25319
|
+
]);
|
|
25320
|
+
var NodeBenchRampStepSchema = object({
|
|
25321
|
+
load: number(),
|
|
25322
|
+
pass: boolean(),
|
|
25323
|
+
p95Ms: number(),
|
|
25324
|
+
dropRatio: number(),
|
|
25325
|
+
/** Completed frames per second over the accounted window. */
|
|
25326
|
+
fps: number(),
|
|
25327
|
+
cpuPct: number().nullable(),
|
|
25328
|
+
ramFreePct: number().nullable(),
|
|
25329
|
+
failReasons: array(string()).readonly()
|
|
25330
|
+
});
|
|
25331
|
+
var NodeBenchCellSchema = discriminatedUnion("phase", [object({
|
|
25332
|
+
phase: literal("device"),
|
|
25333
|
+
deviceKey: string(),
|
|
25334
|
+
modelId: string(),
|
|
25335
|
+
/** Single-stream latency (the K = 1 step). */
|
|
25336
|
+
p50Ms: number(),
|
|
25337
|
+
p95Ms: number(),
|
|
25338
|
+
p99Ms: number(),
|
|
25339
|
+
/** Frames per second sustained at the last passing step. */
|
|
25340
|
+
fps: number(),
|
|
25341
|
+
/** Streams at the camera rate the device carried inside the frame interval; 0 = not even one. */
|
|
25342
|
+
kMax: number(),
|
|
25343
|
+
limitedBy: NodeBenchLimitSchema,
|
|
25344
|
+
/** First call (model load + warm-up). */
|
|
25345
|
+
warmupMs: number(),
|
|
25346
|
+
ramp: array(NodeBenchRampStepSchema).readonly()
|
|
25347
|
+
}), object({
|
|
25348
|
+
phase: literal("pipeline"),
|
|
25349
|
+
deviceKey: string(),
|
|
25350
|
+
modelId: string(),
|
|
25351
|
+
steps: array(string()).readonly(),
|
|
25352
|
+
/** Parallel sessions at the camera rate the node carried; 0 = not even one. */
|
|
25353
|
+
maxSessions: number(),
|
|
25354
|
+
limitedBy: NodeBenchLimitSchema,
|
|
25355
|
+
/** Detail steps that produced at least one result on the clip — a step that never fired measured nothing. */
|
|
25356
|
+
stepsFired: array(string()).readonly(),
|
|
25357
|
+
warmupMs: number(),
|
|
25358
|
+
ramp: array(NodeBenchRampStepSchema).readonly()
|
|
25359
|
+
})]);
|
|
25360
|
+
/**
|
|
25361
|
+
* What a result was measured ON. A result whose fingerprint no longer matches
|
|
25362
|
+
* the node no longer beats the table.
|
|
25363
|
+
*/
|
|
25364
|
+
var NodeBenchFingerprintSchema = object({
|
|
25365
|
+
pipelineVersion: string().nullable(),
|
|
25366
|
+
cpuModel: string().nullable(),
|
|
25367
|
+
ramGb: number().nullable(),
|
|
25368
|
+
os: string().nullable(),
|
|
25369
|
+
/** Per device: the pool the cells ran on (runtime + tuning). */
|
|
25370
|
+
pools: record(string(), object({
|
|
25371
|
+
runtime: string(),
|
|
25372
|
+
numWorkers: number(),
|
|
25373
|
+
concurrency: number(),
|
|
25374
|
+
batchMode: string()
|
|
25375
|
+
})).default({})
|
|
25376
|
+
});
|
|
25377
|
+
/** The frames the run used. */
|
|
25378
|
+
var NodeBenchClipSchema = object({
|
|
25379
|
+
/** `camstack-bench-v1` or `reference-images` (the fallback when the clip is not reachable). */
|
|
25380
|
+
id: string(),
|
|
25381
|
+
revision: string().nullable(),
|
|
25382
|
+
frames: number(),
|
|
25383
|
+
width: number(),
|
|
25384
|
+
height: number()
|
|
25385
|
+
});
|
|
25386
|
+
var NodeBenchRunnerInputSchema = object({
|
|
25387
|
+
runId: string().min(1),
|
|
25388
|
+
devices: array(NodeBenchmarkDevicePlanSchema).min(1),
|
|
25389
|
+
phases: array(NodeBenchmarkPhaseSchema).min(1),
|
|
25390
|
+
/** The full detail step tree root for the `pipeline` measurement is built on the node from these ids. */
|
|
25391
|
+
steps: array(string()).default([]),
|
|
25392
|
+
fpsPerStream: number().int().min(1).max(30),
|
|
25393
|
+
/** The runner stops on its own past this instant, whatever the hub does. */
|
|
25394
|
+
deadlineAtMs: number(),
|
|
25395
|
+
settleSec: number().min(0).max(60).default(NODE_BENCHMARK_DEFAULTS.settleSec),
|
|
25396
|
+
measureSec: number().min(2).max(300).default(NODE_BENCHMARK_DEFAULTS.measureSec),
|
|
25397
|
+
keepDownloadedModels: boolean().default(false)
|
|
25398
|
+
});
|
|
25399
|
+
var NodeBenchRunnerStateSchema = _enum([
|
|
25400
|
+
"running",
|
|
25401
|
+
"done",
|
|
25402
|
+
"failed",
|
|
25403
|
+
"aborted"
|
|
25404
|
+
]);
|
|
25405
|
+
var NodeBenchRunnerStatusSchema = object({
|
|
25406
|
+
runId: string(),
|
|
25407
|
+
nodeId: string(),
|
|
25408
|
+
state: NodeBenchRunnerStateSchema,
|
|
25409
|
+
progress: NodeBenchProgressSchema.nullable(),
|
|
25410
|
+
/** Every finished cell so far — a run stopped half way keeps what it measured. */
|
|
25411
|
+
cells: array(NodeBenchCellSchema).readonly(),
|
|
25412
|
+
fingerprint: NodeBenchFingerprintSchema.nullable(),
|
|
25413
|
+
clip: NodeBenchClipSchema.nullable(),
|
|
25414
|
+
/** Cameras seen running on the node during the run (they share its pools). */
|
|
25415
|
+
activeCameraIds: array(number()).readonly(),
|
|
25416
|
+
/** Models the run downloaded and then deleted (not installed before). */
|
|
25417
|
+
deletedModels: array(string()).readonly(),
|
|
25418
|
+
error: string().nullable(),
|
|
25419
|
+
startedAtMs: number(),
|
|
25420
|
+
finishedAtMs: number().nullable()
|
|
25421
|
+
});
|
|
25422
|
+
var NodeBenchmarkStateSchema = _enum([
|
|
25423
|
+
"draining",
|
|
25424
|
+
"measuring",
|
|
25425
|
+
"restoring",
|
|
25426
|
+
"done",
|
|
25427
|
+
"failed",
|
|
25428
|
+
"aborted"
|
|
25429
|
+
]);
|
|
25430
|
+
/** Why a run ended. */
|
|
25431
|
+
var NodeBenchmarkEndReasonSchema = _enum([
|
|
25432
|
+
"completed",
|
|
25433
|
+
"operator-abort",
|
|
25434
|
+
"deadline",
|
|
25435
|
+
"node-lost",
|
|
25436
|
+
"runner-lost",
|
|
25437
|
+
"hub-restart",
|
|
25438
|
+
"drain-timeout",
|
|
25439
|
+
"failed"
|
|
25440
|
+
]);
|
|
25441
|
+
var NodeBenchmarkRunSchema = object({
|
|
25442
|
+
runId: string(),
|
|
25443
|
+
nodeId: string(),
|
|
25444
|
+
state: NodeBenchmarkStateSchema,
|
|
25445
|
+
plan: NodeBenchmarkPlanSchema,
|
|
25446
|
+
startedAtMs: number(),
|
|
25447
|
+
deadlineAtMs: number(),
|
|
25448
|
+
finishedAtMs: number().nullable(),
|
|
25449
|
+
endReason: NodeBenchmarkEndReasonSchema.nullable(),
|
|
25450
|
+
error: string().nullable(),
|
|
25451
|
+
/** Cameras moved off the node for the run. */
|
|
25452
|
+
moved: array(number()).readonly(),
|
|
25453
|
+
/** Cameras that stayed (their only frame source is the node). */
|
|
25454
|
+
staying: array(number()).readonly(),
|
|
25455
|
+
/** Something else ran on the node's pools during the run. */
|
|
25456
|
+
contaminated: boolean(),
|
|
25457
|
+
progress: NodeBenchProgressSchema.nullable(),
|
|
25458
|
+
resultIds: array(string()).readonly()
|
|
25459
|
+
});
|
|
25460
|
+
/** `getNodeBenchmarkStatus`: the active run (or the last one), and whether benchmark mode is on. */
|
|
25461
|
+
var NodeBenchmarkStatusSchema = object({
|
|
25462
|
+
/** The node the cluster is in benchmark mode for; null = none. */
|
|
25463
|
+
modeNodeId: string().nullable(),
|
|
25464
|
+
run: NodeBenchmarkRunSchema.nullable()
|
|
25465
|
+
});
|
|
25466
|
+
/**
|
|
25467
|
+
* One stored measurement — the only authority Auto tune and the automatic
|
|
25468
|
+
* shares read measured capacity from. Written by the orchestrator when a run
|
|
25469
|
+
* ends, never by anyone else.
|
|
25470
|
+
*/
|
|
25471
|
+
var NodeBenchmarkResultSchema = object({
|
|
25472
|
+
id: string(),
|
|
25473
|
+
runId: string(),
|
|
25474
|
+
nodeId: string(),
|
|
25475
|
+
cell: NodeBenchCellSchema,
|
|
25476
|
+
fpsPerStream: number(),
|
|
25477
|
+
fingerprint: NodeBenchFingerprintSchema.nullable(),
|
|
25478
|
+
clip: NodeBenchClipSchema.nullable(),
|
|
25479
|
+
/** Other work shared the node's pools (a camera that could not move, or the hub's own duties). */
|
|
25480
|
+
contaminated: boolean(),
|
|
25481
|
+
stayingCameras: array(number()).readonly(),
|
|
25482
|
+
/** The run ended early; the cell itself completed. */
|
|
25483
|
+
partialRun: boolean(),
|
|
25484
|
+
measuredAtMs: number()
|
|
25485
|
+
});
|
|
25486
|
+
var ListNodeBenchmarkResultsInputSchema = object({
|
|
25487
|
+
nodeId: string().optional(),
|
|
25488
|
+
deviceKey: string().optional()
|
|
25489
|
+
});
|
|
25490
|
+
/** A result with its standing today: does it still beat the table? */
|
|
25491
|
+
var NodeBenchmarkResultViewSchema = NodeBenchmarkResultSchema.extend({
|
|
25492
|
+
/** `fresh` beats the table; `stale` falls back to it; `superseded` = a newer row covers the same cell. */
|
|
25493
|
+
standing: _enum([
|
|
25494
|
+
"fresh",
|
|
25495
|
+
"stale",
|
|
25496
|
+
"superseded"
|
|
25497
|
+
]),
|
|
25498
|
+
staleWhy: _enum([
|
|
25499
|
+
"age",
|
|
25500
|
+
"runtime",
|
|
25501
|
+
"pool-tuning"
|
|
25502
|
+
]).nullable()
|
|
25503
|
+
});
|
|
25504
|
+
object({
|
|
25505
|
+
runId: string(),
|
|
25506
|
+
nodeId: string(),
|
|
25507
|
+
startedAtMs: number(),
|
|
25508
|
+
deadlineAtMs: number(),
|
|
25509
|
+
plan: NodeBenchmarkPlanSchema,
|
|
25510
|
+
moved: array(number()).readonly(),
|
|
25511
|
+
staying: array(number()).readonly()
|
|
25512
|
+
});
|
|
25513
|
+
/** Candidate detectors per device, for the plan editor. */
|
|
25514
|
+
var NodeBenchmarkCandidatesSchema = object({
|
|
25515
|
+
nodeId: string(),
|
|
25516
|
+
reachable: boolean(),
|
|
25517
|
+
devices: array(object({
|
|
25518
|
+
deviceKey: string(),
|
|
25519
|
+
enabled: boolean(),
|
|
25520
|
+
available: boolean(),
|
|
25521
|
+
/** Ordered: what Auto tune would pick first, then the rest of the family by accuracy. */
|
|
25522
|
+
suggested: array(string()).readonly(),
|
|
25523
|
+
/** Every root detector the device has a build for. */
|
|
25524
|
+
all: array(string()).readonly(),
|
|
25525
|
+
/** The model the device runs now, when pinned. */
|
|
25526
|
+
currentModelId: string().nullable()
|
|
25527
|
+
})).readonly(),
|
|
25528
|
+
/** Detail steps the node's catalog offers under the root (for the `pipeline` measurement). */
|
|
25529
|
+
steps: array(object({
|
|
25530
|
+
id: string(),
|
|
25531
|
+
name: string(),
|
|
25532
|
+
slot: string()
|
|
25533
|
+
})).readonly()
|
|
25534
|
+
});
|
|
24053
25535
|
object({
|
|
24054
25536
|
activeCameras: number(),
|
|
24055
25537
|
throttledCameras: number(),
|
|
@@ -25138,7 +26620,16 @@ method(RunnerCameraConfigSchema, object({ success: literal(true) }), { kind: "mu
|
|
|
25138
26620
|
}), ParkedTrackFrameSchema.nullable()), method(object({
|
|
25139
26621
|
deviceId: number(),
|
|
25140
26622
|
trackId: string()
|
|
25141
|
-
}), object({ released: number().int().nonnegative() }), { kind: "mutation" })
|
|
26623
|
+
}), object({ released: number().int().nonnegative() }), { kind: "mutation" }), method(NodeBenchRunnerInputSchema, object({
|
|
26624
|
+
accepted: literal(true),
|
|
26625
|
+
runId: string()
|
|
26626
|
+
}), {
|
|
26627
|
+
kind: "mutation",
|
|
26628
|
+
auth: "admin"
|
|
26629
|
+
}), method(object({ runId: string() }), NodeBenchRunnerStatusSchema.nullable(), { auth: "admin" }), method(object({ runId: string() }), object({ aborted: boolean() }), {
|
|
26630
|
+
kind: "mutation",
|
|
26631
|
+
auth: "admin"
|
|
26632
|
+
});
|
|
25142
26633
|
var CameraPipelineConfigSchema = object({
|
|
25143
26634
|
engine: PipelineEngineChoiceSchema.optional(),
|
|
25144
26635
|
steps: array(PipelineStepInputSchema).readonly(),
|
|
@@ -25777,6 +27268,21 @@ method(object({
|
|
|
25777
27268
|
}), method(PlacementStatsInputSchema, PlacementStatsSchema, { auth: "admin" }), method(SuggestSharesInputSchema, SuggestSharesResultSchema, { auth: "admin" }), method(_void(), EffectiveSharesSchema, { auth: "admin" }), method(SetShareSourceInputSchema, object({ success: literal(true) }), {
|
|
25778
27269
|
kind: "mutation",
|
|
25779
27270
|
auth: "admin"
|
|
27271
|
+
}), method(NodeBenchmarkPlanSchema, NodeBenchmarkPreflightSchema, { auth: "admin" }), method(NodeBenchmarkPlanSchema, discriminatedUnion("kind", [object({
|
|
27272
|
+
kind: literal("started"),
|
|
27273
|
+
runId: string()
|
|
27274
|
+
}), object({
|
|
27275
|
+
kind: literal("refused"),
|
|
27276
|
+
preflight: NodeBenchmarkPreflightSchema
|
|
27277
|
+
})]), {
|
|
27278
|
+
kind: "mutation",
|
|
27279
|
+
auth: "admin"
|
|
27280
|
+
}), method(_void(), NodeBenchmarkStatusSchema, { auth: "admin" }), method(object({ runId: string() }), object({ aborted: boolean() }), {
|
|
27281
|
+
kind: "mutation",
|
|
27282
|
+
auth: "admin"
|
|
27283
|
+
}), method(object({ nodeId: string() }), NodeBenchmarkCandidatesSchema, { auth: "admin" }), method(ListNodeBenchmarkResultsInputSchema, array(NodeBenchmarkResultViewSchema).readonly(), { auth: "admin" }), method(object({ id: string() }), object({ deleted: boolean() }), {
|
|
27284
|
+
kind: "mutation",
|
|
27285
|
+
auth: "admin"
|
|
25780
27286
|
}), method(object({ deviceId: number() }), CameraPipelineSettingsSchema.nullable()), method(object({
|
|
25781
27287
|
deviceId: number(),
|
|
25782
27288
|
addonId: string(),
|
|
@@ -30893,6 +32399,9 @@ var CreateIntegrationInputSchema = object({
|
|
|
30893
32399
|
enabled: boolean().optional(),
|
|
30894
32400
|
info: record(string(), unknown()).optional(),
|
|
30895
32401
|
settings: record(string(), unknown()).optional(),
|
|
32402
|
+
/** Keys of `settings` the form's schema declares secret (by type) — kept in
|
|
32403
|
+
* the keychain, not the table (D787). */
|
|
32404
|
+
secretKeys: array(string()).optional(),
|
|
30896
32405
|
skipRestart: boolean().optional()
|
|
30897
32406
|
});
|
|
30898
32407
|
var UpdateIntegrationInputSchema = object({
|
|
@@ -30916,7 +32425,9 @@ method(_void(), array(IntegrationWithStateSchema)), method(object({ id: string()
|
|
|
30916
32425
|
auth: "admin"
|
|
30917
32426
|
}), method(object({ id: string() }), record(string(), unknown()), { auth: "admin" }), method(object({
|
|
30918
32427
|
id: string(),
|
|
30919
|
-
settings: record(string(), unknown())
|
|
32428
|
+
settings: record(string(), unknown()),
|
|
32429
|
+
/** Keys the form's schema declares secret (by type) — keychain-stored (D787). */
|
|
32430
|
+
secretKeys: array(string()).optional()
|
|
30920
32431
|
}), object({ success: boolean() }), {
|
|
30921
32432
|
kind: "mutation",
|
|
30922
32433
|
auth: "admin"
|
|
@@ -39621,6 +41132,90 @@ Object.freeze({
|
|
|
39621
41132
|
addonId: null,
|
|
39622
41133
|
access: "create"
|
|
39623
41134
|
},
|
|
41135
|
+
"keychain.delete": {
|
|
41136
|
+
capName: "keychain",
|
|
41137
|
+
capScope: "system",
|
|
41138
|
+
addonId: null,
|
|
41139
|
+
access: "delete"
|
|
41140
|
+
},
|
|
41141
|
+
"keychain.getState": {
|
|
41142
|
+
capName: "keychain",
|
|
41143
|
+
capScope: "system",
|
|
41144
|
+
addonId: null,
|
|
41145
|
+
access: "view"
|
|
41146
|
+
},
|
|
41147
|
+
"keychain.listMeta": {
|
|
41148
|
+
capName: "keychain",
|
|
41149
|
+
capScope: "system",
|
|
41150
|
+
addonId: null,
|
|
41151
|
+
access: "view"
|
|
41152
|
+
},
|
|
41153
|
+
"keychain.put": {
|
|
41154
|
+
capName: "keychain",
|
|
41155
|
+
capScope: "system",
|
|
41156
|
+
addonId: null,
|
|
41157
|
+
access: "create"
|
|
41158
|
+
},
|
|
41159
|
+
"keychain.resolve": {
|
|
41160
|
+
capName: "keychain",
|
|
41161
|
+
capScope: "system",
|
|
41162
|
+
addonId: null,
|
|
41163
|
+
access: "view"
|
|
41164
|
+
},
|
|
41165
|
+
"keychainAdmin.deleteOrphans": {
|
|
41166
|
+
capName: "keychain-admin",
|
|
41167
|
+
capScope: "system",
|
|
41168
|
+
addonId: null,
|
|
41169
|
+
access: "delete"
|
|
41170
|
+
},
|
|
41171
|
+
"keychainAdmin.downloadRecoveryKey": {
|
|
41172
|
+
capName: "keychain-admin",
|
|
41173
|
+
capScope: "system",
|
|
41174
|
+
addonId: null,
|
|
41175
|
+
access: "create"
|
|
41176
|
+
},
|
|
41177
|
+
"keychainAdmin.listAudit": {
|
|
41178
|
+
capName: "keychain-admin",
|
|
41179
|
+
capScope: "system",
|
|
41180
|
+
addonId: null,
|
|
41181
|
+
access: "view"
|
|
41182
|
+
},
|
|
41183
|
+
"keychainAdmin.listSecrets": {
|
|
41184
|
+
capName: "keychain-admin",
|
|
41185
|
+
capScope: "system",
|
|
41186
|
+
addonId: null,
|
|
41187
|
+
access: "view"
|
|
41188
|
+
},
|
|
41189
|
+
"keychainAdmin.purgeRetiredKeys": {
|
|
41190
|
+
capName: "keychain-admin",
|
|
41191
|
+
capScope: "system",
|
|
41192
|
+
addonId: null,
|
|
41193
|
+
access: "delete"
|
|
41194
|
+
},
|
|
41195
|
+
"keychainAdmin.resetKeychain": {
|
|
41196
|
+
capName: "keychain-admin",
|
|
41197
|
+
capScope: "system",
|
|
41198
|
+
addonId: null,
|
|
41199
|
+
access: "delete"
|
|
41200
|
+
},
|
|
41201
|
+
"keychainAdmin.reveal": {
|
|
41202
|
+
capName: "keychain-admin",
|
|
41203
|
+
capScope: "system",
|
|
41204
|
+
addonId: null,
|
|
41205
|
+
access: "create"
|
|
41206
|
+
},
|
|
41207
|
+
"keychainAdmin.rotateMasterKey": {
|
|
41208
|
+
capName: "keychain-admin",
|
|
41209
|
+
capScope: "system",
|
|
41210
|
+
addonId: null,
|
|
41211
|
+
access: "create"
|
|
41212
|
+
},
|
|
41213
|
+
"keychainAdmin.status": {
|
|
41214
|
+
capName: "keychain-admin",
|
|
41215
|
+
capScope: "system",
|
|
41216
|
+
addonId: null,
|
|
41217
|
+
access: "view"
|
|
41218
|
+
},
|
|
39624
41219
|
"lawnMowerControl.dock": {
|
|
39625
41220
|
capName: "lawn-mower-control",
|
|
39626
41221
|
capScope: "device",
|
|
@@ -40995,6 +42590,18 @@ Object.freeze({
|
|
|
40995
42590
|
addonId: null,
|
|
40996
42591
|
access: "create"
|
|
40997
42592
|
},
|
|
42593
|
+
"pipelineAnalytics.addRetrainFrameFromRecording": {
|
|
42594
|
+
capName: "pipeline-analytics",
|
|
42595
|
+
capScope: "device",
|
|
42596
|
+
addonId: null,
|
|
42597
|
+
access: "create"
|
|
42598
|
+
},
|
|
42599
|
+
"pipelineAnalytics.addRetrainFramesToCollection": {
|
|
42600
|
+
capName: "pipeline-analytics",
|
|
42601
|
+
capScope: "device",
|
|
42602
|
+
addonId: null,
|
|
42603
|
+
access: "create"
|
|
42604
|
+
},
|
|
40998
42605
|
"pipelineAnalytics.applyDeviceSettingsPatch": {
|
|
40999
42606
|
capName: "pipeline-analytics",
|
|
41000
42607
|
capScope: "device",
|
|
@@ -41043,12 +42650,24 @@ Object.freeze({
|
|
|
41043
42650
|
addonId: null,
|
|
41044
42651
|
access: "view"
|
|
41045
42652
|
},
|
|
42653
|
+
"pipelineAnalytics.createRetrainCollection": {
|
|
42654
|
+
capName: "pipeline-analytics",
|
|
42655
|
+
capScope: "device",
|
|
42656
|
+
addonId: null,
|
|
42657
|
+
access: "create"
|
|
42658
|
+
},
|
|
41046
42659
|
"pipelineAnalytics.deleteDeviceEvents": {
|
|
41047
42660
|
capName: "pipeline-analytics",
|
|
41048
42661
|
capScope: "device",
|
|
41049
42662
|
addonId: null,
|
|
41050
42663
|
access: "delete"
|
|
41051
42664
|
},
|
|
42665
|
+
"pipelineAnalytics.deleteRetrainCollection": {
|
|
42666
|
+
capName: "pipeline-analytics",
|
|
42667
|
+
capScope: "device",
|
|
42668
|
+
addonId: null,
|
|
42669
|
+
access: "delete"
|
|
42670
|
+
},
|
|
41052
42671
|
"pipelineAnalytics.deleteTracks": {
|
|
41053
42672
|
capName: "pipeline-analytics",
|
|
41054
42673
|
capScope: "device",
|
|
@@ -41253,6 +42872,24 @@ Object.freeze({
|
|
|
41253
42872
|
addonId: null,
|
|
41254
42873
|
access: "view"
|
|
41255
42874
|
},
|
|
42875
|
+
"pipelineAnalytics.listRetrainAssistProfiles": {
|
|
42876
|
+
capName: "pipeline-analytics",
|
|
42877
|
+
capScope: "device",
|
|
42878
|
+
addonId: null,
|
|
42879
|
+
access: "view"
|
|
42880
|
+
},
|
|
42881
|
+
"pipelineAnalytics.listRetrainCollectionFrames": {
|
|
42882
|
+
capName: "pipeline-analytics",
|
|
42883
|
+
capScope: "device",
|
|
42884
|
+
addonId: null,
|
|
42885
|
+
access: "view"
|
|
42886
|
+
},
|
|
42887
|
+
"pipelineAnalytics.listRetrainCollections": {
|
|
42888
|
+
capName: "pipeline-analytics",
|
|
42889
|
+
capScope: "device",
|
|
42890
|
+
addonId: null,
|
|
42891
|
+
access: "view"
|
|
42892
|
+
},
|
|
41256
42893
|
"pipelineAnalytics.listRetrainFrames": {
|
|
41257
42894
|
capName: "pipeline-analytics",
|
|
41258
42895
|
capScope: "device",
|
|
@@ -41301,6 +42938,12 @@ Object.freeze({
|
|
|
41301
42938
|
addonId: null,
|
|
41302
42939
|
access: "create"
|
|
41303
42940
|
},
|
|
42941
|
+
"pipelineAnalytics.proposeRetrainAnnotationsWithLlm": {
|
|
42942
|
+
capName: "pipeline-analytics",
|
|
42943
|
+
capScope: "device",
|
|
42944
|
+
addonId: null,
|
|
42945
|
+
access: "create"
|
|
42946
|
+
},
|
|
41304
42947
|
"pipelineAnalytics.pruneEvents": {
|
|
41305
42948
|
capName: "pipeline-analytics",
|
|
41306
42949
|
capScope: "device",
|
|
@@ -41355,6 +42998,18 @@ Object.freeze({
|
|
|
41355
42998
|
addonId: null,
|
|
41356
42999
|
access: "create"
|
|
41357
43000
|
},
|
|
43001
|
+
"pipelineAnalytics.removeRetrainFrameFromCollection": {
|
|
43002
|
+
capName: "pipeline-analytics",
|
|
43003
|
+
capScope: "device",
|
|
43004
|
+
addonId: null,
|
|
43005
|
+
access: "delete"
|
|
43006
|
+
},
|
|
43007
|
+
"pipelineAnalytics.renameRetrainCollection": {
|
|
43008
|
+
capName: "pipeline-analytics",
|
|
43009
|
+
capScope: "device",
|
|
43010
|
+
addonId: null,
|
|
43011
|
+
access: "create"
|
|
43012
|
+
},
|
|
41358
43013
|
"pipelineAnalytics.restageRetrainTrack": {
|
|
41359
43014
|
capName: "pipeline-analytics",
|
|
41360
43015
|
capScope: "device",
|
|
@@ -41643,6 +43298,12 @@ Object.freeze({
|
|
|
41643
43298
|
addonId: null,
|
|
41644
43299
|
access: "view"
|
|
41645
43300
|
},
|
|
43301
|
+
"pipelineOrchestrator.abortNodeBenchmark": {
|
|
43302
|
+
capName: "pipeline-orchestrator",
|
|
43303
|
+
capScope: "system",
|
|
43304
|
+
addonId: null,
|
|
43305
|
+
access: "create"
|
|
43306
|
+
},
|
|
41646
43307
|
"pipelineOrchestrator.applyAutoTune": {
|
|
41647
43308
|
capName: "pipeline-orchestrator",
|
|
41648
43309
|
capScope: "system",
|
|
@@ -41667,6 +43328,12 @@ Object.freeze({
|
|
|
41667
43328
|
addonId: null,
|
|
41668
43329
|
access: "create"
|
|
41669
43330
|
},
|
|
43331
|
+
"pipelineOrchestrator.deleteNodeBenchmarkResult": {
|
|
43332
|
+
capName: "pipeline-orchestrator",
|
|
43333
|
+
capScope: "system",
|
|
43334
|
+
addonId: null,
|
|
43335
|
+
access: "delete"
|
|
43336
|
+
},
|
|
41670
43337
|
"pipelineOrchestrator.getAgentLoad": {
|
|
41671
43338
|
capName: "pipeline-orchestrator",
|
|
41672
43339
|
capScope: "system",
|
|
@@ -41775,6 +43442,24 @@ Object.freeze({
|
|
|
41775
43442
|
addonId: null,
|
|
41776
43443
|
access: "view"
|
|
41777
43444
|
},
|
|
43445
|
+
"pipelineOrchestrator.getNodeBenchmarkCandidates": {
|
|
43446
|
+
capName: "pipeline-orchestrator",
|
|
43447
|
+
capScope: "system",
|
|
43448
|
+
addonId: null,
|
|
43449
|
+
access: "view"
|
|
43450
|
+
},
|
|
43451
|
+
"pipelineOrchestrator.getNodeBenchmarkPreflight": {
|
|
43452
|
+
capName: "pipeline-orchestrator",
|
|
43453
|
+
capScope: "system",
|
|
43454
|
+
addonId: null,
|
|
43455
|
+
access: "view"
|
|
43456
|
+
},
|
|
43457
|
+
"pipelineOrchestrator.getNodeBenchmarkStatus": {
|
|
43458
|
+
capName: "pipeline-orchestrator",
|
|
43459
|
+
capScope: "system",
|
|
43460
|
+
addonId: null,
|
|
43461
|
+
access: "view"
|
|
43462
|
+
},
|
|
41778
43463
|
"pipelineOrchestrator.getNodeInferenceDevices": {
|
|
41779
43464
|
capName: "pipeline-orchestrator",
|
|
41780
43465
|
capScope: "system",
|
|
@@ -41817,6 +43502,12 @@ Object.freeze({
|
|
|
41817
43502
|
addonId: null,
|
|
41818
43503
|
access: "view"
|
|
41819
43504
|
},
|
|
43505
|
+
"pipelineOrchestrator.listNodeBenchmarkResults": {
|
|
43506
|
+
capName: "pipeline-orchestrator",
|
|
43507
|
+
capScope: "system",
|
|
43508
|
+
addonId: null,
|
|
43509
|
+
access: "view"
|
|
43510
|
+
},
|
|
41820
43511
|
"pipelineOrchestrator.pauseForStorageMigration": {
|
|
41821
43512
|
capName: "pipeline-orchestrator",
|
|
41822
43513
|
capScope: "system",
|
|
@@ -41961,6 +43652,12 @@ Object.freeze({
|
|
|
41961
43652
|
addonId: null,
|
|
41962
43653
|
access: "create"
|
|
41963
43654
|
},
|
|
43655
|
+
"pipelineOrchestrator.startNodeBenchmark": {
|
|
43656
|
+
capName: "pipeline-orchestrator",
|
|
43657
|
+
capScope: "system",
|
|
43658
|
+
addonId: null,
|
|
43659
|
+
access: "create"
|
|
43660
|
+
},
|
|
41964
43661
|
"pipelineOrchestrator.suggestShares": {
|
|
41965
43662
|
capName: "pipeline-orchestrator",
|
|
41966
43663
|
capScope: "system",
|
|
@@ -41979,6 +43676,12 @@ Object.freeze({
|
|
|
41979
43676
|
addonId: null,
|
|
41980
43677
|
access: "create"
|
|
41981
43678
|
},
|
|
43679
|
+
"pipelineRunner.abortNodeBench": {
|
|
43680
|
+
capName: "pipeline-runner",
|
|
43681
|
+
capScope: "system",
|
|
43682
|
+
addonId: null,
|
|
43683
|
+
access: "create"
|
|
43684
|
+
},
|
|
41982
43685
|
"pipelineRunner.attachCamera": {
|
|
41983
43686
|
capName: "pipeline-runner",
|
|
41984
43687
|
capScope: "system",
|
|
@@ -42027,6 +43730,12 @@ Object.freeze({
|
|
|
42027
43730
|
addonId: null,
|
|
42028
43731
|
access: "view"
|
|
42029
43732
|
},
|
|
43733
|
+
"pipelineRunner.getNodeBenchStatus": {
|
|
43734
|
+
capName: "pipeline-runner",
|
|
43735
|
+
capScope: "system",
|
|
43736
|
+
addonId: null,
|
|
43737
|
+
access: "view"
|
|
43738
|
+
},
|
|
42030
43739
|
"pipelineRunner.getParkedTrackFrame": {
|
|
42031
43740
|
capName: "pipeline-runner",
|
|
42032
43741
|
capScope: "system",
|
|
@@ -42069,6 +43778,12 @@ Object.freeze({
|
|
|
42069
43778
|
addonId: null,
|
|
42070
43779
|
access: "create"
|
|
42071
43780
|
},
|
|
43781
|
+
"pipelineRunner.startNodeBench": {
|
|
43782
|
+
capName: "pipeline-runner",
|
|
43783
|
+
capScope: "system",
|
|
43784
|
+
addonId: null,
|
|
43785
|
+
access: "create"
|
|
43786
|
+
},
|
|
42072
43787
|
"plateGallery.assignPlate": {
|
|
42073
43788
|
capName: "plate-gallery",
|
|
42074
43789
|
capScope: "system",
|
|
@@ -47002,6 +48717,11 @@ Object.freeze({
|
|
|
47002
48717
|
form: "single",
|
|
47003
48718
|
optional: false
|
|
47004
48719
|
}],
|
|
48720
|
+
"pipelineAnalytics.addRetrainFrameFromRecording": [{
|
|
48721
|
+
name: "deviceId",
|
|
48722
|
+
form: "single",
|
|
48723
|
+
optional: false
|
|
48724
|
+
}],
|
|
47005
48725
|
"pipelineAnalytics.applyDeviceSettingsPatch": [{
|
|
47006
48726
|
name: "deviceId",
|
|
47007
48727
|
form: "single",
|
|
@@ -47192,6 +48912,11 @@ Object.freeze({
|
|
|
47192
48912
|
form: "single",
|
|
47193
48913
|
optional: false
|
|
47194
48914
|
}],
|
|
48915
|
+
"pipelineAnalytics.proposeRetrainAnnotationsWithLlm": [{
|
|
48916
|
+
name: "deviceId",
|
|
48917
|
+
form: "single",
|
|
48918
|
+
optional: false
|
|
48919
|
+
}],
|
|
47195
48920
|
"pipelineAnalytics.pruneEventsBefore": [{
|
|
47196
48921
|
name: "deviceId",
|
|
47197
48922
|
form: "single",
|
|
@@ -49298,16 +51023,6 @@ DEFAULT_NATIVE_LEASE_SETTINGS.admission;
|
|
|
49298
51023
|
var MB = 1024 * 1024;
|
|
49299
51024
|
1024 * MB, 3072 * MB;
|
|
49300
51025
|
//#endregion
|
|
49301
|
-
//#region src/hub-browser-origin.ts
|
|
49302
|
-
async function hubBrowserOrigin(localNetwork, logger) {
|
|
49303
|
-
try {
|
|
49304
|
-
return (await localNetwork.getAddresses.query()).roles.publicEndpoint.resolved;
|
|
49305
|
-
} catch (err) {
|
|
49306
|
-
logger.warn("hub address unavailable from local-network — using the localhost default", { meta: { error: err instanceof Error ? err.message : String(err) } });
|
|
49307
|
-
return null;
|
|
49308
|
-
}
|
|
49309
|
-
}
|
|
49310
|
-
//#endregion
|
|
49311
51026
|
Object.defineProperty(exports, "BaseAddon", {
|
|
49312
51027
|
enumerable: true,
|
|
49313
51028
|
get: function() {
|
|
@@ -49356,12 +51071,6 @@ Object.defineProperty(exports, "errMsg", {
|
|
|
49356
51071
|
return errMsg;
|
|
49357
51072
|
}
|
|
49358
51073
|
});
|
|
49359
|
-
Object.defineProperty(exports, "hubBrowserOrigin", {
|
|
49360
|
-
enumerable: true,
|
|
49361
|
-
get: function() {
|
|
49362
|
-
return hubBrowserOrigin;
|
|
49363
|
-
}
|
|
49364
|
-
});
|
|
49365
51074
|
Object.defineProperty(exports, "isDisplayIconKey", {
|
|
49366
51075
|
enumerable: true,
|
|
49367
51076
|
get: function() {
|