dsh-vidi 0.7.2 → 0.7.3

package/lib/client.js

@@ -35188,6 +35188,80 @@ function upload(file, onProgress) {
 	});
 }
 /** A value to copy: plain text (not an input look-alike) and a text button. */
+/** The push stream key: copy it, or change it (typed, or a new random one). */
+function KeyRow({ value, t, onChanged }) {
+	const [edit, setEdit] = (0, react.useState)(null);
+	const [err, setErr] = (0, react.useState)("");
+	const [done, setDone] = (0, react.useState)(false);
+	const save = async (body) => {
+		if (typeof body.key === "string" && !/^[A-Za-z0-9_-]{3,40}$/.test(body.key.trim())) {
+			setErr(t("push.badKey"));
+			return;
+		}
+		try {
+			await post("pushkey", body);
+			setEdit(null);
+			setErr("");
+			onChanged();
+		} catch (e) {
+			setErr(e.message);
+		}
+	};
+	return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("dt", { children: t("push.key") }), /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("dd", { children: [edit === null ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [
+		/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+			className: "val",
+			children: value
+		}),
+		/* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+			className: "dshl-link",
+			onClick: () => {
+				navigator.clipboard.writeText(value);
+				setDone(true);
+				setTimeout(() => setDone(false), 1500);
+			},
+			children: done ? t("push.copied") : t("push.copy")
+		}),
+		/* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+			className: "dshl-link",
+			onClick: () => setEdit(value),
+			children: t("push.change")
+		})
+	] }) : /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [
+		/* @__PURE__ */ (0, react_jsx_runtime.jsx)("input", {
+			className: "dshl-keyedit",
+			value: edit,
+			spellCheck: false,
+			autoFocus: true,
+			onFocus: (e) => e.target.select(),
+			onChange: (e) => setEdit(e.target.value),
+			onKeyDown: (e) => {
+				if (e.key === "Enter") save({ key: edit });
+				if (e.key === "Escape") setEdit(null);
+			}
+		}),
+		/* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+			className: "dshl-link",
+			onClick: () => void save({ key: edit }),
+			children: t("push.save")
+		}),
+		/* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+			className: "dshl-link",
+			onClick: () => void save({ random: true }),
+			children: t("push.random")
+		}),
+		/* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+			className: "dshl-link",
+			onClick: () => {
+				setEdit(null);
+				setErr("");
+			},
+			children: t("player.cancel")
+		})
+	] }), err && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+		className: "err",
+		children: err
+	})] })] });
+}
 function CopyRow({ label, value, copy, copied }) {
 	const [done, setDone] = (0, react.useState)(false);
 	return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("dt", { children: label }), /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("dd", { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
@@ -35781,11 +35855,10 @@ function LiveView(props) {
 					value: armed.rtmp,
 					copy: t("push.copy"),
 					copied: t("push.copied")
-				}), armed.key && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(CopyRow, {
-					label: t("push.key"),
+				}), armed.key && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(KeyRow, {
 					value: armed.key,
-					copy: t("push.copy"),
-					copied: t("push.copied")
+					t,
+					onChanged: () => void post("arm", options()).then((a) => setArmed(a.busy ? null : a)).catch(() => {})
 				})] })]
 			})
 		]
@@ -36878,6 +36951,10 @@ const en = {
 	"rs.overlay": "Subtitles for OBS (Browser Source)",
 	"rs.overlay.d": "Add a Browser Source in OBS with this address (1920×1080): the newest subtitles on a transparent background, over your camera or any picture. Add ?lines=zh,src&size=4.5 to choose lines and size.",
 	"rs.copy": "Copy",
+	"push.change": "Change",
+	"push.save": "Save",
+	"push.random": "New random key",
+	"push.badKey": "3–40 letters, digits, - or _",
 	"side.hide": "Hide the chat",
 	"side.show": "Show the chat",
 	"side.resize": "Drag to change the width",
@@ -37262,6 +37339,10 @@ const zh = {
 	"rs.overlay": "OBS 字幕叠加（浏览器源）",
 	"rs.overlay.d": "在 OBS 里加一个「浏览器源」，填这个地址（1920×1080）：透明背景上只有最新的字幕，叠在摄像头或任何画面上。地址后加 ?lines=zh,src&size=4.5 可以选行和字号。",
 	"rs.copy": "复制",
+	"push.change": "修改",
+	"push.save": "保存",
+	"push.random": "换一个",
+	"push.badKey": "用 3–40 位字母、数字、- 或 _",
 	"side.hide": "收起对话",
 	"side.show": "展开对话",
 	"side.resize": "拖动调整宽度",
@@ -37761,6 +37842,10 @@ const CSS = `
 .dshl-pushinfo dl { display: grid; grid-template-columns: auto 1fr; align-items: center; gap: 6px 16px; margin: 0; }
 .dshl-pushinfo dt { color: var(--faint); font-size: 12px; }
 .dshl-pushinfo dd { display: flex; align-items: center; gap: 14px; min-width: 0; margin: 0; }
+.dshl-keyedit { width: 140px; height: 26px; padding: 0 8px; border: 1px solid var(--line); border-radius: 6px; background: var(--bg); color: var(--ink); font: 13px ui-monospace, SFMono-Regular, Menlo, monospace; }
+.dshl-keyedit:focus { outline: none; border-color: var(--accent); }
+.dshl-pushinfo dd:has(.err) { flex-wrap: wrap; row-gap: 4px; }
+.dshl-pushinfo dd .err { flex-basis: 100%; color: #d1434b; font-size: 12px; }
 .dshl-pushinfo .val { overflow: hidden; text-overflow: ellipsis; white-space: nowrap; color: var(--ink); font-family: ui-monospace, SFMono-Regular, Menlo, monospace; font-size: 13px; user-select: all; }
 .dshl-pushinfo .dshl-link { flex: none; font-size: 12.5px; }
 

package/lib/index.mjs

@@ -2289,11 +2289,28 @@ var LiveJob = class LiveJob extends EventEmitter {
 				}
 			}, 400);
 		}
-		ff.stderr.on("data", (d) => appendFileSync(join(this.deps.dir, "ffmpeg.log"), d));
+		let rejected = false;
+		ff.stderr.on("data", (d) => {
+			appendFileSync(join(this.deps.dir, "ffmpeg.log"), d);
+			if (this.opts.source === "push" && !rejected && /Unexpected stream/.test(d.toString())) {
+				rejected = true;
+				ff.kill("SIGKILL");
+			}
+		});
 		ff.on("exit", (code) => {
 			if (this.ffmpeg !== ff) return;
 			this.ffmpeg = void 0;
 			if (this.status !== "running") return;
+			if (this.opts.source === "push" && this.message && (rejected || !this.segments().length)) {
+				if (rejected) rmSync(hls, {
+					recursive: true,
+					force: true
+				});
+				setTimeout(() => {
+					if (this.status === "running" && !this.ffmpeg) this.spawnFfmpeg(input);
+				}, 500);
+				return;
+			}
 			this.finishCapture(code === 0 ? "ended" : this.ffmpegError(code), code === 0 || this.segments().length > 0);
 		});
 	}
@@ -5880,7 +5897,14 @@ function apply(ctx, config) {
 	* page owns it.
 	*/
 	let armed;
-	const PUSH_KEY = "dsh";
+	const hadSettings = existsSync(settingsFile);
+	const pushKey = () => {
+		const saved = prefs().pushKey;
+		if (saved) return saved;
+		const key = hadSettings ? "dsh" : Math.random().toString(36).slice(2, 10);
+		savePrefs({ pushKey: key });
+		return key;
+	};
 	async function disarm() {
 		const a = armed;
 		armed = void 0;
@@ -5952,7 +5976,7 @@ function apply(ctx, config) {
 				host: lanAddress(),
 				rtmpPort: config.rtmpPort,
 				srtPort: config.srtPort,
-				key: waiting ? PUSH_KEY : void 0
+				key: waiting ? pushKey() : void 0
 			},
 			cookies: () => prefs().cookies
 		};
@@ -6182,6 +6206,15 @@ function apply(ctx, config) {
 				}
 				return send(res, 200, job.summary());
 			}
+			if (route === "pushkey" && req.method === "POST") {
+				if ([...jobs.values()].some((j) => j.opts.source === "push" && j.status === "running" && !j.message)) return send(res, 409, { error: "a stream is coming in; change the key after it ends" });
+				const b = await readJson(req);
+				const key = b.random ? Math.random().toString(36).slice(2, 10) : String(b.key ?? "").trim();
+				if (!/^[A-Za-z0-9_-]{3,40}$/.test(key)) return send(res, 400, { error: "use 3–40 letters, digits, - or _" });
+				savePrefs({ pushKey: key });
+				await disarm();
+				return send(res, 200, { key });
+			}
 			if (route === "arm" && req.method === "POST") {
 				const b = await readJson(req);
 				return send(res, 200, await arm({

package/package.json

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