@plitzi/cli 0.37.6 → 0.37.8

package/CHANGELOG.md

@@ -1,5 +1,49 @@
 # @plitzi/cli
 
+## 0.37.8
+
+### Patch Changes
+
+- 4d10e0a: ## Fixed: an api container could not read a file from a CDN
+
+  - **What happened:** the api container sent `Content-Type: application/json` on every request, including a GET with no
+    body to describe. That made every read a non-simple cross-origin request, so the browser asked the host's
+    permission first.
+  - **Who it hit:** hosts that allow plain cross-origin reads (GET and HEAD from any origin, the usual CORS of a public
+    bucket, the space's own CDN among them) refused that preflight. The file never loaded. Tremor's world outlines on
+    `cdn-dev.plitzi.com` are one example.
+  - **What changes:** a read now sends `Accept: application/json`, and `Content-Type` goes only with a body, unless the
+    author set their own. Headers the author adds still make the request non-simple, as they must.
+
+- Updated dependencies [4d10e0a]
+  - @plitzi/sdk-authoring@0.37.8
+
+## 0.37.7
+
+### Patch Changes
+
+- 4d10e0a: ## CDNs with several buckets
+
+  A CDN is the customer's own storage account — S3 or R2, which they run and pay for — and now holds any number of
+  buckets, each with its own configuration: its name at the provider, its region, `public` (served at its domain) or
+  `private` (no domain, read only by the platform with the CDN's credential).
+
+  - `Cdn` carries `buckets: CdnBucket[]`; `domain`, `visibility`, `bucketName` and `region` moved from the CDN to its
+    buckets. `Resource.bucketIdentifier` names the bucket a file is in.
+  - `SpaceAddCdn(name, provider, endpoint, buckets)` creates the account with its buckets; `SpaceUpdateCdn` changes the
+    account only. New `SpaceAddCdnBucket`, `SpaceUpdateCdnBucket` and `SpaceRemoveCdnBucket`.
+  - `SpaceResources`, `SpaceAddResource`, `SpaceRemoveResource` and `SpaceMoveResource` take `bucketIdentifier`.
+  - Server code — functions and runtime — goes in the space's oldest private bucket. A bucket that keeps code a version
+    runs can be neither made public, pointed at another bucket nor removed, and neither can its CDN.
+  - Builder: Resources shows each CDN with its buckets — add, edit and remove buckets, upload and browse per bucket; the
+    account (name, provider, endpoint, credential) is edited apart. Saving an element as a template picks a public
+    bucket (`elementAsTemplate({ cdnIdentifier, bucketIdentifier }, …)`).
+  - CLI: `plitzi upload plugin --bucket <identifier>` (with `--cdn` to narrow); only public buckets are offered, a private
+    one is refused.
+
+- Updated dependencies [4d10e0a]
+  - @plitzi/sdk-authoring@0.37.7
+
 ## 0.37.6
 
 ### Patch Changes

package/README.md

@@ -172,8 +172,9 @@ up in the live one because of a flag.
 `upload plugin` takes the zip named, or the one `pack plugin` left in the project (the newest, when there are several —
 asked at a terminal). It is checked for its `plugin-manifest.json` before anything is sent. Without a connection, or
 without a space, the browser opens for what is missing, so the first upload is one command too. It goes on one of the
-space's CDNs — `--cdn <identifier>`, or asked when there are several — and is installed, as the builder does when a
-zip is dropped under Resources: added, or the plugin already there moved to the new version with its settings kept.
+space's public buckets — `--bucket <identifier>` (narrowed to one CDN with `--cdn <identifier>`), or asked when there
+are several; a private bucket is refused, since no page could load from it — and is installed, as the builder does when
+a zip is dropped under Resources: added, or the plugin already there moved to the new version with its settings kept.
 
 `--api` (or `PLITZI_API_URL`) points it at another platform, a self-hosted or local one; the CLI trusts the
 certificate authorities the system trusts, as the browser beside it does.

package/dist/index.js

@@ -4552,28 +4552,43 @@ var manifestOf = (zip) => {
 		return;
 	}
 };
-var chooseCdn = async (listed, given, spaceName) => {
-	const cdns = listed.filter((cdn) => cdn.visibility !== "private");
-	if (given) {
-		const named = listed.find((cdn) => cdn.identifier === given);
-		if (!named) fail(`${spaceName} has no CDN "${given}". Its CDNs: ${listed.map((cdn) => cdn.identifier).join(", ")}.`);
-		else if (named.visibility === "private") {
-			fail(`"${given}" is a private CDN: it keeps ${spaceName}'s server code and has no public address, so no page could load a plugin from it. Use a public one${cdns.length ? `: ${cdns.map((cdn) => cdn.identifier).join(", ")}` : ""}.`);
+/**
+* The public bucket a plugin goes in — the one `--cdn` and `--bucket` name, the only one there is, or the one picked.
+* A private bucket keeps server code and has no public address, so it is never one.
+*/
+var chooseTarget = async (cdns, { cdn: givenCdn, bucket: givenBucket }, spaceName) => {
+	if (givenCdn && !cdns.some((cdn) => cdn.identifier === givenCdn)) {
+		fail(`${spaceName} has no CDN "${givenCdn}". Its CDNs: ${cdns.map((cdn) => cdn.identifier).join(", ")}.`);
+		return;
+	}
+	const candidates = cdns.filter((cdn) => !givenCdn || cdn.identifier === givenCdn).flatMap((cdn) => cdn.buckets.map((bucket) => ({
+		cdn,
+		bucket
+	})));
+	if (givenBucket) {
+		const named = candidates.find(({ bucket }) => bucket.identifier === givenBucket);
+		if (!named) {
+			fail(`${spaceName} has no bucket "${givenBucket}"${givenCdn ? ` in the CDN "${givenCdn}"` : ""}.`);
+			return;
+		}
+		if (named.bucket.visibility === "private") {
+			fail(`"${givenBucket}" is a private bucket: it has no public address, so no page could load a plugin from it.`);
 			return;
 		}
 		return named;
 	}
-	if (cdns.length === 0) {
-		fail(`${spaceName} has no public CDN to put a plugin on. Add one in the builder, under Resources${listed.length ? " (its only CDNs are private, for server code)" : ""}.`);
+	const targets = candidates.filter(({ bucket }) => bucket.visibility === "public");
+	if (targets.length === 0) {
+		fail(`${spaceName} has no public bucket to put a plugin in. Add one to a CDN in the builder, under Resources.`);
 		return;
 	}
-	if (cdns.length === 1) return cdns[0];
+	if (targets.length === 1) return targets[0];
 	if (!atTerminal()) {
 		refuseWithoutTerminal("upload", [{
-			flag: "--cdn",
-			choices: cdns.map((cdn) => cdn.identifier),
-			question: `Which of ${spaceName}'s CDNs does the plugin go on?`
-		}], "plitzi upload plugin stopped before uploading anything: which CDN serves the plugin is a choice");
+			flag: "--bucket",
+			choices: targets.map(({ bucket }) => bucket.identifier),
+			question: `Which of ${spaceName}'s public buckets does the plugin go in? (narrow with --cdn)`
+		}], "plitzi upload plugin stopped before uploading anything: which bucket serves the plugin is a choice");
 		return;
 	}
 	const rl = readline.createInterface({
@@ -4581,9 +4596,9 @@ var chooseCdn = async (listed, given, spaceName) => {
 		output: process.stdout
 	});
 	try {
-		return await askPick(rl, `Which of ${spaceName}'s CDNs does the plugin go on?`, cdns.map((cdn) => ({
-			label: `${cdn.name} ${chalk.dim(`${cdn.identifier} · ${cdn.domain}`)}`,
-			value: cdn
+		return await askPick(rl, `Which of ${spaceName}'s public buckets does the plugin go in?`, targets.map((target) => ({
+			label: `${target.cdn.name} — ${target.bucket.name} ${chalk.dim(`${target.bucket.identifier} · ${target.bucket.domain}`)}`,
+			value: target
 		})));
 	} finally {
 		rl.close();
@@ -4617,11 +4632,15 @@ var uploadPluginCommand = async (zipGiven, options) => {
 		fail(listed.value.reply.data.error ?? `Could not list ${space.name}'s CDNs (${listed.value.reply.status}).`);
 		return;
 	}
-	const cdn = await chooseCdn(listed.value.reply.data.cdns ?? [], options.cdn, space.name);
-	if (!cdn) return;
+	const target = await chooseTarget(listed.value.reply.data.cdns ?? [], options, space.name);
+	if (!target) return;
+	const { cdn, bucket } = target;
 	const label = `${manifest.root}${manifest.version ? ` ${manifest.version}` : ""}`;
-	console.log(`\nUploading ${chalk.bold(label)} to ${chalk.bold(space.name)}, on ${cdn.name}…`);
-	const query = new URLSearchParams({ filename: path.basename(zipPath) });
+	console.log(`\nUploading ${chalk.bold(label)} to ${chalk.bold(space.name)}, in ${cdn.name} — ${bucket.name}…`);
+	const query = new URLSearchParams({
+		filename: path.basename(zipPath),
+		bucket: bucket.identifier
+	});
 	const uploaded = await authorizedRequest(listed.value.connection, `/spaces/${space.id}/cdns/${encodeURIComponent(cdn.identifier)}/plugins?${query}`, {
 		method: "POST",
 		headers: { "Content-Type": "application/zip" },
@@ -4674,7 +4693,7 @@ program.command("login").description("Sign in, in your browser. The session is k
 program.command("logout").description("Sign out: the session is revoked on the platform and forgotten here").action(() => logout());
 program.command("whoami").description("Who the CLI is signed in as, and the space it works in").option(...API_OPTION).action((options) => whoami(options));
 program.command("space").description("Choose the space to work in, in your browser. One at a time: it replaces the one chosen before").option(...API_OPTION).action((options) => space(options));
-program.command("upload").description("Put something of this project on the space you work in").command("plugin").argument("[zip]", "The zip plitzi pack plugin built. Left out: the one packed in this project.").description("Upload a packed plugin to a CDN of the space you work in, and install it there").option("--cdn <identifier>", "Which of the space’s CDNs. Asked for when it has several.").option(...API_OPTION).action((zip, options) => uploadPluginCommand(zip, options));
+program.command("upload").description("Put something of this project on the space you work in").command("plugin").argument("[zip]", "The zip plitzi pack plugin built. Left out: the one packed in this project.").description("Upload a packed plugin to a CDN of the space you work in, and install it there").option("--cdn <identifier>", "Which of the space’s CDNs the bucket is in.").option("--bucket <identifier>", "Which public bucket the plugin goes in. Asked for when there are several.").option(...API_OPTION).action((zip, options) => uploadPluginCommand(zip, options));
 var functions = program.command("functions").description("The space’s own server code: functions/ in this project is a working copy of it");
 functions.command("pull").description("Write the space’s functions into functions/ — refused when that would overwrite what is not pushed").option("-f, --force", "Overwrite what is not pushed, or a copy of another space").option(...API_OPTION).action((options) => pullFunctions(options));
 functions.command("push").description("Save functions/ as the space’s draft: built and checked on the platform, refused if it moved on since").option(...API_OPTION).action((options) => pushFunctions(options));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plitzi/cli",
-  "version": "0.37.6",
+  "version": "0.37.8",
   "license": "AGPL-3.0",
   "description": "Command line for Plitzi: scaffold a project that renders a space, a plugin package, or an element of your own.",
   "files": [
@@ -21,14 +21,14 @@
   },
   "sideEffects": false,
   "dependencies": {
-    "@plitzi/sdk-authoring": "0.37.6",
+    "@plitzi/sdk-authoring": "0.37.8",
     "chalk": "^6.0.0",
     "commander": "^15.0.0",
     "esbuild": "^0.28.2",
     "fflate": "^0.8.3"
   },
   "devDependencies": {
-    "@plitzi/sdk-shared": "0.37.6",
+    "@plitzi/sdk-shared": "0.37.8",
     "@types/node": "^26.6.2",
     "eslint": "^9.39.5",
     "eslint-plugin-import": "^2.32.0",