dsh-vidi 0.2.1 → 0.2.3

package/lib/client.js

@@ -36192,6 +36192,7 @@ const en = {
 	"chat.p.download": "Download the original of this video.",
 	"page.back": "Back to chats",
 	"page.open": "Vidi video",
+	"page.failed": "The video page could not open: {e}",
 	"side.subs": "Subtitles {p}%",
 	"side.subsLive": "Subtitling",
 	"side.recording": "Recording",
@@ -36506,6 +36507,7 @@ const zh = {
 	"chat.p.download": "下载这个视频的原片。",
 	"page.back": "返回对话",
 	"page.open": "Vidi 视频",
+	"page.failed": "视频页打不开：{e}",
 	"side.subs": "字幕 {p}%",
 	"side.subsLive": "生成字幕中",
 	"side.recording": "录制中",
@@ -36756,7 +36758,17 @@ const CSS = `
 @media (max-width: 1000px) { .dshl-main { grid-template-columns: minmax(0, 1fr); } }
 
 /* Video page (full window over the app) */
+.dshl-toast { position: fixed; left: 50%; bottom: 28px; z-index: 2147483001; max-width: min(560px, calc(100vw - 32px)); padding: 10px 16px; border-radius: 10px;
+  background: rgba(28,28,31,.95); color: #f2f2f3; font: 13.5px/1.5 system-ui, -apple-system, sans-serif; box-shadow: 0 10px 30px rgba(0,0,0,.3); transform: translateX(-50%); pointer-events: none; }
 .dshl-pagewrap { position: absolute; inset: 0; z-index: 1; pointer-events: auto; background: var(--dsw-alias-bg-base, #fff); }
+/* Desktop app: the page covers the whole window. Windows: start under the title bar. macOS: the
+   traffic lights sit over the top-left, so the top bar leaves them room, lines its controls up
+   with them, and its empty space moves the window like the app's own top strip. Full screen and
+   the web page need none of this. */
+.dshl-pagewrap { top: var(--dsh-frame-chrome-top, 0px); }
+html[data-platform='darwin']:not([data-fullscreen]) .dshl.page .dshl-top { padding: 4px 16px 8px 84px; -webkit-app-region: drag; app-region: drag; }
+html[data-platform='darwin']:not([data-fullscreen]) .dshl.page .dshl-top :is(button, input, label, a, select, .dshl-pick) { -webkit-app-region: no-drag; app-region: no-drag; }
+@media (max-width: 600px) { html[data-platform='darwin']:not([data-fullscreen]) .dshl.page .dshl-top { padding-left: 80px; } }
 .dshl.page { display: flex; flex-direction: column; height: 100%; overflow: hidden; }
 .dshl.page .dshl-main { flex: 1; min-height: 0; grid-template-columns: minmax(0, 1fr) clamp(320px, 30vw, 420px); align-items: stretch; padding-bottom: 16px; }
 /* Video page: player on top, then the status row, then subtitles/glossary filling what is left; chat on the right. */
@@ -37196,6 +37208,7 @@ function ensureStyles() {
 
 // src/client/VideoPage.tsx
 const PAGE_SESSION = "dsh-live.pageSession";
+const samePath = (a, b) => !!a && !!b && a.replace(/\/+$/, "") === b.replace(/\/+$/, "");
 /**
 * The video page's own conversation: reused while it exists, created when not.
 * It lives in a "Video" workspace on the video folder, so DeepSeek's own file
@@ -37207,8 +37220,15 @@ async function pageSession(sessions, workspaces, title) {
 		saved = localStorage.getItem(PAGE_SESSION);
 	} catch {}
 	if (saved && sessions.has(saved)) return saved;
-	const deps = await fetch("/live/api/deps").then((r) => r.json()).catch(() => ({}));
-	const ws = await workspaces.create({ path: deps.dataDir });
+	const deps = await fetch("/live/api/deps").then((r) => r.json());
+	if (!deps?.dataDir) throw new Error("the video plugin is not running yet");
+	const known = () => workspaces.list?.getSnapshot().items?.find((w) => samePath(w.path, deps.dataDir));
+	let ws = known();
+	if (!ws) ws = await workspaces.create({ path: deps.dataDir }).catch((err) => {
+		const again = known();
+		if (again) return again;
+		throw err;
+	});
 	const workspaceId = ws.workspaceId ?? ws.id;
 	if (workspaceId && ws.title !== title) await workspaces.rename(workspaceId, title).catch(() => {});
 	const id = await sessions.create(workspaceId ? { workspaceId } : { cwd: deps.dataDir });
@@ -37223,6 +37243,17 @@ async function pageSession(sessions, workspaces, title) {
 * The page's session becomes current so its chat is live; closing goes back.
 */
 async function openPage(sessions, opts = {}) {
+	try {
+		await showPage(sessions, opts);
+	} catch (err) {
+		console.error("[dsh-vidi] could not open the video page", err);
+		pageStore.set({ error: err.message || String(err) });
+		setTimeout(() => {
+			if (pageStore.get().error) pageStore.set({ error: void 0 });
+		}, 6e3);
+	}
+}
+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);
@@ -37248,6 +37279,11 @@ function VideoPage(props) {
 	const page = (0, react.useSyncExternalStore)(pageStore.subscribe, pageStore.get);
 	const face = (0, react.useSyncExternalStore)(sessions.subscribe, () => page.sessionId ? sessions.face(page.sessionId) : void 0);
 	const chat = (0, react.useSyncExternalStore)(sessions.subscribe, () => page.sessionId ? sessions.chat(page.sessionId) : void 0);
+	if (page.error && !page.open) return /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+		className: "dshl-toast",
+		role: "alert",
+		children: t("page.failed").replace("{e}", page.error)
+	});
 	if (!page.open || !page.sessionId) return null;
 	return /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
 		className: "dshl-pagewrap",

package/lib/index.mjs

@@ -2641,6 +2641,92 @@ var LiveJob = class LiveJob extends EventEmitter {
 		for (const f of readdirSync(dir)) if (f.startsWith(`.${name}.`)) rmSync(join(dir, f), { force: true });
 		return out;
 	}
+	/**
+	* Cut [from, to] into an MP4 with the subtitles drawn into the picture,
+	* looking exactly like the player (and the restream): each change of the
+	* lines on screen becomes one transparent picture, shown for its stretch.
+	*/
+	async burnClip(from, to, style, opts = {}) {
+		if (!(to > from)) throw new Error("end must be after start");
+		const h = opts.height ?? 1080, w = Math.round(h * 16 / 9);
+		const dir = join(this.deps.dir, "clips");
+		mkdirSync(dir, { recursive: true });
+		const name = `clip_${from.toFixed(1)}-${to.toFixed(1)}_subs`.replace(/\./g, "_");
+		const out = opts.out ?? join(dir, `${name}.mp4`);
+		const tmp = join(dir, `.${name}`);
+		mkdirSync(tmp, { recursive: true });
+		const spans = [];
+		for (let t = from; t < to; t += .1) {
+			const rows = this.rowsAt(t, style);
+			const key = JSON.stringify(rows);
+			const last = spans.at(-1);
+			if (last && last.key === key) last.end = Math.min(to, t + .1);
+			else spans.push({
+				start: t,
+				end: Math.min(to, t + .1),
+				key,
+				rows
+			});
+		}
+		const pictures = /* @__PURE__ */ new Map();
+		const lines = ["ffconcat version 1.0"];
+		for (const s of spans) {
+			let file = pictures.get(s.key);
+			if (!file) {
+				file = join(tmp, `${pictures.size}.png`);
+				const png = await drawSubtitles(s.rows, style, w, h);
+				if (!png) throw new Error("subtitles could not be drawn on this computer");
+				writeFileSync(file, png);
+				pictures.set(s.key, file);
+			}
+			lines.push(`file '${file.replace(/'/g, "'\\''")}'`, `duration ${(s.end - s.start).toFixed(3)}`);
+		}
+		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",
+				"error",
+				"-y",
+				...args,
+				"-f",
+				"concat",
+				"-safe",
+				"0",
+				"-i",
+				list,
+				"-t",
+				String(to - from),
+				"-filter_complex",
+				`[0:v]scale=${w}:${h}:force_original_aspect_ratio=decrease,pad=${w}:${h}:(ow-iw)/2:(oh-ih)/2,setsar=1,setpts=PTS-STARTPTS[v];[1:v]format=rgba,setpts=PTS-STARTPTS[s];[v][s]overlay=0:0:eof_action=repeat,format=yuv420p[o]`,
+				"-map",
+				"[o]",
+				"-map",
+				"0:a?",
+				"-c:v",
+				"libx264",
+				"-preset",
+				"veryfast",
+				"-crf",
+				"20",
+				"-c:a",
+				"aac",
+				"-b:a",
+				"160k",
+				"-movflags",
+				"+faststart",
+				out
+			], { timeout: 9e5 });
+		} finally {
+			rmSync(tmp, {
+				recursive: true,
+				force: true
+			});
+		}
+		return out;
+	}
 	/** Language actually spoken (setting, or what recognition detected). */
 	spokenLang() {
 		if (this.opts.srcLang !== "auto") return this.opts.srcLang;
@@ -4660,6 +4746,7 @@ function apply(ctx, config) {
 		jobs.set(id, job);
 		if (!waiting) byConversation.set(opts.conversationId, id);
 		job.autoSubs = true;
+		bus.emit("job", job);
 		job.start();
 		return job;
 	}
@@ -5201,6 +5288,27 @@ function apply(ctx, config) {
 		},
 		subsDefaults: lastOptions
 	});
+	/**
+	* For companion plugins (a Studio edition and the like): the jobs with their
+	* tools — frames, clips with subtitles drawn in, cues and events — and the
+	* subtitle model, so a companion adds its own workflow without a copy of any
+	* of this. Inject 'vidi' to use it.
+	*/
+	const vidiService = {
+		version: 1,
+		dataDir: config.dataDir,
+		job: (conversationId) => jobForConversation(conversationId),
+		jobById: (id) => jobs.get(id),
+		jobs: () => [...jobs.values()],
+		onJob: (fn) => {
+			bus.on("job", fn);
+			return () => {
+				bus.off("job", fn);
+			};
+		},
+		llm: () => llm
+	};
+	ctx.effect(() => ctx.provide("vidi", vidiService), "dsh-vidi: companion service");
 	ctx.effect(() => ctx.webServer.register({
 		kind: "prefix",
 		path: "/live/api",

package/package.json

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