@camstack/system 1.2.438 → 1.2.440

package/dist/builtins/core-blocks/core-blocks.addon.mjs

@@ -1,5 +1,7 @@
-import { A as DeclaredDevices, Cn as normalizeCoreBlockWrite, Ct as coreBlockIdFromAddonId, Dr as errMsg, Ln as resolveCoreBlockEntry, Nt as describeComposableCaps, Or as BaseAddon, Pn as replacedFieldKeys, Rn as resolveCoreBlockFiles, St as coreBlockComposition, Tt as coreBlocksCapability, Zr as hydrateSchema, br as compositionSourceKey, bt as compositionSourceRefs, h as CORE_BLOCK_ADDON_PREFIX, hr as composedDeviceRef, kn as planComposition, m as CORE_BLOCKS_ADDON_ID, or as validateComposition, p as COMPOSER_RUNNER_ID, r as ALL_CAPABILITY_DEFINITIONS, ut as buildCapabilityLookup, v as CoreBlockSchema, wt as coreBlockSourceKind, xt as coreBlockAddonId } from "../../dist-Dc8GKC5H.mjs";
-import { t as describeCompositionSources } from "../../composition-sources-DpHGCjdL.mjs";
+import { A as DeclaredDevices, Ar as errMsg, Bn as resolveCoreBlockFiles, Cr as compositionSourceKey, Ct as coreBlockAddonId, Dt as coreBlocksCapability, Et as coreBlockSourceKind, Ft as describeComposableCaps, In as replacedFieldKeys, St as compositionSourceRefs, Tn as normalizeCoreBlockWrite, Tt as coreBlockIdFromAddonId, ei as hydrateSchema, ft as buildCapabilityLookup, h as CORE_BLOCK_ADDON_PREFIX, jn as planComposition, jr as BaseAddon, lr as validateComposition, m as CORE_BLOCKS_ADDON_ID, p as COMPOSER_RUNNER_ID, r as ALL_CAPABILITY_DEFINITIONS, v as CoreBlockSchema, vr as composedDeviceRef, wt as coreBlockComposition, zn as resolveCoreBlockEntry } from "../../dist-9fcsrFU3.mjs";
+import { t as describeCompositionSources } from "../../composition-sources-CS0D7imL.mjs";
+import { t as prefixRange } from "../../prefix-range-Dl0znowN.mjs";
+import { n as unwrapStoredValue, t as loadPrefixed } from "../../prefix-walk-DAOBSyH1.mjs";
 import { createRequire } from "node:module";
 import { randomUUID } from "node:crypto";
 import { customizationBlockName } from "@camstack/types/node";
@@ -485,6 +487,72 @@ var BlockSupervisor = class {
 	}
 };
 //#endregion
+//#region src/kernel/addon-settings-store.ts
+/** The collection every addon's settings share. Named nowhere else (with sections' own module). */
+var ADDON_SETTINGS_COLLECTION = "addon-settings";
+function createAddonSettingsStore(door, addonId) {
+	const prefix = `${addonId}.`;
+	const message = (err) => err instanceof Error ? err.message : String(err);
+	return {
+		async read() {
+			try {
+				const value = await loadPrefixed(door, ADDON_SETTINGS_COLLECTION, prefix);
+				return Object.keys(value).length === 0 ? { kind: "absent" } : {
+					kind: "present",
+					value
+				};
+			} catch (err) {
+				return {
+					kind: "unreadable",
+					error: message(err)
+				};
+			}
+		},
+		async readKey(key) {
+			try {
+				const row = await door.get({
+					collection: ADDON_SETTINGS_COLLECTION,
+					key: `${prefix}${key}`
+				});
+				return row === void 0 || row === null ? { kind: "absent" } : {
+					kind: "present",
+					value: unwrapStoredValue(row)
+				};
+			} catch (err) {
+				return {
+					kind: "unreadable",
+					error: message(err)
+				};
+			}
+		},
+		async merge(patch) {
+			const records = [];
+			const removed = [];
+			for (const [key, value] of Object.entries(patch)) if (value === void 0) removed.push(`${prefix}${key}`);
+			else records.push({
+				id: `${prefix}${key}`,
+				data: {
+					addonId,
+					key,
+					value
+				}
+			});
+			if (records.length === 0 && removed.length === 0) return;
+			if (prefixRange(prefix) === null) throw new Error(`addon settings: "${addonId}" cannot be expressed as an id range`);
+			await door.transact({ ops: [...removed.length > 0 ? [{
+				op: "deleteWhere",
+				collection: ADDON_SETTINGS_COLLECTION,
+				filter: { whereIn: { id: removed } }
+			}] : [], ...records.length > 0 ? [{
+				op: "upsertMany",
+				collection: ADDON_SETTINGS_COLLECTION,
+				conflict: ["id"],
+				records
+			}] : []] });
+		}
+	};
+}
+//#endregion
 //#region src/builtins/core-blocks/block-settings-store.ts
 /**
 * @durable class=config owner=core-blocks
@@ -545,15 +613,12 @@ var BlockSettingsStore = class {
 		});
 	}
 	async mirrorToBlockAddon(blockId, values) {
-		const namespace = coreBlockAddonId(blockId);
-		try {
-			await this.store.set.mutate({
-				namespace,
-				collection: "addon-settings",
-				key: "root",
-				value: values
-			});
-		} catch {}
+		const store = this.store;
+		await createAddonSettingsStore({
+			query: (input) => store.query.query(input),
+			get: (input) => store.get.query(input),
+			transact: (input) => store.transact.mutate(input)
+		}, coreBlockAddonId(blockId)).merge(values);
 	}
 };
 //#endregion
@@ -2258,4 +2323,4 @@ async function loadTranspiler(logger) {
 	}
 }
 //#endregion
-export { CoreBlocksAddon, loadBlockTypeDefs as a, BlockSupervisor as c, blockIdFromAddonId as d, materializeBlock as f, compileBlock as i, BLOCK_ADDON_PREFIX as l, CORE_BLOCKS_COLLECTION as n, BlockSettingsStore as o, removeBlockPackage as p, CoreBlockStore as r, CORE_BLOCK_SETTINGS_COLLECTION as s, extractSettingsSchema as t, blockAddonId as u };
+export { CoreBlocksAddon, loadBlockTypeDefs as a, createAddonSettingsStore as c, blockAddonId as d, blockIdFromAddonId as f, compileBlock as i, BlockSupervisor as l, removeBlockPackage as m, CORE_BLOCKS_COLLECTION as n, BlockSettingsStore as o, materializeBlock as p, CoreBlockStore as r, CORE_BLOCK_SETTINGS_COLLECTION as s, extractSettingsSchema as t, BLOCK_ADDON_PREFIX as u };

package/dist/builtins/core-blocks/index.mjs

@@ -1,2 +1,2 @@
-import { CoreBlocksAddon, a as loadBlockTypeDefs, c as BlockSupervisor, d as blockIdFromAddonId, f as materializeBlock, i as compileBlock, l as BLOCK_ADDON_PREFIX, n as CORE_BLOCKS_COLLECTION, o as BlockSettingsStore, p as removeBlockPackage, r as CoreBlockStore, s as CORE_BLOCK_SETTINGS_COLLECTION, t as extractSettingsSchema, u as blockAddonId } from "./core-blocks.addon.mjs";
+import { CoreBlocksAddon, a as loadBlockTypeDefs, d as blockAddonId, f as blockIdFromAddonId, i as compileBlock, l as BlockSupervisor, m as removeBlockPackage, n as CORE_BLOCKS_COLLECTION, o as BlockSettingsStore, p as materializeBlock, r as CoreBlockStore, s as CORE_BLOCK_SETTINGS_COLLECTION, t as extractSettingsSchema, u as BLOCK_ADDON_PREFIX } from "./core-blocks.addon.mjs";
 export { BLOCK_ADDON_PREFIX, BlockSettingsStore, BlockSupervisor, CORE_BLOCKS_COLLECTION, CORE_BLOCK_SETTINGS_COLLECTION, CoreBlockStore, CoreBlocksAddon, CoreBlocksAddon as default, blockAddonId, blockIdFromAddonId, compileBlock, extractSettingsSchema, loadBlockTypeDefs, materializeBlock, removeBlockPackage };

package/dist/builtins/device-manager/device-manager.addon.js

@@ -3,8 +3,10 @@ Object.defineProperties(exports, {
 	[Symbol.toStringTag]: { value: "Module" }
 });
 require("../../chunk-Cek0wNdY.js");
-const require_dist = require("../../dist-GgG-7amw.js");
-const require_retired_settings_keys = require("../../retired-settings-keys-Dr_4lfKu.js");
+const require_dist = require("../../dist-BKhlcYz6.js");
+const require_prefix_range = require("../../prefix-range-D_KueXbQ.js");
+const require_prefix_walk = require("../../prefix-walk-Dv6MLZlM.js");
+const require_retired_settings_keys = require("../../retired-settings-keys-D_VwZiDt.js");
 let zod = require("zod");
 let node_crypto = require("node:crypto");
 let _camstack_types_node = require("@camstack/types/node");
@@ -2730,30 +2732,13 @@ async function listPersistedByAddon(pctx, input) {
 	return saved;
 }
 /**
-* Every requested device's persisted config, in as few store round trips as the
-* settings view allows.
-*
-* One call when the view can batch (the in-process door, which keys
-* `addon-device-settings` by `<addonId>:<deviceId>.` and answers a whole addon
-* with one indexed range scan). Otherwise the per-device form, unchanged — a
-* fallback and not a silent downgrade: `readDeviceStoreBatch` is optional
-* precisely because a forked addon's view has nothing to batch, and refusing
-* would break the only implementation that cannot comply.
-*
-* A read that THROWS yields `{}` for that device rather than failing the whole
-* listing: one unreadable settings row must not make the fleet unlistable.
+* Every requested device's persisted config in ONE store round trip (D870). A
+* store that cannot be asked THROWS and the listing fails with it: an
+* unreadable row is not a device with no settings (D49).
 */
 async function readDeviceConfigs(pctx, deviceIds) {
 	if (deviceIds.length === 0) return /* @__PURE__ */ new Map();
-	const batch = pctx.settings.readDeviceStoreBatch;
-	if (batch !== void 0) return batch.call(pctx.settings, deviceIds);
-	const out = /* @__PURE__ */ new Map();
-	for (const id of deviceIds) try {
-		out.set(id, await pctx.settings.readDeviceStore(id));
-	} catch {
-		out.set(id, {});
-	}
-	return out;
+	return pctx.settings.readDeviceStoreBatch(deviceIds);
 }
 async function listAll(pctx, input) {
 	const ownerFilter = Reflect.get(input, "addonId");
@@ -4856,6 +4841,170 @@ function createDeviceManagerExtensionProvider(pctx) {
 	});
 }
 //#endregion
+//#region src/kernel/device-settings-store.ts
+/** The collection every addon's per-device settings share. Named nowhere else. */
+var DEVICE_SETTINGS_COLLECTION = "addon-device-settings";
+function scopeOf(addonId, deviceId) {
+	return `${addonId}:${String(deviceId)}.`;
+}
+function assertDeviceId(deviceId) {
+	if (!Number.isInteger(deviceId) || deviceId <= 0) throw new Error(`device settings: "${String(deviceId)}" is not a device id`);
+}
+function deviceIdOfSuffix(suffix) {
+	const dot = suffix.indexOf(".");
+	if (dot <= 0) return null;
+	const id = Number(suffix.slice(0, dot));
+	return Number.isInteger(id) && id > 0 ? id : null;
+}
+/** Every field row of one device scope, or a throw. */
+async function readScope(door, addonId, deviceId) {
+	return require_prefix_walk.loadPrefixed(door, DEVICE_SETTINGS_COLLECTION, scopeOf(addonId, deviceId));
+}
+function createDeviceSettingsStore(door, addonId) {
+	return {
+		async read(deviceId) {
+			try {
+				assertDeviceId(deviceId);
+				const value = await readScope(door, addonId, deviceId);
+				return Object.keys(value).length === 0 ? { kind: "absent" } : {
+					kind: "present",
+					value
+				};
+			} catch (err) {
+				return {
+					kind: "unreadable",
+					error: err instanceof Error ? err.message : String(err)
+				};
+			}
+		},
+		async readBatch(deviceIds) {
+			const out = /* @__PURE__ */ new Map();
+			if (deviceIds.length === 0) return out;
+			for (const id of deviceIds) out.set(id, {});
+			const wanted = new Set(deviceIds);
+			const all = await require_prefix_walk.loadPrefixed(door, DEVICE_SETTINGS_COLLECTION, `${addonId}:`);
+			for (const [suffix, value] of Object.entries(all)) {
+				const id = deviceIdOfSuffix(suffix);
+				if (id === null || !wanted.has(id)) continue;
+				const blob = out.get(id);
+				if (blob !== void 0) blob[suffix.slice(suffix.indexOf(".") + 1)] = value;
+			}
+			return out;
+		},
+		async listIds() {
+			const all = await require_prefix_walk.loadPrefixed(door, DEVICE_SETTINGS_COLLECTION, `${addonId}:`, () => null);
+			const ids = /* @__PURE__ */ new Set();
+			for (const suffix of Object.keys(all)) {
+				const id = deviceIdOfSuffix(suffix);
+				if (id !== null) ids.add(id);
+			}
+			return [...ids].toSorted((a, b) => a - b);
+		},
+		async merge(deviceId, patch) {
+			assertDeviceId(deviceId);
+			const scope = scopeOf(addonId, deviceId);
+			const records = [];
+			const removed = [];
+			for (const [key, value] of Object.entries(patch)) if (value === void 0) removed.push(`${scope}${key}`);
+			else records.push({
+				id: `${scope}${key}`,
+				data: {
+					addonId,
+					deviceId: String(deviceId),
+					key,
+					value
+				}
+			});
+			if (records.length === 0 && removed.length === 0) return;
+			await door.transact({ ops: [...removed.length > 0 ? [{
+				op: "deleteWhere",
+				collection: DEVICE_SETTINGS_COLLECTION,
+				filter: { whereIn: { id: removed } }
+			}] : [], ...records.length > 0 ? [{
+				op: "upsertMany",
+				collection: DEVICE_SETTINGS_COLLECTION,
+				conflict: ["id"],
+				records
+			}] : []] });
+		},
+		async clear(deviceId) {
+			assertDeviceId(deviceId);
+			const range = require_prefix_range.prefixRange(scopeOf(addonId, deviceId));
+			if (range === null) throw new Error(`device settings: no id range for addon "${addonId}"`);
+			await door.deleteWhere({
+				collection: DEVICE_SETTINGS_COLLECTION,
+				filter: { whereBetween: { id: [range.lo, range.hi] } }
+			});
+		}
+	};
+}
+/** The `Record` form of a read: `{}` for a store that answered with no row, a THROW for one that did not. */
+async function readDeviceOrThrow(store, deviceId) {
+	const read = await store.read(deviceId);
+	switch (read.kind) {
+		case "present": return { ...read.value };
+		case "absent": return {};
+		case "unreadable": throw new Error(`device settings of ${String(deviceId)} could not be read: ${read.error}`);
+	}
+}
+/**
+* Remove a device's rows for EVERY addon, in one statement (D865's central
+* delete). Matched on the device id each row carries, so no addon needs a
+* handler. Returns how many rows went.
+*/
+async function clearDeviceSettings(door, deviceId) {
+	assertDeviceId(deviceId);
+	const { deleted } = await door.deleteWhere({
+		collection: DEVICE_SETTINGS_COLLECTION,
+		filter: { where: { deviceId: String(deviceId) } }
+	});
+	return deleted;
+}
+/** Rows one page of the scope walk asks for. */
+var SCOPE_PAGE_ROWS = 1e3;
+/** Pages the walk may take before it refuses (a bound, never a silent cut). */
+var SCOPE_PAGE_BUDGET = 512;
+/** Above every id: ids are ASCII. */
+var SCOPE_TAIL = "";
+/**
+* Every (addon, device) pair holding rows, across all addons - the admin
+* "deleted devices" listing. A keyset walk by primary key (never one query cut
+* at a row cap): a read that cannot be completed THROWS.
+*/
+async function listDeviceSettingsScopes(door) {
+	const seen = /* @__PURE__ */ new Map();
+	let cursor = "";
+	for (let page = 0;; page++) {
+		if (page >= SCOPE_PAGE_BUDGET) throw new Error(`device settings scopes: more than ${SCOPE_PAGE_BUDGET} pages - refusing a partial list`);
+		const rows = await door.query({
+			collection: DEVICE_SETTINGS_COLLECTION,
+			filter: {
+				whereBetween: { id: [cursor, SCOPE_TAIL] },
+				orderBy: {
+					field: "id",
+					direction: "asc"
+				},
+				limit: SCOPE_PAGE_ROWS
+			}
+		});
+		for (const row of rows) {
+			const addonId = row.data["addonId"];
+			const raw = row.data["deviceId"];
+			if (typeof addonId !== "string" || typeof raw !== "string") continue;
+			const deviceId = Number(raw);
+			if (!Number.isInteger(deviceId) || deviceId <= 0) continue;
+			seen.set(`${addonId}:${deviceId}`, {
+				deviceId,
+				addonId
+			});
+		}
+		const last = rows[rows.length - 1];
+		if (rows.length < SCOPE_PAGE_ROWS || last === void 0) return [...seen.values()];
+		if (last.id === cursor) throw new Error(`device settings scopes: no progress at "${last.id}"`);
+		cursor = last.id;
+	}
+}
+//#endregion
 //#region src/builtins/device-manager/migration-refused.ts
 /**
 * A migration step that REFUSED with nothing moved.
@@ -5788,41 +5937,16 @@ async function cleanupDeletedDevicesData(deps, input) {
 		unreachable: [...unreachable]
 	};
 }
-/** The settings-store collection every addon's per-device settings share. */
-var ADDON_DEVICE_SETTINGS_COLLECTION = "addon-device-settings";
-/** The engine's hard ceiling on one read; a result this long may be a truncated one. */
-var SCOPE_READ_LIMIT = 2e4;
 /** Scope access over the settings store; undefined when the store is unavailable. */
 function settingsScopes(store) {
 	if (store === void 0) return void 0;
+	const door = {
+		query: (input) => store.query.query(input),
+		deleteWhere: (input) => store.deleteWhere.mutate(input)
+	};
 	return {
-		list: async () => {
-			const rows = await store.query.query({
-				collection: ADDON_DEVICE_SETTINGS_COLLECTION,
-				filter: { limit: SCOPE_READ_LIMIT }
-			});
-			if (rows.length >= SCOPE_READ_LIMIT) throw new Error(`the settings read returned ${rows.length} rows — possibly truncated`);
-			const seen = /* @__PURE__ */ new Map();
-			for (const row of rows) {
-				const addonId = row.data["addonId"];
-				const raw = row.data["deviceId"];
-				if (typeof addonId !== "string" || typeof raw !== "string") continue;
-				const deviceId = Number(raw);
-				if (!Number.isInteger(deviceId) || deviceId <= 0) continue;
-				seen.set(`${addonId}:${deviceId}`, {
-					deviceId,
-					addonId
-				});
-			}
-			return [...seen.values()];
-		},
-		clear: async (deviceId) => {
-			const { deleted } = await store.deleteWhere.mutate({
-				collection: ADDON_DEVICE_SETTINGS_COLLECTION,
-				filter: { where: { deviceId: String(deviceId) } }
-			});
-			return deleted;
-		}
+		list: () => listDeviceSettingsScopes(door),
+		clear: (deviceId) => clearDeviceSettings(door, deviceId)
 	};
 }
 //#endregion
@@ -6267,11 +6391,7 @@ function removalSteps(pctx, deviceId, providerAddonId, deletedAt) {
 			run: async () => {
 				const api = pctx.host.ctx.api?.settingsStore;
 				if (api === void 0) throw new Error("settings-store api not available");
-				const { deleted } = await api.deleteWhere.mutate({
-					collection: "addon-device-settings",
-					filter: { where: { deviceId: String(deviceId) } }
-				});
-				return deleted;
+				return clearDeviceSettings({ deleteWhere: (input) => api.deleteWhere.mutate(input) }, deviceId);
 			}
 		},
 		{
@@ -8740,7 +8860,17 @@ var DeviceTombstoneStore = class {
 		this.now = opts.now ?? (() => Date.now());
 		this.retentionMs = opts.retentionMs ?? 7776e6;
 	}
-	/** Lazy, idempotent declaration; a rejection is not latched. */
+	/**
+	* Declare the collection now. Idempotent; a rejection is not latched.
+	*
+	* Called at device-manager init (D871) so the table exists on a hub that has
+	* not deleted a device yet. It used to be declared only by the first
+	* `record` / `listSince`, i.e. by the first delete or by an implementer's
+	* reconcile — so a hub whose implementers had not been redeployed, and where
+	* nothing was deleted, never had the table, and the census read that as
+	* "D865 is not running". A DECLARATION only: nothing is read, written or
+	* purged here.
+	*/
 	declare() {
 		if (this.declared !== null) return this.declared;
 		const run = this.backend.declareCollection({
@@ -10738,6 +10868,11 @@ var DeviceManagerAddon = class extends require_dist.BaseAddon {
 			backend: deviceRowBackendOf(settingsStoreApi),
 			logger: this.ctx.logger.child("tombstones")
 		});
+		try {
+			await tombstones.declare();
+		} catch (err) {
+			this.ctx.logger.warn("device tombstones collection not declared at init — retried on first use", { meta: { error: err instanceof Error ? err.message : String(err) } });
+		}
 		this.staleWrapperActivations.checkOnce(() => readBindingsStore(this.bindingsDeps));
 		try {
 			await require_retired_settings_keys.purgeRetiredSettingsRows(deviceRows.retiredRowStore(), this.ctx.logger.child("RetiredRows"));
@@ -11074,5 +11209,7 @@ var DeviceManagerAddon = class extends require_dist.BaseAddon {
 //#endregion
 exports.DeviceManagerAddon = DeviceManagerAddon;
 exports.default = DeviceManagerAddon;
+exports.createDeviceSettingsStore = createDeviceSettingsStore;
 exports.mergeAggregates = mergeAggregates;
+exports.readDeviceOrThrow = readDeviceOrThrow;
 exports.setWrapperActive = setWrapperActive;