dsh-background-by-model 0.7.2 → 0.7.4

package/lib/index.js

@@ -59,15 +59,12 @@ const ROTATE_ORDERS = ["order", "shuffle"];
 const ROTATE_MIN_MS = 5e3;
 /** Slowest allowed dwell time (24 h): one image per day is still "rotation". */
 const ROTATE_MAX_MS = 864e5;
-/** Longest allowed cross-fade; 0 is a hard cut. */
-const ROTATE_FADE_MAX_MS = 3e3;
 /** Everything off: the shipped default, and what a config predating this feature gets. */
 const DEFAULT_ROTATION = {
 	enabled: false,
 	intervalMs: 6e4,
 	order: "order",
-	advanceOnSwitch: false,
-	fadeMs: 320
+	advanceOnSwitch: false
 };
 /** A fresh rotation block (never hand out the shared default object). */
 function defaultRotation() {
@@ -124,6 +121,28 @@ const DEFAULT_PART_BLURS = {
 	rightbar: 0,
 	input: 0
 };
+/** Longest allowed switch duration; 0 is a hard cut. */
+const TRANSITION_MAX_MS = 3e3;
+/** Every accepted `effect`, in UI order. */
+const TRANSITION_EFFECTS = [
+	"fade",
+	"none",
+	"zoom",
+	"slide"
+];
+/** Every accepted `easing`, in UI order. */
+const TRANSITION_EASINGS = [
+	"ease",
+	"linear",
+	"ease-out",
+	"ease-in-out"
+];
+/** The shipped default: the cross-fade this plugin already performed, at 320 ms. */
+const DEFAULT_TRANSITION = {
+	effect: "fade",
+	easing: "ease",
+	durationMs: 320
+};
 /**
 * `#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.
@@ -220,8 +239,7 @@ function normalizeRotation(raw) {
 		enabled: r.enabled === true,
 		intervalMs: clamp(r.intervalMs, ROTATE_MIN_MS, ROTATE_MAX_MS, d.intervalMs),
 		order: ROTATE_ORDERS.includes(r.order) ? r.order : d.order,
-		advanceOnSwitch: r.advanceOnSwitch === true,
-		fadeMs: clamp(r.fadeMs, 0, ROTATE_FADE_MAX_MS, d.fadeMs)
+		advanceOnSwitch: r.advanceOnSwitch === true
 	};
 }
 /** Own-property test for values that may be anything at all (a raw JSON entry). */
@@ -229,6 +247,54 @@ function hasOwn(o, key) {
 	return Object.prototype.hasOwnProperty.call(o, key);
 }
 /**
+* The duration a config written before the switch effect carries on any of its
+* rules, or `undefined` when it carries none worth adopting.
+*
+* `rotate.fadeMs` was the per-rule duration from 0.7.0 on, and it had NO control
+* anywhere — it could only be hand-edited, which is why the global setting
+* replaced it. This is the one-shot lift that keeps such a hand-tuned value from
+* being silently dropped on upgrade: the first rule whose value differs from the
+* 320 ms every build shipped is adopted as the global duration. Values that are
+* all the default are ignored, so an ordinary config keeps the ordinary default,
+* and rules that DISAGREE cannot be represented by one global number — the first
+* deliberate value wins, and the others are gone with the field they lived on.
+*/
+function legacyFadeMs(rawRules) {
+	if (!Array.isArray(rawRules)) return void 0;
+	for (const entry of rawRules) {
+		const rotate = entry?.rotate;
+		if (rotate === null || typeof rotate !== "object") continue;
+		const value = rotate.fadeMs;
+		if (typeof value !== "number" || !isFinite(value)) continue;
+		if (value === DEFAULT_TRANSITION.durationMs) continue;
+		return clamp(value, 0, TRANSITION_MAX_MS, DEFAULT_TRANSITION.durationMs);
+	}
+}
+/**
+* Coerce one persisted transition block; a config written before this setting
+* existed has no `transition` key at all and gets the shipped default, which is
+* the behaviour it already had.
+*
+* `legacyMs` is the per-rule `fadeMs` this shape replaced (see `legacyFadeMs`),
+* adopted only when the incoming config has no `durationMs` of its own — so a
+* deliberate hand-tuned blend survives the upgrade instead of being dropped with
+* the field it used to live on.
+*
+* `durationMs` is clamped with `0` kept as a real value (a hard cut) rather than
+* read as "absent": 0 is exactly how a hard cut is asked for without changing
+* the effect.
+*/
+function normalizeTransition(raw, legacyMs) {
+	const t = raw ?? {};
+	const d = DEFAULT_TRANSITION;
+	const fallback = typeof legacyMs === "number" && isFinite(legacyMs) ? legacyMs : d.durationMs;
+	return {
+		effect: TRANSITION_EFFECTS.includes(t.effect) ? t.effect : d.effect,
+		easing: TRANSITION_EASINGS.includes(t.easing) ? t.easing : d.easing,
+		durationMs: clamp(t.durationMs, 0, TRANSITION_MAX_MS, fallback)
+	};
+}
+/**
 * Coerce one persisted image entry, or null when it lacks a usable slot.
 *
 * `inherit` is the RULE's own color, and it is applied only to an entry that has
@@ -365,6 +431,7 @@ function normalizeConfig(raw) {
 		rules,
 		opacities,
 		blurs,
+		transition: normalizeTransition(r.transition, legacyFadeMs(r.rules)),
 		settingsOpacity: clamp01(r.settingsOpacity, 1),
 		chatTextOpacity: clamp01(r.chatTextOpacity, 0),
 		trajectoryOpacity: clamp01(r.trajectoryOpacity, 1),
@@ -498,6 +565,7 @@ const LEGACY_CONFIG_KEYS = /* @__PURE__ */ new Set([
 	"bgState"
 ]);
 const LEGACY_RULE_KEYS = /* @__PURE__ */ new Set(["slot", "bgState"]);
+const LEGACY_NESTED_KEYS = /* @__PURE__ */ new Set(["rules[].rotate.fadeMs"]);
 const warnedConfigKeys = /* @__PURE__ */ new Set();
 function warnUnknownConfigKeys(raw, normalized) {
 	if (raw === null || typeof raw !== "object") return;
@@ -516,6 +584,16 @@ function warnUnknownConfigKeys(raw, normalized) {
 		const keys = new Set(Object.keys(have));
 		for (const key of Object.keys(got)) if (!keys.has(key)) warned(`${group}.${key}`);
 	}
+	const shapes = [[
+		"transition",
+		r.transition,
+		normalized.transition
+	]];
+	for (const [label, got, known] of shapes) {
+		if (got === null || typeof got !== "object") continue;
+		const keys = new Set(Object.keys(known));
+		for (const key of Object.keys(got)) if (!keys.has(key)) warned(`${label}.${key}`);
+	}
 	const sent = Array.isArray(r.rules) ? r.rules[0] : void 0;
 	const have = normalized.rules[0];
 	if (sent !== null && typeof sent === "object" && have !== void 0) {
@@ -534,7 +612,7 @@ function warnUnknownConfigKeys(raw, normalized) {
 		for (const [label, got, known] of nested) {
 			if (got === null || typeof got !== "object" || known === null || known === void 0) continue;
 			const knownKeys = new Set(Object.keys(known));
-			for (const key of Object.keys(got)) if (!knownKeys.has(key)) warned(`${label}.${key}`);
+			for (const key of Object.keys(got)) if (!knownKeys.has(key) && !LEGACY_NESTED_KEYS.has(`${label}.${key}`)) warned(`${label}.${key}`);
 		}
 	}
 }
@@ -740,7 +818,7 @@ async function handleRpcMethod(ctx, endpoint, payload) {
 				value: {
 					config: await readConfig(),
 					slots: await listSlots(),
-					schema: 4
+					schema: 5
 				}
 			};
 			case "writeConfig": return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-background-by-model",
-  "version": "0.7.2",
+  "version": "0.7.4",
   "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",
@@ -58,10 +58,11 @@
     "typecheck": "tsc -p tsconfig.json",
     "check:holiday": "node scripts/holiday-check.ts",
     "check:rotation": "node scripts/rotation-check.ts",
+    "check:transition": "node scripts/transition-check.ts",
     "check:repaint": "node scripts/repaint-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/repaint-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/ui-strings-check.ts && node scripts/node-half-check.mjs"
   },
   "devDependencies": {
     "@deepseek-ai/dsh-home-paths": "^0.1.0-rc.6",