dsh-any-background 0.2.9 → 0.2.10

package/lib/index.js

@@ -536,12 +536,41 @@ async function ensureDir() {
 		console.warn(`dsh-any-background: cannot create data dir "${dataDir()}"`, e);
 	}
 }
+let configCacheKey = null;
+let configCacheValue = null;
+function dropConfigCache() {
+	configCacheKey = null;
+	configCacheValue = null;
+}
 async function readConfig() {
 	await ensureDir();
+	const file = configPath();
+	let text;
+	let key;
 	try {
-		const raw = await readFile(configPath(), "utf8");
-		return normalizeConfig(JSON.parse(raw));
+		const st = await stat(file);
+		key = {
+			mtimeMs: st.mtimeMs,
+			size: st.size
+		};
+		if (configCacheKey !== null && configCacheValue !== null && configCacheKey.mtimeMs === key.mtimeMs && configCacheKey.size === key.size) return configCacheValue;
+		text = await readFile(file, "utf8");
 	} catch {
+		dropConfigCache();
+		return { ...DEFAULT_CONFIG };
+	}
+	try {
+		const parsed = normalizeConfig(JSON.parse(text));
+		configCacheKey = key;
+		configCacheValue = parsed;
+		return parsed;
+	} catch (e) {
+		try {
+			const into = `${file}.corrupt-${Date.now()}`;
+			await rename(file, into);
+			console.warn(`dsh-any-background: theme-config.json was corrupt, archived to "${into}" and reset to defaults`, e);
+		} catch {}
+		dropConfigCache();
 		return { ...DEFAULT_CONFIG };
 	}
 }
@@ -573,13 +602,19 @@ function warnUnknownConfigKeys(raw, normalized) {
 }
 async function writeConfig(config) {
 	await ensureDir();
+	const tmp = `${configPath()}.tmp`;
 	try {
 		const normalized = normalizeConfig(config);
 		warnUnknownConfigKeys(config, normalized);
-		await writeFile(configPath(), JSON.stringify(normalized, null, 2), "utf8");
+		await writeFile(tmp, JSON.stringify(normalized, null, 2), "utf8");
+		await rename(tmp, configPath());
+		dropConfigCache();
 		return true;
 	} catch (e) {
 		console.error(`dsh-any-background: failed to write "${CONFIG_FILE}"`, e);
+		try {
+			await rm(tmp, { force: true });
+		} catch {}
 		return false;
 	}
 }
@@ -618,6 +653,17 @@ function sniffImageMime(buf) {
 	if (buf.length >= 12 && buf[0] === 82 && buf[1] === 73 && buf[2] === 70 && buf[3] === 70 && buf[8] === 87 && buf[9] === 69 && buf[10] === 66 && buf[11] === 80) return "image/webp";
 	return "image/jpeg";
 }
+/** True when the leading bytes are a container the serve route knows how to
+*  sniff. The Content-Type only reflects what the server claims; validating the
+*  bytes themselves rejects a mislabeled or hostile payload with a clear error
+*  instead of persisting a file that renders as a broken image. */
+function isImageBytes(buf) {
+	if (buf.length >= 4 && buf[0] === 137 && buf[1] === 80 && buf[2] === 78 && buf[3] === 71) return true;
+	if (buf.length >= 3 && buf[0] === 255 && buf[1] === 216 && buf[2] === 255) return true;
+	if (buf.length >= 6 && buf[0] === 71 && buf[1] === 73 && buf[2] === 70) return true;
+	if (buf.length >= 12 && buf[0] === 82 && buf[1] === 73 && buf[2] === 70 && buf[3] === 70 && buf[8] === 87 && buf[9] === 69 && buf[10] === 66 && buf[11] === 80) return true;
+	return false;
+}
 /** Download a wallpaper from a network URL and persist it into the local
 *  wallpaper.jpg slot (replacing whatever was stored), so type switches and
 *  rotation keep working through the single active slot. The response carries
@@ -690,6 +736,10 @@ async function writeWallpaperFromUrl(url) {
 			error: "read failed"
 		};
 	}
+	if (!isImageBytes(buf)) return {
+		ok: false,
+		error: "not an image"
+	};
 	await ensureDir();
 	try {
 		await writeFile(wallpaperPath(), buf);
@@ -911,21 +961,28 @@ async function writeVideoFromUrl(url) {
 		const out = createWriteStream(tmp);
 		let received = 0;
 		let failed = false;
-		const fail = () => {
-			if (failed) return;
-			failed = true;
-			out.destroy();
-			rm(tmp, { force: true });
-		};
 		const nodeStream = Readable.fromWeb(res.body);
 		let idle = null;
+		const clearIdle = () => {
+			if (idle !== null) {
+				clearTimeout(idle);
+				idle = null;
+			}
+		};
 		const pokeIdle = () => {
-			if (idle) clearTimeout(idle);
+			clearIdle();
 			idle = setTimeout(() => {
 				nodeStream.destroy();
 				fail();
 			}, VIDEO_FETCH_IDLE_TIMEOUT);
 		};
+		const fail = () => {
+			if (failed) return;
+			failed = true;
+			clearIdle();
+			out.destroy();
+			rmWhenClosed(out, tmp);
+		};
 		nodeStream.on("data", (chunk) => {
 			pokeIdle();
 			received += chunk.byteLength;
@@ -934,10 +991,7 @@ async function writeVideoFromUrl(url) {
 				fail();
 			}
 		});
-		nodeStream.on("end", () => {
-			if (idle) clearTimeout(idle);
-			idle = null;
-		});
+		nodeStream.on("end", clearIdle);
 		nodeStream.on("aborted", fail);
 		nodeStream.on("error", fail);
 		out.on("error", fail);
@@ -1001,6 +1055,37 @@ async function writeVideo(dataUrl) {
 		return false;
 	}
 }
+/** Drop a partial upload's temp file once its sink is really closed. Windows
+*  refuses to unlink a file that still has an open handle, so removing it in the
+*  same tick as `out.destroy()` silently fails and leaves the aborted transfer
+*  on disk (up to the full limit) until some later upload overwrites it. */
+function rmWhenClosed(out, tmp) {
+	const drop = () => {
+		rm(tmp, { force: true });
+	};
+	if (out.closed === true) drop();
+	else out.once("close", drop);
+}
+/** Reject an oversized upload with a real status and tear the transfer down.
+*  The bare req.destroy()+fail() path left the client holding a network error
+*  with no way to tell "too large" from "connection died". The body is machine
+*  readable (`error` + the enforced `limit`) so the panel can phrase the
+*  refusal in the user's own language, with `message` kept for logs. */
+function rejectOversizedUpload(req, res, fail, limit) {
+	try {
+		res.writeHead(413, { "Content-Type": "application/json" });
+		res.end(JSON.stringify({
+			ok: false,
+			error: "too large",
+			limit,
+			message: `too large (limit ${limit})`
+		}));
+	} catch {}
+	fail();
+	try {
+		req.destroy();
+	} catch {}
+}
 /** Stream the stored video: correct MIME, no caching, Range answers so the
 *  browser can seek (snapshot capture does). */
 async function serveVideo(req, res) {
@@ -1104,16 +1189,14 @@ async function handleVideoUpload(req, res) {
 			if (failed) return;
 			failed = true;
 			out.destroy();
-			rm(tmp, { force: true });
+			rmWhenClosed(out, tmp);
 		};
 		req.on("aborted", fail);
 		req.on("error", fail);
 		req.on("data", (chunk) => {
+			if (failed) return;
 			received += chunk.byteLength;
-			if (received > VIDEO_UPLOAD_MAX) {
-				req.destroy();
-				fail();
-			}
+			if (received > VIDEO_UPLOAD_MAX) rejectOversizedUpload(req, res, fail, "2 GB");
 		});
 		out.on("error", () => {
 			fail();
@@ -1226,7 +1309,7 @@ async function handleWallpaperUpload(req, res) {
 			if (failed) return;
 			failed = true;
 			out.destroy();
-			rm(tmp, { force: true });
+			rmWhenClosed(out, tmp);
 		};
 		req.on("aborted", fail);
 		req.on("error", fail);
@@ -1238,11 +1321,9 @@ async function handleWallpaperUpload(req, res) {
 			} catch {}
 		});
 		req.on("data", (chunk) => {
+			if (failed) return;
 			received += chunk.byteLength;
-			if (received > WALLPAPER_UPLOAD_MAX) {
-				req.destroy();
-				fail();
-			}
+			if (received > WALLPAPER_UPLOAD_MAX) rejectOversizedUpload(req, res, fail, "100 MB");
 		});
 		req.pipe(out);
 		out.on("finish", async () => {
@@ -1338,7 +1419,7 @@ async function handleFontUpload(req, res) {
 			if (failed) return;
 			failed = true;
 			out.destroy();
-			rm(tmp, { force: true });
+			rmWhenClosed(out, tmp);
 		};
 		req.on("aborted", fail);
 		req.on("error", fail);
@@ -1350,11 +1431,9 @@ async function handleFontUpload(req, res) {
 			} catch {}
 		});
 		req.on("data", (chunk) => {
+			if (failed) return;
 			received += chunk.byteLength;
-			if (received > FONT_UPLOAD_MAX) {
-				req.destroy();
-				fail();
-			}
+			if (received > FONT_UPLOAD_MAX) rejectOversizedUpload(req, res, fail, "100 MB");
 		});
 		req.pipe(out);
 		out.on("finish", async () => {
@@ -1458,8 +1537,7 @@ function isoWeekKey(d) {
 *  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;
+	const rot = (await readConfig()).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;
@@ -1477,12 +1555,14 @@ async function advanceRotationIfDue() {
 		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;
+	if (!await writeConfig({
+		...await readConfig(),
+		rotation: {
+			...rot,
+			current: idx,
+			lastRotate: now.toISOString()
+		}
+	})) return false;
 	return true;
 }
 /** Dispatch one decoded RPC method to the matching persistence routine and
@@ -1588,6 +1668,22 @@ function apply(ctx) {
 					}));
 					return;
 				}
+				const declaredLen = Number(req.headers["content-length"] ?? "");
+				if (Number.isFinite(declaredLen) && declaredLen > RPC_BODY_MAX) {
+					res.writeHead(413, {
+						"Content-Type": "application/json",
+						connection: "close"
+					});
+					res.end(JSON.stringify({
+						ok: false,
+						error: {
+							code: "dsh-any-background/too-large",
+							message: `body exceeds ${RPC_BODY_MAX} bytes; uploads must use the binary routes`,
+							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) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-any-background",
-  "version": "0.2.9",
+  "version": "0.2.10",
   "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",
@@ -73,9 +73,13 @@
     "@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"
+    "react": "^18.2.0",
+    "dsh-better-sidebar": ">=0.4.0"
   },
   "peerDependenciesMeta": {
+    "dsh-better-sidebar": {
+      "optional": true
+    },
     "react": {
       "optional": true
     },