@hyperframes/core 0.8.214 → 0.8.217

package/dist/runtime/compositionLength.d.ts

@@ -11,11 +11,16 @@ export declare function readCompositionSize(root: Element): {
     width: number | null;
     height: number | null;
 };
-/** The latest end among the document's timed video and audio, at their absolute starts. */
-export declare function resolveMediaWindowDurationSeconds(doc: ParentNode, media: {
+type MediaTiming = {
     mediaStart: (el: HTMLMediaElement) => number;
     mediaDuration: (el: HTMLMediaElement) => number | null;
-}): number | null;
+};
+/** The timed `<video>`/`<audio>` whose window ends last, and where it ends. */
+export declare function longestMediaWindow(doc: ParentNode, media: MediaTiming): {
+    seconds: number;
+    element: HTMLMediaElement;
+} | null;
+export declare function resolveMediaWindowDurationSeconds(doc: ParentNode, media: MediaTiming): number | null;
 /** The latest of the root's declared length and its direct sub-compositions' ends. */
 export declare function resolveAuthoredCompositionFloorSeconds(root: Element, startResolver: StartResolver): number | null;
 /** The last-resort length: the latest end among the root's timed clips. Until every clip's length
@@ -31,9 +36,24 @@ export type CompositionLengthInputs = {
     fallback: number;
     derived: () => number;
 };
-/** A declared root length is the length; else the longest of timeline, floors and fallback (a
- *  loop-inflated timeline yields to a floor or fallback); else the length derived from the clips. */
+export type CompositionLengthFrom = "declared" | "timeline" | "floor" | "fallback" | "derived";
+export type CompositionLengthSource = {
+    from: CompositionLengthFrom;
+} | {
+    from: "media";
+    tag: string;
+    src: string;
+    trimmed: boolean;
+};
 export declare function resolveCompositionLengthSeconds(input: CompositionLengthInputs): number;
+/** A declared root length is the length; else the longest of timeline, floors and fallback (a
+ *  loop-inflated timeline yields to a floor or fallback); else the length derived from the clips.
+ *  `from` names the input that set it, and `floorIndex` which floor when a floor did. */
+export declare function resolveCompositionLength(input: CompositionLengthInputs): {
+    seconds: number;
+    from: CompositionLengthFrom;
+    floorIndex: number | null;
+};
 /** Size, frame rate and length of a composition nothing is running (a server-parsed or detached
  *  document): no timelines, no adapters, and media without a known source length is pending. */
 export declare function readStaticCompositionMeta(doc: Document): {

package/dist/runtime/compositionLength.js

@@ -16,9 +16,9 @@ export function readCompositionSize(root) {
         height: parseCompositionDimension(root.getAttribute("data-height")),
     };
 }
-/** The latest end among the document's timed video and audio, at their absolute starts. */
-export function resolveMediaWindowDurationSeconds(doc, media) {
-    const clipEnds = [];
+/** The timed `<video>`/`<audio>` whose window ends last, and where it ends. */
+export function longestMediaWindow(doc, media) {
+    let longest = null;
     for (const node of doc.querySelectorAll("video[data-start], audio[data-start]")) {
         const start = media.mediaStart(node);
         if (!Number.isFinite(start))
@@ -26,10 +26,14 @@ export function resolveMediaWindowDurationSeconds(doc, media) {
         const duration = media.mediaDuration(node);
         if (duration == null || duration <= MIN_VALID_TIMELINE_DURATION_SECONDS)
             continue;
-        clipEnds.push(Math.max(0, start) + duration);
+        const end = Math.max(0, start) + duration;
+        if (!longest || end > longest.seconds)
+            longest = { seconds: end, element: node };
     }
-    return aboveOneFrame(resolveCompositionDuration({ authoredDurationSeconds: null, clipEndsSeconds: clipEnds })
-        .seconds);
+    return longest && aboveOneFrame(longest.seconds) !== null ? longest : null;
+}
+export function resolveMediaWindowDurationSeconds(doc, media) {
+    return longestMediaWindow(doc, media)?.seconds ?? null;
 }
 /** The latest of the root's declared length and its direct sub-compositions' ends. */
 export function resolveAuthoredCompositionFloorSeconds(root, startResolver) {
@@ -75,14 +79,19 @@ export function resolveContentDerivedDuration(root, startResolver, { unregistere
         ? { ...result, seconds: null, source: "unresolved", reason: "a clip's length is pending" }
         : result;
 }
-/** A declared root length is the length; else the longest of timeline, floors and fallback (a
- *  loop-inflated timeline yields to a floor or fallback); else the length derived from the clips. */
 export function resolveCompositionLengthSeconds(input) {
+    return resolveCompositionLength(input).seconds;
+}
+/** A declared root length is the length; else the longest of timeline, floors and fallback (a
+ *  loop-inflated timeline yields to a floor or fallback); else the length derived from the clips.
+ *  `from` names the input that set it, and `floorIndex` which floor when a floor did. */
+export function resolveCompositionLength(input) {
     if (input.declared !== null && Number.isFinite(input.declared) && input.declared > 0) {
-        return input.declared;
+        return { seconds: input.declared, from: "declared", floorIndex: null };
     }
     const rawTimeline = aboveOneFrame(input.timeline());
-    const floor = Math.max(0, ...input.floors().map((seconds) => seconds ?? 0));
+    const floors = input.floors().map((seconds) => seconds ?? 0);
+    const floor = Math.max(0, ...floors);
     const fallback = Number.isFinite(input.fallback) && input.fallback > MIN_VALID_TIMELINE_DURATION_SECONDS
         ? input.fallback
         : 0;
@@ -91,16 +100,23 @@ export function resolveCompositionLengthSeconds(input) {
         rawTimeline >= LOOP_INFLATED_TIMELINE_SECONDS &&
         aboveOneFrame(floorOrFallback) !== null;
     const timeline = loopInflated ? null : rawTimeline;
-    let seconds;
-    if (timeline !== null)
-        seconds = Math.max(timeline, floorOrFallback);
-    else if (aboveOneFrame(floor) !== null)
-        seconds = floorOrFallback;
-    else if (fallback > 0)
-        seconds = fallback;
-    else
-        seconds = input.derived();
-    return seconds > 0 ? seconds : 0;
+    const floorWins = floor >= fallback;
+    const fromFloorOrFallback = (seconds) => ({
+        seconds,
+        from: floorWins ? "floor" : "fallback",
+        floorIndex: floorWins ? floors.indexOf(floor) : null,
+    });
+    if (timeline !== null) {
+        return timeline >= floorOrFallback
+            ? { seconds: timeline, from: "timeline", floorIndex: null }
+            : fromFloorOrFallback(floorOrFallback);
+    }
+    if (aboveOneFrame(floor) !== null)
+        return fromFloorOrFallback(floorOrFallback);
+    if (fallback > 0)
+        return { seconds: fallback, from: "fallback", floorIndex: null };
+    const derived = input.derived();
+    return { seconds: derived > 0 ? derived : 0, from: "derived", floorIndex: null };
 }
 /** Size, frame rate and length of a composition nothing is running (a server-parsed or detached
  *  document): no timelines, no adapters, and media without a known source length is pending. */

package/dist/runtime/mediaClock.d.ts

@@ -1,2 +1,3 @@
 export declare const MEDIA_ELEMENT_LEAD_SECONDS = 0.00001;
 export declare function mediaElementTime(sourceSeconds: number): number;
+export declare function startsSoundOnlyInsideATap(): boolean;

package/dist/runtime/mediaClock.js

@@ -2,3 +2,7 @@ export const MEDIA_ELEMENT_LEAD_SECONDS = 1e-5;
 export function mediaElementTime(sourceSeconds) {
     return sourceSeconds + MEDIA_ELEMENT_LEAD_SECONDS;
 }
+export function startsSoundOnlyInsideATap() {
+    const { userAgent, maxTouchPoints } = navigator;
+    return /iP(hone|ad|od)/.test(userAgent) || (/Macintosh/.test(userAgent) && maxTouchPoints > 1);
+}

package/dist/telemetryRedaction.js

@@ -10,12 +10,6 @@ export function redactUrlQueryStrings(value) {
         .replace(/\b(https?:\/\/[^\s?]+)\?[^\s]*/g, "$1?…")
         .replace(/((?:X-(?:Amz|Goog)-[\w-]*|Signature)=)[^&\s]*/gi, "$1…");
 }
-/**
- * Path characters we treat as part of a single segment. Space is deliberately
- * excluded: including it would let a match run past the path and swallow the
- * prose after it, and a path with a space still gets its remaining segments
- * redacted, which is the part that carries the identifying information.
- */
 /**
  * A path segment is defined by what ENDS it, not by an alphabet.
  *
@@ -31,6 +25,9 @@ export function redactUrlQueryStrings(value) {
  * run past the path and swallow the prose after it.
  */
 const SEGMENT = String.raw `[^\s/\\'"]+`;
+/** A folder that another separator follows may hold spaces (`My Drive`, `내 드라이브`, `OneDrive - Contoso`); only
+ * the last segment stops at a space, so prose after a path survives. Line breaks still end it. */
+const FOLDER = String.raw `${SEGMENT}(?:[^\S\r\n]+(?![A-Za-z]:[\\/])${SEGMENT})*(?=[\\/])`;
 /** Same, minus the dot, so a trailing `.ext` can be matched separately. */
 const SEGMENT_NODOT = String.raw `[^\s/\\'".]+`;
 /**
@@ -54,10 +51,12 @@ const TOKEN_TAIL = String.raw `[^\s'")]*`;
  * position inside a URL can start a match. URLs are handled above, where the
  * host is kept and only the query is dropped.
  */
-const ABSOLUTE_PATH = new RegExp(String.raw `(?<![:\w/\\])(?:[A-Za-z]:)?(?:[\\/]${SEGMENT}){2,}${TOKEN_TAIL}`, "g");
+const ABSOLUTE_PATH = new RegExp(
+// A Windows share (`\\server\share`) starts with two separators; the first is taken as its root.
+String.raw `(?<![:\w\p{L}\p{N}\p{M}/\\])(?:[A-Za-z]:|\\(?=\\[^\s\\/]))?(?:[\\/]${FOLDER})+[\\/]${SEGMENT}${TOKEN_TAIL}`, "gu");
 /** `./assets/bgm.mp3`, `../out.wav`, `.\tmp\x` — relative paths leak the same
  *  project structure absolute ones do, and were previously untouched. */
-const RELATIVE_PATH = new RegExp(String.raw `(?<![\w/\\.])\.{1,2}(?:[\\/]${SEGMENT})+${TOKEN_TAIL}`, "g");
+const RELATIVE_PATH = new RegExp(String.raw `(?<![\w/\\.])\.{1,2}(?:[\\/]${FOLDER})*[\\/]${SEGMENT}${TOKEN_TAIL}`, "g");
 /**
  * A bare basename with an asset extension. ffprobe reports the input by the
  * name it was given, so a caller that passes a basename (or a path this
@@ -82,6 +81,8 @@ const BARE_RELATIVE_PATH = new RegExp([
     // Two or more separators: `customer/acme/video.mp4`. No extension needed —
     // that much structure is already a path.
     String.raw `(?<![^\s'\"(=,\[])(?:${SEGMENT}[\\/]){2,}${SEGMENT}${TOKEN_TAIL}`,
+    // Spaced folders only before a file name with an extension, so ffprobe's `N/A, … bitrate: N/A` is not a path.
+    String.raw `(?<![^\s'\"(=,\[])${SEGMENT}[\\/](?:${FOLDER}[\\/]){1,8}${SEGMENT_NODOT}\.\w{1,8}\b${TOKEN_TAIL}`,
     // One separator, but the last segment carries a file extension:
     // `assets/bgm.mp3`. That segment is dot-free on purpose — SEGMENT includes
     // `.`, so a greedy one swallows the extension this rule needs.
@@ -122,10 +123,10 @@ function redactFilePaths(value) {
         // (`/assets/x.mp3`), so the absolute rule would consume it and leave the
         // leading `.` stranded outside the redaction.
         .replace(RELATIVE_PATH, "[path]")
-        // Bare-relative BEFORE absolute: a bare path's interior satisfies the
-        // absolute rule, which would claim it and strand the first segment.
-        .replace(BARE_RELATIVE_PATH, "[path]")
+        // Absolute BEFORE bare-relative: the folders after a space in `/Users/kim/My Drive/x.mp4` look like a bare path
+        // on their own, and claiming them first would strand the start of the absolute one.
         .replace(ABSOLUTE_PATH, "[path]")
+        .replace(BARE_RELATIVE_PATH, "[path]")
         .replace(ASSET_BASENAME, "[file]"));
 }
 export function redactTelemetryString(value, maxLength = MAX_TELEMETRY_STRING_LENGTH) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hyperframes/core",
-  "version": "0.8.214",
+  "version": "0.8.217",
   "description": "",
   "repository": {
     "type": "git",
@@ -64,6 +64,10 @@
       "import": "./dist/removeTree.js",
       "types": "./dist/removeTree.d.ts"
     },
+    "./env-proxy": {
+      "import": "./dist/envProxy.js",
+      "types": "./dist/envProxy.d.ts"
+    },
     "./rename-retry": {
       "import": "./dist/renameWithRetry.js",
       "types": "./dist/renameWithRetry.d.ts"
@@ -425,9 +429,9 @@
     "linkedom": "^0.18.12",
     "postcss": "^8.5.8",
     "wawoff2": "^2.0.1",
-    "@hyperframes/lint": "0.8.214",
-    "@hyperframes/parsers": "0.8.214",
-    "@hyperframes/studio-server": "0.8.214"
+    "@hyperframes/parsers": "0.8.217",
+    "@hyperframes/lint": "0.8.217",
+    "@hyperframes/studio-server": "0.8.217"
   },
   "devDependencies": {
     "@fontsource/archivo-black": "^5.2.8",