dsh-vidi 0.5.1 → 0.5.2

package/lib/client.js

@@ -1603,7 +1603,7 @@ function fragmentsAreEqual(frag, otherFrag) {
 /**
 * Object representing parsed data from an HLS Segment. Found in {@link hls.js#LevelDetails.fragments}.
 */
-var Fragment = class extends BaseSegment {
+var Fragment$1 = class extends BaseSegment {
 	constructor(type, base) {
 		super(base);
 		this._decryptdata = null;
@@ -9753,7 +9753,7 @@ var M3U8Parser = class M3U8Parser {
 		let discontinuityCounter = 0;
 		let currentBitrate = 0;
 		let prevFrag = null;
-		let frag = new Fragment(type, base);
+		let frag = new Fragment$1(type, base);
 		let result;
 		let i;
 		let levelkeys;
@@ -9771,7 +9771,7 @@ var M3U8Parser = class M3U8Parser {
 		while ((result = LEVEL_PLAYLIST_REGEX_FAST.exec(string)) !== null) {
 			if (createNextFrag) {
 				createNextFrag = false;
-				frag = new Fragment(type, base);
+				frag = new Fragment$1(type, base);
 				frag.playlistOffset = totalduration;
 				frag.setStart(totalduration);
 				frag.sn = currentSN;
@@ -9819,7 +9819,7 @@ var M3U8Parser = class M3U8Parser {
 					const byteRange = frag.byteRange;
 					if (byteRange.length === 2) frag.bitrate = (byteRange[1] - byteRange[0]) * 8 / frag.duration | 0;
 					if (level.iframesOnly && byteRange[0] && ((_currentInitSegment = currentInitSegment) == null ? void 0 : _currentInitSegment.cc) !== discontinuityCounter) {
-						const init = new Fragment(type, base);
+						const init = new Fragment$1(type, base);
 						init.relurl = frag.relurl;
 						init.setByteRange(`${Math.min(byteRange[0], 1316)}@0`);
 						init.level = id;
@@ -9953,7 +9953,7 @@ var M3U8Parser = class M3U8Parser {
 					case "MAP": {
 						const mapAttrs = new AttrList(value1, level);
 						if (frag.duration) {
-							const init = new Fragment(type, base);
+							const init = new Fragment$1(type, base);
 							setInitSegment(init, mapAttrs, id, levelkeys);
 							currentInitSegment = init;
 							frag.initSegment = currentInitSegment;
@@ -33343,6 +33343,95 @@ var Hls = class Hls {
 };
 Hls.defaultConfig = void 0;
 
+// src/wrap.ts
+/**
+* Line breaking for subtitles drawn on a canvas (burned into clips and
+* restreams, screenshots): break where the text allows, never start a line
+* with closing punctuation, and spread the text evenly over the lines it
+* needs — so a long line wraps as two halves instead of a full line plus one
+* orphaned character.
+*/
+/** Characters that may not begin a line (they stay with the text before them). */
+const NO_START = new Set(Array.from("，。、；：！？）》」』】〕〉”’…—,.;:!?)]}%"));
+/** Where a sentence pauses: breaking right after these reads best. */
+const PAUSE = "，。、；：！？,;:!? ";
+/** Greedy breaking at `width`: Latin text at spaces, CJK between any two characters. */
+function greedy(chars, width, measure) {
+	const lines = [];
+	let cur = "";
+	for (const ch of chars) {
+		const next = cur + ch;
+		if (cur && measure(next) > width && !NO_START.has(ch)) {
+			const sp = cur.lastIndexOf(" ");
+			const pause = Math.max(...Array.from(PAUSE).map((p) => cur.lastIndexOf(p)));
+			if (/[A-Za-z0-9]/.test(ch) && /[A-Za-z0-9]$/.test(cur) && sp > cur.length * .3) {
+				lines.push(cur.slice(0, sp));
+				cur = cur.slice(sp + 1) + ch;
+			} else if (pause > cur.length * .6 && pause < cur.length - 1) {
+				lines.push(cur.slice(0, pause + 1).trimEnd());
+				cur = cur.slice(pause + 1).trimStart() + ch;
+			} else {
+				lines.push(cur.trimEnd());
+				cur = ch.trimStart();
+			}
+		} else cur = next;
+	}
+	if (cur.trim()) lines.push(cur.trimEnd());
+	return lines;
+}
+/** Wrap `text` to at most `maxWidth`, using as few lines as possible, each about the same length. */
+function wrapBalanced(text, maxWidth, measure) {
+	const chars = Array.from(text.trim());
+	const first = greedy(chars, maxWidth, measure);
+	if (first.length < 2) return first;
+	let lo = measure(text) / first.length * .9, hi = maxWidth, best = first;
+	for (let i = 0; i < 14 && hi - lo > 1; i++) {
+		const mid = (lo + hi) / 2;
+		const lines = greedy(chars, mid, measure);
+		if (lines.length <= first.length) {
+			best = lines;
+			hi = mid;
+		} else lo = mid;
+	}
+	return atPauses(best, maxWidth, measure);
+}
+/** Move each break to a nearby pause (within 4 characters) when both lines still fit. */
+function atPauses(lines, maxWidth, measure) {
+	const out = lines.map((l) => Array.from(l));
+	for (let k = 0; k + 1 < out.length; k++) {
+		const a = out[k], b = out[k + 1];
+		if (PAUSE.includes(a.at(-1) ?? "")) continue;
+		const sep = /[\x21-\x7e]$/.test(a.join("")) && /^[\x21-\x7e]/.test(b.join("")) ? [" "] : [];
+		let pick;
+		for (let d = 1; d <= 4 && pick === void 0; d++) for (const shift of [d, -d]) {
+			const cut = a.length + shift;
+			if (cut <= 0) continue;
+			const joined = [
+				...a,
+				...sep,
+				...b
+			];
+			if (cut >= joined.length) continue;
+			if (!PAUSE.includes(joined[cut - 1])) continue;
+			const na = joined.slice(0, cut).join("").trimEnd(), nb = joined.slice(cut).join("").trimStart();
+			if (nb && measure(na) <= maxWidth && measure(nb) <= maxWidth) {
+				pick = shift;
+				break;
+			}
+		}
+		if (pick !== void 0) {
+			const joined = [
+				...a,
+				...sep,
+				...b
+			], cut = a.length + pick;
+			out[k] = Array.from(joined.slice(0, cut).join("").trimEnd());
+			out[k + 1] = Array.from(joined.slice(cut).join("").trimStart());
+		}
+	}
+	return out.map((l) => l.join(""));
+}
+
 // src/client/subStyle.tsx
 const STORE = "dsh-live.subStyle";
 /** First line is the main one (largest); the original, when not first, is the smallest. */
@@ -33400,11 +33489,29 @@ function visibleRows(texts, style) {
 		return true;
 	});
 }
+let measurer;
 function SubtitleOverlay({ texts, style, draft }) {
 	const rows = visibleRows(texts, style);
-	if (!rows.length) return null;
+	const box = (0, react.useRef)(null);
+	const [width, setWidth] = (0, react.useState)(0);
+	(0, react.useLayoutEffect)(() => {
+		const el = box.current;
+		if (!el) return;
+		const ro = new ResizeObserver(() => setWidth(el.clientWidth));
+		ro.observe(el);
+		setWidth(el.clientWidth);
+		return () => ro.disconnect();
+	}, []);
+	const lines = (text, size, weight) => {
+		if (measurer === void 0) measurer = typeof document === "undefined" ? null : document.createElement("canvas").getContext("2d");
+		if (!width || !measurer || !box.current) return [text];
+		const px = size / 100 * (width / .92);
+		measurer.font = `${weight} ${px}px ${getComputedStyle(box.current).fontFamily}`;
+		return wrapBalanced(text, (width - px * .9) * .97, (t) => measurer.measureText(t).width);
+	};
 	const edge = style.position === "top" ? { top: `${style.offset}%` } : { bottom: `${style.offset}%` };
 	return /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+		ref: box,
 		className: "dshl-sub",
 		"data-pos": style.position,
 		style: {
@@ -33414,7 +33521,7 @@ function SubtitleOverlay({ texts, style, draft }) {
 		children: rows.map((l, i) => /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", { children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
 			className: `${i === 0 ? "tgt" : "src"} ${l.key === "src" && draft ? "draft" : ""} ${l.key.startsWith("site:") ? "site" : ""}`,
 			style: { fontSize: `${l.size}cqw` },
-			children: texts[l.key]
+			children: lines(texts[l.key].trim(), l.size, i === 0 ? 600 : 400).map((ln, k) => /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react.Fragment, { children: [k > 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("br", {}), ln] }, k))
 		}) }, l.key))
 	});
 }
@@ -33429,14 +33536,7 @@ function drawSubtitles(g, W, H, texts, style) {
 	const blocks = rows.map((l, i) => {
 		const px = l.size / 100 * W;
 		g.font = `${i === 0 ? 600 : 400} ${px}px ${family}`;
-		const words = [...String(texts[l.key])];
-		const lines = [];
-		let cur = "";
-		for (const ch of words) if (g.measureText(cur + ch).width > W * .88 && cur) {
-			lines.push(cur);
-			cur = ch.trimStart();
-		} else cur += ch;
-		if (cur) lines.push(cur);
+		const lines = wrapBalanced(String(texts[l.key]), W * .88, (t) => g.measureText(t).width);
 		return {
 			px,
 			weight: i === 0 ? 600 : 400,
@@ -37389,6 +37489,8 @@ html[data-platform='darwin'] .dshl.page .dshl-top :is(button, input, label, a, .
 .dshl-sub .src { color: #e8e8e8; }
 .dshl-sub .draft { color: #b8b8b8; font-style: italic; }
 .dshl-sub div + div { margin-top: .3em; }
+/* A line that wraps is split into even halves, not a full line and one orphaned character. */
+.dshl-sub div { line-break: strict; }
 .dshl-stage:not(.idle) .dshl-sub[data-pos=bottom] { transform: translate(-50%, -64px); }
 .dshl-stage:not(.idle) .dshl-sub[data-pos=top] { transform: translate(-50%, 34px); }
 

package/lib/index.mjs

@@ -1157,6 +1157,94 @@ function findOriginal(dir) {
 	const f = readdirSync(dir).find((n) => /^original\.(mp4|mkv|webm|m4a|mp3)$/.test(n));
 	return f ? join(dir, f) : void 0;
 }
+// src/wrap.ts
+/**
+* Line breaking for subtitles drawn on a canvas (burned into clips and
+* restreams, screenshots): break where the text allows, never start a line
+* with closing punctuation, and spread the text evenly over the lines it
+* needs — so a long line wraps as two halves instead of a full line plus one
+* orphaned character.
+*/
+/** Characters that may not begin a line (they stay with the text before them). */
+const NO_START = new Set(Array.from("，。、；：！？）》」』】〕〉”’…—,.;:!?)]}%"));
+/** Where a sentence pauses: breaking right after these reads best. */
+const PAUSE = "，。、；：！？,;:!? ";
+/** Greedy breaking at `width`: Latin text at spaces, CJK between any two characters. */
+function greedy(chars, width, measure) {
+	const lines = [];
+	let cur = "";
+	for (const ch of chars) {
+		const next = cur + ch;
+		if (cur && measure(next) > width && !NO_START.has(ch)) {
+			const sp = cur.lastIndexOf(" ");
+			const pause = Math.max(...Array.from(PAUSE).map((p) => cur.lastIndexOf(p)));
+			if (/[A-Za-z0-9]/.test(ch) && /[A-Za-z0-9]$/.test(cur) && sp > cur.length * .3) {
+				lines.push(cur.slice(0, sp));
+				cur = cur.slice(sp + 1) + ch;
+			} else if (pause > cur.length * .6 && pause < cur.length - 1) {
+				lines.push(cur.slice(0, pause + 1).trimEnd());
+				cur = cur.slice(pause + 1).trimStart() + ch;
+			} else {
+				lines.push(cur.trimEnd());
+				cur = ch.trimStart();
+			}
+		} else cur = next;
+	}
+	if (cur.trim()) lines.push(cur.trimEnd());
+	return lines;
+}
+/** Wrap `text` to at most `maxWidth`, using as few lines as possible, each about the same length. */
+function wrapBalanced(text, maxWidth, measure) {
+	const chars = Array.from(text.trim());
+	const first = greedy(chars, maxWidth, measure);
+	if (first.length < 2) return first;
+	let lo = measure(text) / first.length * .9, hi = maxWidth, best = first;
+	for (let i = 0; i < 14 && hi - lo > 1; i++) {
+		const mid = (lo + hi) / 2;
+		const lines = greedy(chars, mid, measure);
+		if (lines.length <= first.length) {
+			best = lines;
+			hi = mid;
+		} else lo = mid;
+	}
+	return atPauses(best, maxWidth, measure);
+}
+/** Move each break to a nearby pause (within 4 characters) when both lines still fit. */
+function atPauses(lines, maxWidth, measure) {
+	const out = lines.map((l) => Array.from(l));
+	for (let k = 0; k + 1 < out.length; k++) {
+		const a = out[k], b = out[k + 1];
+		if (PAUSE.includes(a.at(-1) ?? "")) continue;
+		const sep = /[\x21-\x7e]$/.test(a.join("")) && /^[\x21-\x7e]/.test(b.join("")) ? [" "] : [];
+		let pick;
+		for (let d = 1; d <= 4 && pick === void 0; d++) for (const shift of [d, -d]) {
+			const cut = a.length + shift;
+			if (cut <= 0) continue;
+			const joined = [
+				...a,
+				...sep,
+				...b
+			];
+			if (cut >= joined.length) continue;
+			if (!PAUSE.includes(joined[cut - 1])) continue;
+			const na = joined.slice(0, cut).join("").trimEnd(), nb = joined.slice(cut).join("").trimStart();
+			if (nb && measure(na) <= maxWidth && measure(nb) <= maxWidth) {
+				pick = shift;
+				break;
+			}
+		}
+		if (pick !== void 0) {
+			const joined = [
+				...a,
+				...sep,
+				...b
+			], cut = a.length + pick;
+			out[k] = Array.from(joined.slice(0, cut).join("").trimEnd());
+			out[k + 1] = Array.from(joined.slice(cut).join("").trimStart());
+		}
+	}
+	return out.map((l) => l.join(""));
+}
 // src/restream.ts
 /** Platforms people push to; only a label on our side — the address and key come from the platform's own streaming tool. */
 const PLATFORMS = [
@@ -1247,22 +1335,7 @@ async function drawSubtitles(rows, style, w, h) {
 	const blocks = rows.map((r) => {
 		const px = Math.round(r.size / 100 * w);
 		g.font = `${r.main ? 600 : 500} ${px}px ${FONT}`;
-		const lines = [];
-		let cur = "";
-		for (const ch of Array.from(r.text)) {
-			const next = cur + ch;
-			if (cur && g.measureText(next).width > maxW - px * .9) {
-				const sp = cur.lastIndexOf(" ");
-				if (sp > cur.length * .5 && /[A-Za-z]/.test(ch)) {
-					lines.push(cur.slice(0, sp));
-					cur = cur.slice(sp + 1) + ch;
-				} else {
-					lines.push(cur);
-					cur = ch.trimStart();
-				}
-			} else cur = next;
-		}
-		if (cur.trim()) lines.push(cur);
+		const lines = wrapBalanced(r.text, maxW - px * .9, (t) => g.measureText(t).width);
 		return {
 			px,
 			main: r.main,

package/package.json

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