avbridge 2.2.1 → 2.5.0

package/src/util/libav-http-reader.ts

@@ -102,9 +102,13 @@ export async function prepareLibavInput(
   libav: LibavLikeWithBlob,
   filename: string,
   source: import("./source.js").NormalizedSource,
+  transport?: import("../types.js").TransportConfig,
 ): Promise<LibavInputHandle> {
   if (source.kind === "url") {
-    const handle = await attachLibavHttpReader(libav, filename, source.url);
+    const handle = await attachLibavHttpReader(libav, filename, source.url, {
+      requestInit: transport?.requestInit,
+      fetchFn: transport?.fetchFn,
+    });
     return {
       filename,
       transport: "http-range",

package/src/util/source.ts

@@ -1,4 +1,6 @@
-import type { ContainerKind, MediaInput } from "../types.js";
+import type { ContainerKind, MediaInput, TransportConfig } from "../types.js";
+import { mergeFetchInit, fetchWith } from "./transport.js";
+import { AvbridgeError, ERR_PROBE_FETCH_FAILED } from "../errors.js";
 
 /**
  * Bytes needed by the sniffer to identify every container we recognize.
@@ -59,7 +61,10 @@ export function isInMemorySource(source: NormalizedSource): source is Extract<No
  *
  * For non-URL inputs, the bytes are already in memory and we just wrap them.
  */
-export async function normalizeSource(source: MediaInput): Promise<NormalizedSource> {
+export async function normalizeSource(
+  source: MediaInput,
+  transport?: TransportConfig,
+): Promise<NormalizedSource> {
   if (source instanceof File) {
     return {
       kind: "blob",
@@ -82,7 +87,7 @@ export async function normalizeSource(source: MediaInput): Promise<NormalizedSou
   }
   if (typeof source === "string" || source instanceof URL) {
     const url = source instanceof URL ? source.toString() : source;
-    return await fetchUrlForSniff(url, source);
+    return await fetchUrlForSniff(url, source, transport);
   }
   throw new TypeError("unsupported source type");
 }
@@ -93,20 +98,35 @@ export async function normalizeSource(source: MediaInput): Promise<NormalizedSou
  * we only read the first 32 KB and abort the rest of the response so we
  * don't accidentally buffer a large file.
  */
-async function fetchUrlForSniff(url: string, originalSource: MediaInput): Promise<NormalizedSource> {
+async function fetchUrlForSniff(
+  url: string,
+  originalSource: MediaInput,
+  transport?: TransportConfig,
+): Promise<NormalizedSource> {
   const name = url.split("/").pop()?.split("?")[0] ?? undefined;
+  const doFetch = fetchWith(transport);
 
   // First attempt: Range request for the sniff window.
   let res: Response;
   try {
-    res = await fetch(url, {
+    res = await doFetch(url, mergeFetchInit(transport?.requestInit, {
       headers: { Range: `bytes=0-${URL_SNIFF_RANGE_BYTES - 1}` },
-    });
+    })!);
   } catch (err) {
-    throw new Error(`failed to fetch source ${url}: ${(err as Error).message}`);
+    throw new AvbridgeError(
+      ERR_PROBE_FETCH_FAILED,
+      `Failed to fetch source ${url}: ${(err as Error).message}`,
+      "Check that the URL is reachable and CORS is configured. If the source requires authentication, pass requestInit with credentials/headers.",
+    );
   }
   if (!res.ok && res.status !== 206) {
-    throw new Error(`failed to fetch source ${url}: ${res.status} ${res.statusText}`);
+    throw new AvbridgeError(
+      ERR_PROBE_FETCH_FAILED,
+      `Failed to fetch source ${url}: ${res.status} ${res.statusText}`,
+      res.status === 403 || res.status === 401
+        ? "The server rejected the request. Pass requestInit with the required Authorization header or credentials."
+        : "Check that the URL is correct and the server is reachable.",
+    );
   }
 
   // Determine the total file size from Content-Range (preferred) or Content-Length.

package/src/util/transport.ts

@@ -0,0 +1,26 @@
+import type { FetchFn, TransportConfig } from "../types.js";
+
+/**
+ * Merge two RequestInit objects. Headers are merged (not overwritten) so
+ * the caller's auth headers coexist with the player's Range headers.
+ * Other fields (credentials, mode, signal, etc.) in `extra` override `base`.
+ */
+export function mergeFetchInit(
+  base: RequestInit | undefined,
+  extra: RequestInit | undefined,
+): RequestInit | undefined {
+  if (!base && !extra) return undefined;
+  return {
+    ...base,
+    ...extra,
+    headers: {
+      ...(base?.headers as Record<string, string> | undefined ?? {}),
+      ...(extra?.headers as Record<string, string> | undefined ?? {}),
+    },
+  };
+}
+
+/** Return the fetch function from a TransportConfig, falling back to globalThis.fetch. */
+export function fetchWith(transport?: TransportConfig): FetchFn {
+  return transport?.fetchFn ?? globalThis.fetch;
+}