music-metadata 11.16.0 → 11.16.1

package/lib/id3v2/FrameParser.js

@@ -150,7 +150,7 @@ export class FrameParser {
                 const idAndData = FrameParser.readIdentifierAndData(uint8Array.subarray(1), encoding);
                 output = {
                     description: idAndData.id,
-                    text: this.splitValue(type, util.decodeString(idAndData.data, encoding).replace(/\x00+$/, ''))
+                    text: this.splitValue(type, FrameParser.trimNullPadding(util.decodeString(idAndData.data, encoding)))
                 };
                 break;
             }

package/lib/ogg/OggParser.js

@@ -86,6 +86,7 @@ export class OggParser extends BasicParser {
     async parse() {
         this.streams = new Map();
         let enfOfStream = false;
+        let stoppedEarly = false;
         let header;
         try {
             do {
@@ -100,7 +101,10 @@ export class OggParser extends BasicParser {
                 }
                 await stream.parsePage(this.tokenizer, header);
                 if (stream.pageNumber > 12 &&
+                    // A comment (including its cover art) may span more than 13 pages.
+                    [...this.streams.values()].every(stream => stream.pageConsumer?.isMetadataComplete !== false) &&
                     !(this.options.duration && [...this.streams.values()].find(stream => stream.pageConsumer?.durationOnLastPage))) {
+                    stoppedEarly = true;
                     debug('Stop processing Ogg stream');
                     break;
                 }
@@ -120,7 +124,9 @@ export class OggParser extends BasicParser {
         }
         for (const stream of this.streams.values()) {
             if (!stream.closed) {
-                this.metadata.addWarning(`End-of-stream reached before reaching last page in Ogg stream serial=${stream.streamSerial}`);
+                if (!stoppedEarly) {
+                    this.metadata.addWarning(`End-of-stream reached before reaching last page in Ogg stream serial=${stream.streamSerial}`);
+                }
                 await stream.pageConsumer?.flush();
             }
             stream.pageConsumer?.calculateDuration(enfOfStream);

package/lib/ogg/OggToken.d.ts

@@ -62,6 +62,8 @@ export declare class SegmentTable implements IGetToken<ISegmentTable> {
     get(buf: Uint8Array, off: number): ISegmentTable;
 }
 export interface IPageConsumer {
+    /** False while required metadata is still being read; undefined if not tracked. */
+    isMetadataComplete?: boolean;
     /**
      * Need to parse to end to be able to calculate the duration
      */

package/lib/ogg/vorbis/VorbisStream.d.ts

@@ -26,6 +26,7 @@ export declare class VorbisStream implements IPageConsumer {
     protected options: IOptions;
     protected lastPageHeader?: IPageHeader;
     durationOnLastPage: boolean;
+    isMetadataComplete: boolean;
     constructor(metadata: INativeMetadataCollector, options: IOptions);
     /**
      * Vorbis 1 parser

package/lib/ogg/vorbis/VorbisStream.js

@@ -14,6 +14,7 @@ export class VorbisStream {
     constructor(metadata, options) {
         this.pageSegments = [];
         this.durationOnLastPage = true;
+        this.isMetadataComplete = false;
         this.metadata = metadata;
         this.options = options;
     }
@@ -137,5 +138,6 @@ export class VorbisStream {
         while (userCommentListLength-- > 0) {
             offset += await this.parseUserComment(pageData, offset);
         }
+        this.isMetadataComplete = true;
     }
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "music-metadata",
   "description": "Music metadata parser for Node.js, supporting virtual any audio and tag format.",
-  "version": "11.16.0",
+  "version": "11.16.1",
   "author": {
     "name": "Borewit",
     "url": "https://github.com/Borewit"