dsh-vidi 0.7.9 → 0.8.1

package/lib/client.js

@@ -34794,6 +34794,46 @@ function Settings(props) {
 	const { engine, onEngine, mode, onMode, spoken, onSpoken, langOptions, login, onLogin, browsers, providers, shared, name, onKey, disabled, open, onOpen, update, onCheckUpdate, t } = props;
 	const [checking, setChecking] = (0, react.useState)(false);
 	const [checked, setChecked] = (0, react.useState)(false);
+	const [installing, setInstalling] = (0, react.useState)(false);
+	const [installed, setInstalled] = (0, react.useState)(null);
+	const installUpdate = async () => {
+		setInstalling(true);
+		setInstalled(null);
+		const target = update?.latest;
+		try {
+			const j = await (await fetch("/live/api/update", {
+				method: "POST",
+				headers: { "content-type": "application/json" },
+				body: "{}"
+			})).json();
+			setInstalled(j);
+			if (j.status === "applied") {
+				try {
+					sessionStorage.setItem("dsh-vidi.reopen", "1");
+				} catch {}
+				setTimeout(() => location.reload(), 800);
+			}
+			setInstalling(false);
+			return;
+		} catch {}
+		for (let i = 0; i < 60; i++) {
+			await new Promise((res) => setTimeout(res, 1500));
+			try {
+				if ((await (await fetch("/live/api/version")).json()).current === target) {
+					try {
+						sessionStorage.setItem("dsh-vidi.reopen", "1");
+					} catch {}
+					location.reload();
+					return;
+				}
+			} catch {}
+		}
+		setInstalled({
+			status: "failed",
+			message: "no answer"
+		});
+		setInstalling(false);
+	};
 	const box = (0, react.useRef)(null);
 	const [draft, setDraft] = (0, react.useState)("");
 	const [busy, setBusy] = (0, react.useState)(false);
@@ -35127,9 +35167,14 @@ function Settings(props) {
 					children: [
 						/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
 							className: "vline",
-							children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: t("upd.version").replace("{v}", update.current) }), update.newer ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+							children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: t("upd.version").replace("{v}", update.current) }), update.newer ? update.canInstall && !installed ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+								className: "dshl-btn primary small",
+								disabled: installing,
+								onClick: () => void installUpdate(),
+								children: installing ? t("upd.installing") : t("upd.install").replace("{v}", update.latest ?? "")
+							}) : /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
 								className: "new",
-								children: t("upd.available").replace("{v}", update.latest ?? "")
+								children: installed?.status === "restart" ? t("upd.restart").replace("{v}", installed.version ?? "") : installed?.status === "applied" ? t("upd.applied") : t("upd.available").replace("{v}", update.latest ?? "")
 							}) : /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
 								className: "dshl-link",
 								disabled: checking,
@@ -35143,10 +35188,18 @@ function Settings(props) {
 								children: checking ? t("upd.checking") : checked && !update.error ? t("upd.latest") : t("upd.check")
 							})]
 						}),
-						update.newer && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+						update.newer && !update.canInstall && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
 							className: "hint",
 							children: t("upd.how")
 						}),
+						installed?.status === "restart" && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+							className: "hint",
+							children: t("upd.restartHow")
+						}),
+						installed?.status === "failed" && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+							className: "hint",
+							children: t("upd.installFailed").replace("{m}", installed.message ?? "")
+						}),
 						checked && update.error && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
 							className: "hint",
 							children: t("upd.failed")
@@ -37227,6 +37280,12 @@ const en = {
 	"upd.latest": "Up to date",
 	"upd.available": "Version {v} is out",
 	"upd.how": "Update it from DSH’s Plugins page, then restart the app.",
+	"upd.install": "Update to {v}",
+	"upd.installing": "Updating…",
+	"upd.restart": "{v} installed",
+	"upd.restartHow": "Restart the app to use it.",
+	"upd.applied": "Updated",
+	"upd.installFailed": "The update did not go through ({m}). The Plugins page can update it too.",
 	"upd.failed": "Could not reach npm just now; it checks again tomorrow.",
 	"src.tip": "Where the video comes from",
 	"src.link": "Link",
@@ -37652,6 +37711,12 @@ const zh = {
 	"upd.latest": "已是最新",
 	"upd.available": "有新版本 {v}",
 	"upd.how": "到 DSH 的「插件」页面更新，再重启 app。",
+	"upd.install": "更新到 {v}",
+	"upd.installing": "正在更新…",
+	"upd.restart": "{v} 已装好",
+	"upd.restartHow": "重启 app 后生效。",
+	"upd.applied": "已更新",
+	"upd.installFailed": "这次没更新成（{m}），也可以到「插件」页面更新。",
 	"upd.failed": "这会儿连不上 npm，明天会再查一次。",
 	"src.tip": "视频从哪里来",
 	"src.link": "链接",
@@ -38528,6 +38593,7 @@ body > .dshl-menu { z-index: 2147483002; }
 .dshl-pop.settings .srow + .srow { border-top: 1px solid var(--line-soft); }
 .dshl-pop.settings .srow.version .vline { display: flex; align-items: center; justify-content: space-between; gap: 12px; width: 100%; color: var(--faint); font-size: 12.5px; }
 .dshl-pop.settings .srow.version .new { color: #e5484d; font-weight: 550; }
+.dshl-pop.settings .srow.version .dshl-btn.small { height: 28px; padding: 0 12px; border-radius: 7px; font-size: 12.5px; }
 .dshl-pop.settings .srow > .dshl-select, .dshl-pop.settings .srow > .dshl-seg { width: 168px; }
 .dshl-pop.settings .srow > .dshl-seg button { flex: 1; padding: 0 6px; }
 .dshl .srow.col { display: grid; justify-content: stretch; gap: 8px; padding: 10px 0; }
@@ -39005,6 +39071,23 @@ function apply(ctx) {
 				subscribe: (fn) => c.layout.panelInfo.subscribe(fn)
 			}
 		}), "dsh-vidi: main panel host");
+		c.effect(() => {
+			let back = false;
+			try {
+				back = sessionStorage.getItem("dsh-vidi.reopen") === "1";
+				sessionStorage.removeItem("dsh-vidi.reopen");
+			} catch {}
+			if (!back) return () => {};
+			let tries = 0;
+			const timer = setInterval(() => {
+				const s = sessions(), cur = s?.current();
+				if (s && cur) {
+					clearInterval(timer);
+					openPage(s, { sessionId: cur });
+				} else if (++tries > 40) clearInterval(timer);
+			}, 250);
+			return () => clearInterval(timer);
+		}, "dsh-vidi: reopen after update");
 		c.slots.inject("main", () => c.slots.register({
 			name: "main",
 			key: PANEL_ID,

package/lib/index.mjs

@@ -5780,6 +5780,9 @@ function metered(llm, meter) {
 }
 // src/updates.ts
 const DAY = 864e5;
+/** pnpm holds back releases younger than a day: offer only versions it will install. */
+const MIN_AGE = process.env.VIDI_UPDATE_MIN_AGE_HOURS !== void 0 ? Number(process.env.VIDI_UPDATE_MIN_AGE_HOURS) * 36e5 : DAY;
+const NAME = "dsh-vidi";
 /** a > b for plain x.y.z versions (pre-releases count as older than the release). */
 function greater(a, b) {
 	const parse = (v) => {
@@ -5793,38 +5796,76 @@ function greater(a, b) {
 	for (let i = 0; i < 3; i++) if ((x.n[i] ?? 0) !== (y.n[i] ?? 0)) return (x.n[i] ?? 0) > (y.n[i] ?? 0);
 	return !x.pre && !!y.pre;
 }
-function updateChecker(log) {
+function updateChecker(log, manager) {
 	let current = "0.0.0";
 	try {
 		current = String(JSON.parse(readFileSync(new URL("../package.json", import.meta.url), "utf8")).version);
 	} catch {}
 	let latest, checkedAt, error;
+	let canInstall = false;
 	let running;
 	const state = () => ({
 		current,
 		latest,
 		newer: !!latest && greater(latest, current),
+		canInstall,
 		checkedAt,
 		error
 	});
 	const check = () => running ??= (async () => {
 		try {
-			const r = await fetch("https://registry.npmjs.org/dsh-vidi/latest", {
-				signal: AbortSignal.timeout(1e4),
+			const r = await fetch(`https://registry.npmjs.org/${NAME}`, {
+				signal: AbortSignal.timeout(15e3),
 				headers: { accept: "application/json" }
 			});
 			if (!r.ok) throw new Error(`registry ${r.status}`);
-			latest = String((await r.json()).version ?? "") || void 0;
+			const doc = await r.json();
+			latest = Object.keys(doc.versions ?? {}).filter((v) => !v.includes("-") && Date.now() - Date.parse(doc.time?.[v] ?? "") >= MIN_AGE).reduce((best, v) => !best || greater(v, best) ? v : best, void 0);
 			error = void 0;
 			if (latest && greater(latest, current)) log(`update: ${latest} available (running ${current})`);
 		} catch (err) {
 			error = err.message;
-		} finally {
-			checkedAt = Date.now();
-			running = void 0;
 		}
+		try {
+			canInstall = !!(await manager()?.listBundles())?.find((b) => b.name === NAME)?.updatable;
+		} catch {
+			canInstall = false;
+		}
+		checkedAt = Date.now();
+		running = void 0;
 		return state();
 	})();
+	/** Install the newest version through DSH's plugin manager. */
+	const install = async () => {
+		const pm = manager();
+		if (!pm || !latest || !greater(latest, current)) return {
+			status: "failed",
+			message: "nothing to install"
+		};
+		log(`update: installing ${latest}`);
+		try {
+			const out = await pm.updateBundle(NAME, latest, { requestId: `vidi-update-${Date.now()}` });
+			const app = out.result?.application;
+			if (app === "restart-required") return {
+				status: "restart",
+				version: latest
+			};
+			if (app === "applied" || app === "unchanged") return {
+				status: "applied",
+				version: latest
+			};
+			const e = out.result?.error;
+			return {
+				status: "failed",
+				message: e?.diagnostic || e?.message || e?.code || app || "failed"
+			};
+		} catch (err) {
+			return {
+				status: "failed",
+				message: err.message
+			};
+		}
+	};
 	check();
 	const timer = setInterval(() => void check(), DAY);
 	timer.unref?.();
@@ -5834,6 +5875,7 @@ function updateChecker(log) {
 			return state();
 		},
 		check,
+		install,
 		stop: () => clearInterval(timer)
 	};
 }
@@ -6449,6 +6491,7 @@ function apply(ctx, config) {
 				return send(res, 200, job.summary());
 			}
 			if (route === "version") return send(res, 200, req.method === "POST" ? await updates.check() : updates.state());
+			if (route === "update" && req.method === "POST") return send(res, 200, await updates.install());
 			if (route === "devices") {
 				const devices = await listDevices();
 				log(`devices: ${devices.filter((d) => d.kind !== "mic").length} picture, ${devices.filter((d) => d.kind === "mic").length} microphone`);
@@ -6890,7 +6933,13 @@ function apply(ctx, config) {
 	}), "dsh-vidi: media route");
 	let updates;
 	ctx.effect(() => {
-		updates = updateChecker(log);
+		updates = updateChecker(log, () => {
+			try {
+				return ctx.get?.("pluginManager");
+			} catch {
+				return;
+			}
+		});
 		return () => updates.stop();
 	}, "dsh-vidi: update check");
 	ctx.effect(() => startOverlay(config.overlayPort, () => [...jobs.values()].filter((j) => j.summary().status === "running").at(-1) ?? [...jobs.values()].at(-1), (fn) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-vidi",
-  "version": "0.7.9",
+  "version": "0.8.1",
   "description": "A video tool for DeepSeek Harness: watch live streams, videos and podcasts with real-time subtitles in any language, then clip and download",
   "type": "module",
   "license": "PolyForm-Noncommercial-1.0.0",