dsh-vidi 0.8.2 → 0.8.3

package/lib/client.js

@@ -35281,19 +35281,6 @@ function useDevices(enabled) {
 	}, [enabled, devices]);
 	return devices;
 }
-/**
-* Ask for the camera / microphone from the page first when the page runs on the same computer: the system
-* then asks the user once for this app, and the capture that follows is allowed.
-*/
-async function askDeviceAccess(video) {
-	if (!(location.protocol === "dsh-app:" || /^(localhost|127\.0\.0\.1|\[::1\])$/.test(location.hostname)) || !navigator.mediaDevices?.getUserMedia) return;
-	try {
-		(await navigator.mediaDevices.getUserMedia({
-			audio: true,
-			video
-		})).getTracks().forEach((tr) => tr.stop());
-	} catch {}
-}
 /** 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);
@@ -35488,7 +35475,9 @@ function LiveView(props) {
 		setSrcTabRaw(v);
 		setError("");
 	};
-	const devices = useDevices(srcTab === "camera");
+	const devices = useDevices(srcTab === "camera" || job?.source === "device");
+	const [accessIssue, setAccessIssue] = (0, react.useState)(null);
+	const [asking, setAsking] = (0, react.useState)(false);
 	const [camVideo, setCamVideoRaw] = (0, react.useState)(() => store.get("device.video", ""));
 	const [camAudio, setCamAudioRaw] = (0, react.useState)(() => store.get("device.audio", ""));
 	const setCamVideo = (v) => {
@@ -35968,8 +35957,8 @@ function LiveView(props) {
 	const needsModel = !hasTranslator && shownLines.some((l) => l !== "src");
 	const hasMain = !!job && !(job.status === "error" && !job.files.length);
 	const cams = (devices ?? []).filter((d) => d.kind !== "mic"), mics = (devices ?? []).filter((d) => d.kind === "mic");
-	const camV = camVideo === "none" || cams.some((d) => d.id === camVideo) ? camVideo : cams.find((d) => d.kind === "camera")?.id ?? "none";
-	const camA = mics.some((d) => d.id === camAudio) ? camAudio : mics[0]?.id ?? "";
+	const camV = camVideo === "none" || cams.some((d) => d.id === camVideo) ? camVideo : cams.find((d) => d.preferred)?.id ?? cams.find((d) => d.kind === "camera")?.id ?? "none";
+	const camA = mics.some((d) => d.id === camAudio) ? camAudio : mics.find((d) => d.preferred)?.id ?? mics[0]?.id ?? "";
 	const videoOptions = [...cams.map((d) => ({
 		value: d.id,
 		label: d.kind === "screen" ? t("dev.screen").replace("{n}", String(Number(/\d+/.exec(d.name)?.[0] ?? 0) + 1)) : d.name,
@@ -35982,13 +35971,48 @@ function LiveView(props) {
 	const startDevice = async () => {
 		if (!camA) return;
 		const title = camV === "none" ? mics.find((d) => d.id === camA)?.name ?? "" : videoOptions.find((o) => o.value === camV)?.label ?? "";
-		await askDeviceAccess(camV !== "none" && cams.find((d) => d.id === camV)?.kind === "camera");
+		const kinds = ["microphone", ...cams.find((d) => d.id === camV)?.kind === "camera" ? ["camera"] : []];
+		setAccessIssue(null);
+		try {
+			let st = await (await fetch("/live/api/access")).json();
+			for (const k of kinds) {
+				if (st[k] !== "not-determined") continue;
+				setAsking(true);
+				st = {
+					...st,
+					[k]: (await post("access", {
+						kind: k,
+						action: "ask"
+					})).state
+				};
+			}
+			setAsking(false);
+			const blocked = kinds.filter((k) => st[k] === "denied" || st[k] === "restricted");
+			if (blocked.length) {
+				setAccessIssue(blocked);
+				return;
+			}
+		} catch {
+			setAsking(false);
+		}
 		start(JSON.stringify({
 			video: camV === "none" ? void 0 : camV,
 			audio: camA,
 			title
 		}), "device");
 	};
+	const openPrivacy = (kind) => void post("access", {
+		kind,
+		action: "settings"
+	}).catch(() => {});
+	const blockedKind = () => {
+		try {
+			const c = JSON.parse(job?.url ?? "{}");
+			return cams.find((d) => d.id === c.video)?.kind === "screen" ? "screen" : "camera";
+		} catch {
+			return "camera";
+		}
+	};
 	const emptyBox = () => /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 		className: "dshl-drop",
 		children: [
@@ -36292,8 +36316,8 @@ function LiveView(props) {
 		}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
 			className: "dshl-btn primary",
 			onClick: () => void startDevice(),
-			disabled: !camA,
-			children: t("dev.start")
+			disabled: !camA || asking,
+			children: asking ? t("dev.asking") : t("dev.start")
 		})] }),
 		srcTab === "push" && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
 			className: "dshl-field static",
@@ -36390,13 +36414,37 @@ function LiveView(props) {
 				className: "dshl-note",
 				children: t("note.noModel")
 			}),
-			(error || job?.status === "error") && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+			accessIssue && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 				className: "dshl-note warn",
-				children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: error || (job?.message === "device-blocked" ? t("dev.blocked") : job?.message) }), job && !active && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
-					className: "dshl-link",
-					onClick: () => start(job.url, job.source),
-					children: t("st.retry")
-				})]
+				children: [
+					/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: t("dev.denied").replace("{d}", accessIssue.map((k) => t(`dev.k.${k}`)).join(t("dev.and"))) }),
+					/* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+						className: "dshl-link",
+						onClick: () => openPrivacy(accessIssue[0]),
+						children: t("dev.openSettings")
+					}),
+					/* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+						className: "dshl-link",
+						onClick: () => void startDevice(),
+						children: t("st.retry")
+					})
+				]
+			}),
+			!accessIssue && (error || job?.status === "error") && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+				className: "dshl-note warn",
+				children: [
+					/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: error || (job?.message === "device-blocked" ? t("dev.blocked") : job?.message) }),
+					job?.message === "device-blocked" && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+						className: "dshl-link",
+						onClick: () => openPrivacy(blockedKind()),
+						children: t("dev.openSettings")
+					}),
+					job && !active && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+						className: "dshl-link",
+						onClick: () => start(job.url, job.source),
+						children: t("st.retry")
+					})
+				]
 			}),
 			!hasMain ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("section", {
 				className: "dshl-empty",
@@ -37305,7 +37353,14 @@ const en = {
 	"src.push.bar": "Waiting for OBS: server and key below",
 	"src.push.wait": "Getting the address ready…",
 	"src.push.busy": "Close the current video to receive a stream",
-	"dev.blocked": "No picture or sound from the device. Allow DeepSeek Harness under System Settings → Privacy & Security → Camera and Microphone (Screen Recording for the screen), then start again.",
+	"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 ",
+	"dev.k.camera": "camera",
+	"dev.k.microphone": "microphone",
+	"dev.k.screen": "screen",
+	"dev.openSettings": "Open System Settings",
+	"dev.asking": "Allow it in the system dialog…",
 	"dev.video": "Picture",
 	"dev.audio": "Microphone",
 	"dev.cameras": "Cameras",
@@ -37736,7 +37791,14 @@ const zh = {
 	"src.push.bar": "等 OBS 推流过来，服务器和密钥在下面",
 	"src.push.wait": "正在准备推流地址…",
 	"src.push.busy": "关掉当前视频后可以接收推流",
-	"dev.blocked": "设备没有传来画面和声音。到 系统设置 → 隐私与安全性 → 摄像头、麦克风（用屏幕时是 屏幕录制）里打开 DeepSeek Harness，再点开始。",
+	"dev.blocked": "设备没有传来画面和声音：DeepSeek Harness 需要系统授权。点「打开系统设置」，在列表里打开 DeepSeek Harness，再点重试。",
+	"dev.denied": "DeepSeek Harness 需要{d}权限。点「打开系统设置」，在列表里打开它，再点重试。",
+	"dev.and": "和",
+	"dev.k.camera": "摄像头",
+	"dev.k.microphone": "麦克风",
+	"dev.k.screen": "屏幕录制",
+	"dev.openSettings": "打开系统设置",
+	"dev.asking": "请在系统弹窗里点允许…",
 	"dev.video": "画面",
 	"dev.audio": "麦克风",
 	"dev.cameras": "摄像头",

package/lib/index.mjs

@@ -1829,7 +1829,7 @@ async function listDevices() {
 				kind: /^Capture screen/.test(name) ? "screen" : "camera"
 			});
 		}
-		return out.filter((d) => !(d.kind === "mic" && /speakers|audio device|blackhole|soundflower|loopback/i.test(d.name)));
+		return preferLocal(out.filter((d) => !(d.kind === "mic" && /speakers|audio device|streaming|virtual|blackhole|soundflower|loopback/i.test(d.name))), await defaultInput());
 	}
 	if (process.platform === "win32") {
 		const text = await ffmpegList([
@@ -1873,6 +1873,39 @@ async function listDevices() {
 		kind: "mic"
 	}];
 }
+/** The system's default input device (macOS), by name. */
+function defaultInput() {
+	return new Promise((resolve) => {
+		execFile("system_profiler", ["SPAudioDataType", "-json"], { timeout: 8e3 }, (err, out) => {
+			if (err) return resolve(void 0);
+			try {
+				resolve((JSON.parse(String(out)).SPAudioDataType?.[0]?._items ?? []).find((i) => i.coreaudio_default_audio_input_device === "spaudio_yes")?._name);
+			} catch {
+				resolve(void 0);
+			}
+		});
+	});
+}
+/**
+* Mark (and list first) this computer's own camera and the default microphone, ahead of a phone's camera
+* through Continuity ("“Name”的相机", "Name's Camera") or a desk-view camera.
+*/
+function preferLocal(list, defaultMic) {
+	const phone = (d) => /^[“"].*[”"]/.test(d.name) || /['’]s (camera|microphone)/i.test(d.name);
+	const deskView = (d) => /桌上视角|desk view/i.test(d.name);
+	const cams = list.filter((d) => d.kind === "camera");
+	const cam = cams.find((d) => !phone(d) && !deskView(d) && /macbook|imac|facetime|built-in|内建|display/i.test(d.name)) ?? cams.find((d) => !phone(d) && !deskView(d)) ?? cams[0];
+	const mics = list.filter((d) => d.kind === "mic");
+	const mic = mics.find((d) => d.name === defaultMic) ?? mics.find((d) => !phone(d)) ?? mics[0];
+	for (const d of [cam, mic]) if (d) d.preferred = true;
+	const rank = (d) => d.preferred ? 0 : phone(d) || deskView(d) ? 2 : 1;
+	const group = {
+		camera: 0,
+		screen: 1,
+		mic: 2
+	};
+	return [...list].sort((a, b) => group[a.kind] - group[b.kind] || rank(a) - rank(b));
+}
 /** ffmpeg input for the chosen devices: arguments plus which streams carry the picture and the sound. */
 function deviceInput(c, q) {
 	if (!c.audio) throw new Error("choose a microphone");
@@ -5778,6 +5811,82 @@ function metered(llm, meter) {
 		}
 	};
 }
+// src/access.ts
+const LOAD = "$.NSBundle.bundleWithPath(\"/System/Library/Frameworks/AVFoundation.framework\").load; const D = $.NSClassFromString(\"AVCaptureDevice\");";
+const MEDIA = {
+	camera: "vide",
+	microphone: "soun"
+};
+const STATES = [
+	"not-determined",
+	"restricted",
+	"denied",
+	"granted"
+];
+function jxa(script, timeout) {
+	return new Promise((resolve) => {
+		execFile("osascript", [
+			"-l",
+			"JavaScript",
+			"-e",
+			script
+		], { timeout }, (err, out) => resolve(err ? "" : String(out).trim()));
+	});
+}
+/** This app's camera and microphone permission (macOS); 'unknown' elsewhere. */
+async function accessStatus() {
+	if (process.platform !== "darwin") return {
+		camera: "unknown",
+		microphone: "unknown"
+	};
+	const out = await jxa(`${LOAD} JSON.stringify({ camera: D.authorizationStatusForMediaType("vide"), microphone: D.authorizationStatusForMediaType("soun") })`, 1e4);
+	try {
+		const j = JSON.parse(out);
+		return {
+			camera: STATES[Number(j.camera)] ?? "unknown",
+			microphone: STATES[Number(j.microphone)] ?? "unknown"
+		};
+	} catch {
+		return {
+			camera: "unknown",
+			microphone: "unknown"
+		};
+	}
+}
+/** Ask once (the system dialog); answers the state afterwards. Already decided: just the state. */
+async function askAccess(kind) {
+	if (process.platform !== "darwin") return "unknown";
+	const before = (await accessStatus())[kind];
+	if (before !== "not-determined") return before;
+	await jxa(`${LOAD} let done = null; D.requestAccessForMediaTypeCompletionHandler("${MEDIA[kind]}", ok => { done = ok });
+    const end = Date.now() + 120000;
+    while (done === null && Date.now() < end) $.NSRunLoop.currentRunLoop.runUntilDate($.NSDate.dateWithTimeIntervalSinceNow(0.2));
+    String(done)`, 13e4);
+	return (await accessStatus())[kind];
+}
+/** Open the system's privacy page for this kind of device, where the app can be switched on. */
+function openPrivacySettings(kind) {
+	if (process.platform === "darwin") {
+		spawn("open", [`x-apple.systempreferences:com.apple.preference.security?${kind === "camera" ? "Privacy_Camera" : kind === "microphone" ? "Privacy_Microphone" : "Privacy_ScreenCapture"}`], {
+			stdio: "ignore",
+			detached: true
+		}).unref();
+		return true;
+	}
+	if (process.platform === "win32") {
+		spawn("cmd", [
+			"/c",
+			"start",
+			"",
+			`ms-settings:${kind === "camera" ? "privacy-webcam" : kind === "microphone" ? "privacy-microphone" : "privacy"}`
+		], {
+			stdio: "ignore",
+			detached: true
+		}).unref();
+		return true;
+	}
+	return false;
+}
 // src/updates.ts
 const DAY = 864e5;
 /** pnpm holds back releases younger than a day: offer only versions it will install. */
@@ -6492,6 +6601,14 @@ function apply(ctx, config) {
 			}
 			if (route === "version") return send(res, 200, req.method === "POST" ? await updates.check() : updates.state());
 			if (route === "update" && req.method === "POST") return send(res, 200, await updates.install());
+			if (route === "access") {
+				if (req.method !== "POST") return send(res, 200, await accessStatus());
+				const b = await readJson(req);
+				const kind = String(b.kind);
+				if (b.action === "settings") return send(res, 200, { opened: openPrivacySettings(kind) });
+				if (kind !== "camera" && kind !== "microphone") return send(res, 400, { error: "camera or microphone" });
+				return send(res, 200, { state: await askAccess(kind) });
+			}
 			if (route === "devices") {
 				const devices = await listDevices();
 				log(`devices: ${devices.filter((d) => d.kind !== "mic").length} picture, ${devices.filter((d) => d.kind === "mic").length} microphone`);

package/package.json

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