makefx 1.0.4 → 1.0.6

package/README.md

@@ -176,4 +176,4 @@ Run `makefx --help` or `makefx help <command>` for command-specific options.
 - Media generation guide: https://makefx.app/docs/media-playbooks
 - Source: https://github.com/krasnoperov/inventory
 
-Version: 1.0.4
+Version: 1.0.6

package/makefx.mjs

@@ -7,7 +7,9 @@ import { spawn } from "node:child_process";
 import { mkdir, readFile, readdir, rename, rm, stat, writeFile } from "node:fs/promises";
 import os from "node:os";
 import path from "node:path";
-import { createReadStream } from "node:fs";
+import { createReadStream, createWriteStream } from "node:fs";
+import { Readable } from "node:stream";
+import { pipeline } from "node:stream/promises";
 import https from "node:https";
 //#region \0rolldown/runtime.js
 var __create = Object.create;
@@ -3215,7 +3217,7 @@ var require_websocket = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	var net = __require("net");
 	var tls = __require("tls");
 	var { randomBytes: randomBytes$1, createHash: createHash$2 } = __require("crypto");
-	var { Duplex: Duplex$2, Readable } = __require("stream");
+	var { Duplex: Duplex$2, Readable: Readable$1 } = __require("stream");
 	var { URL: URL$1 } = __require("url");
 	var PerMessageDeflate = require_permessage_deflate();
 	var Receiver = require_receiver();
@@ -5452,17 +5454,11 @@ async function executeUpload(parsed, deps = defaultDeps$8) {
 	if (config.token.expiresAt < Date.now()) throw new Error(`Token expired for ${env} environment. Run: ${loginCommandForEnvironment(env)}`);
 	const baseUrl = deps.resolveBaseUrl(env);
 	const accessToken = config.token.accessToken;
-	const ctx = {
-		spaceId,
-		baseUrl,
-		accessToken
-	};
 	if (env === "local") process$1.env.NODE_TLS_REJECT_UNAUTHORIZED = "0";
 	try {
 		const fileStat = await deps.stat(filePath);
 		if (!fileStat.isFile()) throw new Error(`"${filePath}" is not a file`);
 		if (fileStat.size > 10485760) throw new Error(`File too large (${(fileStat.size / 1024 / 1024).toFixed(2)}MB). Maximum size: 10MB`);
-		await preflightSourceVariants(ctx, deps, sourceVariantIds);
 		const fileBuffer = await deps.readFile(filePath);
 		const fileName = path.basename(filePath);
 		const formData = new FormData();
@@ -5603,29 +5599,6 @@ function parseCsvOption(value, optionName) {
 	if (value === "true") throw new UploadUsageError(`${optionName} requires a value`);
 	return value.split(",").map((entry) => entry.trim()).filter(Boolean);
 }
-async function preflightSourceVariants(ctx, deps, sourceVariantIds) {
-	if (sourceVariantIds.length === 0) return;
-	const state = await fetchVariantState(ctx, deps);
-	for (const sourceVariantId of sourceVariantIds) if (!state.variantsById.has(sourceVariantId)) throw new Error(`Source variant not found in space: ${sourceVariantId}`);
-}
-async function fetchVariantState(ctx, deps) {
-	const assets = (await fetchJson$1(ctx, deps, `/api/spaces/${ctx.spaceId}/assets`)).assets ?? [];
-	const variantsById = /* @__PURE__ */ new Map();
-	await Promise.all(assets.map(async (asset) => {
-		const details = await fetchJson$1(ctx, deps, `/api/spaces/${ctx.spaceId}/assets/${encodeURIComponent(asset.id)}`);
-		for (const variant of details.variants ?? []) variantsById.set(variant.id, variant);
-	}));
-	return { variantsById };
-}
-async function fetchJson$1(ctx, deps, requestPath) {
-	const response = await deps.fetch(`${ctx.baseUrl}${requestPath}`, { headers: {
-		Authorization: `Bearer ${ctx.accessToken}`,
-		Accept: "application/json"
-	} });
-	const data = await response.json().catch(() => ({}));
-	if (!response.ok) throw new Error("error" in data ? data.error : `Request failed: ${response.status}`);
-	return data;
-}
 function printUsage$8() {
 	console.log(`
 Usage:
@@ -5873,11 +5846,40 @@ async function downloadFile(input) {
 	}
 	const headers = {};
 	if (input.accessToken) headers.Authorization = `Bearer ${input.accessToken}`;
-	const response = await fetch(`${input.baseUrl}${input.requestPath}`, { headers });
-	if (!response.ok) throw new Error(`Failed to download ${input.requestPath}: ${response.status} ${response.statusText}`);
-	const buffer = new Uint8Array(await response.arrayBuffer());
+	const requestUrl = `${input.baseUrl}${input.requestPath}`;
+	let response;
+	try {
+		response = await fetch(requestUrl, { headers });
+	} catch (error) {
+		throw new Error(`Failed to download ${input.requestPath}: ${formatFetchError(error)}`);
+	}
+	if (!response.ok) {
+		const errorText = await readErrorText(response);
+		throw new Error(`Failed to download ${input.requestPath}: ${response.status} ${response.statusText}${errorText ? ` - ${errorText}` : ""}`);
+	}
 	await mkdir(path.dirname(input.outputPath), { recursive: true });
-	await writeFile(input.outputPath, buffer);
+	if (!response.body) throw new Error(`Failed to download ${input.requestPath}: response body was empty`);
+	try {
+		await pipeline(Readable.fromWeb(response.body), createWriteStream(input.outputPath));
+	} catch (error) {
+		throw new Error(`Failed to write download ${input.requestPath} to ${input.outputPath}: ${formatFetchError(error)}`);
+	}
+	return {
+		headers: response.headers,
+		requestUrl
+	};
+}
+async function readErrorText(response) {
+	try {
+		return (await response.text()).slice(0, 500).trim();
+	} catch {
+		return "";
+	}
+}
+function formatFetchError(error) {
+	if (!(error instanceof Error)) return String(error);
+	const cause = error.cause instanceof Error ? ` (${error.cause.message})` : "";
+	return `${error.message}${cause}`;
 }
 async function downloadImage(input) {
 	await downloadFile({
@@ -8679,24 +8681,24 @@ async function executeAssets(parsed, deps = defaultDeps$3) {
 		const ref = parsed.positionals[1];
 		if (!ref) throw new Error("Variant ID or legacy image key is required: makefx assets download <variant-id-or-legacy-image-key> -o <file>");
 		const outputPath = getOutputPath(parsed);
-		const resolved = await resolveDownloadRef(ref, ctx, deps);
-		await deps.downloadFile({
+		const resolved = resolveDownloadRef(ref, ctx);
+		const metadata = getDownloadedVariantMetadata(resolved, await deps.downloadFile({
 			baseUrl: ctx.baseUrl,
 			accessToken: ctx.accessToken,
 			requestPath: resolved.requestPath,
 			outputPath,
 			force: ctx.force
-		});
+		}));
 		await recordDownloadedMirror({
 			ctx,
 			deps,
 			outputPath,
-			variant: resolved.variant
+			variant: metadata.mirrorVariant
 		});
-		deps.print(`Downloaded ${resolved.mediaKey} to ${outputPath}`);
+		deps.print(`Downloaded ${metadata.mediaKey} to ${outputPath}`);
 		return {
 			type: "download",
-			mediaKey: resolved.mediaKey,
+			mediaKey: metadata.mediaKey,
 			outputPath,
 			variant: resolved.variant
 		};
@@ -8881,7 +8883,7 @@ async function fetchJson(ctx, deps, apiPath) {
 	}
 	return response.json();
 }
-async function resolveDownloadRef(ref, ctx, deps) {
+function resolveDownloadRef(ref, ctx) {
 	if (looksLikeStorageKey(ref)) {
 		if (!isLegacyImageStorageKey(ref)) throw new Error("Direct media key downloads are not supported. Pass a variant ID so the authenticated media endpoint can authorize the download.");
 		return {
@@ -8889,19 +8891,32 @@ async function resolveDownloadRef(ref, ctx, deps) {
 			requestPath: `/api/images/${ref}`
 		};
 	}
-	const assets = await listAssets(ctx, deps);
-	for (const asset of assets) {
-		const variant = (await getAssetDetails(ctx, deps, asset.id)).variants.find((candidate) => candidate.id === ref);
-		if (!variant) continue;
-		const mediaKey = variant.media_key || variant.image_key;
-		if (mediaKey) return {
-			mediaKey,
-			requestPath: `/api/spaces/${encodeURIComponent(ctx.spaceId)}/variants/${encodeURIComponent(variant.id)}/media`,
-			variant
-		};
-		throw new Error(`Variant ${ref} has no downloadable media; status is ${variant.status}`);
-	}
-	throw new Error(`Variant not found in space ${ctx.spaceId}: ${ref}`);
+	return {
+		mediaKey: ref,
+		requestPath: `/api/spaces/${encodeURIComponent(ctx.spaceId)}/variants/${encodeURIComponent(ref)}/media`
+	};
+}
+function getDownloadedVariantMetadata(resolved, download) {
+	if (resolved.variant) return {
+		mediaKey: resolved.variant.media_key || resolved.variant.image_key || resolved.mediaKey,
+		mirrorVariant: resolved.variant
+	};
+	const headers = download?.headers;
+	const variantId = headers?.get("x-makefx-variant-id");
+	const assetId = headers?.get("x-makefx-asset-id");
+	const mediaKind = headers?.get("x-makefx-media-kind");
+	const mediaKey = headers?.get("x-makefx-media-key") || resolved.mediaKey;
+	if (!variantId || !assetId) return { mediaKey };
+	return {
+		mediaKey,
+		mirrorVariant: {
+			id: variantId,
+			asset_id: assetId,
+			media_kind: mediaKind || "image",
+			media_key: mediaKey,
+			image_key: mediaKey.startsWith("images/") ? mediaKey : null
+		}
+	};
 }
 function looksLikeStorageKey(value) {
 	return value.includes("/") || [
@@ -9460,7 +9475,7 @@ Options:
 }
 //#endregion
 //#region src/cli/index.ts
-var CLI_VERSION = "1.0.4+20bbdda462d5";
+var CLI_VERSION = "1.0.6+d87c3032db88";
 async function main() {
 	const argv = process$1.argv.slice(2);
 	if (argv[0] === "--") argv.shift();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "makefx",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "description": "Command-line interface for AI-assisted game asset production with Make Effects.",
   "license": "MIT",
   "type": "module",