Add AppendOnlyStreamSource, adjust examples to use it

This commit is contained in:
Vanilagy
2026-04-21 14:58:33 +02:00
parent 2b3e5f45c6
commit 783cfa6fbe
17 changed files with 328 additions and 68 deletions
+1 -1
View File
@@ -34,7 +34,7 @@ export class AdtsMuxer extends Muxer {
async start() {
const release = await this.mutex.acquire();
this.writer = await this.output._getRootWriter();
this.writer = await this.output._getRootWriter(true);
if (!metadataTagsAreEmpty(this.output._metadataTags)) {
const id3Writer = new Id3V2Writer(this.writer);
+1 -5
View File
@@ -54,11 +54,7 @@ export class FlacMuxer extends Muxer {
async start() {
const release = await this.mutex.acquire();
this.writer = await this.output._getRootWriter();
if (this.format._options.appendOnly) {
this.writer.ensureMonotonicity();
}
this.writer = await this.output._getRootWriter(!!this.format._options.appendOnly);
this.writer.write(FLAC_HEADER);
release();
+3 -3
View File
@@ -1225,7 +1225,7 @@ export class HlsMuxer extends Muxer {
isRoot: false,
mimeType: HLS_MIME_TYPE,
});
const writer = new Writer(target);
const writer = new Writer(target, true);
writer.start();
writer.write(textEncoder.encode(playlistText));
@@ -1426,7 +1426,7 @@ export class HlsMuxer extends Muxer {
if (this.numWrittenMasterPlaylists === 0) {
// For the first master playlist write, we use the normal root writer getter, so that the target
// returned by Output.target emits valid write events.
writer = await this.output._getRootWriter();
writer = await this.output._getRootWriter(true);
} else {
// For subsequent master playlist writes, we *must* obtain a different target in order to overwrite
// the file.
@@ -1435,7 +1435,7 @@ export class HlsMuxer extends Muxer {
isRoot: true,
mimeType: HLS_MIME_TYPE,
});
writer = new Writer(target);
writer = new Writer(target, true);
writer.start();
}
+8 -10
View File
@@ -176,7 +176,7 @@ export class IsobmffMuxer extends Muxer {
isCmaf: boolean;
private auxTarget = new BufferTarget();
private auxWriter = new Writer(this.auxTarget);
private auxWriter = new Writer(this.auxTarget, false);
private auxBoxWriter = new IsobmffBoxWriter(this.auxWriter);
private mdat: Box | null = null;
@@ -210,7 +210,11 @@ export class IsobmffMuxer extends Muxer {
const release = await this.mutex.acquire();
if (!this.isCmaf) {
this.writer = await this.output._getRootWriter();
this.writer = await this.output._getRootWriter(target => (
this.format._options.fastStart !== undefined
? this.format._options.fastStart === 'fragmented'
: target instanceof BufferTarget // Since if this is the case we'll use 'in-memory'
));
this.boxWriter = new IsobmffBoxWriter(this.writer);
// If the fastStart option isn't defined, enable in-memory fast start if the target is an ArrayBuffer, as
@@ -223,10 +227,6 @@ export class IsobmffMuxer extends Muxer {
this.isFragmented = true;
}
if (this.fastStart === 'in-memory' || this.isFragmented) {
this.writer?.ensureMonotonicity();
}
if (this.isCmaf) {
if (!this.output._hasInitTarget()) {
throw new Error(
@@ -237,7 +237,7 @@ export class IsobmffMuxer extends Muxer {
// Set up the init writer to which we'll write the init segment
const initTarget = await this.output._getInitTarget();
const initWriter = new Writer(initTarget);
const initWriter = new Writer(initTarget, true);
initWriter.start();
this.initWriter = initWriter;
@@ -1165,11 +1165,9 @@ export class IsobmffMuxer extends Muxer {
// Only now, init the main writer; this way the init writer is fully done before the main writer is
// even acquired
this.writer = await this.output._getRootWriter();
this.writer = await this.output._getRootWriter(true);
this.boxWriter = new IsobmffBoxWriter(this.writer);
this.writer.ensureMonotonicity();
const stypSize = this.boxWriter.measureBox(styp());
const sidxSize = this.boxWriter.measureBox(sidx(this, 0));
this.segmentHeaderSize = stypSize + sidxSize;
+1 -5
View File
@@ -165,13 +165,9 @@ export class MatroskaMuxer extends Muxer {
async start() {
const release = await this.mutex.acquire();
this.writer = await this.output._getRootWriter();
this.writer = await this.output._getRootWriter(!!this.format._options.appendOnly);
this.ebmlWriter = new EBMLWriter(this.writer);
if (this.format._options.appendOnly) {
this.writer.ensureMonotonicity();
}
this.writeEBMLHeader();
this.createSegmentInfo();
+1 -1
View File
@@ -35,7 +35,7 @@ export class Mp3Muxer extends Muxer {
async start() {
const release = await this.mutex.acquire();
this.writer = await this.output._getRootWriter();
this.writer = await this.output._getRootWriter(this.format._options.xingHeader === false);
this.mp3Writer = new Mp3Writer(this.writer);
if (!metadataTagsAreEmpty(this.output._metadataTags)) {
+1 -2
View File
@@ -96,8 +96,7 @@ export class MpegTsMuxer extends Muxer {
async start() {
const release = await this.mutex.acquire();
this.writer = await this.output._getRootWriter();
this.writer.ensureMonotonicity();
this.writer = await this.output._getRootWriter(true);
release();
}
+1 -2
View File
@@ -79,8 +79,7 @@ export class OggMuxer extends Muxer {
async start() {
const release = await this.mutex.acquire();
this.writer = await this.output._getRootWriter();
this.writer.ensureMonotonicity(); // Ogg is always monotonically written!
this.writer = await this.output._getRootWriter(true); // Ogg is always monotonically written!
release();
}
+2 -2
View File
@@ -580,11 +580,11 @@ export class Output<
}
/** @internal */
_getRootWriter() {
_getRootWriter(isMonotonic: boolean | ((target: Target) => boolean)) {
return this._rootWriterPromise ??= (async () => {
const target = await this._getRootTarget();
const writer = new Writer(target);
const writer = new Writer(target, typeof isMonotonic === 'boolean' ? isMonotonic : isMonotonic(target));
writer.start();
return writer;
})();
+94 -3
View File
@@ -42,7 +42,7 @@ export abstract class Target extends EventEmitter<TargetEvents> {
_output: Output | null = null;
/** @internal */
_ensureMonotonicity = false;
_monotonicity: boolean | null = null; // null = unknown
/** @internal */
abstract _start(): void;
@@ -65,6 +65,15 @@ export abstract class Target extends EventEmitter<TargetEvents> {
*/
onwrite: ((start: number, end: number) => unknown) | null = null;
/** @internal */
_setMonotonicity(monotonicity: boolean) {
if (this._monotonicity !== false) {
this._monotonicity = monotonicity;
} else {
// Once false, it's locked
}
}
/** @internal */
_dispatchWrite(start: number, end: number) {
// eslint-disable-next-line @typescript-eslint/no-deprecated
@@ -418,7 +427,7 @@ export class StreamTarget extends Target {
this._writeDataIntoChunks(chunk.data, chunk.start);
this._tryToFlushChunks();
} else {
if (this._ensureMonotonicity && chunk.start !== this._lastFlushEnd) {
if (this._monotonicity === true && chunk.start !== this._lastFlushEnd) {
throw new Error('Internal error: Monotonicity violation.');
}
@@ -530,7 +539,7 @@ export class StreamTarget extends Target {
for (const section of chunk.written) {
const position = chunk.start + section.start;
if (this._ensureMonotonicity && position !== this._lastFlushEnd) {
if (this._monotonicity === true && position !== this._lastFlushEnd) {
throw new Error('Internal error: Monotonicity violation.');
}
@@ -573,6 +582,76 @@ export class StreamTarget extends Target {
}
}
export class AppendOnlyStreamTarget extends Target {
/** @internal */
_writable: WritableStream<Uint8Array>;
/** @internal */
_streamTarget: StreamTarget;
/** @internal */
_writer: WritableStreamDefaultWriter<Uint8Array> | null = null;
/** @internal */
_nextWritePos = 0;
constructor(writable: WritableStream<Uint8Array>) {
super();
this._writable = writable;
this._streamTarget = new StreamTarget(new WritableStream({
start: () => {
this._writer = this._writable.getWriter();
},
write: (chunk) => {
if (this._monotonicity !== true) {
throw new Error(
'AppendOnlyStreamTarget requires that data be written monotonically (always appended to the'
+ ' end). You must use a format that guarantees this behavior.',
);
}
assert(chunk.position === this._nextWritePos);
this._nextWritePos += chunk.data.byteLength;
assert(this._writer);
return this._writer.write(chunk.data);
},
close: () => {
return this._writer?.close();
},
}));
}
/** @internal */
_start(): void {
this._streamTarget._start();
}
/** @internal */
_write(data: Uint8Array, pos: number): void {
this._streamTarget._write(data, pos);
}
/** @internal */
_flush(): Promise<void> {
return this._streamTarget._flush();
}
/** @internal */
_finalize(): Promise<void> {
return this._streamTarget._finalize();
}
/** @internal */
_close(): Promise<void> {
return this._streamTarget._close();
}
/** @internal */
override _setMonotonicity(monotonicity: boolean): void {
super._setMonotonicity(monotonicity);
this._streamTarget._setMonotonicity(monotonicity);
}
}
/**
* Options for {@link FilePathTarget}.
* @group Output targets
@@ -654,6 +733,12 @@ export class FilePathTarget extends Target {
async _close() {
return this._streamTarget._close();
}
/** @internal */
override _setMonotonicity(monotonicity: boolean): void {
super._setMonotonicity(monotonicity);
this._streamTarget._setMonotonicity(monotonicity);
}
}
/**
@@ -726,6 +811,12 @@ export class RangedTarget extends Target {
/** @internal */
async _close() {}
/** @internal */
override _setMonotonicity(monotonicity: boolean): void {
super._setMonotonicity(monotonicity);
this._baseTarget._setMonotonicity(monotonicity);
}
}
/**
+1 -1
View File
@@ -44,7 +44,7 @@ export class WaveMuxer extends Muxer {
async start() {
const release = await this.mutex.acquire();
this.writer = await this.output._getRootWriter();
this.writer = await this.output._getRootWriter(false);
this.riffWriter = new RiffWriter(this.writer);
// No writing needed here - we'll write the header with the first sample
+2 -6
View File
@@ -16,8 +16,9 @@ export class Writer {
private pos = 0;
constructor(target: Target) {
constructor(target: Target, isMonotonic: boolean) {
this.target = target;
target._setMonotonicity(isMonotonic);
}
start() {
@@ -26,11 +27,6 @@ export class Writer {
this.started = true;
}
ensureMonotonicity() {
this.target._ensureMonotonicity = true;
// Note that this currently is without effect for RangedTarget. But, should be fine since its use is rare
}
/** Writes the given data to the target, at the current position. */
write(data: Uint8Array) {
assert(this.started && !this.finalized);