mirror of
https://github.com/heygen-com/hyperframes.git
synced 2026-09-09 12:00:26 +00:00
Merge branch 'main' into via/studio-5433-html-sniff-defense
Both conflicts were import/export unions in the engine package, resolved by keeping both sides: - packages/engine/src/index.ts — main widened the urlDownloader re-export (fetchPublicHttpsText, safeDownloadUrlIdentity, writeUrlDownloadTelemetry and their types) while this branch added the notMediaPayload exports. - packages/engine/src/services/audioMixer.ts — main added UrlDownloadError and writeUrlDownloadTelemetry to the urlDownloader import; this branch added isNotMediaPayload. In audioMixer's prepare path both intents compose in order: main's download telemetry and typed download failure, then the STUDIO-5433 non-media sniff before the probe.
This commit is contained in:
@@ -120,6 +120,7 @@ export {
|
||||
getCapturePerfSummary,
|
||||
percentileOf,
|
||||
prepareCaptureSessionForReuse,
|
||||
deriveBeginFrameProbeTimeTicks,
|
||||
type CaptureSession,
|
||||
isTransientBrowserError,
|
||||
isMemoryExhaustionError,
|
||||
@@ -281,7 +282,18 @@ export {
|
||||
isNotMediaPayload,
|
||||
} from "./utils/notMediaPayload.js";
|
||||
|
||||
export { assertPublicHttpsUrl, downloadToTemp, isHttpUrl } from "./utils/urlDownloader.js";
|
||||
export {
|
||||
assertPublicHttpsUrl,
|
||||
downloadToTemp,
|
||||
fetchPublicHttpsText,
|
||||
isHttpUrl,
|
||||
safeDownloadUrlIdentity,
|
||||
writeUrlDownloadTelemetry,
|
||||
type SafeDownloadUrlIdentity,
|
||||
type UrlDownloadOptions,
|
||||
type UrlDownloadTelemetry,
|
||||
type PublicHttpsTextOptions,
|
||||
} from "./utils/urlDownloader.js";
|
||||
export {
|
||||
runFfmpeg,
|
||||
formatFfmpegError,
|
||||
|
||||
Reference in New Issue
Block a user