dsh-background-by-model 0.7.6 → 0.7.8

package/lib/index.js

@@ -87,11 +87,11 @@ const PART_OPACITY_KEYS = [
 	"input"
 ];
 const DEFAULT_PART_OPACITIES = {
-	bg: .85,
-	sidebar: .93,
+	bg: 0,
+	sidebar: .1,
 	card: 1,
-	code: 1,
-	input: 1
+	code: .81,
+	input: .88
 };
 /**
 * Interface blur (px, 0..60), global (Interface page):
@@ -122,7 +122,7 @@ const DEFAULT_PART_BLURS = {
 	chat: 0,
 	trajectory: 0,
 	rightbar: 0,
-	input: 0
+	input: 60
 };
 /** Longest allowed switch duration; 0 is a hard cut. */
 const TRANSITION_MAX_MS = 3e3;
@@ -146,6 +146,9 @@ const DEFAULT_TRANSITION = {
 	easing: "ease",
 	durationMs: 320
 };
+const DEFAULT_CHAT_TEXT_OPACITY = .35;
+const DEFAULT_TRAJECTORY_OPACITY = .73;
+const DEFAULT_RIGHTBAR_OPACITY = .45;
 /**
 * `#RRGGBB` → the `[h, s, l]` triple every rule stores (`s` and `l` in 0..1), or
 * null when the string is not a hex color.
@@ -210,6 +213,35 @@ function defaultHolidayRule(def) {
 		rotate: defaultRotation()
 	};
 }
+/**
+* A rule with nothing in it yet: no picture, no match string, no color.
+*
+* Two states need this factory and they are the same state — a fresh install
+* (see `freshThemeConfig` and `normalizeConfig`), and the "add rule" tile one
+* entry further down the list.
+*
+* Such a rule is deliberately valid rather than half-built: it is skipped by
+* matching until it has something of its own to paint (`ruleCanPaint` — a picture,
+* or a theme color), which is what makes a rule nobody has filled in yet invisible
+* instead of letting an empty background steal the fallback from rule 1.
+*
+* It used to be born with an allocated slot and an empty image entry, which is
+* what put a blank tile at position 1 of a new rule's strip — and, worse, stopped
+* the picture the user added next from being the first one (a rule paints its
+* FIRST image). The slot is allocated when the first picture arrives.
+*/
+function blankRule(id) {
+	return {
+		id,
+		images: [],
+		match: "",
+		enabled: true,
+		color: null,
+		wallpaperOpacity: 1,
+		blur: 0,
+		rotate: defaultRotation()
+	};
+}
 /** Slot names reach the filesystem, so they are strictly whitelisted. */
 const SLOT_RE = /^[A-Za-z0-9_-]{1,32}$/;
 function clamp(n, lo, hi, def) {
@@ -440,14 +472,36 @@ function normalizeHolidays(raw) {
 		if (typeof id === "string") stored.set(id, item);
 	}
 	return {
-		enabled: r.enabled !== false,
+		enabled: typeof r.enabled === "boolean" ? r.enabled : false,
 		items: HOLIDAYS.map((def) => normalizeHolidayRule(def, stored.get(def.id)))
 	};
 }
+/**
+* The file-preview panel's own opacity.
+*
+* Three states, and the middle one is why this is a function rather than the
+* one-line fallback every other field gets: a real number is the card's own
+* value, `null` is "never owned, so follow `opacities.bg`", and a KEY that is not
+* there at all — a hand-written config, or one written before the option existed
+* — is the shipped profile's 45% (see DEFAULT_RIGHTBAR_OPACITY).
+*
+* `null` has to survive as ITSELF instead of falling through to the default:
+* every release so far has written it — a panel the user never dragged is
+* persisted as an explicit `null` — so treating it as "missing" would hand the
+* shipped 45% to every configuration whose preview panel was following the main
+* background, a silent change to a setup nobody asked to change. It is also
+* unreachable from the UI (no control returns to it); it exists for configs that
+* were written while the shipped default was `null`.
+*/
+function normalizeRightbarOpacity(v) {
+	if (v === null) return null;
+	if (typeof v === "number" && isFinite(v)) return clamp01(v, 1);
+	return DEFAULT_RIGHTBAR_OPACITY;
+}
 /** Coerce an unknown persisted value into a valid ThemeConfig, falling back per-field. */
 function normalizeConfig(raw) {
 	const r = raw ?? {};
-	const rules = Array.isArray(r.rules) ? r.rules.map(normalizeRule).filter((x) => x !== null) : [];
+	const rules = Array.isArray(r.rules) ? r.rules.map(normalizeRule).filter((x) => x !== null) : [blankRule("r1")];
 	const ops = r.opacities ?? {};
 	const bl = r.blurs ?? {};
 	const blurs = {};
@@ -460,13 +514,49 @@ function normalizeConfig(raw) {
 		blurs,
 		transition: normalizeTransition(r.transition, legacyFadeMs(r.rules)),
 		settingsOpacity: clamp01(r.settingsOpacity, 1),
-		chatTextOpacity: clamp01(r.chatTextOpacity, 0),
-		trajectoryOpacity: clamp01(r.trajectoryOpacity, 1),
-		rightbarOpacity: typeof r.rightbarOpacity === "number" && isFinite(r.rightbarOpacity) ? clamp01(r.rightbarOpacity, 1) : null,
+		chatTextOpacity: clamp01(r.chatTextOpacity, DEFAULT_CHAT_TEXT_OPACITY),
+		trajectoryOpacity: clamp01(r.trajectoryOpacity, DEFAULT_TRAJECTORY_OPACITY),
+		rightbarOpacity: normalizeRightbarOpacity(r.rightbarOpacity),
 		autoExtract: r.autoExtract !== false,
 		holidays: normalizeHolidays(r.holidays)
 	};
 }
+/**
+* Whether another round is worth asking for.
+*
+* Three reasons are terminal, and each for its own:
+*
+*   - `missing` — the host says the file is not there. The profile follows a
+*     BRANCH (see `PRESET_ASSET_HOSTS` in ./index), so a renamed or deleted file
+*     has to reach the user as a loud failure NAMING the slot — and it has to
+*     reach them FAST: paying two more rounds for a file that is provably absent
+*     only makes the sentence later, on a button the user is watching.
+*   - `oversized` — the bytes are the problem, and the next round would serve the
+*     same bytes.
+*   - `timeout` — sixty seconds of silence is not weather. Both mirrors were
+*     already asked inside the SAME round, so a retry round would re-ask two hosts
+*     that each just spent a minute not answering. This is also what keeps the
+*     worst case for one file at three minutes instead of six: a round in which BOTH
+*     mirrors were silent is over immediately (two minutes, exactly what it cost
+*     before there were rounds at all), and only a round that mixed a silent mirror
+*     with a transient one can carry a minute into the next round.
+*
+* Everything else is a hiccup: a thrown connection, a 5xx, a 429, a 408, or a 200
+* with no body.
+*/
+function presetRetryable(reason) {
+	return reason !== "missing" && reason !== "oversized" && reason !== "timeout";
+}
+/**
+* The delay before the round that follows `failedAttempt` (1-based), in ms.
+*
+* Doubling rather than fixed: the second retry is the one that has to survive a
+* mirror having a bad few hundred milliseconds, and it is still short enough that
+* a user staring at "downloading" does not read it as a hang.
+*/
+function presetRetryDelayMs(failedAttempt) {
+	return 400 * 2 ** Math.max(0, failedAttempt - 1);
+}
 //#endregion
 //#region src/index.ts
 /**
@@ -636,12 +726,18 @@ const exists = async (p) => {
 * layout mode, opacity, blur and framing, and the remaining legacy files
 * (background video, upload temp) are removed. Idempotent: the rewritten config
 * carries `rules`, so the next read short-circuits.
+*
+* The one case that is NOT a migration — a store with no config file at all — is
+* handed through untouched rather than being filled in as `rules: []`. That empty
+* list would be the same thing the sanitizer reads as "the user deleted every
+* rule", and a fresh install is the opposite of that: `normalizeConfig` turns a
+* config that names no rule list into the one blank rule the panel opens on.
 */
 async function migrateLegacy(raw) {
 	const r = raw ?? {};
 	if (Array.isArray(r.rules)) return r;
 	const hasWallpaper = await exists(legacyWallpaperPath());
-	if (Object.keys(r).length === 0 && !hasWallpaper) return { rules: [] };
+	if (Object.keys(r).length === 0 && !hasWallpaper) return {};
 	if (hasWallpaper) {
 		const target = imagePath("m1");
 		try {
@@ -873,14 +969,20 @@ async function downloadHolidayAsset(asset) {
 	}
 	return null;
 }
+/** Wait, without pulling in `node:timers/promises` for one line. */
+const sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
 /**
-* One asset over the wire, or null for every way it can fail.
+* One asset over the wire, or WHY it did not arrive.
 *
 * Never throws: a holiday that cannot be fetched is a holiday that does not paint
-* today, which is a normal state and not an error path the caller should have to
-* wrap. The `content-length` check is a courtesy — a mirror that announces a
-* huge body never gets to send it — while the post-read size check is the one
-* that actually holds.
+* today, and a profile file that cannot be fetched is a sentence on the button —
+* neither is an error path the caller should have to wrap. What it answers with
+* instead is the reason, because the two callers treat those differently: the
+* profile asks `presetRetryable` whether the reason is weather (./preset) and the
+* festival art takes the null and waits for the next apply.
+*
+* The `content-length` check is a courtesy — a mirror that announces a huge body
+* never gets to send it — while the post-read size check is the one that holds.
 *
 * Deliberately says nothing about WHAT the bytes are: the festival art and the
 * recommended profile are both "a file from the assets repository", and the one
@@ -889,37 +991,89 @@ async function downloadHolidayAsset(asset) {
 * asked for.
 */
 async function fetchAsset(url, max, timeout) {
+	const ctl = new AbortController();
+	const timer = setTimeout(() => ctl.abort(), timeout);
 	try {
-		const ctl = new AbortController();
-		const timer = setTimeout(() => ctl.abort(), timeout);
-		try {
-			const res = await fetch(url, {
-				redirect: "follow",
-				signal: ctl.signal
-			});
-			if (!res.ok) return null;
-			const announced = Number(res.headers.get("content-length") ?? "");
-			if (isFinite(announced) && announced > max) return null;
-			const arr = await res.arrayBuffer();
-			if (arr.byteLength === 0 || arr.byteLength > max) return null;
-			return Buffer.from(arr);
-		} finally {
-			clearTimeout(timer);
-		}
+		const res = await fetch(url, {
+			redirect: "follow",
+			signal: ctl.signal
+		});
+		if (!res.ok) return {
+			ok: false,
+			reason: fetchFailureForStatus(res.status)
+		};
+		const announced = Number(res.headers.get("content-length") ?? "");
+		if (isFinite(announced) && announced > max) return {
+			ok: false,
+			reason: "oversized"
+		};
+		const arr = await res.arrayBuffer();
+		if (arr.byteLength > max) return {
+			ok: false,
+			reason: "oversized"
+		};
+		if (arr.byteLength === 0) return {
+			ok: false,
+			reason: "empty"
+		};
+		return {
+			ok: true,
+			buf: Buffer.from(arr)
+		};
 	} catch {
-		return null;
+		return {
+			ok: false,
+			reason: ctl.signal.aborted ? "timeout" : "network"
+		};
+	} finally {
+		clearTimeout(timer);
 	}
 }
-/** One festival picture, or null when no mirror served an image. */
+/**
+* The status codes worth another round: 5xx is a mirror having a bad moment, 429
+* is one asking to be left alone for a bit, 408 is one giving up on us.
+*
+* Every other non-2xx means the file is not there — jsDelivr answers a path
+* outside the repository with 403, both hosts answer a missing file with 404 — and
+* the profile follows a BRANCH, so that answer has to arrive fast and unchanged.
+*/
+function fetchFailureForStatus(status) {
+	return status >= 500 || status === 429 || status === 408 ? "server" : "missing";
+}
+/**
+* One festival picture, or null when no mirror served an image.
+*
+* One round, deliberately, unlike the profile's (see `fetchPresetFile`): this is
+* fetched during boot, on the day, before the first wallpaper is painted, and a
+* retry round would add its delay to that first paint. The art does not need one
+* either — it is cached once it arrives, and every later read tries again, while a
+* button press has no later read of its own.
+*/
 async function fetchHolidayAsset(url) {
-	const buf = await fetchAsset(url, HOLIDAY_FETCH_MAX, HOLIDAY_FETCH_TIMEOUT);
-	return buf === null || imageMimeOrNull(buf) === null ? null : buf;
+	const got = await fetchAsset(url, HOLIDAY_FETCH_MAX, HOLIDAY_FETCH_TIMEOUT);
+	return !got.ok || imageMimeOrNull(got.buf) === null ? null : got.buf;
 }
-/** One file out of the profile directory, or null when no mirror served it. */
+/**
+* One file out of the profile directory, or null when no mirror served it.
+*
+* Every mirror is asked in every round, so a round is "all the hosts there are"
+* and the rounds are the retry: the case this exists for is a mirror that answers
+* 502 on one round and correctly on the next, on the sixth of seven files, with
+* six good downloads behind it. A round in which every failure was terminal — the
+* file is not there, or it is too big — ends the attempts outright, so "the author
+* renamed a file" still costs exactly two requests and a sentence naming the slot
+* (see `presetRetryable`, ./preset).
+*/
 async function fetchPresetFile(name, max) {
-	for (const host of PRESET_ASSET_HOSTS) {
-		const buf = await fetchAsset(`${host}/${name}`, max, PRESET_FETCH_TIMEOUT);
-		if (buf !== null) return buf;
+	for (let attempt = 1; attempt <= 3; attempt++) {
+		let retryable = false;
+		for (const host of PRESET_ASSET_HOSTS) {
+			const got = await fetchAsset(`${host}/${name}`, max, PRESET_FETCH_TIMEOUT);
+			if (got.ok) return got.buf;
+			if (presetRetryable(got.reason)) retryable = true;
+		}
+		if (!retryable || attempt === 3) return null;
+		await sleep(presetRetryDelayMs(attempt));
 	}
 	return null;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-background-by-model",
-  "version": "0.7.6",
+  "version": "0.7.8",
   "description": "Appearance plugin for DeepSeek Harness: an ordered list of model rules, each carrying its own wallpapers — every image with its own framing and theme color — plus layout mode, opacity and blur; the background follows the model you switch to, and a rule can rotate through several images on its own rhythm.",
   "keywords": [
     "deepseek-harness",
@@ -60,9 +60,10 @@
     "check:code-plate": "node scripts/code-plate-check.ts",
     "check:image-mode": "node scripts/image-mode-check.ts",
     "check:rules": "node scripts/rules-view-check.ts",
+    "check:preset": "node scripts/preset-check.ts",
     "check:ui": "node scripts/ui-strings-check.ts",
     "check:node": "node scripts/node-half-check.mjs",
-    "test": "tsdown && tsc -p tsconfig.json && node scripts/holiday-check.ts && node scripts/rotation-check.ts && node scripts/transition-check.ts && node scripts/repaint-check.ts && node scripts/code-plate-check.ts && node scripts/image-mode-check.ts && node scripts/rules-view-check.ts && node scripts/ui-strings-check.ts && node scripts/node-half-check.mjs"
+    "test": "tsdown && tsc -p tsconfig.json && node scripts/holiday-check.ts && node scripts/rotation-check.ts && node scripts/transition-check.ts && node scripts/repaint-check.ts && node scripts/code-plate-check.ts && node scripts/image-mode-check.ts && node scripts/rules-view-check.ts && node scripts/preset-check.ts && node scripts/ui-strings-check.ts && node scripts/node-half-check.mjs"
   },
   "devDependencies": {
     "@deepseek-ai/dsh-home-paths": "^0.1.0-rc.6",