@fluid-app/fluid-cli-assets 0.1.628 → 0.1.630

package/dist/index.mjs

@@ -1,42 +1,27 @@
-import { createDomainCommand, declareInputs, findProjectConfig, getAuthToken } from "@fluid-app/fluid-cli";
+import { createDomainCommand, declareInputs, findProjectConfig, getAuthToken, uploadToDam } from "@fluid-app/fluid-cli";
 import "commander";
 import { basename } from "node:path";
 //#region src/commands/upload.ts
-const UPLOAD_BASE = (process.env["FLUID_UPLOAD_BASE"] ?? "https://upload.fluid.app").replace(/\/$/, "");
 function registerUpload(parent, ctx) {
 	declareInputs(parent.command("upload [file]").description("Upload a file or URL to the Fluid DAM (via upload.fluid.app)").option("--url <url>", "Fetch from an external URL instead of attaching a local file").option("--name <name>", "Display name for the DAM asset").option("--description <description>", "Asset description").option("--tags <tags>", "Comma-separated tags").option("--folder <folder>", "ImageKit folder override").option("--no-unique-filename", "Disable ImageKit's useUniqueFileName (default: enabled)").option("--create-media", "Also create a Fluid Media resource (active, share, publish-now)").action(async function(filePath, opts) {
 		const token = resolveToken(this.parent?.opts() ?? {});
 		if (!token) throw new Error("No API token found. Run `fluid login` or provide --token <token>.");
 		if (!filePath && !opts.url) throw new Error("Provide a file path or --url <url>. Run `fluid dam upload --help` for usage.");
 		if (filePath && opts.url) throw new Error("Provide either a file path OR --url, not both.");
-		const form = new FormData();
-		if (opts.folder) form.append("folder", opts.folder);
-		if (opts.uniqueFilename === false) form.append("useUniqueFileName", "false");
-		if (opts.url) form.append("external_asset_url", opts.url);
-		else if (filePath) {
-			const bytes = ctx.inputs.readFile(filePath);
-			const name = basename(filePath);
-			form.append("fileName", name);
-			form.append("file", new Blob([new Uint8Array(bytes)]), name);
-		}
-		if (opts.name) form.append("name", opts.name);
-		if (opts.description) form.append("description", opts.description);
-		if (opts.tags) form.append("tags", opts.tags);
-		if (opts.createMedia) form.append("create_media", "true");
-		if (ctx.verbose) process.stderr.write(`POST ${UPLOAD_BASE}/upload\n`);
-		const resp = await fetch(`${UPLOAD_BASE}/upload`, {
-			method: "POST",
-			headers: { Authorization: `Bearer ${token}` },
-			body: form
+		const body = await uploadToDam({
+			token,
+			...filePath ? { file: {
+				bytes: ctx.inputs.readFile(filePath),
+				name: basename(filePath)
+			} } : { url: opts.url },
+			name: opts.name,
+			description: opts.description,
+			tags: opts.tags,
+			folder: opts.folder,
+			uniqueFilename: opts.uniqueFilename,
+			createMedia: opts.createMedia,
+			onRequest: ctx.verbose ? (line) => process.stderr.write(`${line}\n`) : void 0
 		});
-		if (!resp.ok) {
-			let detail = "";
-			try {
-				detail = await resp.text();
-			} catch {}
-			throw new Error(`Upload failed (HTTP ${resp.status})${detail ? `: ${detail.slice(0, 400)}` : ""}`);
-		}
-		const body = await resp.json();
 		ctx.output(body);
 	}), (_opts, args) => args[0] ? [{
 		kind: "file",

package/jest.mocks/fluid-cli.ts

@@ -12,3 +12,5 @@ export function findProjectConfig(): null {
 
 export * from "../../core/src/inputs/index";
 export { createInputsReader } from "../../core/src/inputs/reader";
+// Dependency-free, so the real request is what the tests drive.
+export * from "../../core/src/dam/upload";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fluid-app/fluid-cli-assets",
-  "version": "0.1.628",
+  "version": "0.1.630",
   "description": "Fluid CLI commands for digital asset management (DAM)",
   "type": "module",
   "main": "./dist/index.mjs",
@@ -17,7 +17,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@fluid-app/fluid-cli": "0.1.652",
+    "@fluid-app/fluid-cli": "0.1.654",
     "commander": "^12.0.0"
   },
   "devDependencies": {

package/src/commands/upload.ts

@@ -9,6 +9,9 @@
  *   - Positional `<file>` path  → multipart upload from disk.
  *   - `--url <url>`             → service-side fetch + upload.
  *
+ * The request itself is `uploadToDam` from the core CLI, which
+ * `fluid sites media sync` sends its files through too.
+ *
  * Auth comes from the same --token / --profile / env / active-profile
  * resolution path the rest of the CLI uses; we re-implement the
  * resolve here instead of going through `ctx.getClient()` because
@@ -21,19 +24,10 @@ import {
   declareInputs,
   findProjectConfig,
   getAuthToken,
+  uploadToDam,
 } from "@fluid-app/fluid-cli";
 import type { CommandContext } from "@fluid-app/fluid-cli";
 
-// Hard-coded — the bearer token we forward is the user's Fluid API
-// token, so the destination MUST be a Fluid-controlled host or any
-// `--upload-base evil.example` would exfiltrate it. If you're running the
-// upload service locally, point at it via the
-// FLUID_UPLOAD_BASE env var instead (read at process start, not
-// from an end-user-typed argv string).
-const UPLOAD_BASE = (
-  process.env["FLUID_UPLOAD_BASE"] ?? "https://upload.fluid.app"
-).replace(/\/$/, "");
-
 interface UploadOptions {
   url?: string;
   name?: string;
@@ -98,61 +92,27 @@ export function registerUpload(parent: Command, ctx: CommandContext): void {
         throw new Error("Provide either a file path OR --url, not both.");
       }
 
-      // Multipart order matters for streaming uploads (>~100 MB).
-      // The service streams `file` straight through to ImageKit, so
-      // any field ImageKit needs (`fileName`, `folder`,
-      // `useUniqueFileName`) must arrive BEFORE the file part.
-      // Fields consumed after upload (`name`, `description`, `tags`,
-      // `create_media`) can sit anywhere — we put them last for
-      // readability.
-      const form = new FormData();
-      if (opts.folder) form.append("folder", opts.folder);
-      if (opts.uniqueFilename === false) {
-        form.append("useUniqueFileName", "false");
-      }
-
-      if (opts.url) {
-        form.append("external_asset_url", opts.url);
-      } else if (filePath) {
-        const bytes = ctx.inputs.readFile(filePath);
-        const name = basename(filePath);
-        form.append("fileName", name);
-        // Wrap as a Blob so the global fetch's multipart serializer
-        // emits a proper Content-Disposition with filename. Node 20+
-        // global FormData accepts (Blob, filename) pairs.
-        form.append("file", new Blob([new Uint8Array(bytes)]), name);
-      }
-
-      if (opts.name) form.append("name", opts.name);
-      if (opts.description) form.append("description", opts.description);
-      if (opts.tags) form.append("tags", opts.tags);
-      if (opts.createMedia) form.append("create_media", "true");
-
-      if (ctx.verbose) {
-        process.stderr.write(`POST ${UPLOAD_BASE}/upload\n`);
-      }
-
-      const resp = await fetch(`${UPLOAD_BASE}/upload`, {
-        method: "POST",
-        headers: { Authorization: `Bearer ${token}` },
-        body: form,
+      const body = await uploadToDam({
+        token,
+        // Exactly one of the two was given, checked above.
+        ...(filePath
+          ? {
+              file: {
+                bytes: ctx.inputs.readFile(filePath),
+                name: basename(filePath),
+              },
+            }
+          : { url: opts.url }),
+        name: opts.name,
+        description: opts.description,
+        tags: opts.tags,
+        folder: opts.folder,
+        uniqueFilename: opts.uniqueFilename,
+        createMedia: opts.createMedia,
+        onRequest: ctx.verbose
+          ? (line) => process.stderr.write(`${line}\n`)
+          : undefined,
       });
-
-      if (!resp.ok) {
-        let detail = "";
-        try {
-          detail = await resp.text();
-        } catch {
-          // No body or unreadable — error message stays generic.
-        }
-        throw new Error(
-          `Upload failed (HTTP ${resp.status})${
-            detail ? `: ${detail.slice(0, 400)}` : ""
-          }`,
-        );
-      }
-
-      const body: unknown = await resp.json();
       ctx.output(body);
     });
   declareInputs(upload, (_opts, args) =>