dsh-vidi 0.8.8 → 0.9.0

package/lib/client.js

@@ -358,6 +358,17 @@ const Icon = {
 			rx: "2"
 		})
 	}),
+	timer: () => /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("svg", {
+		viewBox: "0 0 24 24",
+		width: "18",
+		height: "18",
+		...P,
+		children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("circle", {
+			cx: "12",
+			cy: "13.5",
+			r: "7.5"
+		}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("path", { d: "M12 9.5v4l2.5 1.5M10 3h4M12 3v3" })]
+	}),
 	live: () => /* @__PURE__ */ (0, react_jsx_runtime.jsx)("svg", {
 		viewBox: "0 0 24 24",
 		width: "16",
@@ -1062,7 +1073,7 @@ const BGS = {
 * position and background.
 */
 function SubtitleMenu(props) {
-	const { lines, onLines, options, site, name, style, onStyle, t } = props;
+	const { lines, onLines, options, site, name, style, onStyle, spoken, t } = props;
 	const main = lines[0] ?? "src";
 	const second = lines[1] ?? "";
 	const label = (k) => site.find((s) => s.key === k)?.label ?? name(k);
@@ -1127,6 +1138,21 @@ function SubtitleMenu(props) {
 					className: "swap",
 					onClick: () => onLines([second, main]),
 					children: ["⇅ ", t("sub.swapMain")]
+				}),
+				spoken && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("label", {
+					className: "slot",
+					title: t("set.spoken.tip"),
+					children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: t("set.spoken") }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)(Pick, {
+						value: spoken.value,
+						onChange: spoken.onChange,
+						options: [{
+							value: "auto",
+							label: t("set.auto")
+						}, ...spoken.options.map(([k, v]) => ({
+							value: k,
+							label: v
+						}))]
+					})]
 				})
 			]
 		}), /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
@@ -34384,14 +34410,9 @@ const CLOCK$1 = (s) => {
 	return `${h ? `${h}:` : ""}${String(m).padStart(h ? 2 : 1, "0")}:${String(ss).padStart(2, "0")}`;
 };
 const host = (s) => s.replace(/^[a-z]+:\/\//i, "").split("/")[0] ?? s;
-/**
-* The player's restream menu: saved destinations (tick the ones to push to),
-* adding one (platform, server address, stream key — copied from the
-* platform's own streaming tool), subtitles drawn in or not, picture size,
-* then start. While running, each destination shows its own state.
-*/
 function RestreamPanel(props) {
-	const { jobId, status, now, style, t } = props;
+	const { jobId, status, now, style, timing, t } = props;
+	const fromNow = () => timing ? timing.fromFor(timing.mode) : now;
 	const running = !!status?.running;
 	const [targets, setTargets] = (0, react.useState)([]);
 	const [picked, setPicked] = (0, react.useState)(() => {
@@ -34463,7 +34484,7 @@ function RestreamPanel(props) {
 				jobId,
 				action: "start",
 				targets: picked.filter((id) => targets.some((x) => x.id === id)),
-				from: now,
+				from: fromNow(),
 				burn,
 				height,
 				style
@@ -34491,12 +34512,39 @@ function RestreamPanel(props) {
 			jobId,
 			action: "start",
 			targets: [id],
-			from: now,
+			from: fromNow(),
 			burn,
 			height,
 			style
 		}).catch((e) => setError(e.message));
 	};
+	const switchMode = async (m) => {
+		if (!timing || m === timing.mode) return;
+		timing.onMode(m);
+		if (!running) return;
+		const ids = status.targets.map((x) => x.id);
+		setBusy(true);
+		setError("");
+		try {
+			await post$2("restream", {
+				jobId,
+				action: "stop"
+			});
+			await post$2("restream", {
+				jobId,
+				action: "start",
+				targets: ids,
+				from: timing.fromFor(m),
+				burn,
+				height,
+				style
+			});
+		} catch (e) {
+			setError(e.message);
+		} finally {
+			setBusy(false);
+		}
+	};
 	const stateOf = (id) => running ? status.targets.find((x) => x.id === id) : void 0;
 	const chosen = picked.filter((id) => targets.some((x) => x.id === id));
 	if (editing) {
@@ -34678,6 +34726,32 @@ function RestreamPanel(props) {
 				className: "rs-err",
 				children: status.targets.filter((x) => x.message && x.state !== "live").map((x) => `${pname(x.platform)}：${x.message}`).join("；")
 			}),
+			timing && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+				className: "rs-mode",
+				children: [
+					/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+						className: "rs-sub",
+						children: t("rs.mode")
+					}),
+					/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+						className: "seg",
+						children: [
+							"live",
+							"realtime",
+							"polished"
+						].map((m) => /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+							className: timing.mode === m ? "on" : "",
+							disabled: busy,
+							onClick: () => void switchMode(m),
+							children: t(`mode.${m}`)
+						}, m))
+					}),
+					/* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
+						className: "rs-hint",
+						children: t(`rs.mode.${timing.mode}`).replace("{s}", String(Math.max(1, Math.round(timing.behindFor(timing.mode)))))
+					})
+				]
+			}),
 			!running && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
 				className: "rs-opts",
 				children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
@@ -34849,7 +34923,7 @@ async function post$1(path, body) {
 	return j;
 }
 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 { engine, onEngine, 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);
@@ -35161,43 +35235,6 @@ function Settings(props) {
 						})
 					]
 				}),
-				/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
-					className: "srow col",
-					children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
-						className: "pair",
-						children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: t("set.mode") }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
-							className: "dshl-seg",
-							children: [
-								"live",
-								"realtime",
-								"polished"
-							].map((m) => /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
-								className: mode === m ? "on" : "",
-								title: t(`mode.${m}.tip`),
-								onClick: () => onMode(m),
-								children: t(`mode.${m}`)
-							}, m))
-						})]
-					}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
-						className: "hint",
-						children: t(`mode.${mode}.tip`)
-					})]
-				}),
-				/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
-					className: "srow",
-					children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: t("set.spoken") }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)(Pick, {
-						value: spoken,
-						disabled,
-						onChange: onSpoken,
-						options: [{
-							value: "auto",
-							label: t("set.auto")
-						}, ...langOptions.map(([k, v]) => ({
-							value: k,
-							label: v
-						}))]
-					})]
-				}),
 				/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 					className: "srow",
 					title: t("set.login.tip"),
@@ -36014,6 +36051,18 @@ function LiveView(props) {
 	const missing = deps.filter((d) => !d.ok && (d.name === "ffmpeg" || d.name === "yt-dlp" || (engine || "local") === "local" && d.name.startsWith("whisper")));
 	const needsModel = !hasTranslator && shownLines.some((l) => l !== "src");
 	const hasMain = !!job && !(job.status === "error" && !job.files.some((f) => /\.(mp4|m4a|srt|vtt)$/.test(f)));
+	const liveEdge = job?.recorded ?? now;
+	const pushFrom = (m) => {
+		const firstPass = subs.ready ?? subs.at;
+		const at = m === "live" ? liveEdge - 2 : m === "realtime" ? firstPass : Math.max(lastPolished, firstPass - 150);
+		return Math.max(0, Math.min(at, liveEdge));
+	};
+	const pushTiming = job && !job.vod && job.status === "running" ? {
+		mode,
+		onMode: changeMode,
+		fromFor: pushFrom,
+		behindFor: (m) => liveEdge - pushFrom(m)
+	} : void 0;
 	(0, react.useEffect)(() => {
 		if (job && !hasMain) setSrcTabRaw(job.source === "device" ? "camera" : job.source === "push" ? "push" : job.source === "file" ? "file" : "link");
 	}, [job?.id, hasMain]);
@@ -36388,11 +36437,6 @@ function LiveView(props) {
 		/* @__PURE__ */ (0, react_jsx_runtime.jsx)(Settings, {
 			engine: engine || "local",
 			onEngine: setEngine,
-			mode,
-			onMode: changeMode,
-			spoken,
-			onSpoken: setSpoken,
-			langOptions,
 			login,
 			onLogin: chooseLogin,
 			browsers,
@@ -36580,9 +36624,38 @@ function LiveView(props) {
 										name: nameWithSpoken,
 										style: subStyle,
 										onStyle: setSubStyle,
+										spoken: {
+											value: spoken,
+											options: langOptions,
+											onChange: setSpoken
+										},
 										t
 									}) })
 								},
+								...!job.vod && job.status === "running" ? [{
+									id: "mode",
+									icon: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(Icon.timer, {}),
+									title: t("set.mode"),
+									label: t(`mode.${mode}`),
+									content: /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+										className: "dshl-modemenu",
+										children: [
+											"live",
+											"realtime",
+											"polished"
+										].map((m) => /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("button", {
+											className: `mm ${mode === m ? "on" : ""}`,
+											onClick: () => changeMode(m),
+											children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
+												className: "n",
+												children: [t(`mode.${m}`), mode === m && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(Icon.check, {})]
+											}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+												className: "d",
+												children: t(`mode.${m}.tip`)
+											})]
+										}, m))
+									})
+								}] : [],
 								{
 									id: "restream",
 									icon: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(Icon.push, {}),
@@ -36594,6 +36667,7 @@ function LiveView(props) {
 										status: job.restream,
 										now,
 										style: subStyle,
+										timing: pushTiming,
 										t
 									})
 								},
@@ -37418,6 +37492,11 @@ const en = {
 	"dev.blocked": "No picture or sound from the device: DeepSeek Harness needs the system’s permission. Open System Settings, switch DeepSeek Harness on, then retry.",
 	"dev.denied": "DeepSeek Harness needs permission to use the {d}. Open System Settings, switch it on in the list, then retry.",
 	"dev.and": " and ",
+	"set.spoken.tip": "The language people speak in this video; Auto detects it.",
+	"rs.mode": "Subtitle mode of the push-out",
+	"rs.mode.live": "Pushed out about {s} s behind; subtitles come a little after the words.",
+	"rs.mode.realtime": "Pushed out about {s} s behind, with first-pass subtitles in step.",
+	"rs.mode.polished": "Pushed out about {s} s behind, with polished subtitles.",
 	"own.live": "Live",
 	"own.delayed": "As pushed out",
 	"own.toLive": "Show the live picture large",
@@ -37862,6 +37941,11 @@ const zh = {
 	"dev.blocked": "设备没有传来画面和声音：DeepSeek Harness 需要系统授权。点「打开系统设置」，在列表里打开 DeepSeek Harness，再点重试。",
 	"dev.denied": "DeepSeek Harness 需要{d}权限。点「打开系统设置」，在列表里打开它，再点重试。",
 	"dev.and": "和",
+	"set.spoken.tip": "视频里说的是哪种语言；自动 = 自己识别。",
+	"rs.mode": "推流用的字幕模式",
+	"rs.mode.live": "推出去比实时晚约 {s} 秒，字幕会比说话稍晚出现。",
+	"rs.mode.realtime": "推出去比实时晚约 {s} 秒，带对齐好的初版字幕。",
+	"rs.mode.polished": "推出去比实时晚约 {s} 秒，带精修字幕。",
 	"own.live": "实时画面",
 	"own.delayed": "推流画面",
 	"own.toLive": "放大实时画面",
@@ -38402,6 +38486,9 @@ html[data-platform='darwin'] .dshl.page .dshl-top :is(button, input, label, a, .
   outline: 1px solid rgba(255,255,255,.28); box-shadow: 0 6px 24px rgba(0,0,0,.5); cursor: pointer; transition: bottom .25s; }
 .dshl-stage.idle .dshl-vbox.pip, .dshl-stage.idle .dshl-livecam.pip { bottom: 14px; }
 .dshl-stage .pip .dshl-sub { transform: translateX(-50%) !important; }
+.dshl-rs .rs-mode { display: grid; gap: 6px; margin: 10px 0 4px; }
+.dshl-rs .rs-mode .seg { display: flex; }
+.dshl-rs .rs-mode .seg button { flex: 1; }
 .dshl-piplabel { position: absolute; top: 6px; left: 6px; z-index: 3; padding: 2px 7px; border-radius: 5px; background: rgba(0,0,0,.6); color: #fff; font-size: 11px; pointer-events: none; }
 .dshl-stage.idle { cursor: none; }
 .dshl-holdnote { position: absolute; top: 14px; left: 50%; z-index: 4; display: flex; align-items: center; gap: 8px; padding: 6px 12px; border-radius: 999px; transform: translateX(-50%);
@@ -38526,6 +38613,13 @@ html[data-platform='darwin'] .dshl.page .dshl-top :is(button, input, label, a, .
 .dshl-menu .dshl-seg button.on { background: rgba(255,255,255,.92); color: #111; box-shadow: none; }
 .dshl-menu .dshl-switch { background: rgba(255,255,255,.22); }
 .dshl-menu .dshl-switch.on { background: var(--accent); }
+.dshl-modemenu { display: grid; gap: 4px; width: 300px; max-width: 100%; }
+.dshl-modemenu .mm { display: grid; gap: 3px; padding: 9px 10px; border: 0; border-radius: 8px; background: none; color: inherit; text-align: left; cursor: pointer; }
+.dshl-modemenu .mm:hover { background: rgba(255,255,255,.08); }
+.dshl-modemenu .mm.on { background: rgba(255,255,255,.12); }
+.dshl-modemenu .n { display: flex; align-items: center; justify-content: space-between; font-size: 13.5px; font-weight: 600; }
+.dshl-modemenu .n svg { width: 14px; height: 14px; }
+.dshl-modemenu .d { color: rgba(255,255,255,.62); font-size: 12px; line-height: 1.45; }
 .dshl-menu .opt { display: flex; align-items: center; justify-content: space-between; gap: 10px; min-height: 32px; padding: 0 6px; color: var(--muted); }
 .dshl-menu .opt .dshl-seg { max-width: 100%; overflow-x: auto; scrollbar-width: none; }
 .dshl-menu .opt input[type=range] { flex: 1; max-width: 180px; accent-color: var(--accent); }
@@ -38893,8 +38987,14 @@ async function openPage(sessions, opts = {}) {
 }
 async function showPage(sessions, opts) {
 	const current = sessions.current();
-	const sid = opts.sessionId ?? await pageSession(sessions, opts.workspaces, opts.title ?? "Video");
-	if (sid !== current) sessions.open(sid);
+	const fresh = () => pageSession(sessions, opts.workspaces, opts.title ?? "Video");
+	let sid = opts.sessionId && sessions.has(opts.sessionId) ? opts.sessionId : await fresh();
+	if (sid !== current) try {
+		sessions.open(sid);
+	} catch {
+		sid = await fresh();
+		sessions.open(sid);
+	}
 	if (panelHost) {
 		pageStore.set({
 			open: true,
@@ -39037,7 +39137,11 @@ function SidebarButton(props) {
 	const pct = item?.subs === "running" && item.duration ? Math.min(99, Math.round(item.at / item.duration * 100)) : void 0;
 	const meta = !busy ? "" : item?.subs === "running" ? pct !== void 0 ? t("side.subs").replace("{p}", String(pct)) : t("side.subsLive") : item?.recording ? t("side.recording") : item?.loading ? t("side.loading") : t("side.downloading");
 	const thumb = busy && frame && (!item || frame.jobId === item.jobId) ? frame.dataUrl : void 0;
-	const open = () => void openPage(sessions, item ? { sessionId: item.conversationId } : {
+	const open = () => void openPage(sessions, item ? {
+		sessionId: item.conversationId,
+		workspaces,
+		title: t("view.live")
+	} : {
 		workspaces,
 		title: t("view.live")
 	});

package/lib/index.mjs

@@ -1912,8 +1912,6 @@ function deviceInput(c, q) {
 	if (process.platform === "darwin") return {
 		args: [
 			...q,
-			"-use_wallclock_as_timestamps",
-			"1",
 			"-f",
 			"avfoundation",
 			"-framerate",
@@ -1998,6 +1996,8 @@ var LiveJob = class LiveJob extends EventEmitter {
 	/** Real-time picture (own sources): the newest JPEG frame, and whether frames are coming. */
 	lastFrame;
 	previewOn = false;
+	/** Closed by the user: no longer offered anywhere (its files stay). */
+	closed = false;
 	id;
 	status = "resolving";
 	message;
@@ -2451,6 +2451,7 @@ var LiveJob = class LiveJob extends EventEmitter {
 			...picture,
 			"-map",
 			input.audio,
+			...input.fps ? ["-af", "aresample=async=1:min_hard_comp=0.1:first_pts=0"] : [],
 			"-c:a",
 			"aac",
 			"-b:a",
@@ -6558,6 +6559,7 @@ function apply(ctx, config) {
 				const job = jobs.get(String(b.jobId));
 				if (!job) return send(res, 404, { error: "no such job" });
 				await job.close("closed");
+				job.closed = true;
 				const conv = job.summary().conversationId;
 				if (byConversation.get(conv) === job.id) byConversation.set(conv, "");
 				try {
@@ -6601,7 +6603,7 @@ function apply(ctx, config) {
 				return send(res, 200, job.summary());
 			}
 			if (route === "activity") return send(res, 200, {
-				items: [...jobs.values()].map((j) => j.summary()).filter((s) => s.status === "running" && !s.message || s.status === "resolving" || s.subs?.state === "running").map((s) => ({
+				items: [...jobs.values()].filter((j) => !j.closed).map((j) => j.summary()).filter((s) => s.status === "running" && !s.message || s.status === "resolving" || s.subs?.state === "running").map((s) => ({
 					jobId: s.id,
 					conversationId: s.conversationId,
 					title: s.title,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-vidi",
-  "version": "0.8.8",
+  "version": "0.9.0",
   "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",