@mediamonks/canopy-cli 0.7.28 → 0.7.30

package/dist/{src-CwSKZwNK.mjs → src-C7zPhbxi.mjs}

@@ -581,6 +581,243 @@ function dbRouter(config) {
 	});
 	return db;
 }
+/** Serialized JSON bytes of one message's `data`. */
+const REALTIME_MAX_DATA_BYTES = 4096;
+/** Reserved prefix: topics only the project's backend may publish to. */
+const WORKER_TOPIC_PREFIX = "worker:";
+/** How often an idle stream sends a comment so proxies keep it open. */
+const REALTIME_KEEPALIVE_MS = 25e3;
+/**
+* A stream whose reader is this far behind is closed rather than buffered
+* without bound (a stalled or deliberately slow client). The SDK reconnects
+* and re-syncs, exactly as after any other close.
+*/
+const REALTIME_MAX_BUFFER_BYTES = 256 * 1024;
+/** Every stream closes between these two ages, so auth is re-checked on reconnect. */
+const REALTIME_STREAM_MIN_MS = 13 * 6e4;
+const REALTIME_STREAM_MAX_MS = 15 * 6e4;
+/** 1-64 of [A-Za-z0-9_.-], not dots only (`.`/`..` would be eaten by URL path normalization). */
+const TOPIC_BODY = /^(?!\.+$)[A-Za-z0-9_.-]{1,64}$/;
+function validateTopic(name) {
+	const body = name.startsWith("worker:") ? name.slice(7) : name;
+	return TOPIC_BODY.test(body);
+}
+const isWorkerTopic = (name) => name.startsWith(WORKER_TOPIC_PREFIX);
+/** A subscription's topics: valid, de-duplicated, 1 to REALTIME_MAX_TOPICS. */
+function parseTopicList(raw) {
+	const topics = [...new Set(raw)];
+	if (topics.length === 0) return {
+		ok: false,
+		error: "invalid_topic",
+		detail: "subscribe to at least one topic"
+	};
+	const bad = topics.find((t) => !validateTopic(t));
+	if (bad !== void 0) return {
+		ok: false,
+		error: "invalid_topic",
+		detail: topicDetail(bad)
+	};
+	if (topics.length > 20) return {
+		ok: false,
+		error: "too_many_topics",
+		detail: `one stream carries at most 20 topics`
+	};
+	return {
+		ok: true,
+		topics
+	};
+}
+function topicDetail(name) {
+	return `"${name.slice(0, 80)}" is not a topic name: use 1-64 letters, digits, "-", "_" or ".", optionally after "${WORKER_TOPIC_PREFIX}"`;
+}
+/** Time-ordered, unguessable enough to be a message id, not a credential. */
+function newMessageId(now = Date.now()) {
+	const random = crypto.getRandomValues(/* @__PURE__ */ new Uint8Array(8));
+	let hex = "";
+	for (const byte of random) hex += byte.toString(16).padStart(2, "0");
+	return `${now.toString(36).padStart(9, "0")}${hex}`;
+}
+function stampFrom(sender) {
+	return sender.kind === "monk" && sender.email ? {
+		kind: "monk",
+		email: sender.email
+	} : { kind: sender.kind };
+}
+function refusalJson(c, refusal) {
+	return c.json({
+		error: refusal.error,
+		detail: refusal.detail
+	}, refusal.status);
+}
+function gate(c, ctx) {
+	if (!ctx.broker) return c.json({
+		error: "not_supported_on_target",
+		capability: "realtime",
+		detail: "realtime is not available on this Canopy site"
+	}, 501);
+	if (!ctx.enabled) return c.json({
+		error: "realtime_not_enabled",
+		detail: "realtime is turned off for this project — a Canopy admin can turn it on for you"
+	}, 403);
+}
+const encoder = new TextEncoder();
+const frame = (event, data) => encoder.encode(`event: ${event}\ndata: ${JSON.stringify(data)}\n\n`);
+const KEEPALIVE = encoder.encode(": keep-alive\n\n");
+function realtimeRouter(config) {
+	const realtime = new Hono();
+	const random = config.random ?? Math.random;
+	realtime.get("/realtime", async (c) => {
+		if (c.req.method !== "GET") return c.json({
+			error: "method_not_allowed",
+			detail: "subscribe with GET"
+		}, 405);
+		const ctx = await config.context(c);
+		if (ctx instanceof Response) return ctx;
+		const refused = gate(c, ctx);
+		if (refused) return refused;
+		const list = parseTopicList(c.req.queries("topic") ?? []);
+		if (!list.ok) return c.json({
+			error: list.error,
+			detail: list.detail
+		}, 400);
+		const broker = ctx.broker;
+		let controller;
+		let handle;
+		let ended = false;
+		let keepAlive;
+		let lifetime;
+		const send = (bytes) => {
+			if (ended) return;
+			try {
+				controller.enqueue(bytes);
+			} catch {
+				end(false);
+				return;
+			}
+			if ((controller.desiredSize ?? 0) < 0) {
+				end(false);
+				try {
+					controller.error(/* @__PURE__ */ new Error("realtime stream reader fell behind"));
+				} catch {}
+			}
+		};
+		const end = (closeStream) => {
+			if (ended) return;
+			ended = true;
+			clearInterval(keepAlive);
+			clearTimeout(lifetime);
+			handle?.close();
+			if (closeStream) try {
+				controller.close();
+			} catch {}
+		};
+		const stream = new ReadableStream({
+			start(ctrl) {
+				controller = ctrl;
+			},
+			cancel() {
+				end(false);
+			}
+		}, new ByteLengthQueuingStrategy({ highWaterMark: REALTIME_MAX_BUFFER_BYTES }));
+		const sink = {
+			deliver(envelope) {
+				const out = ctx.redactEmails && envelope.from.email !== void 0 ? {
+					...envelope,
+					from: { kind: envelope.from.kind }
+				} : envelope;
+				send(frame("message", out));
+			},
+			close() {
+				end(true);
+			}
+		};
+		send(frame("open", { topics: list.topics }));
+		const signal = c.req.raw.signal;
+		signal?.addEventListener("abort", () => end(false), { once: true });
+		let subscribed;
+		try {
+			subscribed = await broker.subscribe(ctx.scope, list.topics, sink, ctx.owner);
+		} catch (error) {
+			config.onError?.(c, error);
+			ended = true;
+			return c.json({
+				error: "realtime_unavailable",
+				detail: "realtime is briefly unavailable, retry shortly"
+			}, 503);
+		}
+		if ("refused" in subscribed) {
+			ended = true;
+			return refusalJson(c, subscribed);
+		}
+		handle = subscribed;
+		if (ended || signal?.aborted) {
+			end(false);
+			handle.close();
+		} else {
+			keepAlive = setInterval(() => send(KEEPALIVE), REALTIME_KEEPALIVE_MS);
+			const span = REALTIME_STREAM_MAX_MS - REALTIME_STREAM_MIN_MS;
+			lifetime = setTimeout(() => end(true), REALTIME_STREAM_MIN_MS + Math.floor(random() * span));
+		}
+		return new Response(stream, {
+			status: 200,
+			headers: {
+				"content-type": "text/event-stream; charset=utf-8",
+				"cache-control": "private, no-store, no-transform",
+				"x-accel-buffering": "no"
+			}
+		});
+	});
+	realtime.post("/realtime/:topic", async (c) => {
+		const ctx = await config.context(c);
+		if (ctx instanceof Response) return ctx;
+		const refused = gate(c, ctx);
+		if (refused) return refused;
+		const topic = c.req.param("topic");
+		if (!validateTopic(topic)) return c.json({
+			error: "invalid_topic",
+			detail: topicDetail(topic)
+		}, 400);
+		if (!ctx.isRuntime && isWorkerTopic(topic)) return c.json({
+			error: "topic_worker_only",
+			detail: `only the project's backend can publish to "${topic}" — pages can subscribe to it, but publish from a worker route instead`
+		}, 403);
+		const body = await c.req.json().catch(() => void 0);
+		if (typeof body !== "object" || body === null || Array.isArray(body) || body.data === void 0) return c.json({
+			error: "invalid_message",
+			detail: "send a JSON body of the form { \"data\": … }"
+		}, 400);
+		const data = body.data;
+		const bytes = encoder.encode(JSON.stringify(data)).byteLength;
+		if (bytes > 4096) return c.json({
+			error: "message_too_large",
+			detail: `message data is ${bytes} bytes; the limit is ${REALTIME_MAX_DATA_BYTES}. Send an id and load the rest from the database`
+		}, 413);
+		const envelope = {
+			id: newMessageId(),
+			topic,
+			data,
+			from: stampFrom(ctx.sender),
+			ts: (/* @__PURE__ */ new Date()).toISOString()
+		};
+		let refusal;
+		try {
+			refusal = await ctx.broker.publish(ctx.scope, envelope, {
+				bytes,
+				dailyQuota: ctx.dailyQuota,
+				dailyBytesQuota: ctx.dailyBytesQuota
+			});
+		} catch (error) {
+			config.onError?.(c, error);
+			return c.json({
+				error: "realtime_unavailable",
+				detail: "realtime is briefly unavailable, retry shortly"
+			}, 503);
+		}
+		if (refusal) return refusalJson(c, refusal);
+		return c.json({ id: envelope.id }, 202);
+	});
+	return realtime;
+}
 //#endregion
 //#region ../data-plane/src/worker-request.ts
 /**
@@ -652,4 +889,4 @@ function stampWorkerHeaders(headers, ctx) {
 	return headers;
 }
 //#endregion
-export { blobRouter as a, META_COLUMNS as i, stampWorkerHeaders as n, dbRouter as r, redactCanopyCredentials as t };
+export { META_COLUMNS as a, dbRouter as i, stampWorkerHeaders as n, blobRouter as o, realtimeRouter as r, redactCanopyCredentials as t };

package/dist/{staging-CKEoDnac.mjs → staging-D06zobnf.mjs}

@@ -1,5 +1,5 @@
 import { c as resolveProject, l as stagingUrl, o as projectFlagArgs, s as projectUrl } from "./site-DM2J10CB.mjs";
-import { a as unwrap, d as withContext, i as requireTty, l as apiRequest, r as reportErrors, t as formatDateTime } from "./ui-DR-siu2S.mjs";
+import { a as unwrap, d as withContext, i as requireTty, l as apiRequest, r as reportErrors, t as formatDateTime } from "./ui-CeupNHNa.mjs";
 import { defineCommand } from "citty";
 import * as p from "@clack/prompts";
 //#region src/staging.ts

package/dist/{token-Dp2CoIYj.mjs → token-C_PFNqcv.mjs}

@@ -1,5 +1,5 @@
 import { a as projectDirArgs, c as resolveProject, o as projectFlagArgs } from "./site-DM2J10CB.mjs";
-import { l as apiRequest, r as reportErrors, t as formatDateTime } from "./ui-DR-siu2S.mjs";
+import { l as apiRequest, r as reportErrors, t as formatDateTime } from "./ui-CeupNHNa.mjs";
 import { defineCommand } from "citty";
 const tokenCommand = defineCommand({
 	meta: {

package/dist/{ui-DR-siu2S.mjs → ui-CeupNHNa.mjs}

@@ -38,6 +38,10 @@ const ERROR_COPY = {
 		why: "the project is paused",
 		fix: "Resume it from the dashboard, then retry."
 	},
+	project_moved: {
+		why: "the project was marked as moved to another URL, so its hostnames only redirect",
+		fix: "Deploy to the project's new home instead, or undo the move under Settings in the dashboard and retry."
+	},
 	no_database: {
 		why: "the project has no database yet",
 		fix: "Deploy the project once (`canopy deploy`) to provision its database, then retry."

package/dist/{upgrade-BjQguwG6.mjs → upgrade-C8YdSKKd.mjs}

@@ -1,5 +1,5 @@
 import { t as PACKAGE_NAME } from "./version-check-CcsA1QjI.mjs";
-import { r as reportErrors } from "./ui-DR-siu2S.mjs";
+import { r as reportErrors } from "./ui-CeupNHNa.mjs";
 import { defineCommand } from "citty";
 import { spawn } from "node:child_process";
 import { fileURLToPath } from "node:url";
@@ -112,7 +112,7 @@ const upgradeCommand = defineCommand({
 		const spec = `${PACKAGE_NAME}@${args.version ?? "latest"}`;
 		const command = pmCommand(pm);
 		const cmd = installArgs(pm, spec);
-		const { skillInstalled } = await import("./skill-C83Za5BU.mjs");
+		const { skillInstalled } = await import("./skill-CuES7kPj.mjs");
 		const { homedir } = await import("node:os");
 		const refreshGlobal = skillInstalled(homedir());
 		const refreshRepo = process.cwd() !== homedir() && skillInstalled(process.cwd());

package/dist/{usage-81JSiWIx.mjs → usage-CV7TjTO8.mjs}

@@ -1,5 +1,5 @@
 import { c as resolveProject, o as projectFlagArgs } from "./site-DM2J10CB.mjs";
-import { d as withContext, l as apiRequest, r as reportErrors } from "./ui-DR-siu2S.mjs";
+import { d as withContext, l as apiRequest, r as reportErrors } from "./ui-CeupNHNa.mjs";
 import { defineCommand } from "citty";
 //#region src/usage.ts
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mediamonks/canopy-cli",
-  "version": "0.7.28",
+  "version": "0.7.30",
   "description": "Canopy CLI — create, develop and deploy Canopy projects.",
   "bin": {
     "canopy": "./dist/index.mjs"
@@ -20,7 +20,7 @@
     "esbuild": "^0.28.1",
     "hono": "^4.8.0",
     "vite-server": "npm:vite@^7",
-    "@mediamonks/canopy": "0.0.7",
+    "@mediamonks/canopy": "0.0.10",
     "@mediamonks/canopy-data-plane": "0.0.4"
   },
   "devDependencies": {

package/dist/dev-BOvMCaML.mjs

@@ -1,2 +0,0 @@
-import { t as devCommand } from "./dev-BvjbJcse.mjs";
-export { devCommand };