music-metadata 11.9.0 → 11.10.1

package/README.md

@@ -602,6 +602,9 @@ Returns a list of supported MIME-types. This may include some MIME-types which a
   Note that enabling this option **does not guarantee** that duration will be available,
   only that the parser will attempt to calculate it when possible, even if it requires reading the full file.
 
+- `includeChapters`: `boolean` (default: `false`)
+  When `true`, the MP4 parser scans the `mdat` atom for chapters.
+
 - `mkvUseIndex`: `boolean` (default: `false`)
 
   When `true`, the parser uses the SeekHead index in Matroska (MKV) files to skip segment and cluster elements.

package/lib/common/MetadataCollector.js

@@ -5,7 +5,7 @@ import { CombinedTagMapper } from './CombinedTagMapper.js';
 import { CommonTagMapper } from './GenericTagMapper.js';
 import { toRatio } from './Util.js';
 import { fileTypeFromBuffer } from 'file-type';
-import { parseLrc } from '../lrc/LyricsParser.js';
+import { parseLyrics } from '../lrc/LyricsParser.js';
 const debug = initDebug('music-metadata:collector');
 const TagPriority = ['matroska', 'APEv2', 'vorbis', 'ID3v2.4', 'ID3v2.3', 'ID3v2.2', 'exif', 'asf', 'iTunes', 'AIFF', 'ID3v1'];
 /**
@@ -187,7 +187,7 @@ export class MetadataCollector {
                 break;
             case 'lyrics':
                 if (typeof tag.value === 'string') {
-                    tag.value = parseLrc(tag.value);
+                    tag.value = parseLyrics(tag.value);
                 }
                 break;
             default:

package/lib/id3v2/FrameParser.js

@@ -55,7 +55,7 @@ function parseGenreCode(code) {
     if (code === 'CR')
         return 'Cover';
     if (code.match(/^\d*$/)) {
-        return Genres[Number.parseInt(code)];
+        return Genres[Number.parseInt(code, 10)];
     }
 }
 export class FrameParser {

package/lib/id3v2/ID3v2Token.d.ts

@@ -48,7 +48,7 @@ export declare const LyricsContentType: {
 };
 export type LyricsContentType = typeof LyricsContentType[keyof typeof LyricsContentType];
 export declare const TimestampFormat: {
-    notSynchronized0: number;
+    notSynchronized: number;
     mpegFrameNumber: number;
     milliseconds: number;
 };

package/lib/id3v2/ID3v2Token.js

@@ -40,7 +40,7 @@ export const LyricsContentType = {
     trivia_pop: 6,
 };
 export const TimestampFormat = {
-    notSynchronized0: 0,
+    notSynchronized: 0,
     mpegFrameNumber: 1,
     milliseconds: 2
 };

package/lib/lrc/LyricsParser.d.ts

@@ -1,4 +1,6 @@
 import { type ILyricsTag } from '../type.js';
+export declare function parseLyrics(input: string): ILyricsTag;
+export declare function toUnsyncedLyrics(lyrics: string): ILyricsTag;
 /**
  * Parse LRC (Lyrics) formatted text
  * Ref: https://en.wikipedia.org/wiki/LRC_(file_format)

package/lib/lrc/LyricsParser.js

@@ -1,4 +1,20 @@
 import { LyricsContentType, TimestampFormat } from '../type.js';
+// Shared timestamp regex for LRC format
+const TIMESTAMP_REGEX = /\[(\d{2}):(\d{2})\.(\d{2,3})]/;
+export function parseLyrics(input) {
+    if (TIMESTAMP_REGEX.test(input)) {
+        return parseLrc(input);
+    }
+    return toUnsyncedLyrics(input);
+}
+export function toUnsyncedLyrics(lyrics) {
+    return {
+        contentType: LyricsContentType.lyrics,
+        timeStampFormat: TimestampFormat.notSynchronized,
+        text: lyrics.trim(),
+        syncText: [],
+    };
+}
 /**
  * Parse LRC (Lyrics) formatted text
  * Ref: https://en.wikipedia.org/wiki/LRC_(file_format)
@@ -7,34 +23,23 @@ import { LyricsContentType, TimestampFormat } from '../type.js';
 export function parseLrc(lrcString) {
     const lines = lrcString.split('\n');
     const syncText = [];
-    // Regular expression to match LRC timestamps (e.g., [00:45.52] or [00:45.520])
-    const timestampRegex = /\[(\d{2}):(\d{2})\.(\d{2,3})\]/;
     for (const line of lines) {
-        const match = line.match(timestampRegex);
+        const match = line.match(TIMESTAMP_REGEX);
         if (match) {
             const minutes = Number.parseInt(match[1], 10);
             const seconds = Number.parseInt(match[2], 10);
-            const millisecondsStr = match[3];
-            let milliseconds;
-            if (millisecondsStr.length === 3) {
-                //  (e.g., .521 = 521 millseconds)
-                milliseconds = Number.parseInt(millisecondsStr, 10);
-            }
-            else {
-                //  (e.g., .52 = 520 millseconds)
-                milliseconds = Number.parseInt(millisecondsStr, 10) * 10;
-            }
-            // Convert the timestamp to milliseconds, as per TimestampFormat.milliseconds
-            const timestamp = (minutes * 60 + seconds) * 1000 + milliseconds;
-            // Get the text portion of the line (e.g., "あの蝶は自由になれたかな")
-            const text = line.replace(timestampRegex, '').trim();
+            const ms = match[3].length === 3
+                ? Number.parseInt(match[3], 10)
+                : Number.parseInt(match[3], 10) * 10;
+            const timestamp = (minutes * 60 + seconds) * 1000 + ms;
+            const text = line.replace(TIMESTAMP_REGEX, '').trim();
             syncText.push({ timestamp, text });
         }
     }
-    // Creating the ILyricsTag object
     return {
         contentType: LyricsContentType.lyrics,
         timeStampFormat: TimestampFormat.milliseconds,
+        text: syncText.map(line => line.text).join('\n'),
         syncText,
     };
 }

package/lib/mp4/MP4Parser.js

@@ -300,6 +300,8 @@ export class MP4Parser extends BasicParser {
                     switch (atom.header.name) {
                         case 'trak':
                             return this.parseTrackBox(atom);
+                        case 'udta':
+                            return this.parseTrackBox(atom);
                     }
                     break;
                 case 'moof':

package/lib/mp4/Mp4Loader.js

@@ -1,7 +1,7 @@
 export const mp4ParserLoader = {
     parserType: 'mp4',
-    extensions: ['.mp4', '.m4a', '.m4b', '.m4pa', 'm4v', 'm4r', '3gp'],
-    mimeTypes: ['audio/mp4', 'audio/m4a', 'video/m4v', 'video/mp4'],
+    extensions: ['.mp4', '.m4a', '.m4b', '.m4pa', 'm4v', 'm4r', '3gp', '.mov', '.movie', '.qt'],
+    mimeTypes: ['audio/mp4', 'audio/m4a', 'video/m4v', 'video/mp4', 'video/quicktime'],
     async load() {
         return (await import('./MP4Parser.js')).MP4Parser;
     }

package/lib/ogg/OggParser.js

@@ -84,6 +84,7 @@ export class OggParser extends BasicParser {
      */
     async parse() {
         this.streams = new Map();
+        let enfOfStream = false;
         let header;
         try {
             do {
@@ -105,6 +106,7 @@ export class OggParser extends BasicParser {
         catch (err) {
             if (err instanceof EndOfStreamError) {
                 debug("Reached end-of-stream");
+                enfOfStream = true;
             }
             else if (err instanceof OggContentError) {
                 this.metadata.addWarning(`Corrupt Ogg content at ${this.tokenizer.position}`);
@@ -117,7 +119,7 @@ export class OggParser extends BasicParser {
                 this.metadata.addWarning(`End-of-stream reached before reaching last page in Ogg stream serial=${stream.streamSerial}`);
                 await stream.pageConsumer?.flush();
             }
-            stream.pageConsumer?.calculateDuration();
+            stream.pageConsumer?.calculateDuration(enfOfStream);
         }
     }
 }

package/lib/ogg/OggToken.d.ts

@@ -75,7 +75,7 @@ export interface IPageConsumer {
     /**
      * Calculate duration of provided header
      */
-    calculateDuration(): void;
+    calculateDuration(enfOfStream: boolean): void;
     /**
      * Force to parse pending segments
      */

package/lib/ogg/opus/OpusStream.d.ts

@@ -20,5 +20,5 @@ export declare class OpusStream extends VorbisStream {
      */
     protected parseFirstPage(_header: IPageHeader, pageData: Uint8Array): void;
     protected parseFullPage(pageData: Uint8Array): Promise<void>;
-    calculateDuration(): void;
+    calculateDuration(enfOfStream: boolean): void;
 }

package/lib/ogg/opus/OpusStream.js

@@ -41,8 +41,8 @@ export class OpusStream extends VorbisStream {
                 break;
         }
     }
-    calculateDuration() {
-        if (this.lastPageHeader && this.metadata.format.sampleRate && this.lastPageHeader.absoluteGranulePosition >= 0) {
+    calculateDuration(enfOfStream) {
+        if (this.lastPageHeader && (enfOfStream || this.lastPageHeader.headerType.lastPage) && this.metadata.format.sampleRate && this.lastPageHeader.absoluteGranulePosition >= 0) {
             // Calculate duration
             const pos_48bit = this.lastPageHeader.absoluteGranulePosition - this.idHeader.preSkip;
             this.metadata.setFormat('numberOfSamples', pos_48bit);

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

@@ -37,7 +37,7 @@ export declare class VorbisStream implements IPageConsumer {
     flush(): Promise<void>;
     parseUserComment(pageData: Uint8Array, offset: number): Promise<number>;
     addTag(id: string, value: string | IVorbisPicture): Promise<void>;
-    calculateDuration(): void;
+    calculateDuration(enfOfStream: boolean): void;
     /**
      * Parse first Ogg/Vorbis page
      * @param _header

package/lib/ogg/vorbis/VorbisStream.js

@@ -77,7 +77,7 @@ export class VorbisStream {
         }
         await this.metadata.addTag('vorbis', id, value);
     }
-    calculateDuration() {
+    calculateDuration(enfOfStream) {
         if (this.lastPageHeader && this.metadata.format.sampleRate && this.lastPageHeader.absoluteGranulePosition >= 0) {
             // Calculate duration
             this.metadata.setFormat('numberOfSamples', this.lastPageHeader.absoluteGranulePosition);

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.9.0",
+  "version": "11.10.1",
   "author": {
     "name": "Borewit",
     "url": "https://github.com/Borewit"
@@ -110,32 +110,32 @@
     "@tokenizer/token": "^0.3.0",
     "content-type": "^1.0.5",
     "debug": "^4.4.3",
-    "file-type": "^21.0.0",
+    "file-type": "^21.1.0",
     "media-typer": "^1.1.0",
     "strtok3": "^10.3.4",
     "token-types": "^6.1.1",
     "uint8array-extras": "^1.5.0"
   },
   "devDependencies": {
-    "@biomejs/biome": "2.2.4",
+    "@biomejs/biome": "2.3.5",
     "@types/chai": "^5.2.2",
     "@types/chai-as-promised": "^8.0.2",
     "@types/content-type": "^1.1.9",
     "@types/debug": "^4.1.12",
     "@types/media-typer": "^1.1.3",
     "@types/mocha": "^10.0.10",
-    "@types/node": "^24.3.1",
+    "@types/node": "^24.5.0",
     "c8": "^10.1.3",
-    "chai": "^6.0.1",
+    "chai": "^6.2.1",
     "chai-as-promised": "^8.0.2",
-    "del-cli": "^6.0.0",
+    "del-cli": "^7.0.0",
     "mime": "^4.1.0",
-    "mocha": "^11.7.2",
+    "mocha": "^11.7.5",
     "node-readable-to-web-readable-stream": "^0.4.2",
     "remark-cli": "^12.0.1",
     "remark-preset-lint-consistent": "^6.0.1",
     "ts-node": "^10.9.2",
-    "typescript": "^5.9.2"
+    "typescript": "^5.9.3"
   },
   "engines": {
     "node": ">=18"