music-metadata 10.0.0 → 10.1.0

package/lib/matroska/MatroskaParser.js

@@ -1,5 +1,6 @@
 import { Float32_BE, Float64_BE, StringType, UINT8 } from 'token-types';
 import initDebug from 'debug';
+import { EndOfStreamError } from 'strtok3';
 import { BasicParser } from '../common/BasicParser.js';
 import * as matroskaDtd from './MatroskaDtd.js';
 import { DataType, TargetType, TrackType } from './types.js';
@@ -52,7 +53,7 @@ export class MatroskaParser extends BasicParser {
                 }
             }
             const audioTracks = matroska.segment.tracks;
-            if (audioTracks && audioTracks.entries) {
+            if (audioTracks === null || audioTracks === void 0 ? void 0 : audioTracks.entries) {
                 audioTracks.entries.forEach(entry => {
                     const stream = {
                         codecName: entry.codecID.replace('A_', '').replace('V_', ''),
@@ -69,19 +70,14 @@ export class MatroskaParser extends BasicParser {
                     this.metadata.addStreamInfo(stream);
                 });
                 const audioTrack = audioTracks.entries
-                    .filter(entry => {
-                    return entry.trackType === TrackType.audio.valueOf();
-                })
+                    .filter(entry => entry.trackType === TrackType.audio)
                     .reduce((acc, cur) => {
-                    if (!acc) {
+                    if (!acc)
                         return cur;
-                    }
-                    if (!acc.flagDefault && cur.flagDefault) {
+                    if (cur.flagDefault && !acc.flagDefault)
                         return cur;
-                    }
-                    if (cur.trackNumber && cur.trackNumber < acc.trackNumber) {
+                    if (cur.trackNumber < acc.trackNumber)
                         return cur;
-                    }
                     return acc;
                 }, null);
                 if (audioTrack) {
@@ -120,7 +116,7 @@ export class MatroskaParser extends BasicParser {
                 element = await this.readElement();
             }
             catch (error) {
-                if (error.message === 'End-Of-Stream') {
+                if (error instanceof EndOfStreamError) {
                     break;
                 }
                 throw error;
@@ -141,7 +137,10 @@ export class MatroskaParser extends BasicParser {
                     }
                 }
                 else {
-                    tree[type.name] = await this.parserMap.get(type.value)(element);
+                    const parser = this.parserMap.get(type.value);
+                    if (typeof parser === 'function') {
+                        tree[type.name] = await parser(element);
+                    }
                 }
             }
             else {
@@ -238,3 +237,4 @@ export class MatroskaParser extends BasicParser {
         }
     }
 }
+//# sourceMappingURL=MatroskaParser.js.map

package/lib/matroska/types.d.ts

@@ -22,6 +22,7 @@ export interface IContainerType {
 export interface ITree {
     [name: string]: string | number | boolean | Uint8Array | ITree | ITree[];
 }
+export type ValueType = string | number | Uint8Array | boolean | ITree | ITree[];
 export interface ISeekHead {
     id?: Uint8Array;
     position?: number;
@@ -40,9 +41,9 @@ export interface ISegmentInformation {
 }
 export interface ITrackEntry {
     uid?: Uint8Array;
-    trackNumber?: number;
+    trackNumber: number;
     trackType?: TrackType;
-    audio?: ITrackAudio;
+    audio: ITrackAudio;
     video?: ITrackVideo;
     flagEnabled?: boolean;
     flagDefault?: boolean;
@@ -51,7 +52,7 @@ export interface ITrackEntry {
     trackTimecodeScale?: number;
     name?: string;
     language?: string;
-    codecID?: string;
+    codecID: string;
     codecPrivate?: Uint8Array;
     codecName?: string;
     codecSettings?: string;
@@ -121,6 +122,7 @@ export declare enum TrackType {
     button = 18,
     control = 32
 }
+export type TrackTypeKey = keyof TrackType;
 export interface ITarget {
     trackUID?: Uint8Array;
     chapterUID?: Uint8Array;
@@ -146,7 +148,7 @@ export interface IAttachmedFile {
     uid: string;
 }
 export interface IAttachments {
-    attachedFiles?: IAttachmedFile[];
+    attachedFiles: IAttachmedFile[];
 }
 export interface IMatroskaSegment {
     metaSeekInfo?: IMetaSeekInformation;

package/lib/mp4/Atom.d.ts

@@ -4,11 +4,11 @@ export type AtomDataHandler = (atom: Atom, remaining: number) => Promise<void>;
 export declare class Atom {
     readonly header: AtomToken.IAtomHeader;
     extended: boolean;
-    readonly parent: Atom;
-    static readAtom(tokenizer: ITokenizer, dataHandler: AtomDataHandler, parent: Atom, remaining: number): Promise<Atom>;
+    readonly parent: Atom | null;
+    static readAtom(tokenizer: ITokenizer, dataHandler: AtomDataHandler, parent: Atom | null, remaining: number): Promise<Atom>;
     readonly children: Atom[];
     readonly atomPath: string;
-    constructor(header: AtomToken.IAtomHeader, extended: boolean, parent: Atom);
+    constructor(header: AtomToken.IAtomHeader, extended: boolean, parent: Atom | null);
     getHeaderLength(): number;
     getPayloadLength(remaining: number): number;
     readAtoms(tokenizer: ITokenizer, dataHandler: AtomDataHandler, size: number): Promise<void>;

package/lib/mp4/Atom.js

@@ -23,7 +23,7 @@ export class Atom {
         this.extended = extended;
         this.parent = parent;
         this.children = [];
-        this.atomPath = (this.parent ? this.parent.atomPath + '.' : '') + this.header.name;
+        this.atomPath = (this.parent ? `${this.parent.atomPath}.` : '') + this.header.name;
     }
     getHeaderLength() {
         return this.extended ? 16 : 8;
@@ -51,19 +51,16 @@ export class Atom {
             case 'ilst':
             case 'tref':
                 return this.readAtoms(tokenizer, dataHandler, this.getPayloadLength(remaining));
-            case 'meta': // Metadata Atom, ref: https://developer.apple.com/library/content/documentation/QuickTime/QTFF/Metadata/Metadata.html#//apple_ref/doc/uid/TP40000939-CH1-SW8
+            case 'meta': { // Metadata Atom, ref: https://developer.apple.com/library/content/documentation/QuickTime/QTFF/Metadata/Metadata.html#//apple_ref/doc/uid/TP40000939-CH1-SW8
                 // meta has 4 bytes of padding, ignore
                 const peekHeader = await tokenizer.peekToken(Header);
                 const paddingLength = peekHeader.name === 'hdlr' ? 0 : 4;
                 await tokenizer.ignore(paddingLength);
                 return this.readAtoms(tokenizer, dataHandler, this.getPayloadLength(remaining) - paddingLength);
-            case 'mdhd': // Media header atom
-            case 'mvhd': // 'movie' => 'mvhd': movie header atom; child of Movie Atom
-            case 'tkhd':
-            case 'stsz':
-            case 'mdat':
+            }
             default:
                 return dataHandler(this, remaining);
         }
     }
 }
+//# sourceMappingURL=Atom.js.map

package/lib/mp4/AtomToken.js

@@ -68,7 +68,7 @@ export class FixedLengthAtom {
         if (len < expLen) {
             throw new Error(`Atom ${atomId} expected to be ${expLen}, but specifies ${len} bytes long.`);
         }
-        else if (len > expLen) {
+        if (len > expLen) {
             debug(`Warning: atom ${atomId} expected to be ${expLen}, but was actually ${len} bytes long.`);
         }
     }
@@ -390,3 +390,4 @@ function readTokenTable(buf, token, off, remainingLen, numberOfEntries) {
     }
     return entries;
 }
+//# sourceMappingURL=AtomToken.js.map

package/lib/mp4/MP4Parser.js

@@ -91,6 +91,7 @@ function distinct(value, index, self) {
 export class MP4Parser extends BasicParser {
     constructor() {
         super(...arguments);
+        this.tracks = [];
         this.atomParsers = {
             /**
              * Parse movie header (mvhd) atom
@@ -208,13 +209,13 @@ export class MP4Parser extends BasicParser {
         const integerType = (signed ? 'INT' : 'UINT') + array.length * 8 + (array.length > 1 ? '_BE' : '');
         const token = Token[integerType];
         if (!token) {
-            throw new Error('Token for integer type not found: "' + integerType + '"');
+            throw new Error(`Token for integer type not found: "${integerType}"`);
         }
         return Number(token.get(array, 0));
     }
     async parse() {
         this.tracks = [];
-        let remainingFileSize = this.tokenizer.fileInfo.size;
+        let remainingFileSize = this.tokenizer.fileInfo.size || 0;
         while (!this.tokenizer.fileInfo.size || remainingFileSize > 0) {
             try {
                 const token = await this.tokenizer.peekToken(AtomToken.Header);
@@ -226,9 +227,13 @@ export class MP4Parser extends BasicParser {
                 }
             }
             catch (error) {
-                const errMsg = `Error at offset=${this.tokenizer.position}: ${error.message}`;
-                debug(errMsg);
-                this.addWarning(errMsg);
+                if (error instanceof Error) {
+                    const errMsg = `Error at offset=${this.tokenizer.position}: ${error.message}`;
+                    debug(errMsg);
+                    this.addWarning(errMsg);
+                }
+                else
+                    throw error;
                 break;
             }
             const rootAtom = await Atom.readAtom(this.tokenizer, (atom, remaining) => this.handleAtom(atom, remaining), null, remainingFileSize);
@@ -309,10 +314,8 @@ export class MP4Parser extends BasicParser {
         if (this.atomParsers[atom.header.name]) {
             return this.atomParsers[atom.header.name](remaining);
         }
-        else {
-            debug(`No parser for atom path=${atom.atomPath}, payload-len=${remaining}, ignoring atom`);
-            await this.tokenizer.ignore(remaining);
-        }
+        debug(`No parser for atom path=${atom.atomPath}, payload-len=${remaining}, ignoring atom`);
+        await this.tokenizer.ignore(remaining);
     }
     getTrackDescription() {
         return this.tracks[this.tracks.length - 1];
@@ -326,7 +329,7 @@ export class MP4Parser extends BasicParser {
         await this.metadata.addTag(tagFormat, id, value);
     }
     addWarning(message) {
-        debug('Warning: ' + message);
+        debug(`Warning: ${message}`);
         this.metadata.addWarning(message);
     }
     /**
@@ -343,20 +346,22 @@ export class MP4Parser extends BasicParser {
                     return this.parseValueAtom(tagKey, child);
                 case 'name': // name atom (optional)
                 case 'mean':
-                case 'rate':
+                case 'rate': {
                     const name = await this.tokenizer.readToken(new AtomToken.NameAtom(payLoadLength));
-                    tagKey += ':' + name.name;
+                    tagKey += `:${name.name}`;
                     break;
-                default:
+                }
+                default: {
                     const uint8Array = await this.tokenizer.readToken(new Token.Uint8ArrayType(payLoadLength));
-                    this.addWarning('Unsupported meta-item: ' + tagKey + '[' + child.header.name + '] => value=' + uint8ArrayToHex(uint8Array) + ' ascii=' + uint8ArrayToString(uint8Array, 'ascii'));
+                    this.addWarning(`Unsupported meta-item: ${tagKey}[${child.header.name}] => value=${uint8ArrayToHex(uint8Array)} ascii=${uint8ArrayToString(uint8Array, 'ascii')}`);
+                }
             }
         }, metaAtom.getPayloadLength(0));
     }
     async parseValueAtom(tagKey, metaAtom) {
         const dataAtom = await this.tokenizer.readToken(new AtomToken.DataAtom(Number(metaAtom.header.length) - AtomToken.Header.len));
         if (dataAtom.type.set !== 0) {
-            throw new Error('Unsupported type-set != 0: ' + dataAtom.type.set);
+            throw new Error(`Unsupported type-set != 0: ${dataAtom.type.set}`);
         }
         // Use well-known-type table
         // Ref: https://developer.apple.com/library/content/documentation/QuickTime/QTFF/Metadata/Metadata.html#//apple_ref/doc/uid/TP40000939-CH1-SW35
@@ -364,24 +369,27 @@ export class MP4Parser extends BasicParser {
             case 0: // reserved: Reserved for use where no type needs to be indicated
                 switch (tagKey) {
                     case 'trkn':
-                    case 'disk':
+                    case 'disk': {
                         const num = Token.UINT8.get(dataAtom.value, 3);
                         const of = Token.UINT8.get(dataAtom.value, 5);
                         // console.log("  %s[data] = %s/%s", tagKey, num, of);
-                        await this.addTag(tagKey, num + '/' + of);
+                        await this.addTag(tagKey, `${num}/${of}`);
                         break;
-                    case 'gnre':
+                    }
+                    case 'gnre': {
                         const genreInt = Token.UINT8.get(dataAtom.value, 1);
                         const genreStr = Genres[genreInt - 1];
                         // console.log("  %s[data] = %s", tagKey, genreStr);
                         await this.addTag(tagKey, genreStr);
                         break;
-                    case 'rate':
+                    }
+                    case 'rate': {
                         const rate = new TextDecoder('ascii').decode(dataAtom.value);
                         await this.addTag(tagKey, rate);
                         break;
+                    }
                     default:
-                        debug('unknown proprietary value type for: ' + metaAtom.atomPath);
+                        debug(`unknown proprietary value type for: ${metaAtom.atomPath}`);
                 }
                 break;
             case 1: // UTF-8: Without any count or NULL terminator
@@ -515,3 +523,4 @@ export class MP4Parser extends BasicParser {
         return stcTable[stcTable.length - 1].samplesPerChunk;
     }
 }
+//# sourceMappingURL=MP4Parser.js.map

package/lib/mp4/MP4TagMapper.d.ts

@@ -1,6 +1,6 @@
 import { CaseInsensitiveTagMap } from '../common/CaseInsensitiveTagMap.js';
-import { ITag } from "../type.js";
-import { INativeMetadataCollector } from "../common/MetadataCollector.js";
+import type { ITag } from "../type.js";
+import type { INativeMetadataCollector } from "../common/MetadataCollector.js";
 export declare const tagType = "iTunes";
 export declare class MP4TagMapper extends CaseInsensitiveTagMap {
     constructor();

package/lib/mp4/MP4TagMapper.js

@@ -115,7 +115,7 @@ export class MP4TagMapper extends CaseInsensitiveTagMap {
             case 'rate':
                 tag.value = {
                     source: undefined,
-                    rating: parseFloat(tag.value) / 100
+                    rating: Number.parseFloat(tag.value) / 100
                 };
                 break;
         }

package/lib/mpeg/ExtendedLameHeader.d.ts

@@ -2,7 +2,7 @@
  * Extended Lame Header
  */
 import type { IGetToken } from 'strtok3';
-import { IReplayGain } from './ReplayGainDataFormat.js';
+import { type IReplayGain } from './ReplayGainDataFormat.js';
 /**
  * LAME Tag, extends the Xing header format
  * First added in LAME 3.12 for VBR
@@ -12,9 +12,9 @@ export interface IExtendedLameHeader {
     revision: number;
     vbr_method: number;
     lowpass_filter: number;
-    track_peak?: number;
-    track_gain: IReplayGain;
-    album_gain: IReplayGain;
+    track_peak?: number | null;
+    track_gain?: IReplayGain;
+    album_gain?: IReplayGain;
     music_length: number;
     music_crc: number;
     header_crc: number;

package/lib/mpeg/ExtendedLameHeader.js

@@ -17,7 +17,7 @@ export const ExtendedLameHeader = {
             revision: common.getBitAllignedNumber(buf, off, 0, 4),
             vbr_method: common.getBitAllignedNumber(buf, off, 4, 4),
             lowpass_filter: 100 * Token.UINT8.get(buf, off + 1),
-            track_peak: track_peak === 0 ? undefined : track_peak / Math.pow(2, 23),
+            track_peak: track_peak === 0 ? null : track_peak / 2 ** 23,
             track_gain: ReplayGain.get(buf, 6),
             album_gain: ReplayGain.get(buf, 8),
             music_length: Token.UINT32_BE.get(buf, off + 20),
@@ -26,3 +26,4 @@ export const ExtendedLameHeader = {
         };
     }
 };
+//# sourceMappingURL=ExtendedLameHeader.js.map

package/lib/mpeg/MpegParser.d.ts

@@ -4,7 +4,7 @@ export declare class MpegParser extends AbstractID3Parser {
     private syncFrameCount;
     private countSkipFrameData;
     private totalDataLength;
-    private audioFrameHeader;
+    private audioFrameHeader?;
     private bitrates;
     private offset;
     private frame_size;