create-opentray 0.22.0 → 0.23.0

package/dist/{bin-Dyfucd3C.mjs → bin-DDNgskyb.mjs}

@@ -9767,22 +9767,7 @@ const scrapeUrl = async (url, options = {}) => {
 		...c,
 		order
 	}));
-	const solids = [];
-	for (const original of originals) for (const variant of ["solid-black", "solid-white"]) {
-		const solid = await renderSolidSilhouette(original.path, variant === "solid-black" ? black : white);
-		if (solid === void 0) continue;
-		const hash = await iconPerceptualHash(solid);
-		if (hash !== void 0 && solids.some((s) => s.hash !== void 0 && hamming(hash, s.hash) <= 6)) continue;
-		const path = await writeIconTemp(solid, dir);
-		solids.push({
-			url: original.url,
-			path,
-			variant,
-			variantOf: original.order,
-			hash
-		});
-	}
-	const icons = [...originals.map((c) => ({
+	const icons = originals.map((c) => ({
 		index: c.order,
 		url: c.url,
 		path: c.path,
@@ -9790,16 +9775,7 @@ const scrapeUrl = async (url, options = {}) => {
 		height: c.height,
 		format: c.format,
 		variant: "original"
-	})), ...solids.map((s, i) => ({
-		index: originals.length + i,
-		url: s.url,
-		path: s.path,
-		width: SOLID_SIZE,
-		height: SOLID_SIZE,
-		format: "png",
-		variant: s.variant,
-		variantOf: s.variantOf
-	}))];
+	}));
 	return {
 		ok: true,
 		title,
@@ -9827,25 +9803,15 @@ const deriveUrlPresets = async (url, options = {}) => {
 		...scraped.frameEmbeddable === void 0 ? {} : { frameEmbeddable: scraped.frameEmbeddable }
 	};
 };
-const black = {
-	r: 0,
-	g: 0,
-	b: 0
-};
-const white = {
-	r: 255,
-	g: 255,
-	b: 255
-};
-const SOLID_SIZE = 128;
 /**
 * Render a solid-color silhouette from an icon's alpha mask (RGB discarded,
-* alpha kept) — the shape language macOS tray templates want. Non-decodable
-* sources (e.g. corrupt bytes) return undefined instead of failing the scrape.
+* alpha kept) — the shape language macOS tray templates want. Called on the
+* browser-extracted SUBJECT (its alpha mask IS the subject shape); returns
+* undefined for non-decodable sources instead of failing the caller.
 */
 const renderSolidSilhouette = async (sourcePath, color) => {
 	try {
-		const image = await containImage(await decodeImageFile(sourcePath), SOLID_SIZE, SOLID_SIZE);
+		const image = await containImage(await decodeImageFile(sourcePath), 128, 128);
 		for (let i = 0; i < image.data.length; i += 4) {
 			image.data[i] = color.r;
 			image.data[i + 1] = color.g;
@@ -17321,6 +17287,7 @@ const createWizardSession = (options) => {
 	let trayIconIsSolid = false;
 	let iconCandidates = [];
 	let iconPort;
+	let iconGeneration = 0;
 	let currentTokens = [];
 	let currentCommand = "";
 	let urlSource;
@@ -17459,13 +17426,15 @@ const createWizardSession = (options) => {
 			if (stateNow === "frozen" || stateNow === "materializing" || stateNow === "success") return;
 			iconCandidates = scraped.icons;
 			iconPort = port;
+			iconGeneration += 1;
 			currentIconPath = scraped.icons[0]?.path;
 			currentIconUrl = scraped.icons[0]?.url;
 			if (scraped.title !== void 0) scrapedTitle = scraped.title;
 			emit({
 				type: "icons",
 				port,
-				icons: scraped.icons
+				icons: scraped.icons,
+				generation: iconGeneration
 			});
 			emit({
 				type: "scrape",
@@ -17570,6 +17539,7 @@ const createWizardSession = (options) => {
 				...selectedPort === void 0 ? {} : { selectedPort },
 				iconCandidates: [...iconCandidates],
 				...iconPort === void 0 ? {} : { iconsPort: iconPort },
+				iconsGeneration: iconGeneration,
 				interactive
 			};
 		},
@@ -17595,6 +17565,64 @@ const createWizardSession = (options) => {
 		replaceIconCandidates(port, icons) {
 			iconPort = port;
 			iconCandidates = icons;
+			iconGeneration += 1;
+		},
+		async addIconCandidate(port, candidate) {
+			if (state === "frozen" || state === "materializing" || state === "success") return;
+			if (iconPort !== port) return;
+			const source = iconCandidates.find((icon) => icon.index === candidate.variantOf);
+			if (source === void 0) return;
+			const dir = tempIconDir ?? (tempIconDir = await mkdtemp(join(tmpdir(), "create-opentray-")));
+			const path = join(dir, `subject-${createHash("sha256").update(candidate.bytes).digest("hex").slice(0, 16)}.bin`);
+			await writeFile(path, candidate.bytes);
+			const priorSubject = iconCandidates.find((icon) => icon.variant === "subject" && icon.variantOf === source.index);
+			const base = priorSubject === void 0 ? iconCandidates : iconCandidates.filter((icon) => icon !== priorSubject && !(icon.variantOf === priorSubject.index && icon.variant !== "original" && icon.variant !== "subject"));
+			let nextIndex = base.reduce((max, icon) => Math.max(max, icon.index), -1) + 1;
+			const appended = {
+				index: nextIndex,
+				url: source.url,
+				path,
+				width: candidate.width,
+				height: candidate.height,
+				format: candidate.format,
+				variant: "subject",
+				variantOf: source.index
+			};
+			let candidates = [...base, appended];
+			for (const [variant, color] of [["solid-black", {
+				r: 0,
+				g: 0,
+				b: 0
+			}], ["solid-white", {
+				r: 255,
+				g: 255,
+				b: 255
+			}]]) {
+				const solid = await renderSolidSilhouette(path, color);
+				if (solid === void 0) continue;
+				const solidPath = join(dir, `solid-${variant}-${createHash("sha256").update(solid).digest("hex").slice(0, 12)}.bin`);
+				await writeFile(solidPath, solid);
+				nextIndex += 1;
+				candidates = [...candidates, {
+					index: nextIndex,
+					url: source.url,
+					path: solidPath,
+					width: 128,
+					height: 128,
+					format: "png",
+					variant,
+					variantOf: appended.index
+				}];
+			}
+			iconCandidates = candidates;
+			if (priorSubject !== void 0) iconGeneration += 1;
+			emit({
+				type: "icons",
+				port,
+				icons: iconCandidates,
+				generation: iconGeneration
+			});
+			return appended;
 		},
 		selectTrayIconCandidate(port, index) {
 			if (state === "frozen" || state === "materializing" || state === "success") return false;
@@ -17603,7 +17631,7 @@ const createWizardSession = (options) => {
 			touched.trayIconPath = true;
 			currentTrayIconPath = candidate.path;
 			currentTrayIconUrl = candidate.url;
-			trayIconIsSolid = candidate.variant !== "original";
+			trayIconIsSolid = candidate.variant === "solid-black" || candidate.variant === "solid-white";
 			form = {
 				...form,
 				trayIconPath: candidate.path
@@ -17621,7 +17649,7 @@ const createWizardSession = (options) => {
 			if (!touched.trayIconPath) {
 				currentTrayIconPath = candidate.path;
 				currentTrayIconUrl = candidate.url;
-				trayIconIsSolid = candidate.variant !== "original";
+				trayIconIsSolid = candidate.variant === "solid-black" || candidate.variant === "solid-white";
 				form = {
 					...form,
 					iconPath: candidate.path,
@@ -17649,6 +17677,7 @@ const createWizardSession = (options) => {
 				scrapedTitle = void 0;
 				iconCandidates = [];
 				iconPort = void 0;
+				iconGeneration += 1;
 				currentIconPath = void 0;
 				currentIconUrl = void 0;
 				stopTimers();
@@ -17678,6 +17707,7 @@ const createWizardSession = (options) => {
 			const scraped = await (options.scrapeUrl ?? scrapeUrl)(parsed.href, tempIconDir === void 0 ? {} : { tempDir: tempIconDir });
 			iconCandidates = scraped.ok ? scraped.icons : [];
 			iconPort = 0;
+			iconGeneration += 1;
 			currentIconPath = scraped.ok ? scraped.icons[0]?.path : void 0;
 			currentIconUrl = scraped.ok ? scraped.icons[0]?.url : void 0;
 			scrapedTitle = scraped.ok ? scraped.title : void 0;
@@ -17687,7 +17717,8 @@ const createWizardSession = (options) => {
 			emit({
 				type: "icons",
 				port: 0,
-				icons: iconCandidates
+				icons: iconCandidates,
+				generation: iconGeneration
 			});
 			emit({
 				type: "scrape",
@@ -17741,6 +17772,7 @@ const createWizardSession = (options) => {
 			currentTrayIconUrl = void 0;
 			trayIconIsSolid = false;
 			iconCandidates = [];
+			iconGeneration += 1;
 			touched.appId = false;
 			touched.appName = false;
 			touched.pm = false;
@@ -18859,6 +18891,8 @@ const LOOPBACK_HOSTS = /* @__PURE__ */ new Set([
 ]);
 const createWizardServer = async (createSession, options = {}) => {
 	const token = randomBytes(16).toString("hex");
+	const imglyUpstream = options.imglyUpstream ?? IMGLY_UPSTREAM;
+	const imglyCacheRoot = options.imglyCacheRoot ?? join(homedir(), ".opentray", "cache", "imgly-data");
 	const clients = /* @__PURE__ */ new Set();
 	const eventLog = [];
 	const EVENT_LOG_LIMIT = 200;
@@ -18933,6 +18967,10 @@ const createWizardServer = async (createSession, options = {}) => {
 			await handleAssetFile(url.pathname, response);
 			return;
 		}
+		if (url.pathname.startsWith("/imgly-data/")) {
+			await handleImglyAsset(url, response, imglyCacheRoot, imglyUpstream);
+			return;
+		}
 		if (url.pathname === "/logo.png" || FAVICON_PATHS.has(url.pathname)) {
 			await handleAssetFile(url.pathname, response);
 			return;
@@ -19137,6 +19175,83 @@ const handleVendorAsset = async (pathname, response) => {
 	}
 	respond(response, 404, "text/plain", "terminal renderer asset is missing\n");
 };
+/**
+* Backend model proxy/cache for the browser subject extraction (owner
+* round-8): the wizard rebinds a RANDOM port every launch, so a browser-side
+* cache can never survive — the backend downloads model assets from the
+* vendor CDN ONCE into a persistent disk cache and serves the frontend from
+* loopback. Content-addressed chunks are immutable → long-lived cache headers.
+*/
+const IMGLY_CONTENT_TYPES = {
+	".json": "application/json",
+	".wasm": "application/wasm",
+	".mjs": "text/javascript; charset=utf-8"
+};
+/** Model chunks are 4 MiB; bound the proxy to stop unbounded disk writes. */
+const IMGLY_FILE_LIMIT = 16 * 1024 * 1024;
+const IMGLY_UPSTREAM = (version) => `https://staticimgly.com/@imgly/background-removal-data/${version}/dist/`;
+const handleImglyAsset = async (url, response, cacheRoot, upstream) => {
+	const match = /^\/imgly-data\/([\w.-]+)\/([\w.-]+)$/.exec(url.pathname);
+	if (match === null) {
+		respond(response, 404, "text/plain", "not found\n");
+		return;
+	}
+	const version = match[1];
+	const name = match[2];
+	if (version.includes("..") || name.includes("..")) {
+		respond(response, 404, "text/plain", "not found\n");
+		return;
+	}
+	const contentType = IMGLY_CONTENT_TYPES[extname(name).toLowerCase()] ?? "application/octet-stream";
+	const respondBytes = (bytes, fromCache) => {
+		response.writeHead(200, {
+			"content-type": contentType,
+			"content-length": bytes.length,
+			"cache-control": "public, max-age=31536000, immutable",
+			"x-opentray-imgly-cache": fromCache ? "hit" : "miss"
+		});
+		response.end(bytes);
+	};
+	const dir = join(cacheRoot, version);
+	const path = join(dir, name);
+	const cached = await readFile(path).catch(() => void 0);
+	if (cached !== void 0) {
+		respondBytes(cached, true);
+		return;
+	}
+	const fetchFromUpstream = async () => {
+		const upstreamResponse = await fetch(`${upstream(version)}${name}`);
+		if (!upstreamResponse.ok) throw new Error(`upstream ${upstreamResponse.status}`);
+		const bytes = Buffer.from(await upstreamResponse.arrayBuffer());
+		if (bytes.length === 0 || bytes.length > IMGLY_FILE_LIMIT) throw new Error(`upstream size out of bounds: ${bytes.length}`);
+		await mkdir(dir, { recursive: true });
+		const tempPath = join(dir, `.${name}.${randomBytes(6).toString("hex")}.tmp`);
+		await writeFile(tempPath, bytes);
+		await rm(path, { force: true });
+		await rename(tempPath, path);
+		return bytes;
+	};
+	const inFlight = handleImglyAsset.inFlight.get(path);
+	if (inFlight !== void 0) {
+		try {
+			respondBytes(await inFlight, true);
+		} catch {
+			respond(response, 502, "text/plain", "model asset upstream failed\n");
+		}
+		return;
+	}
+	const download = fetchFromUpstream();
+	handleImglyAsset.inFlight.set(path, download);
+	try {
+		respondBytes(await download, false);
+	} catch (error) {
+		respond(response, 502, "text/plain", `model asset upstream failed: ${String(error)}\n`);
+	} finally {
+		handleImglyAsset.inFlight.delete(path);
+	}
+};
+/** In-flight upstream downloads, keyed by cache path (per server instance). */
+handleImglyAsset.inFlight = /* @__PURE__ */ new Map();
 /** Containment: icon routes must only read sources the wizard itself
 *  produced (its temp dirs / saved uploads), never arbitrary paths. */
 const isWizardOwnedIconPath = (session, target) => {
@@ -19163,6 +19278,41 @@ const handleApi = async (pathname, request, response, session, preReadBody) => {
 		respond(response, 200, "application/json", JSON.stringify({ path }) + "\n");
 		return;
 	}
+	if (pathname === "/api/icon-candidate") {
+		const query = new URL(request.url ?? "/", "http://127.0.0.1").searchParams;
+		const port = Number.parseInt(query.get("port") ?? "", 10);
+		const variantOf = Number.parseInt(query.get("variantOf") ?? "", 10);
+		const width = Number.parseInt(query.get("width") ?? "", 10);
+		const height = Number.parseInt(query.get("height") ?? "", 10);
+		if (!Number.isInteger(port) || !Number.isInteger(variantOf) || !Number.isInteger(width) || width <= 0 || !Number.isInteger(height) || height <= 0) {
+			respond(response, 400, "application/json", "{\"error\":\"port, variantOf, width and height are required\"}\n");
+			return;
+		}
+		const chunks = [];
+		for await (const chunk of request) {
+			const piece = typeof chunk === "string" ? Buffer.from(chunk) : chunk;
+			chunks.push(piece);
+		}
+		const bytes = Buffer.concat(chunks);
+		if (bytes.length < 64) {
+			respond(response, 400, "application/json", "{\"error\":\"image bytes are required\"}\n");
+			return;
+		}
+		const format = query.get("format") ?? "png";
+		const appended = await session.addIconCandidate(port, {
+			bytes,
+			variantOf,
+			width,
+			height,
+			format
+		});
+		if (appended === void 0) {
+			respond(response, 409, "application/json", "{\"error\":\"candidate not acceptable for this port/state\"}\n");
+			return;
+		}
+		respond(response, 200, "application/json", JSON.stringify({ index: appended.index }) + "\n");
+		return;
+	}
 	const body = preReadBody ?? await readJsonBody(request);
 	switch (pathname) {
 		case "/api/url": {
@@ -20807,4 +20957,4 @@ if (isMainModule()) main(process.argv.slice(2)).then((code) => {
 //#endregion
 export { resolveOnPath as A, parseNetstatPorts as C, waitForTcpPort as D, verifyHttpService as E, toProjectDirectoryName as F, deriveDefaultAppId as M, deriveDefaultAppName as N, parseShebangInterpreter as O, isValidAppId as P, parseLsofPorts as S, serviceUrl as T, faviconCandidateSize as _, isAuthorized as a, scrapeService as b, openMaterializedApp as c, expectedDarwinBundlePath as d, isDirectoryOccupied$1 as f, extractTitle as g, extractFaviconCandidates as h, createWizardServer as i, tokenizeCommandLine as j, resolveLaunchVector as k, pinningHint as l, writeScaffold as m, openBrowser as n, isLoopbackHost as o, materialize as p, parseWizardCli as r, createWizardSession as s, main as t, detectPackageManager as u, rankFaviconCandidates as v, parsePowerShellPorts as w, createPortDiscovery as x, resolveFaviconUrl as y };
 
-//# sourceMappingURL=bin-Dyfucd3C.mjs.map
+//# sourceMappingURL=bin-DDNgskyb.mjs.map