dsh-vidi 0.9.2 → 0.9.4

package/lib/client.js

@@ -33627,6 +33627,9 @@ function drawSubtitles(g, W, H, texts, style) {
 }
 
 // src/client/Player.tsx
+/** A control-bar menu: an icon button that opens a panel above the bar. */
+/** Seconds between two lines that still count as one stretch of speech (the line stays up across it). */
+const GAP_FILL = 4;
 /** Subtitles carry no full stop at the end of a line (older lines may still have one). */
 const noStop = (x) => /(\.\.\.|…)$/.test(x) ? x : x.replace(/[，,、；;：:]+$/, "").replace(/[。．｡]$|(?<=[^.\s])\.$/, "");
 const qLabel = (h) => h >= 2160 ? "4K" : h >= 1440 ? "2K" : `${h}p`;
@@ -33920,7 +33923,14 @@ const Player = (0, react.forwardRef)(function Player(props, ref) {
 	const total = vod ? Math.max(duration ?? 0, edge) : edge;
 	const behind = Math.max(0, edge - now);
 	const atLive = behind < delay + 10;
-	const current = cues.filter((c) => c.start - .2 <= now && now <= c.end + 1.2).at(-1) ?? (trail ? cues.filter((c) => c.start <= now && c.end > now - 8).at(-1) : void 0);
+	const current = (() => {
+		let i = -1;
+		for (let k = 0; k < cues.length; k++) if (cues[k].start - .2 <= now) i = k;
+		const c = cues[i], next = cues[i + 1];
+		if (!c) return void 0;
+		const until = next && next.start - c.end <= GAP_FILL ? next.start - .2 : c.end + 1.2;
+		return now <= Math.max(until, c.end + .3) ? c : void 0;
+	})() ?? (trail ? cues.filter((c) => c.start <= now && c.end > now - 8).at(-1) : void 0);
 	const textsOf = (cue) => {
 		const out = {};
 		if (!cue) return out;
@@ -35406,6 +35416,31 @@ function History({ t, ui, onOpen }) {
 	(0, react.useEffect)(() => {
 		load(0, 5);
 	}, []);
+	const busy = items.some((v) => v.work);
+	const shown = (0, react.useRef)(5);
+	shown.current = Math.max(5, items.length);
+	(0, react.useEffect)(() => {
+		if (!busy) return;
+		const timer = window.setInterval(() => void load(0, shown.current), 3e3);
+		return () => window.clearInterval(timer);
+	}, [busy]);
+	const [halting, setHalting] = (0, react.useState)(null);
+	const halt = async (v) => {
+		setHalting(v.id);
+		await fetch("/live/api/halt", {
+			method: "POST",
+			headers: { "content-type": "application/json" },
+			body: JSON.stringify({ jobId: v.id })
+		}).catch(() => {});
+		await load(0, shown.current);
+		setHalting(null);
+	};
+	const doing = (w) => [
+		w.recording ? t("hist.recording") : "",
+		w.loading ? t("hist.loading") : "",
+		w.subs !== void 0 ? w.subs >= 0 ? t("hist.subsPct").replace("{p}", String(w.subs)) : t("hist.subs") : "",
+		w.pushing ? t("hist.pushing") : ""
+	].filter(Boolean);
 	if (!items.length) return null;
 	const from = (v) => v.source === "file" ? t("src.file") : v.source === "device" ? t("src.camera") : v.source === "push" ? t("src.push") : siteName(v.url ?? "") || (() => {
 		try {
@@ -35460,11 +35495,23 @@ function History({ t, ui, onOpen }) {
 								].filter(Boolean).join(" · ")
 							})]
 						}),
-						v.running && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+						v.work ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+							className: "chip",
+							children: doing(v.work).join(" · ")
+						}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+							className: "dshl-link stop",
+							disabled: halting === v.id,
+							"data-tip": t("hist.stop.tip").replace("{w}", doing(v.work).join("、")),
+							onClick: (e) => {
+								e.stopPropagation();
+								halt(v);
+							},
+							children: t(halting === v.id ? "hist.stopping" : "hist.stop")
+						})] }) : v.running ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
 							className: "chip",
 							children: t("hist.running")
-						}),
-						v.live && v.source === "url" && !v.running && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+						}) : null,
+						v.live && v.source === "url" && !v.running && !v.work && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
 							className: "dshl-link replay",
 							onClick: (e) => {
 								e.stopPropagation();
@@ -36508,21 +36555,23 @@ function LiveView(props) {
 							c.final && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
 								className: "tools",
 								onClick: (e) => e.stopPropagation(),
-								children: [idx < shown.length - 1 && shown[idx + 1]?.final && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+								children: [idx < shown.length - 1 && shown[idx + 1]?.final && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("button", {
 									className: "ghost",
-									title: t("lines.merge"),
+									"data-tip": t("lines.merge"),
+									"aria-label": t("lines.merge"),
 									onClick: () => void mergeLine(c.id),
-									children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(Icon.merge, {})
+									children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(Icon.merge, {}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: t("lines.mergeShort") })]
 								}), (() => {
 									const k = shownLines.find((x) => (lineText(c, x) ?? "").length > 1) ?? "src";
-									return Array.from(lineText(c, k) ?? c.src).length > 1 && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+									return Array.from(lineText(c, k) ?? c.src).length > 1 && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("button", {
 										className: "ghost",
-										title: t("lines.split"),
+										"data-tip": t("lines.split"),
+										"aria-label": t("lines.split"),
 										onClick: () => setSplitting({
 											id: c.id,
 											key: lineKey(k)
 										}),
-										children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(Icon.scissors, {})
+										children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(Icon.scissors, {}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: t("lines.splitShort") })]
 									});
 								})()]
 							})
@@ -37748,8 +37797,10 @@ const en = {
 	"dev.and": " and ",
 	"how.title": "How subtitles are made",
 	"how.more": "More services and keys are in Settings.",
-	"lines.merge": "Join with the next line",
-	"lines.split": "Split this line",
+	"lines.merge": "Join this line and the next into one",
+	"lines.split": "Break this line in two: then click where it should break",
+	"lines.mergeShort": "Join",
+	"lines.splitShort": "Split",
 	"lines.splitHint": "Click where the line should break.",
 	"hist.goLive": "Watch live again",
 	"hist.replay": "Replay",
@@ -37757,6 +37808,14 @@ const en = {
 	"hist.untitled": "Untitled video",
 	"hist.live": "live",
 	"hist.running": "Live now",
+	"hist.recording": "Recording",
+	"hist.loading": "Loading",
+	"hist.subs": "Making subtitles",
+	"hist.subsPct": "Subtitles {p}%",
+	"hist.pushing": "Pushing out",
+	"hist.stop": "Stop",
+	"hist.stopping": "Stopping…",
+	"hist.stop.tip": "Stop: {w}",
 	"hist.more": "More ({n})",
 	"set.spoken.tip": "The language people speak in this video; Auto detects it.",
 	"rs.mode": "Subtitle mode of the push-out",
@@ -38209,8 +38268,10 @@ const zh = {
 	"dev.and": "和",
 	"how.title": "字幕怎么做",
 	"how.more": "更多服务和 key 在设置里。",
-	"lines.merge": "和下一句合并",
-	"lines.split": "拆成两句",
+	"lines.merge": "把这一句和下一句合成一句",
+	"lines.split": "把这一句拆成两句：点了以后，再点文字里要断开的位置",
+	"lines.mergeShort": "合并",
+	"lines.splitShort": "拆开",
 	"lines.splitHint": "点一下要断开的位置。",
 	"hist.goLive": "回到直播",
 	"hist.replay": "回放",
@@ -38218,6 +38279,14 @@ const zh = {
 	"hist.untitled": "未命名视频",
 	"hist.live": "直播",
 	"hist.running": "直播中",
+	"hist.recording": "录制中",
+	"hist.loading": "加载中",
+	"hist.subs": "字幕制作中",
+	"hist.subsPct": "字幕 {p}%",
+	"hist.pushing": "推流中",
+	"hist.stop": "停止",
+	"hist.stopping": "停止中…",
+	"hist.stop.tip": "停止：{w}",
 	"hist.more": "更多（还有 {n} 个）",
 	"set.spoken.tip": "视频里说的是哪种语言；自动 = 自己识别。",
 	"rs.mode": "推流用的字幕模式",
@@ -38902,6 +38971,9 @@ html[data-platform='darwin'] .dshl.page .dshl-top :is(button, input, label, a, .
 .dshl-history .tx { display: grid; gap: 3px; min-width: 0; flex: 1; }
 .dshl-history .tt { overflow: hidden; text-overflow: ellipsis; white-space: nowrap; font-size: 13.5px; font-weight: 550; }
 .dshl-history .mm { overflow: hidden; text-overflow: ellipsis; white-space: nowrap; color: var(--faint); font-size: 12px; }
+.dshl-history .stop { flex: none; padding: 4px 6px; font-size: 12.5px; color: var(--faint); }
+.dshl-history .stop:hover { color: var(--live); }
+.dshl-history .stop:disabled { opacity: .5; }
 .dshl-history .chip { flex: none; padding: 2px 8px; border-radius: 999px; background: color-mix(in srgb, var(--live) 14%, transparent); color: var(--live); font-size: 11.5px; font-weight: 600; }
 .dshl-history .more { margin: 8px 0 0 6px; font-size: 12.5px; }
 .dshl-modemenu .mh { margin: 6px 4px 2px; color: rgba(255,255,255,.55); font-size: 11.5px; }
@@ -38911,8 +38983,11 @@ html[data-platform='darwin'] .dshl.page .dshl-top :is(button, input, label, a, .
 .dshl-line { position: relative; }
 .dshl-line .tools { position: absolute; top: 4px; right: 4px; display: none; gap: 2px; padding: 2px; border-radius: 7px; background: var(--bg); box-shadow: 0 1px 4px rgba(0,0,0,.12); }
 .dshl-line:hover .tools, .dshl-line:focus-within .tools { display: flex; }
-.dshl-line .tools .ghost { display: grid; place-items: center; width: 26px; height: 24px; border: 0; border-radius: 5px; background: none; color: var(--muted); cursor: pointer; }
-.dshl-line .tools svg { width: 15px; height: 15px; }
+.dshl-line .tools .ghost { position: relative; display: flex; align-items: center; gap: 4px; height: 24px; padding: 0 7px 0 5px; border: 0; border-radius: 5px; background: none; color: var(--muted); font-size: 12px; white-space: nowrap; cursor: pointer; }
+.dshl-line .tools svg { width: 14px; height: 14px; flex: none; }
+/* Says what a button does the moment the pointer is on it (the system tooltip takes a second). */
+.dshl-history .stop { position: relative; }
+.dshl-history .stop[data-tip]:hover::after, .dshl-line .tools .ghost[data-tip]:hover::after { content: attr(data-tip); position: absolute; top: calc(100% + 6px); right: 0; z-index: 5; width: max-content; max-width: 220px; padding: 5px 8px; border-radius: 6px; background: var(--ink); color: var(--bg); font-size: 12px; line-height: 1.45; white-space: normal; text-align: left; pointer-events: none; }
 .dshl-line .tools .ghost:hover { background: var(--hover); color: var(--ink); }
 .dshl-line.splitting { cursor: default; background: color-mix(in srgb, var(--accent) 8%, transparent); }
 .dshl-line .cutline .ch { cursor: col-resize; border-left: 1px solid transparent; }

package/lib/index.mjs

@@ -118,8 +118,13 @@ function join$1(parts) {
 */
 function exportCues(cues, langs, format, title = "") {
 	const rows = cues.filter((c) => c.final && lines(c, langs).length);
-	if (format === "srt") return rows.map((c, i) => `${i + 1}\n${stamp(c.start, ",")} --> ${stamp(c.end, ",")}\n${lines(c, langs).join("\n")}\n`).join("\n");
-	if (format === "vtt") return "WEBVTT\n\n" + rows.map((c) => `${stamp(c.start, ".")} --> ${stamp(c.end, ".")}\n${lines(c, langs).join("\n")}\n`).join("\n");
+	const endOf = (i) => {
+		const c = rows[i], n = rows[i + 1];
+		const until = n && n.start - c.end <= 4 ? n.start : c.end + .6;
+		return Math.max(c.start + .8, Math.min(until, n ? n.start : until));
+	};
+	if (format === "srt") return rows.map((c, i) => `${i + 1}\n${stamp(c.start, ",")} --> ${stamp(endOf(i), ",")}\n${lines(c, langs).join("\n")}\n`).join("\n");
+	if (format === "vtt") return "WEBVTT\n\n" + rows.map((c, i) => `${stamp(c.start, ".")} --> ${stamp(endOf(i), ".")}\n${lines(c, langs).join("\n")}\n`).join("\n");
 	const md = format === "md";
 	return (md && title ? `# ${title}\n\n` : title ? `${title}\n\n` : "") + paragraphs(rows).map((p) => {
 		const who = p[0].speaker;
@@ -2016,6 +2021,12 @@ function cutNear(cs, ratio) {
 	}
 	return best > 0 ? best : Math.max(1, Math.min(n - 1, target));
 }
+/** When a video was first opened: its folder is named after that moment (UTC); older saves could carry a later time. */
+function openedAt(id, saved) {
+	const named = /^(\d{4}-\d{2}-\d{2})T(\d{2})-(\d{2})-(\d{2})/.exec(id);
+	const fromName = named ? Date.parse(`${named[1]}T${named[2]}:${named[3]}:${named[4]}Z`) : NaN;
+	return Number.isFinite(fromName) ? fromName : typeof saved === "number" ? saved : void 0;
+}
 var LiveJob = class LiveJob extends EventEmitter {
 	opts;
 	deps;
@@ -2028,6 +2039,7 @@ var LiveJob = class LiveJob extends EventEmitter {
 	status = "resolving";
 	message;
 	title;
+	/** When it was first opened (kept across restores, so the history keeps its place). */
 	startedAt = Date.now();
 	cues = [];
 	ffmpeg;
@@ -2170,6 +2182,7 @@ var LiveJob = class LiveJob extends EventEmitter {
 			const j = JSON.parse(readFileSync(join(dir, "job.json"), "utf8"));
 			const job = new LiveJob(j.id, j.opts, deps);
 			job.title = j.title;
+			job.startedAt = openedAt(j.id, j.startedAt) ?? job.startedAt;
 			job.vod = !!j.vod;
 			job.duration = j.duration;
 			job.captureDone = true;
@@ -3087,7 +3100,12 @@ var LiveJob = class LiveJob extends EventEmitter {
 	}
 	/** What the player would show at media time t, line by line (the same rules: no repeats, line-end marks dropped). */
 	rowsAt(t, style) {
-		const cue = this.cues.find((c) => c.final && c.start <= t && t < Math.max(c.end, c.start + 1.2));
+		const finals = this.cues.filter((c) => c.final);
+		let i = -1;
+		for (let k = 0; k < finals.length; k++) if (finals[k].start <= t) i = k;
+		const cand = finals[i], next = finals[i + 1];
+		const until = cand ? next && next.start - cand.end <= 4 ? next.start : Math.max(cand.end, cand.start + 1.2) : 0;
+		const cue = cand && t < until ? cand : void 0;
 		const text = (key) => {
 			if (key.startsWith("site:")) return this.siteCues.get(key)?.find((c) => c.start <= t && t < c.end)?.text;
 			if (!cue) return void 0;
@@ -6601,7 +6619,7 @@ function apply(ctx, config) {
 							title: j.title || device || (j.opts.source === "url" ? j.opts.url : ""),
 							source: j.opts.source,
 							url: j.opts.source === "url" ? j.opts.url : void 0,
-							startedAt: j.startedAt,
+							startedAt: openedAt(j.id, j.startedAt),
 							duration,
 							live: !j.vod,
 							running: false,
@@ -6617,7 +6635,26 @@ function apply(ctx, config) {
 			}
 			if (hit.item) out.push(hit.item);
 		}
-		return out;
+		for (const item of out) {
+			const j = jobs.get(String(item.id));
+			if (!j) continue;
+			const w = workOf(j);
+			if (w) item.work = w;
+		}
+		return [...out.filter((i) => i.work), ...out.filter((i) => !i.work)];
+	}
+	/** Still working: recording a live stream, loading a video, making subtitles, pushing out. */
+	function workOf(j) {
+		const s = j.summary();
+		const ok = !s.message;
+		const total = s.vod ? s.duration : s.status === "running" ? void 0 : s.recorded || s.duration;
+		const w = {
+			recording: s.status === "running" && !s.vod && ok,
+			loading: (s.status === "running" || s.status === "resolving") && !!s.vod && ok,
+			subs: s.subs?.state === "running" ? total ? Math.min(99, Math.round(s.subs.at / total * 100)) : -1 : void 0,
+			pushing: !!s.restream?.running
+		};
+		return w.recording || w.loading || w.subs !== void 0 || w.pushing ? w : void 0;
 	}
 	/** A small picture of a video for its history row (made once, kept in its folder). */
 	async function thumbnail(id) {
@@ -6800,6 +6837,16 @@ function apply(ctx, config) {
 				} catch {}
 				return send(res, 200, { ok: true });
 			}
+			if (route === "halt" && req.method === "POST") {
+				const b = await readJson(req);
+				const job = jobs.get(String(b.jobId));
+				if (!job) return send(res, 404, { error: "no such job" });
+				const s = job.summary();
+				if (s.subs?.state === "running") await job.pauseSubs();
+				if (s.restream?.running) await job.stopRestream();
+				if ((s.status === "running" || s.status === "resolving") && !s.vod) await job.stop();
+				return send(res, 200, { ok: true });
+			}
 			if (route === "stop" && req.method === "POST") {
 				const b = await readJson(req);
 				const job = jobs.get(String(b.jobId));

package/package.json

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