@lantharos/pult 0.8.0 → 0.10.0

package/index.mjs

@@ -1,4 +1,4 @@
-import { A as mapBlocks, C as HEADER, D as sign, O as verify, P as findActionDef, T as NonceWindow, a as collect, b as KIND, d as Transport, f as b, g as home, h as isPendingAttachment, i as validate, j as DEFAULT_STATES, k as eachBlock, m as fieldValues, n as reviveDates, o as findAction, p as bindActions, s as flag, t as ValidationError, u as PultError, v as page, w as refKey, x as captureOrigin, y as view } from "./schema-CzG8J_9_.mjs";
+import { A as mapBlocks, D as sign, E as NonceWindow, F as HOME, I as actionId, L as findActionDef, M as valuesIn, N as DEFAULT_STATES, O as verify, S as kindOf, T as refKey, a as collect, b as captureOrigin, d as Transport, f as b, g as isPendingAttachment, h as hasPendingAttachments, i as validate, k as eachBlock, m as fieldValues, n as reviveDates, o as findAction, p as bindActions, s as flag, t as ValidationError, u as PultError, v as view, w as HEADER, y as KIND } from "./schema-DuTVNptF.mjs";
 //#region ../protocol/src/flags.ts
 function rampAt(ramp, now = Date.now()) {
 	if (now >= ramp.end) return ramp.to;
@@ -15,7 +15,7 @@ function currentValue(state, now = Date.now()) {
 }
 function resolveFlag(name, state, context = {}, now = Date.now()) {
 	const { key, attributes = {} } = context;
-	if (key !== void 0 && key in state.targets) return state.targets[key];
+	if (key !== void 0 && Object.hasOwn(state.targets, key)) return state.targets[key];
 	const rule = state.rules.find((candidate) => candidate.conditions.every((condition) => holds(condition, attributes[condition.attribute])));
 	if (rule) return rule.rollout === null ? rule.value : share(name, key, rule.rollout);
 	const rollout = currentRollout(state, now);
@@ -63,10 +63,11 @@ var Batcher = class {
 	}
 	send(item) {
 		return new Promise((resolve, reject) => {
-			const size = JSON.stringify(item).length;
+			const json = JSON.stringify(item);
+			const size = utf8Length(json);
 			if (this.#bytes + size > MAX_BYTES) this.#flush();
 			this.#queue.push({
-				item,
+				json,
 				size,
 				resolve,
 				reject
@@ -89,15 +90,15 @@ var Batcher = class {
 		if (batch.length) this.#post(batch);
 	}
 	async #post(batch) {
-		const body = { items: batch.map((entry) => entry.item) };
+		const body = `{"items":[${batch.map((entry) => entry.json).join(",")}]}`;
 		try {
 			let response;
 			try {
-				response = await this.transport.request("POST", "/v1/items", body);
+				response = await this.transport.json("POST", "/v1/items", body);
 			} catch (error) {
 				if (!(error instanceof PultError && error.code === "manifest_required")) throw error;
 				await this.sync();
-				response = await this.transport.request("POST", "/v1/items", body);
+				response = await this.transport.json("POST", "/v1/items", body);
 			}
 			response.results.forEach((outcome, index) => {
 				const entry = batch[index];
@@ -109,8 +110,16 @@ var Batcher = class {
 		}
 	}
 };
+function utf8Length(text) {
+	let bytes = text.length;
+	for (let index = 0; index < text.length; index++) {
+		const code = text.charCodeAt(index);
+		if (code >= 128) bytes += code < 2048 || code >= 55296 && code <= 57343 ? 1 : 2;
+	}
+	return bytes;
+}
 //#endregion
-//#region src/define/inbox.ts
+//#region src/define/inbox/inbox.ts
 function inbox(name, options) {
 	const states = options.states ?? DEFAULT_STATES;
 	const closed = options.closed ?? (options.states ? states.slice(1) : ["handled"]);
@@ -138,7 +147,7 @@ function liveView(title, data, record) {
 	};
 }
 //#endregion
-//#region src/define/triage.ts
+//#region src/define/inbox/triage.ts
 function noul(prompt, criteria) {
 	return {
 		type: "noul",
@@ -204,14 +213,14 @@ function action(name, options) {
 const identity = (value) => value;
 function resource(name, options) {
 	const origin = captureOrigin();
-	const actions = { "*": { id: `${name}.*` } };
+	const actions = { "*": { id: actionId(name, "*") } };
 	for (const [key, action] of Object.entries(options.actions?.(identity) ?? {})) actions[key] = {
 		[KIND]: "action",
 		origin,
 		options: action,
 		resource: name,
 		name: key,
-		id: `${name}.${key}`
+		id: actionId(name, key)
 	};
 	return {
 		[KIND]: "resource",
@@ -319,28 +328,35 @@ async function titles(definitions, request) {
 	return Object.fromEntries(resolved.filter((entry) => entry !== null));
 }
 async function available(definitions, request) {
-	const availability = {};
-	for (const ref of request.refs) {
+	const entries = await Promise.all(request.refs.map(async (ref) => {
 		const resource = definitions.resources.get(ref.resource);
 		const record = resource && await resource.options.get(ref.id);
-		if (!resource || !record) continue;
-		const actions = {};
-		for (const [name, action] of Object.entries(resource.actions)) {
-			if (!("options" in action)) continue;
-			const { when, defaults } = action.options;
-			if (when && !when(record)) continue;
-			actions[name] = defaults ? JSON.parse(JSON.stringify(defaults(record))) : null;
-		}
-		availability[`${ref.resource}:${ref.id}`] = actions;
+		return resource && record ? [[refKey(ref), actionsFor(resource, record)]] : [];
+	}));
+	return Object.fromEntries(entries.flat());
+}
+function actionsFor(resource, record) {
+	const actions = {};
+	for (const [name, action] of Object.entries(resource.actions)) {
+		if (kindOf(action) !== "action") continue;
+		const { when, defaults } = action.options;
+		if (when && !when(record)) continue;
+		actions[name] = defaults ? JSON.parse(JSON.stringify(defaults(record))) : null;
 	}
-	return availability;
+	return actions;
 }
 async function settle(definitions, blocks, scope) {
 	const bound = scope ? bindActions(blocks, scope.resource, recordId(scope.resource, scope.record)) : blocks;
 	const loaded = /* @__PURE__ */ new Map();
-	if (scope) loaded.set(`${scope.resource.name}:${recordId(scope.resource, scope.record)}`, Promise.resolve(scope.record));
+	if (scope) loaded.set(refKey({
+		resource: scope.resource.name,
+		id: recordId(scope.resource, scope.record)
+	}), Promise.resolve(scope.record));
 	const load = (resource, id) => {
-		const key = `${resource.name}:${id}`;
+		const key = refKey({
+			resource: resource.name,
+			id
+		});
 		if (!loaded.has(key)) loaded.set(key, Promise.resolve(resource.options.get(id)));
 		return loaded.get(key);
 	};
@@ -361,15 +377,10 @@ async function settle(definitions, blocks, scope) {
 	const visit = (target) => {
 		if (!targets.has(keyOf(target))) targets.set(keyOf(target), verdict(target));
 	};
-	const editsIn = (value) => {
-		if (value && typeof value === "object" && "edit" in value) visit(value.edit);
-	};
 	eachBlock(bound, (block) => {
 		if (block.type === "actions") for (const button of block.actions) visit(button);
 		if (block.type === "form") visit(block.form);
-		if (block.type === "fields") for (const field of block.fields) editsIn(field.value);
-		if (block.type === "stats") for (const stat of block.stats) editsIn(stat.value);
-		if (block.type === "table") for (const row of block.rows) for (const value of row) editsIn(value);
+		for (const value of valuesIn(block)) if (value && typeof value === "object" && "edit" in value) visit(value.edit);
 	});
 	if (!targets.size) return bound;
 	const verdicts = new Map(await Promise.all([...targets].map(async ([key, pending]) => [key, await pending])));
@@ -482,7 +493,10 @@ var Dispatcher = class {
 		this.report = report;
 	}
 	definitions() {
-		this.#definitions ??= Promise.all(Object.values(this.project.modules).map((load) => load())).then(collect);
+		this.#definitions ??= Promise.all(Object.values(this.project.modules).map((load) => load())).then(collect).catch((error) => {
+			this.#definitions = null;
+			throw error;
+		});
 		return this.#definitions;
 	}
 	async handle(envelope, defer = () => {}) {
@@ -572,7 +586,7 @@ async function renderItem(inbox, item, upload) {
 	return {
 		title,
 		record: item.record ?? void 0,
-		data: JSON.parse(JSON.stringify(data)),
+		data,
 		blocks: bindActions(await upload(blocks), inbox.options.resource ?? null, item.record ?? null),
 		replyTo: inbox.options.reply?.to(view)
 	};
@@ -591,6 +605,7 @@ function defaultBlocks(data) {
 //#endregion
 //#region src/client/flags.ts
 const FRESH_MS = 1e4;
+const MAX_PARSED = 256;
 const EMPTY = {
 	version: -1,
 	flags: {}
@@ -615,6 +630,7 @@ var Flags = class {
 		const state = (await this.#current()).flags[flag.name];
 		const raw = state === void 0 ? void 0 : resolveFlag(flag.name, state, contextOf(context));
 		if (raw === void 0 || raw === null) return flag.options.default;
+		if (!flag.options.value) return typeof raw === "boolean" ? raw : flag.options.default;
 		return this.#validated(flag, raw);
 	}
 	takeReads() {
@@ -624,7 +640,7 @@ var Flags = class {
 		return reads;
 	}
 	#store(snapshot) {
-		if (snapshot.version !== this.#snapshot?.version) this.#parsed.clear();
+		if (snapshot !== this.#snapshot) this.#parsed.clear();
 		this.#snapshot = snapshot;
 		this.#checkedAt = Date.now();
 	}
@@ -651,12 +667,16 @@ var Flags = class {
 		return this.#snapshot ?? EMPTY;
 	}
 	#validated(flag, raw) {
-		const key = `${flag.name}\u0000${JSON.stringify(raw)}`;
-		let parsed = this.#parsed.get(key);
+		let values = this.#parsed.get(flag.name);
+		if (!values) {
+			values = /* @__PURE__ */ new Map();
+			this.#parsed.set(flag.name, values);
+		}
+		let parsed = values.get(raw);
 		if (!parsed) {
-			const schema = flag.options.value;
-			parsed = schema ? validate(schema, raw).catch(() => flag.options.default) : Promise.resolve(typeof raw === "boolean" ? raw : flag.options.default);
-			this.#parsed.set(key, parsed);
+			if (values.size >= MAX_PARSED) values.clear();
+			parsed = validate(flag.options.value, raw).catch(() => flag.options.default);
+			values.set(raw, parsed);
 		}
 		return parsed;
 	}
@@ -672,11 +692,12 @@ function contextOf(context) {
 //#endregion
 //#region src/client/socket.ts
 const HEARTBEAT_MS = 25e3;
+const SILENCE_MS = 2 * HEARTBEAT_MS;
 const MAX_BACKOFF_MS = 3e4;
-function connect({ transport, version, onRequest, onSyncManifest, onFlags, reads, onStatus }) {
-	const nonces = new NonceWindow();
+function connect({ transport, nonces, version, onRequest, onSyncManifest, onFlags, reads, onStatus }) {
 	let socket = null;
 	let heartbeat;
+	let retry;
 	let attempt = 0;
 	let closed = false;
 	const send = (message) => socket?.send(JSON.stringify(message));
@@ -716,20 +737,44 @@ function connect({ transport, version, onRequest, onSyncManifest, onFlags, reads
 			});
 		}
 	};
+	const stopHeartbeat = () => {
+		if (heartbeat) clearInterval(heartbeat);
+	};
+	const reconnect = () => {
+		stopHeartbeat();
+		onFlags(null);
+		onStatus?.("disconnected");
+		if (closed) return;
+		const delay = Math.min(MAX_BACKOFF_MS, 500 * 2 ** attempt++) * (.5 + Math.random() / 2);
+		retry = setTimeout(open, delay);
+	};
 	const open = async () => {
 		const signature = await sign(transport.key.secret, "connect", version);
+		if (closed) return;
 		const params = new URLSearchParams({
 			environment: transport.key.environment,
 			version,
 			...signature
 		});
-		socket = new WebSocket(`${transport.url.replace(/^http/, "ws")}/v1/connect?${params}`);
-		socket.addEventListener("message", (event) => {
+		const current = new WebSocket(`${transport.url.replace(/^http/, "ws")}/v1/connect?${params}`);
+		let heardAt = Date.now();
+		let lost = false;
+		const lose = () => {
+			if (lost) return;
+			lost = true;
+			current.close();
+			reconnect();
+		};
+		socket = current;
+		current.addEventListener("message", (event) => {
+			heardAt = Date.now();
 			if (event.data !== "pong") handle(JSON.parse(String(event.data)));
 		});
-		socket.addEventListener("open", () => {
+		current.addEventListener("open", () => {
+			heardAt = Date.now();
 			heartbeat = setInterval(() => {
-				socket?.send("ping");
+				if (Date.now() - heardAt > SILENCE_MS) return lose();
+				current.send("ping");
 				const counted = reads();
 				if (counted) send({
 					type: "reads",
@@ -737,38 +782,52 @@ function connect({ transport, version, onRequest, onSyncManifest, onFlags, reads
 				});
 			}, HEARTBEAT_MS);
 		});
-		socket.addEventListener("close", () => {
-			if (heartbeat) clearInterval(heartbeat);
-			onFlags(null);
-			onStatus?.("disconnected");
-			if (closed) return;
-			const delay = Math.min(MAX_BACKOFF_MS, 500 * 2 ** attempt++) * (.5 + Math.random() / 2);
-			setTimeout(open, delay);
-		});
+		current.addEventListener("close", lose);
 	};
 	open();
 	return { close() {
 		closed = true;
+		if (retry) clearTimeout(retry);
+		stopHeartbeat();
 		socket?.close();
 	} };
 }
 //#endregion
-//#region src/client/pult.ts
-function createPult({ key = env("PULT_KEY"), project, url = env("PULT_URL") ?? "https://app.pult.sh", fetch = globalThis.fetch }) {
-	if (!key) throw new Error("Pult needs a key: pass `key` or set PULT_KEY");
-	const transport = new Transport(key, url, (input, init) => fetch(input, init));
-	const upload = async (blocks) => Promise.all(blocks.map(async (block) => {
-		if (!isPendingAttachment(block)) return block;
-		const data = block.data instanceof Blob ? block.data : new Uint8Array(block.data);
-		const { key } = await transport.upload(block.name, block.contentType, data);
+//#region src/client/upload.ts
+function uploader(transport) {
+	const attach = async ({ name, contentType, data }) => {
+		const bytes = await bytesOf(data);
+		const { key } = await transport.upload(name, contentType, bytes);
 		return {
 			type: "attachment",
-			name: block.name,
+			name,
 			key,
-			contentType: block.contentType,
-			size: byteLength(data)
+			contentType,
+			size: bytes.byteLength
+		};
+	};
+	const walk = (blocks) => Promise.all(blocks.map(async (block) => {
+		if (isPendingAttachment(block)) return attach(block);
+		if (block.type === "columns") return {
+			type: "columns",
+			columns: await Promise.all(block.columns.map(walk))
 		};
+		return block;
 	}));
+	return async (blocks) => hasPendingAttachments(blocks) ? walk(blocks) : blocks;
+}
+async function bytesOf(data) {
+	if (data instanceof Blob) return new Uint8Array(await data.arrayBuffer());
+	if (data instanceof ArrayBuffer) return new Uint8Array(data);
+	return data;
+}
+//#endregion
+//#region src/client/pult.ts
+function createPult({ key = env("PULT_KEY"), project, url = env("PULT_URL") ?? "https://app.pult.sh", fetch = globalThis.fetch }) {
+	if (!key) throw new Error("Pult needs a key: pass `key` or set PULT_KEY");
+	const transport = new Transport(key, url, (input, init) => fetch(input, init));
+	const upload = uploader(transport);
+	const nonces = new NonceWindow();
 	const report = async (job, update) => {
 		await transport.request("POST", `/v1/jobs/${job}`, update);
 	};
@@ -812,6 +871,7 @@ function createPult({ key = env("PULT_KEY"), project, url = env("PULT_URL") ?? "
 	function listen(options = {}) {
 		return connect({
 			transport,
+			nonces,
 			version: manifest.version,
 			onRequest: (envelope) => dispatcher.handle(envelope),
 			onSyncManifest: (environment) => environment === manifest.sync ? {
@@ -824,7 +884,6 @@ function createPult({ key = env("PULT_KEY"), project, url = env("PULT_URL") ?? "
 		});
 	}
 	function handler() {
-		const nonces = new NonceWindow();
 		return async (request, context) => {
 			const body = await request.text();
 			const signature = signedHeaders(request.headers);
@@ -887,9 +946,6 @@ function signedHeaders(headers) {
 		signature
 	} : null;
 }
-function byteLength(data) {
-	return data instanceof Blob ? data.size : data.byteLength;
-}
 function env(name) {
 	return globalThis.process?.env[name];
 }
@@ -915,20 +971,29 @@ function defineConfig(options) {
 	};
 }
 //#endregion
-//#region src/define/notify.ts
-function slack(channel) {
-	return { channel: channel.replace(/^#/, "") };
-}
-function notify(name, options) {
+//#region src/define/console/page.ts
+function page(name, options) {
 	return {
-		[KIND]: "notify",
+		[KIND]: "page",
 		origin: captureOrigin(),
 		name,
 		options
 	};
 }
+function home(options) {
+	const resolved = Array.isArray(options) || typeof options === "function" ? { render: options } : options;
+	return {
+		[KIND]: "page",
+		origin: captureOrigin(),
+		name: HOME,
+		options: {
+			label: "Home",
+			...resolved
+		}
+	};
+}
 //#endregion
-//#region src/define/role.ts
+//#region src/define/console/role.ts
 function role(name, options) {
 	return {
 		[KIND]: "role",
@@ -938,7 +1003,23 @@ function role(name, options) {
 	};
 }
 //#endregion
-//#region src/define/status.ts
+//#region src/define/console/space.ts
+function space(name, options) {
+	const { home } = options;
+	return {
+		[KIND]: "space",
+		origin: captureOrigin(),
+		name,
+		options,
+		home: home === void 0 ? null : kindOf(home) === "page" ? home : page(name, {
+			label: options.label,
+			icon: options.icon,
+			render: home
+		})
+	};
+}
+//#endregion
+//#region src/define/controls/status.ts
 function status(options) {
 	return {
 		[KIND]: "status",
@@ -947,4 +1028,17 @@ function status(options) {
 	};
 }
 //#endregion
-export { PultError, ValidationError, action, b, choice, createPult, defineConfig, flag, home, inbox, notify, noul, page, resource, role, run, score, setState, slack, status, tag, triage, view };
+//#region src/define/inbox/notify.ts
+function slack(channel) {
+	return { channel: channel.replace(/^#/, "") };
+}
+function notify(name, options) {
+	return {
+		[KIND]: "notify",
+		origin: captureOrigin(),
+		name,
+		options
+	};
+}
+//#endregion
+export { PultError, ValidationError, action, b, choice, createPult, defineConfig, flag, home, inbox, notify, noul, page, resource, role, run, score, setState, slack, space, status, tag, triage, view };

package/package.json

@@ -1,18 +1,37 @@
 {
   "name": "@lantharos/pult",
-  "version": "0.8.0",
+  "version": "0.10.0",
   "description": "The other side of your app",
   "license": "MIT",
+  "keywords": [
+    "back office",
+    "admin panel",
+    "internal tools",
+    "console",
+    "feature flags",
+    "status page"
+  ],
   "homepage": "https://pult.sh",
+  "bugs": "https://github.com/Lantharos/Pult/issues",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/Lantharos/Pult.git",
+    "directory": "packages/pult"
+  },
   "type": "module",
+  "sideEffects": false,
+  "engines": {
+    "node": ">=22.17.0"
+  },
   "exports": {
     ".": {
       "types": "./index.d.mts",
       "default": "./index.mjs"
-    }
+    },
+    "./package.json": "./package.json"
   },
   "bin": {
-    "pult": "./cli.mjs"
+    "pult": "cli.mjs"
   },
   "publishConfig": {
     "access": "public"