dsh-any-background 0.2.3 → 0.2.5

package/lib/index.js

@@ -21,6 +21,7 @@ const inject = ["connection", "webServer"];
 const DATA_DIR = ".dsh-any-background-data";
 const CONFIG_FILE = "theme-config.json";
 const WALLPAPER_FILE = "wallpaper.jpg";
+const ROTATION_DIR = "rotation";
 const VIDEO_ROUTE = "/dsh-any-background/video";
 const UPLOAD_ROUTE = "/dsh-any-background/video/upload";
 const UPLOAD_TMP = "wallpaper.upload.tmp";
@@ -84,7 +85,26 @@ const DEFAULT_CONFIG = {
 	generatedBg: null,
 	regenerateOnReload: false,
 	chatTextOpacity: 0,
-	trajectoryOpacity: 1
+	trajectoryOpacity: 1,
+	profiles: [],
+	rotation: {
+		enabled: false,
+		mode: "shuffle",
+		interval: "daily",
+		current: 0,
+		items: [],
+		lastRotate: null
+	},
+	schedule: {
+		enabled: false,
+		mode: "time",
+		dayProfile: null,
+		nightProfile: null,
+		dayStart: "07:00",
+		nightStart: "19:00"
+	},
+	schemeOverride: "auto",
+	activeProfile: null
 };
 const dataDir = () => dshHomePath(DATA_DIR);
 const configPath = () => dshHomePath(DATA_DIR, CONFIG_FILE);
@@ -196,7 +216,12 @@ function normalizeConfig(raw) {
 		generatedBg,
 		regenerateOnReload: typeof r.regenerateOnReload === "boolean" ? r.regenerateOnReload : DEFAULT_CONFIG.regenerateOnReload,
 		chatTextOpacity: clamp(r.chatTextOpacity, 0, 1, DEFAULT_CONFIG.chatTextOpacity),
-		trajectoryOpacity: clamp(r.trajectoryOpacity, 0, 1, DEFAULT_CONFIG.trajectoryOpacity)
+		trajectoryOpacity: clamp(r.trajectoryOpacity, 0, 1, DEFAULT_CONFIG.trajectoryOpacity),
+		profiles: normalizeProfiles(r.profiles),
+		rotation: normalizeRotation(r.rotation),
+		schedule: normalizeSchedule(r.schedule),
+		schemeOverride: r.schemeOverride === "light" || r.schemeOverride === "dark" ? r.schemeOverride : "auto",
+		activeProfile: typeof r.activeProfile === "string" ? r.activeProfile : null
 	};
 }
 function normalizeGeneratedBg(p) {
@@ -230,6 +255,101 @@ function normalizeGeneratedBg(p) {
 	};
 	return null;
 }
+const MAX_PROFILES = 20;
+const MAX_ROTATION_ITEMS = 30;
+const MAX_THUMB_BYTES = 65536;
+const HHMM_RE = /^([01]\d|2[0-3]):[0-5]\d$/;
+/** Coerce an unknown value into a ProfileAppearance (appearance subset only). */
+function normalizeProfileAppearance(raw) {
+	const a = raw ?? {};
+	const c = a.color;
+	const ops = a.opacities ?? {};
+	const bl = a.blurs ?? {};
+	const blurs = {};
+	for (const k of [
+		"bg",
+		"sidebar",
+		"card",
+		"settings",
+		"chat",
+		"trajectory",
+		"input"
+	]) blurs[k] = clamp(bl[k], 0, 60, DEFAULT_CONFIG.blurs[k]);
+	return {
+		color: Array.isArray(c) && c.length === 3 && c.every((x) => typeof x === "number" && isFinite(x)) ? [
+			clamp(c[0], 0, 360, 220),
+			clamp(c[1], 0, 1, .55),
+			clamp(c[2], 0, 1, .25)
+		] : null,
+		opacities: {
+			bg: clamp(ops.bg, 0, 1, DEFAULT_CONFIG.opacities.bg),
+			sidebar: clamp(ops.sidebar, 0, 1, DEFAULT_CONFIG.opacities.sidebar),
+			card: clamp(ops.card, 0, 1, DEFAULT_CONFIG.opacities.card),
+			input: clamp(ops.input, 0, 1, DEFAULT_CONFIG.opacities.input)
+		},
+		blurs,
+		settingsOpacity: clamp(a.settingsOpacity, 0, 1, DEFAULT_CONFIG.settingsOpacity),
+		wallpaperOpacity: clamp(a.wallpaperOpacity, 0, 1, DEFAULT_CONFIG.wallpaperOpacity),
+		blur: clamp(a.blur, 0, 60, DEFAULT_CONFIG.blur),
+		chatTextOpacity: clamp(a.chatTextOpacity, 0, 1, DEFAULT_CONFIG.chatTextOpacity),
+		trajectoryOpacity: clamp(a.trajectoryOpacity, 0, 1, DEFAULT_CONFIG.trajectoryOpacity)
+	};
+}
+function normalizeProfiles(raw) {
+	if (!Array.isArray(raw)) return [];
+	const out = [];
+	for (const item of raw.slice(0, MAX_PROFILES)) {
+		const p = item ?? {};
+		if (typeof p.id !== "string" || p.id.length === 0 || p.id.length > 64) continue;
+		if (out.some((e) => e.id === p.id)) continue;
+		out.push({
+			id: p.id,
+			name: typeof p.name === "string" && p.name.trim() ? p.name.slice(0, 60) : "Profile",
+			createdAt: typeof p.createdAt === "string" ? p.createdAt : "",
+			config: normalizeProfileAppearance(p.config)
+		});
+	}
+	return out;
+}
+/** Rotation items live as files under the rotation dir; only the server
+*  creates those names, so a stored `file` is accepted only when it is a bare
+*  filename with a known image extension (no path traversal). */
+function safeRotationFile(name) {
+	if (typeof name !== "string" || !/^[\w-]+\.(jpg|jpeg|png|gif|webp)$/i.test(name)) return null;
+	return name;
+}
+function normalizeRotation(raw) {
+	const r = raw ?? {};
+	const items = [];
+	if (Array.isArray(r.items)) for (const item of r.items.slice(0, MAX_ROTATION_ITEMS)) {
+		const it = item ?? {};
+		const file = safeRotationFile(it.file);
+		if (file === null) continue;
+		items.push({
+			file,
+			thumb: typeof it.thumb === "string" && it.thumb.startsWith("data:image/") && it.thumb.length <= MAX_THUMB_BYTES ? it.thumb : ""
+		});
+	}
+	return {
+		enabled: r.enabled === true,
+		mode: r.mode === "order" ? "order" : "shuffle",
+		interval: r.interval === "reload" || r.interval === "weekly" ? r.interval : "daily",
+		current: typeof r.current === "number" && isFinite(r.current) && r.current >= 0 ? Math.floor(r.current) : 0,
+		items,
+		lastRotate: typeof r.lastRotate === "string" ? r.lastRotate : null
+	};
+}
+function normalizeSchedule(raw) {
+	const r = raw ?? {};
+	return {
+		enabled: r.enabled === true,
+		mode: r.mode === "system" ? "system" : "time",
+		dayProfile: typeof r.dayProfile === "string" ? r.dayProfile : null,
+		nightProfile: typeof r.nightProfile === "string" ? r.nightProfile : null,
+		dayStart: typeof r.dayStart === "string" && HHMM_RE.test(r.dayStart) ? r.dayStart : DEFAULT_CONFIG.schedule.dayStart,
+		nightStart: typeof r.nightStart === "string" && HHMM_RE.test(r.nightStart) ? r.nightStart : DEFAULT_CONFIG.schedule.nightStart
+	};
+}
 async function ensureDir() {
 	try {
 		await mkdir(dataDir(), { recursive: true });
@@ -258,7 +378,8 @@ async function writeConfig(config) {
 }
 async function readWallpaper() {
 	try {
-		return `data:image/jpeg;base64,${(await readFile(wallpaperPath())).toString("base64")}`;
+		const buf = await readFile(wallpaperPath());
+		return `data:${sniffImageMime(buf)};base64,${buf.toString("base64")}`;
 	} catch {
 		return null;
 	}
@@ -368,6 +489,132 @@ async function writeWallpaperFromUrl(url) {
 		error: "write failed"
 	};
 }
+const rotationDir = () => dshHomePath(DATA_DIR, ROTATION_DIR);
+async function ensureRotationDir() {
+	try {
+		await mkdir(rotationDir(), { recursive: true });
+	} catch {}
+}
+function imageExtFor(mime) {
+	if (mime === "image/png") return "png";
+	if (mime === "image/gif") return "gif";
+	if (mime === "image/webp") return "webp";
+	return "jpg";
+}
+/** Accept only an inline base64 image data URL (same fence as writeWallpaper). */
+function decodeImageDataUrl(dataUrl) {
+	if (typeof dataUrl !== "string") return null;
+	const m = /^data:image\/[a-zA-Z0-9.+-]+;base64,([A-Za-z0-9+/=]+)$/.exec(dataUrl);
+	if (!m) return null;
+	const buf = Buffer.from(m[1], "base64");
+	return buf.length > 0 ? buf : null;
+}
+/** Persist a thumbnail string only when it is a small inline image data URL. */
+function sanitizeThumb(thumb) {
+	return typeof thumb === "string" && thumb.startsWith("data:image/") && thumb.length <= MAX_THUMB_BYTES ? thumb : "";
+}
+async function handleRotationAdd(payload) {
+	const buf = decodeImageDataUrl(payload?.dataUrl);
+	if (buf === null) return {
+		ok: false,
+		error: "invalid image"
+	};
+	const thumb = sanitizeThumb(payload?.thumb);
+	await ensureDir();
+	await ensureRotationDir();
+	if ((await readConfig()).rotation.items.length >= MAX_ROTATION_ITEMS) return {
+		ok: false,
+		error: "too many items"
+	};
+	const file = `wp-${Date.now().toString(36)}.${imageExtFor(sniffImageMime(buf))}`;
+	try {
+		await writeFile(dshHomePath(DATA_DIR, ROTATION_DIR, file), buf);
+	} catch (e) {
+		console.error("dsh-any-background: failed to write a rotation wallpaper", e);
+		return {
+			ok: false,
+			error: "write failed"
+		};
+	}
+	const fresh = await readConfig();
+	fresh.rotation.items.push({
+		file,
+		thumb
+	});
+	if (!await writeConfig(fresh)) return {
+		ok: false,
+		error: "config write failed"
+	};
+	return {
+		ok: true,
+		index: fresh.rotation.items.length - 1,
+		items: fresh.rotation.items
+	};
+}
+async function handleRotationRemove(payload) {
+	const idx = payload?.index;
+	if (typeof idx !== "number" || !isFinite(idx)) return {
+		ok: false,
+		error: "invalid index"
+	};
+	const cfg = await readConfig();
+	const i = Math.floor(idx);
+	if (i < 0 || i >= cfg.rotation.items.length) return {
+		ok: false,
+		error: "not found"
+	};
+	const [removed] = cfg.rotation.items.splice(i, 1);
+	cfg.rotation.current = Math.max(0, Math.min(cfg.rotation.current >= i ? cfg.rotation.current - 1 : cfg.rotation.current, Math.max(0, cfg.rotation.items.length - 1)));
+	if (removed !== void 0) try {
+		await rm(dshHomePath(DATA_DIR, ROTATION_DIR, removed.file), { force: true });
+	} catch {}
+	if (!await writeConfig(cfg)) return {
+		ok: false,
+		error: "config write failed"
+	};
+	return {
+		ok: true,
+		items: cfg.rotation.items
+	};
+}
+/** Activate a rotation item: copy its bytes over the active wallpaper slot and
+*  return the freshly sniffed data URL so the client can apply it live. */
+async function handleRotationSet(payload) {
+	const idx = payload?.index;
+	if (typeof idx !== "number" || !isFinite(idx)) return {
+		ok: false,
+		error: "invalid index"
+	};
+	const cfg = await readConfig();
+	const i = Math.floor(idx);
+	const item = cfg.rotation.items[i];
+	if (item === void 0) return {
+		ok: false,
+		error: "not found"
+	};
+	let buf;
+	try {
+		buf = await readFile(dshHomePath(DATA_DIR, ROTATION_DIR, item.file));
+	} catch {
+		return {
+			ok: false,
+			error: "file missing"
+		};
+	}
+	try {
+		await writeFile(wallpaperPath(), buf);
+	} catch (e) {
+		console.error("dsh-any-background: failed to activate a rotation wallpaper", e);
+		return {
+			ok: false,
+			error: "write failed"
+		};
+	}
+	return {
+		ok: true,
+		dataUrl: `data:${sniffImageMime(buf)};base64,${buf.toString("base64")}`
+	};
+}
 async function videoUrl() {
 	return await findVideoFile() ? VIDEO_ROUTE : null;
 }
@@ -537,69 +784,223 @@ async function handleVideoUpload(req, res) {
 	}
 }
 const NS = "dshAnyBackground";
-function apply(ctx) {
-	const dispose = ctx.connection.rpc.handle("/dsh-any-background", async (ep, payload) => {
-		const method = ep.slice(`${NS}/`.length);
-		try {
-			switch (method) {
-				case "read": return {
+const RPC_CHANNEL = "/dsh-any-background";
+const RPC_BODY_MAX = 314572800;
+/** ISO week key — mirrors the client's rotationDue so daily/weekly cadence
+*  decisions agree across both halves. */
+function isoWeekKey(d) {
+	const t = new Date(Date.UTC(d.getFullYear(), d.getMonth(), d.getDate()));
+	const day = t.getUTCDay() || 7;
+	t.setUTCDate(t.getUTCDate() + 4 - day);
+	const yearStart = new Date(Date.UTC(t.getUTCFullYear(), 0, 1));
+	const week = Math.ceil(((t.getTime() - yearStart.getTime()) / 864e5 + 1) / 7);
+	return `${t.getUTCFullYear()}-W${week}`;
+}
+/** Advance the rotation pool when its cadence is due: pick the next item,
+*  copy it over the active wallpaper slot, and persist the rotation state.
+*  Runs inside `read` so a reload restores the NEW wallpaper directly — the
+*  old one never reaches the screen. The client's maybeRotate stays as a
+*  fallback and skips when this already advanced (the `rotated` flag). */
+async function advanceRotationIfDue() {
+	const cfg = await readConfig();
+	const rot = cfg.rotation;
+	if (!rot.enabled || rot.items.length === 0) return false;
+	const now = /* @__PURE__ */ new Date();
+	const last = rot.lastRotate !== null ? new Date(rot.lastRotate) : null;
+	if (!(rot.interval === "reload" || last === null || isNaN(last.getTime()) || (rot.interval === "daily" ? last.toDateString() !== now.toDateString() : isoWeekKey(last) !== isoWeekKey(now)))) return false;
+	const n = rot.items.length;
+	let idx = rot.current;
+	if (rot.mode === "shuffle" && n > 1) while (idx === rot.current) idx = Math.floor(Math.random() * n);
+	else idx = (rot.current + 1) % n;
+	const item = rot.items[idx];
+	if (item === void 0) return false;
+	try {
+		const buf = await readFile(dshHomePath(DATA_DIR, ROTATION_DIR, item.file));
+		await writeFile(wallpaperPath(), buf);
+	} catch (e) {
+		console.error("dsh-any-background: failed to advance the rotation pool", e);
+		return false;
+	}
+	cfg.rotation = {
+		...rot,
+		current: idx,
+		lastRotate: now.toISOString()
+	};
+	if (!await writeConfig(cfg)) return false;
+	return true;
+}
+/** Dispatch one decoded RPC method to the matching persistence routine and
+*  return the wire `result` half of the server-response envelope. */
+async function handleRpcMethod(endpoint, payload) {
+	const method = endpoint.slice(`${NS}/`.length);
+	try {
+		switch (method) {
+			case "read": {
+				const rotated = await advanceRotationIfDue();
+				return {
 					ok: true,
 					value: {
 						config: await readConfig(),
 						wallpaper: await readWallpaper(),
-						videoUrl: await videoUrl()
-					}
-				};
-				case "writeConfig": return {
-					ok: true,
-					value: await writeConfig(payload?.config ?? {})
-				};
-				case "setWallpaper": return {
-					ok: true,
-					value: await writeWallpaper(payload?.dataUrl ?? null)
-				};
-				case "setVideo": return {
-					ok: true,
-					value: await writeVideo(payload?.dataUrl ?? null)
-				};
-				case "setWallpaperUrl": return {
-					ok: true,
-					value: await writeWallpaperFromUrl(payload?.url ?? null)
-				};
-				default: return {
-					ok: false,
-					error: {
-						code: "dsh-any-background/bad-request",
-						message: `unknown endpoint ${ep}`,
-						details: { issues: [] }
+						videoUrl: await videoUrl(),
+						rotated
 					}
 				};
 			}
-		} catch (e) {
-			return {
+			case "writeConfig": return {
+				ok: true,
+				value: await writeConfig(payload?.config ?? {})
+			};
+			case "setWallpaper": return {
+				ok: true,
+				value: await writeWallpaper(payload?.dataUrl ?? null)
+			};
+			case "setVideo": return {
+				ok: true,
+				value: await writeVideo(payload?.dataUrl ?? null)
+			};
+			case "setWallpaperUrl": return {
+				ok: true,
+				value: await writeWallpaperFromUrl(payload?.url ?? null)
+			};
+			case "rotationAdd": return {
+				ok: true,
+				value: await handleRotationAdd(payload)
+			};
+			case "rotationRemove": return {
+				ok: true,
+				value: await handleRotationRemove(payload)
+			};
+			case "rotationSet": return {
+				ok: true,
+				value: await handleRotationSet(payload)
+			};
+			default: return {
 				ok: false,
 				error: {
-					code: "dsh-any-background/internal",
-					message: e instanceof Error ? e.message : String(e),
-					details: {}
+					code: "dsh-any-background/bad-request",
+					message: `unknown endpoint ${endpoint}`,
+					details: { issues: [] }
 				}
 			};
 		}
-	}, { authority: "trusted-host" });
-	const disposeRoute = ctx.webServer.register({
-		kind: "prefix",
-		path: VIDEO_ROUTE,
-		handler: serveVideo
-	});
-	const disposeUpload = ctx.webServer.register({
-		kind: "exact",
-		path: UPLOAD_ROUTE,
-		handler: handleVideoUpload
-	});
-	ctx.on("dispose", () => {
-		disposeRoute();
-		disposeUpload();
-		dispose();
+	} catch (e) {
+		return {
+			ok: false,
+			error: {
+				code: "dsh-any-background/internal",
+				message: e instanceof Error ? e.message : String(e),
+				details: {}
+			}
+		};
+	}
+}
+function apply(ctx) {
+	ctx.inject(["connection", "webServer"], (webCtx) => {
+		webCtx.effect(() => webCtx.webServer.register({
+			kind: "prefix",
+			path: RPC_CHANNEL,
+			handler: async (req, res) => {
+				const rejection = webCtx.connection.requestRejection(req);
+				if (rejection !== void 0) {
+					res.writeHead(rejection);
+					res.end(rejection === 401 ? "unauthorized" : "forbidden");
+					return;
+				}
+				if (req.method !== "POST") {
+					res.writeHead(405, { "Content-Type": "application/json" });
+					res.end(JSON.stringify({
+						ok: false,
+						error: {
+							code: "dsh-any-background/bad-request",
+							message: "expected POST",
+							details: {}
+						}
+					}));
+					return;
+				}
+				const pathname = new URL(req.url ?? "/", "http://dsh.internal").pathname;
+				const endpoint = pathname.startsWith(`${RPC_CHANNEL}/`) ? pathname.slice(20) : void 0;
+				if (endpoint === void 0 || endpoint.length === 0) {
+					res.writeHead(404);
+					res.end();
+					return;
+				}
+				const chunks = [];
+				let received = 0;
+				for await (const chunk of req) {
+					const buf = chunk;
+					received += buf.byteLength;
+					if (received > RPC_BODY_MAX) {
+						res.writeHead(413, { connection: "close" });
+						res.end();
+						req.destroy();
+						return;
+					}
+					chunks.push(buf);
+				}
+				let env;
+				try {
+					env = JSON.parse(Buffer.concat(chunks).toString("utf8") || "{}");
+				} catch {
+					res.writeHead(400, { "Content-Type": "application/json" });
+					res.end(JSON.stringify({
+						ok: false,
+						error: {
+							code: "dsh-any-background/bad-request",
+							message: "body is not JSON",
+							details: {}
+						}
+					}));
+					return;
+				}
+				if (env === null || typeof env !== "object" || env.type !== "client-request" || typeof env.rpcId !== "string" || typeof env.method !== "string") {
+					res.writeHead(400, { "Content-Type": "application/json" });
+					res.end(JSON.stringify({
+						ok: false,
+						error: {
+							code: "dsh-any-background/bad-request",
+							message: "invalid client-request envelope",
+							details: {}
+						}
+					}));
+					return;
+				}
+				if (env.method !== endpoint) {
+					res.writeHead(200, { "Content-Type": "application/json" });
+					res.end(JSON.stringify({
+						type: "server-response",
+						rpcId: env.rpcId,
+						result: {
+							ok: false,
+							error: {
+								code: "dsh-any-background/bad-request",
+								message: `method ${env.method} does not match endpoint ${endpoint}`,
+								details: { issues: [] }
+							}
+						}
+					}));
+					return;
+				}
+				const result = await handleRpcMethod(endpoint, env.payload);
+				res.writeHead(200, { "Content-Type": "application/json" });
+				res.end(JSON.stringify({
+					type: "server-response",
+					rpcId: env.rpcId,
+					result
+				}));
+			}
+		}), "dsh-any-background: rpc channel");
+		webCtx.effect(() => webCtx.webServer.register({
+			kind: "prefix",
+			path: VIDEO_ROUTE,
+			handler: serveVideo
+		}), "dsh-any-background: video route");
+		webCtx.effect(() => webCtx.webServer.register({
+			kind: "exact",
+			path: UPLOAD_ROUTE,
+			handler: handleVideoUpload
+		}), "dsh-any-background: upload route");
 	});
 }
 //#endregion

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-any-background",
-  "version": "0.2.3",
+  "version": "0.2.5",
   "description": "Appearance plugin for DeepSeek Harness: custom theme color (PS-style color wheel), background wallpaper with opacity/blur controls, and separate main/settings interface opacity.",
   "keywords": [
     "deepseek-harness",
@@ -22,6 +22,9 @@
   "license": "MIT",
   "author": "Tkingxiao",
   "type": "module",
+  "engines": {
+    "dsh": ">=0.1.2-rc.1"
+  },
   "exports": {
     ".": {
       "default": "./lib/index.js"
@@ -63,14 +66,13 @@
     "@deepseek-ai/dsh-home-paths": "^0.1.0-rc.6"
   },
   "peerDependencies": {
-    "@deepseek-ai/cordis": "^4.0.1",
-    "@deepseek-ai/dsh-client-locale": "^0.1.0-rc.6",
-    "@deepseek-ai/dsh-client-runtime": "^0.1.0-rc.6",
+    "@deepseek-ai/cordis": "^4.0.2",
+    "@deepseek-ai/dsh-client-locale": "^0.1.2-alpha.2",
     "@deepseek-ai/dsh-client-store": "^0.1.2-alpha.2",
-    "@deepseek-ai/dsh-client-connection": "^0.1.0-rc.6",
-    "@deepseek-ai/dsh-client-ui-settings": "^0.1.0-rc.6",
-    "@deepseek-ai/dsh-client-ui-theme": "^0.1.0-rc.6",
-    "@deepseek-ai/dsh-invariants": "^0.1.0-rc.6",
+    "@deepseek-ai/dsh-client-connection": "^0.1.2-alpha.2",
+    "@deepseek-ai/dsh-client-ui-settings": "^0.1.2-alpha.2",
+    "@deepseek-ai/dsh-client-ui-theme": "^0.1.2-alpha.2",
+    "@deepseek-ai/dsh-invariants": "^0.1.2-alpha.2",
     "react": "^18.2.0"
   },
   "peerDependenciesMeta": {
@@ -89,9 +91,6 @@
     "@deepseek-ai/dsh-client-ui-settings": {
       "optional": true
     },
-    "@deepseek-ai/dsh-client-runtime": {
-      "optional": true
-    },
     "@deepseek-ai/dsh-client-ui-theme": {
       "optional": true
     },
@@ -109,7 +108,6 @@
     "client": {
       "platform": "web",
       "inject": [
-        "@deepseek-ai/dsh-client-runtime",
         "@deepseek-ai/dsh-client-store",
         "@deepseek-ai/dsh-client-locale",
         "@deepseek-ai/dsh-client-connection",