dsh-vidi 0.4.1 → 0.4.3

package/lib/client.js

@@ -656,6 +656,42 @@ function ChatPanel(props) {
 	});
 }
 
+// src/client/Guard.tsx
+/**
+* Keeps a companion plugin's part of the page (a tab, a player menu, a
+* workbench) from taking the whole video page down: if it fails, only its
+* own area says so, with a way out, and the video keeps playing.
+*/
+var Guard = class extends react.Component {
+	state = {};
+	static getDerivedStateFromError(error) {
+		return { error };
+	}
+	componentDidCatch(error) {
+		console.error(`[dsh-vidi] ${this.props.name} failed`, error);
+	}
+	render() {
+		if (!this.state.error) return this.props.children;
+		return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+			className: "dshl-guard",
+			role: "alert",
+			children: [
+				/* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", { children: this.props.message }),
+				/* @__PURE__ */ (0, react_jsx_runtime.jsx)("code", { children: this.state.error.message }),
+				/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+					className: "dshl-btn small",
+					onClick: () => this.setState({ error: void 0 }),
+					children: "↻"
+				}), this.props.onClose && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+					className: "dshl-btn small",
+					onClick: this.props.onClose,
+					children: this.props.closeLabel
+				})] })
+			]
+		});
+	}
+};
+
 // src/client/langs.ts
 /** Language names for the UI, by interface language. */
 const NAMES = {
@@ -35250,7 +35286,11 @@ function LiveView(props) {
 		}),
 		job && view && extPanels.filter((p) => p.id === tab).map((p) => /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
 			className: "dshl-panel dshl-ext",
-			children: p.render(view)
+			children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(Guard, {
+				name: `tab ${p.id}`,
+				message: t("ext.failed"),
+				children: p.render(view)
+			})
 		}, p.id)),
 		tab === "glossary" && job && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(GlossaryPanel, {
 			jobId: job.id,
@@ -35479,7 +35519,11 @@ function LiveView(props) {
 									id: `ext:${m.id}`,
 									icon: m.icon,
 									title: m.title(ui),
-									content: view ? m.render(view, () => player.current?.closeMenu()) : null
+									content: view ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)(Guard, {
+										name: `menu ${m.id}`,
+										message: t("ext.failed"),
+										children: m.render(view, () => player.current?.closeMenu())
+									}) : null
 								})),
 								{
 									id: "download",
@@ -35535,7 +35579,13 @@ function LiveView(props) {
 					className: "dshl-side",
 					children: activeBench && view ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
 						className: "dshl-benchbox",
-						children: activeBench.render(view)
+						children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(Guard, {
+							name: `workbench ${activeBench.id}`,
+							message: t("ext.failed"),
+							onClose: () => setBench(null),
+							closeLabel: t("ext.close"),
+							children: activeBench.render(view)
+						}, activeBench.id)
 					}) : pageMode ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)(ChatPanel, {
 						face: chatFace,
 						source: chatSource,
@@ -35582,6 +35632,10 @@ function SubsButton(props) {
 				className: "now",
 				children: pct !== void 0 ? t("subs.progress").replace("{p}", String(pct)) : t("subs.progressLive").replace("{t}", CLOCK(at))
 			}),
+			/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+				className: "short",
+				children: pct !== void 0 ? `${pct}%` : CLOCK(at)
+			}),
 			/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
 				className: "act",
 				children: t("subs.pause")
@@ -36292,6 +36346,8 @@ const en = {
 	"player.polished": "This line is polished",
 	"page.open": "Vidi video",
 	"page.failed": "The video page could not open: {e}",
+	"ext.failed": "This part (from another plugin) ran into an error. The video keeps playing; restarting DSH usually fixes it after an update.",
+	"ext.close": "Back to chat",
 	"side.subs": "Subtitles {p}%",
 	"side.subsLive": "Subtitling",
 	"side.recording": "Recording",
@@ -36614,6 +36670,8 @@ const zh = {
 	"player.polished": "这句字幕已精修",
 	"page.open": "Vidi 视频",
 	"page.failed": "视频页打不开：{e}",
+	"ext.failed": "这一块（来自其他插件）出错了。视频照常播放；刚更新过插件的话，重启一下 DSH 一般就好。",
+	"ext.close": "回到对话",
 	"side.subs": "字幕 {p}%",
 	"side.subsLive": "生成字幕中",
 	"side.recording": "录制中",
@@ -36897,6 +36955,10 @@ html[data-platform='darwin'] .dshl.page .dshl-top :is(button, input, label, a, s
 .dshl.page .dshl-side { position: static; height: 100%; max-height: none; }
 /* Workbench open: the video and its subtitles keep a column on the left; the bench takes the rest. */
 .dshl.page.bench .dshl-main { grid-template-columns: clamp(340px, 32vw, 520px) minmax(0, 1fr); }
+.dshl-guard { display: grid; gap: 8px; margin: 12px; padding: 12px 14px; border: 1px solid color-mix(in srgb, #d1434b 35%, var(--line)); border-radius: 10px; color: var(--ink); font-size: 13px; }
+.dshl-guard p { margin: 0; line-height: 1.6; }
+.dshl-guard code { color: var(--muted); font-size: 12px; white-space: pre-wrap; word-break: break-word; }
+.dshl-guard div { display: flex; gap: 8px; }
 .dshl-benchbox { flex: 1; min-height: 0; overflow: auto; overscroll-behavior: contain; }
 .dshl-under { display: flex; flex-direction: column; flex: 1; min-height: 210px; overflow: hidden; border: 1px solid var(--line); border-radius: 12px; background: var(--l1); }
 .dshl-under .dshl-sidetabs { align-items: center; padding: 0 12px 0 10px; }
@@ -36992,7 +37054,12 @@ html[data-platform='darwin'] .dshl.page .dshl-top :is(button, input, label, a, s
 .dshl-ctrlrow .pill svg { flex: none; width: 18px; height: 18px; }
 .dshl-ctrlrow .pill .txt { overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
 .dshl-ctrlrow .pill .caret { flex: none; width: 5px; height: 5px; border-right: 1.5px solid currentColor; border-bottom: 1.5px solid currentColor; opacity: .8; transform: translateY(1px) rotate(-135deg); }
-@container (max-width: 640px) { .dshl-ctrlrow .pill .txt, .dshl-ctrlrow .pill .caret { display: none; } .dshl-ctrlrow .pill { padding: 0 6px; } }
+@container (max-width: 640px) {
+  .dshl-ctrlrow .pill .txt, .dshl-ctrlrow .pill .caret { display: none; } .dshl-ctrlrow .pill { padding: 0 6px; }
+  /* Narrow player (a workbench beside it, a phone): fewer words, no volume slider (the mute button stays). */
+  .dshl-ctrlrow .vol, .dshl-ctrlrow .theater { display: none; }
+  .dshl-ctrlrow .ic { width: 32px; height: 32px; }
+}
 @container (max-width: 520px) {
   .dshl-ctrlrow { gap: 2px; }
   .dshl-ctrlrow .vol, .dshl-ctrlrow .mute, .dshl-ctrlrow .theater { display: none; }
@@ -37008,7 +37075,8 @@ html[data-platform='darwin'] .dshl.page .dshl-top :is(button, input, label, a, s
 .dshl-subsbtn:hover { filter: brightness(1.08); }
 .dshl-subsbtn.running { background: linear-gradient(to right, rgba(127,176,255,.45) var(--p, 0%), rgba(255,255,255,.14) var(--p, 0%)); font-weight: 500; }
 .dshl-subsbtn.running .dot { width: 7px; height: 7px; border-radius: 50%; background: #ff5a5f; animation: dshl-pulse 1.6s ease-in-out infinite; }
-.dshl-subsbtn.running .act { display: none; }
+.dshl-subsbtn.running .act, .dshl-subsbtn .short { display: none; }
+@container (max-width: 640px) { .dshl-subsbtn .now { display: none; } .dshl-subsbtn.running:not(:hover) .short { display: inline; } }
 .dshl-subsbtn.running:hover .now { display: none; }
 .dshl-subsbtn.running:hover .act { display: inline; }
 .dshl-subsbtn.running:hover .dot { width: 8px; height: 8px; border-radius: 1px; background: #fff; animation: none; }

package/lib/index.mjs

@@ -1693,6 +1693,8 @@ const AHEAD_MAX_LINES = 10;
 *
 * Events: 'state' (JobSummary), 'cue' (Cue — new or revised).
 */
+/** Drop the first `skip` seconds after decoding (an output -ss; empty when there is nothing to drop). */
+const seekAfter = (skip) => skip > .01 ? ["-ss", skip.toFixed(3)] : [];
 var LiveJob = class LiveJob extends EventEmitter {
 	opts;
 	deps;
@@ -2594,7 +2596,14 @@ var LiveJob = class LiveJob extends EventEmitter {
 	exportText(langs, format) {
 		return exportCues(this.cues, langs, format, this.title);
 	}
-	/** Best available picture source for time range [from, to]: original download, finished recording, or recorded segments. */
+	/**
+	* Best available picture source for time range [from, to]: original
+	* download, finished recording, or recorded segments. `args` are the input
+	* arguments; `skip` is how much to drop after decoding (output -ss). Files
+	* seek exactly on input; live segments do not (a seek lands between
+	* keyframes — YouTube live has one every 5 s — and decodes nothing), so they
+	* are read from the start of the first segment and trimmed after decoding.
+	*/
 	mediaFor(from, to) {
 		const original = readdirSync(this.deps.dir).find((n) => /^original\.(mp4|mkv|webm)$/.test(n));
 		if (original) return {
@@ -2604,7 +2613,7 @@ var LiveJob = class LiveJob extends EventEmitter {
 				"-i",
 				join(this.deps.dir, original)
 			],
-			offset: 0
+			skip: 0
 		};
 		if (this.captureDone && existsSync(join(this.deps.dir, "recording.mp4"))) return {
 			args: [
@@ -2613,7 +2622,7 @@ var LiveJob = class LiveJob extends EventEmitter {
 				"-i",
 				join(this.deps.dir, "recording.mp4")
 			],
-			offset: 0
+			skip: 0
 		};
 		const segs = this.segments();
 		const files = readFileSync(this.m3u8, "utf8").split("\n").filter((l) => l && !l.startsWith("#"));
@@ -2621,29 +2630,26 @@ var LiveJob = class LiveJob extends EventEmitter {
 		let last = segs.findIndex((sg) => sg.start + sg.dur >= to);
 		if (last < 0) last = segs.length - 1;
 		if (!segs.length || first > last) throw new Error("that part has not been recorded yet");
-		const list = files.slice(first, last + 1).map((f) => join(this.deps.dir, this.hlsName, f)).join("|");
 		return {
-			args: [
-				"-ss",
-				String(from - segs[first].start),
-				"-i",
-				`concat:${list}`
-			],
-			offset: 0
+			args: ["-i", `concat:${files.slice(first, last + 1).map((f) => join(this.deps.dir, this.hlsName, f)).join("|")}`],
+			skip: Math.max(0, from - segs[first].start)
 		};
 	}
 	/** One small JPEG of the picture at media time `at`, for the model to look at (undefined for audio-only or on failure). */
 	async still(at) {
 		try {
-			const { args } = this.mediaFor(at, at + 1);
+			const { args, skip } = this.mediaFor(at, at + 1);
 			const { stdout } = await run$1("ffmpeg", [
 				"-v",
 				"error",
 				...args,
+				...seekAfter(skip),
 				"-frames:v",
 				"1",
 				"-vf",
 				"scale=768:-2",
+				"-pix_fmt",
+				"yuvj420p",
 				"-q:v",
 				"5",
 				"-f",
@@ -2666,18 +2672,22 @@ var LiveJob = class LiveJob extends EventEmitter {
 		const dir = join(this.deps.dir, "frames");
 		mkdirSync(dir, { recursive: true });
 		const out = join(dir, `frame_${at.toFixed(1).replace(".", "_")}.jpg`);
-		const { args } = this.mediaFor(at, at + 1);
+		const { args, skip } = this.mediaFor(at, at + 1);
 		await run$1("ffmpeg", [
 			"-v",
 			"error",
 			"-y",
 			...args,
+			...seekAfter(skip),
 			"-frames:v",
 			"1",
+			"-pix_fmt",
+			"yuvj420p",
 			"-q:v",
 			"2",
 			out
 		], { timeout: 6e4 });
+		if (!existsSync(out)) throw new Error("no picture at that moment");
 		return out;
 	}
 	/**
@@ -2690,14 +2700,14 @@ var LiveJob = class LiveJob extends EventEmitter {
 		mkdirSync(dir, { recursive: true });
 		const name = `clip_${from.toFixed(1)}-${to.toFixed(1)}`.replace(/\./g, "_");
 		const out = join(dir, `${name}.mp4`);
-		const { args } = this.mediaFor(from, to);
+		const { args, skip } = this.mediaFor(from, to);
 		const subArgs = [];
 		const maps = [];
 		if (langs?.length) {
 			const inRange = this.cues.filter((c) => c.final && c.end > from && c.start < to).map((c) => ({
 				...c,
-				start: Math.max(0, c.start - from),
-				end: Math.min(to, c.end) - from
+				start: Math.max(0, c.start - from) + skip,
+				end: Math.min(to, c.end) - from + skip
 			}));
 			(langs.length > 1 ? [langs, ...langs.map((l) => [l])] : [langs]).forEach((ls, i) => {
 				const f = join(dir, `.${name}.${i}.srt`);
@@ -2712,6 +2722,7 @@ var LiveJob = class LiveJob extends EventEmitter {
 			"-y",
 			...args,
 			...subArgs,
+			...seekAfter(skip),
 			"-t",
 			String(to - from),
 			"-map",
@@ -2764,8 +2775,16 @@ var LiveJob = class LiveJob extends EventEmitter {
 				rows
 			});
 		}
+		const { args, skip } = this.mediaFor(from, to);
 		const pictures = /* @__PURE__ */ new Map();
 		const lines = ["ffconcat version 1.0"];
+		if (skip > 0) {
+			const blank = await drawSubtitles([], style, w, h);
+			if (!blank) throw new Error("subtitles could not be drawn on this computer");
+			const file = join(tmp, "blank.png");
+			writeFileSync(file, blank);
+			lines.push(`file '${file.replace(/'/g, "'\\''")}'`, `duration ${skip.toFixed(3)}`);
+		}
 		for (const s of spans) {
 			let file = pictures.get(s.key);
 			if (!file) {
@@ -2780,7 +2799,6 @@ var LiveJob = class LiveJob extends EventEmitter {
 		lines.push(`file '${pictures.get(spans.at(-1).key).replace(/'/g, "'\\''")}'`);
 		const list = join(tmp, "subs.ffconcat");
 		writeFileSync(list, lines.join("\n") + "\n");
-		const { args } = this.mediaFor(from, to);
 		try {
 			await run$1("ffmpeg", [
 				"-v",
@@ -2793,6 +2811,7 @@ var LiveJob = class LiveJob extends EventEmitter {
 				"0",
 				"-i",
 				list,
+				...seekAfter(skip),
 				"-t",
 				String(to - from),
 				"-filter_complex",

package/package.json

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