music-metadata 11.10.4 → 11.10.6

package/lib/apev2/APEv2Parser.js

@@ -113,7 +113,7 @@ export class APEv2Parser extends BasicParser {
             const tagItemHeader = await this.tokenizer.readToken(TagItemHeader);
             bytesRemaining -= TagItemHeader.len + tagItemHeader.size;
             await this.tokenizer.peekBuffer(keyBuffer, { length: Math.min(keyBuffer.length, bytesRemaining) });
-            let zero = util.findZero(keyBuffer, 0, keyBuffer.length);
+            let zero = util.findZero(keyBuffer);
             const key = await this.tokenizer.readToken(new StringType(zero, 'ascii'));
             await this.tokenizer.ignore(1);
             bytesRemaining -= key.length + 1;
@@ -131,7 +131,7 @@ export class APEv2Parser extends BasicParser {
                     else {
                         const picData = new Uint8Array(tagItemHeader.size);
                         await this.tokenizer.readBuffer(picData);
-                        zero = util.findZero(picData, 0, picData.length);
+                        zero = util.findZero(picData);
                         const description = textDecode(picData.subarray(0, zero), 'utf-8');
                         const data = picData.subarray(zero + 1);
                         await this.metadata.addTag(tagFormat, key, {

package/lib/asf/AsfGuid.d.ts

@@ -0,0 +1,83 @@
+/**
+ * Ref:
+ * - https://tools.ietf.org/html/draft-fleischman-asf-01, Appendix A: ASF GUIDs
+ * - http://drang.s4.xrea.com/program/tips/id3tag/wmp/10_asf_guids.html
+ * - http://drang.s4.xrea.com/program/tips/id3tag/wmp/index.html
+ * - http://drang.s4.xrea.com/program/tips/id3tag/wmp/10_asf_guids.html
+ *
+ * ASF File Structure:
+ * - https://msdn.microsoft.com/en-us/library/windows/desktop/ee663575(v=vs.85).aspx
+ *
+ * ASF GUIDs:
+ * - http://drang.s4.xrea.com/program/tips/id3tag/wmp/10_asf_guids.html
+ * - https://github.com/dji-sdk/FFmpeg/blob/master/libavformat/asf.c
+ */
+export default class AsfGuid {
+    static HeaderObject: AsfGuid;
+    static DataObject: AsfGuid;
+    static SimpleIndexObject: AsfGuid;
+    static IndexObject: AsfGuid;
+    static MediaObjectIndexObject: AsfGuid;
+    static TimecodeIndexObject: AsfGuid;
+    static FilePropertiesObject: AsfGuid;
+    static StreamPropertiesObject: AsfGuid;
+    static HeaderExtensionObject: AsfGuid;
+    static CodecListObject: AsfGuid;
+    static ScriptCommandObject: AsfGuid;
+    static MarkerObject: AsfGuid;
+    static BitrateMutualExclusionObject: AsfGuid;
+    static ErrorCorrectionObject: AsfGuid;
+    static ContentDescriptionObject: AsfGuid;
+    static ExtendedContentDescriptionObject: AsfGuid;
+    static ContentBrandingObject: AsfGuid;
+    static StreamBitratePropertiesObject: AsfGuid;
+    static ContentEncryptionObject: AsfGuid;
+    static ExtendedContentEncryptionObject: AsfGuid;
+    static DigitalSignatureObject: AsfGuid;
+    static PaddingObject: AsfGuid;
+    static ExtendedStreamPropertiesObject: AsfGuid;
+    static AdvancedMutualExclusionObject: AsfGuid;
+    static GroupMutualExclusionObject: AsfGuid;
+    static StreamPrioritizationObject: AsfGuid;
+    static BandwidthSharingObject: AsfGuid;
+    static LanguageListObject: AsfGuid;
+    static MetadataObject: AsfGuid;
+    static MetadataLibraryObject: AsfGuid;
+    static IndexParametersObject: AsfGuid;
+    static MediaObjectIndexParametersObject: AsfGuid;
+    static TimecodeIndexParametersObject: AsfGuid;
+    static CompatibilityObject: AsfGuid;
+    static AdvancedContentEncryptionObject: AsfGuid;
+    static AudioMedia: AsfGuid;
+    static VideoMedia: AsfGuid;
+    static CommandMedia: AsfGuid;
+    static JFIF_Media: AsfGuid;
+    static Degradable_JPEG_Media: AsfGuid;
+    static FileTransferMedia: AsfGuid;
+    static BinaryMedia: AsfGuid;
+    static ASF_Index_Placeholder_Object: AsfGuid;
+    static fromBin(bin: Uint8Array, offset?: number): AsfGuid;
+    /**
+     * Decode GUID in format like "B503BF5F-2EA9-CF11-8EE3-00C00C205365"
+     * @param objectId Binary GUID
+     * @param offset Read offset in bytes, default 0
+     * @returns GUID as dashed hexadecimal representation
+     */
+    static decode(objectId: Uint8Array, offset?: number): string;
+    /**
+     * Decode stream type
+     * @param mediaType Media type GUID
+     * @returns Media type
+     */
+    static decodeMediaType(mediaType: AsfGuid): 'audio' | 'video' | 'command' | 'degradable-jpeg' | 'file-transfer' | 'binary' | undefined;
+    /**
+     * Encode GUID
+     * @param guid GUID like: "B503BF5F-2EA9-CF11-8EE3-00C00C205365"
+     * @returns Encoded Binary GUID
+     */
+    static encode(guid: string): Uint8Array;
+    str: string;
+    constructor(str: string);
+    equals(guid: AsfGuid): boolean;
+    toBin(): Uint8Array;
+}

package/lib/asf/AsfGuid.js

@@ -0,0 +1,109 @@
+import { parseWindowsGuid, Guid } from 'win-guid';
+/**
+ * Ref:
+ * - https://tools.ietf.org/html/draft-fleischman-asf-01, Appendix A: ASF GUIDs
+ * - http://drang.s4.xrea.com/program/tips/id3tag/wmp/10_asf_guids.html
+ * - http://drang.s4.xrea.com/program/tips/id3tag/wmp/index.html
+ * - http://drang.s4.xrea.com/program/tips/id3tag/wmp/10_asf_guids.html
+ *
+ * ASF File Structure:
+ * - https://msdn.microsoft.com/en-us/library/windows/desktop/ee663575(v=vs.85).aspx
+ *
+ * ASF GUIDs:
+ * - http://drang.s4.xrea.com/program/tips/id3tag/wmp/10_asf_guids.html
+ * - https://github.com/dji-sdk/FFmpeg/blob/master/libavformat/asf.c
+ */
+class AsfGuid {
+    static fromBin(bin, offset = 0) {
+        return new AsfGuid(AsfGuid.decode(bin, offset));
+    }
+    /**
+     * Decode GUID in format like "B503BF5F-2EA9-CF11-8EE3-00C00C205365"
+     * @param objectId Binary GUID
+     * @param offset Read offset in bytes, default 0
+     * @returns GUID as dashed hexadecimal representation
+     */
+    static decode(objectId, offset = 0) {
+        return new Guid(objectId.subarray(offset, offset + 16)).toString();
+    }
+    /**
+     * Decode stream type
+     * @param mediaType Media type GUID
+     * @returns Media type
+     */
+    static decodeMediaType(mediaType) {
+        switch (mediaType.str) {
+            case AsfGuid.AudioMedia.str: return 'audio';
+            case AsfGuid.VideoMedia.str: return 'video';
+            case AsfGuid.CommandMedia.str: return 'command';
+            case AsfGuid.Degradable_JPEG_Media.str: return 'degradable-jpeg';
+            case AsfGuid.FileTransferMedia.str: return 'file-transfer';
+            case AsfGuid.BinaryMedia.str: return 'binary';
+        }
+    }
+    /**
+     * Encode GUID
+     * @param guid GUID like: "B503BF5F-2EA9-CF11-8EE3-00C00C205365"
+     * @returns Encoded Binary GUID
+     */
+    static encode(guid) {
+        return parseWindowsGuid(guid);
+    }
+    constructor(str) {
+        this.str = str;
+    }
+    equals(guid) {
+        return this.str === guid.str;
+    }
+    toBin() {
+        return AsfGuid.encode(this.str);
+    }
+}
+// 10.1 Top-level ASF object GUIDs
+AsfGuid.HeaderObject = new AsfGuid("75B22630-668E-11CF-A6D9-00AA0062CE6C");
+AsfGuid.DataObject = new AsfGuid("75B22636-668E-11CF-A6D9-00AA0062CE6C");
+AsfGuid.SimpleIndexObject = new AsfGuid("33000890-E5B1-11CF-89F4-00A0C90349CB");
+AsfGuid.IndexObject = new AsfGuid("D6E229D3-35DA-11D1-9034-00A0C90349BE");
+AsfGuid.MediaObjectIndexObject = new AsfGuid("FEB103F8-12AD-4C64-840F-2A1D2F7AD48C");
+AsfGuid.TimecodeIndexObject = new AsfGuid("3CB73FD0-0C4A-4803-953D-EDF7B6228F0C");
+// 10.2 Header Object GUIDs
+AsfGuid.FilePropertiesObject = new AsfGuid("8CABDCA1-A947-11CF-8EE4-00C00C205365");
+AsfGuid.StreamPropertiesObject = new AsfGuid("B7DC0791-A9B7-11CF-8EE6-00C00C205365");
+AsfGuid.HeaderExtensionObject = new AsfGuid("5FBF03B5-A92E-11CF-8EE3-00C00C205365");
+AsfGuid.CodecListObject = new AsfGuid("86D15240-311D-11D0-A3A4-00A0C90348F6");
+AsfGuid.ScriptCommandObject = new AsfGuid("1EFB1A30-0B62-11D0-A39B-00A0C90348F6");
+AsfGuid.MarkerObject = new AsfGuid("F487CD01-A951-11CF-8EE6-00C00C205365");
+AsfGuid.BitrateMutualExclusionObject = new AsfGuid("D6E229DC-35DA-11D1-9034-00A0C90349BE");
+AsfGuid.ErrorCorrectionObject = new AsfGuid("75B22635-668E-11CF-A6D9-00AA0062CE6C");
+AsfGuid.ContentDescriptionObject = new AsfGuid("75B22633-668E-11CF-A6D9-00AA0062CE6C");
+AsfGuid.ExtendedContentDescriptionObject = new AsfGuid("D2D0A440-E307-11D2-97F0-00A0C95EA850");
+AsfGuid.ContentBrandingObject = new AsfGuid("2211B3FA-BD23-11D2-B4B7-00A0C955FC6E");
+AsfGuid.StreamBitratePropertiesObject = new AsfGuid("7BF875CE-468D-11D1-8D82-006097C9A2B2");
+AsfGuid.ContentEncryptionObject = new AsfGuid("2211B3FB-BD23-11D2-B4B7-00A0C955FC6E");
+AsfGuid.ExtendedContentEncryptionObject = new AsfGuid("298AE614-2622-4C17-B935-DAE07EE9289C");
+AsfGuid.DigitalSignatureObject = new AsfGuid("2211B3FC-BD23-11D2-B4B7-00A0C955FC6E");
+AsfGuid.PaddingObject = new AsfGuid("1806D474-CADF-4509-A4BA-9AABCB96AAE8");
+// 10.3 Header Extension Object GUIDs
+AsfGuid.ExtendedStreamPropertiesObject = new AsfGuid("14E6A5CB-C672-4332-8399-A96952065B5A");
+AsfGuid.AdvancedMutualExclusionObject = new AsfGuid("A08649CF-4775-4670-8A16-6E35357566CD");
+AsfGuid.GroupMutualExclusionObject = new AsfGuid("D1465A40-5A79-4338-B71B-E36B8FD6C249");
+AsfGuid.StreamPrioritizationObject = new AsfGuid("D4FED15B-88D3-454F-81F0-ED5C45999E24");
+AsfGuid.BandwidthSharingObject = new AsfGuid("A69609E6-517B-11D2-B6AF-00C04FD908E9");
+AsfGuid.LanguageListObject = new AsfGuid("7C4346A9-EFE0-4BFC-B229-393EDE415C85");
+AsfGuid.MetadataObject = new AsfGuid("C5F8CBEA-5BAF-4877-8467-AA8C44FA4CCA");
+AsfGuid.MetadataLibraryObject = new AsfGuid("44231C94-9498-49D1-A141-1D134E457054");
+AsfGuid.IndexParametersObject = new AsfGuid("D6E229DF-35DA-11D1-9034-00A0C90349BE");
+AsfGuid.MediaObjectIndexParametersObject = new AsfGuid("6B203BAD-3F11-48E4-ACA8-D7613DE2CFA7");
+AsfGuid.TimecodeIndexParametersObject = new AsfGuid("F55E496D-9797-4B5D-8C8B-604DFE9BFB24");
+AsfGuid.CompatibilityObject = new AsfGuid("26F18B5D-4584-47EC-9F5F-0E651F0452C9");
+AsfGuid.AdvancedContentEncryptionObject = new AsfGuid("43058533-6981-49E6-9B74-AD12CB86D58C");
+// 10.4 Stream Properties Object Stream Type GUIDs
+AsfGuid.AudioMedia = new AsfGuid("F8699E40-5B4D-11CF-A8FD-00805F5C442B");
+AsfGuid.VideoMedia = new AsfGuid("BC19EFC0-5B4D-11CF-A8FD-00805F5C442B");
+AsfGuid.CommandMedia = new AsfGuid("59DACFC0-59E6-11D0-A3AC-00A0C90348F6");
+AsfGuid.JFIF_Media = new AsfGuid("B61BE100-5B4E-11CF-A8FD-00805F5C442B");
+AsfGuid.Degradable_JPEG_Media = new AsfGuid("35907DE0-E415-11CF-A917-00805F5C442B");
+AsfGuid.FileTransferMedia = new AsfGuid("91BD222C-F21C-497A-8B6D-5AA86BFC0185");
+AsfGuid.BinaryMedia = new AsfGuid("3AFB65E2-47EF-40F2-AC2C-70A90D71D343");
+AsfGuid.ASF_Index_Placeholder_Object = new AsfGuid("D9AADE20-7C17-4F9C-BC28-8555DD98E2A2");
+export default AsfGuid;

package/lib/asf/AsfObject.d.ts

@@ -1,6 +1,6 @@
 import type { IGetToken, ITokenizer } from 'strtok3';
 import type { AnyTagValue, IPicture, ITag } from '../type.js';
-import GUID from './GUID.js';
+import AsfGuid from './AsfGuid.js';
 declare const AsfContentParseError_base: {
     new (message: string): {
         readonly fileType: string;
@@ -52,7 +52,7 @@ export interface IAsfObjectHeader {
     /**
      * A GUID that identifies the object. 128 bits
      */
-    objectId: GUID;
+    objectId: AsfGuid;
     /**
      * The size of the object (64-bits)
      */
@@ -95,7 +95,7 @@ export interface IFilePropertiesObject {
      * The value of this field shall be regenerated every time the file is modified in any way.
      * The value of this field shall be identical to the value of the File ID field of the Data Object.
      */
-    fileId: GUID;
+    fileId: AsfGuid;
     /**
      * Specifies the size, in bytes, of the entire file.
      * The value of this field is invalid if the Broadcast Flag bit in the Flags field is set to 1.
@@ -186,7 +186,7 @@ export interface IFilePropertiesObject {
  * Ref: http://drang.s4.xrea.com/program/tips/id3tag/wmp/03_asf_top_level_header_object.html#3_2
  */
 export declare class FilePropertiesObject extends State<IFilePropertiesObject> {
-    static guid: GUID;
+    static guid: AsfGuid;
     get(buf: Uint8Array, off: number): IFilePropertiesObject;
 }
 /**
@@ -200,18 +200,18 @@ export interface IStreamPropertiesObject {
     /**
      * Error Correction Type
      */
-    errorCorrectionType: GUID;
+    errorCorrectionType: AsfGuid;
 }
 /**
  * Token for: 3.3 Stream Properties Object (mandatory, one per stream)
  * Ref: http://drang.s4.xrea.com/program/tips/id3tag/wmp/03_asf_top_level_header_object.html#3_3
  */
 export declare class StreamPropertiesObject extends State<IStreamPropertiesObject> {
-    static guid: GUID;
+    static guid: AsfGuid;
     get(buf: Uint8Array, off: number): IStreamPropertiesObject;
 }
 export interface IHeaderExtensionObject {
-    reserved1: GUID;
+    reserved1: AsfGuid;
     reserved2: number;
     extensionDataSize: number;
 }
@@ -220,7 +220,7 @@ export interface IHeaderExtensionObject {
  * Ref: http://drang.s4.xrea.com/program/tips/id3tag/wmp/03_asf_top_level_header_object.html#3_4
  */
 export declare class HeaderExtensionObject implements IGetToken<IHeaderExtensionObject> {
-    static guid: GUID;
+    static guid: AsfGuid;
     len: number;
     constructor();
     get(buf: Uint8Array, off: number): IHeaderExtensionObject;
@@ -244,7 +244,7 @@ export declare function readCodecEntries(tokenizer: ITokenizer): Promise<ICodecE
  * Ref: http://drang.s4.xrea.com/program/tips/id3tag/wmp/03_asf_top_level_header_object.html#3_10
  */
 export declare class ContentDescriptionObjectState extends State<ITag[]> {
-    static guid: GUID;
+    static guid: AsfGuid;
     private static contentDescTags;
     get(buf: Uint8Array, off: number): ITag[];
 }
@@ -253,7 +253,7 @@ export declare class ContentDescriptionObjectState extends State<ITag[]> {
  * Ref: http://drang.s4.xrea.com/program/tips/id3tag/wmp/03_asf_top_level_header_object.html#3_11
  */
 export declare class ExtendedContentDescriptionObjectState extends State<ITag[]> {
-    static guid: GUID;
+    static guid: AsfGuid;
     get(buf: Uint8Array, off: number): ITag[];
 }
 export interface IStreamName {
@@ -292,7 +292,7 @@ export interface IExtendedStreamPropertiesObject {
  * Ref: http://drang.s4.xrea.com/program/tips/id3tag/wmp/04_objects_in_the_asf_header_extension_object.html#4_1
  */
 export declare class ExtendedStreamPropertiesObjectState extends State<IExtendedStreamPropertiesObject> {
-    static guid: GUID;
+    static guid: AsfGuid;
     get(buf: Uint8Array, off: number): IExtendedStreamPropertiesObject;
 }
 /**
@@ -300,11 +300,11 @@ export declare class ExtendedStreamPropertiesObjectState extends State<IExtended
  * Ref: http://drang.s4.xrea.com/program/tips/id3tag/wmp/04_objects_in_the_asf_header_extension_object.html#4_7
  */
 export declare class MetadataObjectState extends State<ITag[]> {
-    static guid: GUID;
+    static guid: AsfGuid;
     get(uint8Array: Uint8Array, off: number): ITag[];
 }
 export declare class MetadataLibraryObjectState extends MetadataObjectState {
-    static guid: GUID;
+    static guid: AsfGuid;
 }
 export interface IWmPicture extends IPicture {
     type: string;

package/lib/asf/AsfObject.js

@@ -1,7 +1,7 @@
 // ASF Objects
 import * as Token from 'token-types';
 import * as util from '../common/Util.js';
-import GUID from './GUID.js';
+import AsfGuid from './AsfGuid.js';
 import { getParserForAttr, parseUnicodeAttr } from './AsfUtil.js';
 import { AttachedPictureType } from '../id3v2/ID3v2Token.js';
 import { makeUnexpectedFileContentError } from '../ParseError.js';
@@ -44,7 +44,7 @@ export const TopLevelHeaderObjectToken = {
     len: 30,
     get: (buf, off) => {
         return {
-            objectId: GUID.fromBin(buf, off),
+            objectId: AsfGuid.fromBin(buf, off),
             objectSize: Number(Token.UINT64_LE.get(buf, off + 16)),
             numberOfHeaderObjects: Token.UINT32_LE.get(buf, off + 24)
             // Reserved: 2 bytes
@@ -59,7 +59,7 @@ export const HeaderObjectToken = {
     len: 24,
     get: (buf, off) => {
         return {
-            objectId: GUID.fromBin(buf, off),
+            objectId: AsfGuid.fromBin(buf, off),
             objectSize: Number(Token.UINT64_LE.get(buf, off + 16))
         };
     }
@@ -94,7 +94,7 @@ export class IgnoreObjectState extends State {
 export class FilePropertiesObject extends State {
     get(buf, off) {
         return {
-            fileId: GUID.fromBin(buf, off),
+            fileId: AsfGuid.fromBin(buf, off),
             fileSize: Token.UINT64_LE.get(buf, off + 16),
             creationDate: Token.UINT64_LE.get(buf, off + 24),
             dataPacketsCount: Token.UINT64_LE.get(buf, off + 32),
@@ -112,7 +112,7 @@ export class FilePropertiesObject extends State {
         };
     }
 }
-FilePropertiesObject.guid = GUID.FilePropertiesObject;
+FilePropertiesObject.guid = AsfGuid.FilePropertiesObject;
 /**
  * Token for: 3.3 Stream Properties Object (mandatory, one per stream)
  * Ref: http://drang.s4.xrea.com/program/tips/id3tag/wmp/03_asf_top_level_header_object.html#3_3
@@ -120,13 +120,13 @@ FilePropertiesObject.guid = GUID.FilePropertiesObject;
 export class StreamPropertiesObject extends State {
     get(buf, off) {
         return {
-            streamType: GUID.decodeMediaType(GUID.fromBin(buf, off)),
-            errorCorrectionType: GUID.fromBin(buf, off + 8)
+            streamType: AsfGuid.decodeMediaType(AsfGuid.fromBin(buf, off)),
+            errorCorrectionType: AsfGuid.fromBin(buf, off + 8)
             // ToDo
         };
     }
 }
-StreamPropertiesObject.guid = GUID.StreamPropertiesObject;
+StreamPropertiesObject.guid = AsfGuid.StreamPropertiesObject;
 /**
  * 3.4: Header Extension Object (mandatory, one only)
  * Ref: http://drang.s4.xrea.com/program/tips/id3tag/wmp/03_asf_top_level_header_object.html#3_4
@@ -138,13 +138,13 @@ export class HeaderExtensionObject {
     get(buf, off) {
         const view = new DataView(buf.buffer, off);
         return {
-            reserved1: GUID.fromBin(buf, off),
+            reserved1: AsfGuid.fromBin(buf, off),
             reserved2: view.getUint16(16, true),
             extensionDataSize: view.getUint16(18, true)
         };
     }
 }
-HeaderExtensionObject.guid = GUID.HeaderExtensionObject;
+HeaderExtensionObject.guid = AsfGuid.HeaderExtensionObject;
 /**
  * 3.5: The Codec List Object provides user-friendly information about the codecs and formats used to encode the content found in the ASF file.
  * Ref: http://drang.s4.xrea.com/program/tips/id3tag/wmp/03_asf_top_level_header_object.html#3_5
@@ -217,7 +217,7 @@ export class ContentDescriptionObjectState extends State {
         return tags;
     }
 }
-ContentDescriptionObjectState.guid = GUID.ContentDescriptionObject;
+ContentDescriptionObjectState.guid = AsfGuid.ContentDescriptionObject;
 ContentDescriptionObjectState.contentDescTags = ['Title', 'Author', 'Copyright', 'Description', 'Rating'];
 /**
  * 3.11 Extended Content Description Object (optional, one only)
@@ -245,7 +245,7 @@ export class ExtendedContentDescriptionObjectState extends State {
         return tags;
     }
 }
-ExtendedContentDescriptionObjectState.guid = GUID.ExtendedContentDescriptionObject;
+ExtendedContentDescriptionObjectState.guid = AsfGuid.ExtendedContentDescriptionObject;
 /**
  * 4.1 Extended Stream Properties Object (optional, 1 per media stream)
  * Ref: http://drang.s4.xrea.com/program/tips/id3tag/wmp/04_objects_in_the_asf_header_extension_object.html#4_1
@@ -279,7 +279,7 @@ export class ExtendedStreamPropertiesObjectState extends State {
         };
     }
 }
-ExtendedStreamPropertiesObjectState.guid = GUID.ExtendedStreamPropertiesObject;
+ExtendedStreamPropertiesObjectState.guid = AsfGuid.ExtendedStreamPropertiesObject;
 /**
  * 4.7  Metadata Object (optional, 0 or 1)
  * Ref: http://drang.s4.xrea.com/program/tips/id3tag/wmp/04_objects_in_the_asf_header_extension_object.html#4_7
@@ -307,11 +307,11 @@ export class MetadataObjectState extends State {
         return tags;
     }
 }
-MetadataObjectState.guid = GUID.MetadataObject;
+MetadataObjectState.guid = AsfGuid.MetadataObject;
 // 4.8	Metadata Library Object (optional, 0 or 1)
 export class MetadataLibraryObjectState extends MetadataObjectState {
 }
-MetadataLibraryObjectState.guid = GUID.MetadataLibraryObject;
+MetadataLibraryObjectState.guid = AsfGuid.MetadataLibraryObject;
 /**
  * Ref: https://msdn.microsoft.com/en-us/library/windows/desktop/dd757977(v=vs.85).aspx
  */

package/lib/asf/AsfParser.js

@@ -1,6 +1,6 @@
 import initDebug from 'debug';
 import { TrackType } from '../type.js';
-import GUID from './GUID.js';
+import AsfGuid from './AsfGuid.js';
 import * as AsfObject from './AsfObject.js';
 import { BasicParser } from '../common/BasicParser.js';
 import { AsfContentParseError } from './AsfObject.js';
@@ -19,7 +19,7 @@ const headerType = 'asf';
 export class AsfParser extends BasicParser {
     async parse() {
         const header = await this.tokenizer.readToken(AsfObject.TopLevelHeaderObjectToken);
-        if (!header.objectId.equals(GUID.HeaderObject)) {
+        if (!header.objectId.equals(AsfGuid.HeaderObject)) {
             throw new AsfContentParseError(`expected asf header; but was not found; got: ${header.objectId.str}`);
         }
         try {
@@ -61,7 +61,7 @@ export class AsfParser extends BasicParser {
                     tags = await this.tokenizer.readToken(new AsfObject.ExtendedContentDescriptionObjectState(header));
                     await this.addTags(tags);
                     break;
-                case GUID.CodecListObject.str: {
+                case AsfGuid.CodecListObject.str: {
                     const codecs = await AsfObject.readCodecEntries(this.tokenizer);
                     codecs.forEach(codec => {
                         this.metadata.addStreamInfo({
@@ -73,11 +73,11 @@ export class AsfParser extends BasicParser {
                     this.metadata.setFormat('codec', audioCodecs);
                     break;
                 }
-                case GUID.StreamBitratePropertiesObject.str:
+                case AsfGuid.StreamBitratePropertiesObject.str:
                     // ToDo?
                     await this.tokenizer.ignore(header.objectSize - AsfObject.HeaderObjectToken.len);
                     break;
-                case GUID.PaddingObject.str:
+                case AsfGuid.PaddingObject.str:
                     // ToDo: register bytes pad
                     debug('Padding: %s bytes', header.objectSize - AsfObject.HeaderObjectToken.len);
                     await this.tokenizer.ignore(header.objectSize - AsfObject.HeaderObjectToken.len);
@@ -114,14 +114,14 @@ export class AsfParser extends BasicParser {
                     await this.addTags(mlTags);
                     break;
                 }
-                case GUID.PaddingObject.str:
+                case AsfGuid.PaddingObject.str:
                     // ToDo: register bytes pad
                     await this.tokenizer.ignore(remaining);
                     break;
-                case GUID.CompatibilityObject.str:
+                case AsfGuid.CompatibilityObject.str:
                     await this.tokenizer.ignore(remaining);
                     break;
-                case GUID.ASF_Index_Placeholder_Object.str:
+                case AsfGuid.ASF_Index_Placeholder_Object.str:
                     await this.tokenizer.ignore(remaining);
                     break;
                 default:

package/lib/common/Util.d.ts

@@ -2,14 +2,12 @@ import type { IRatio } from '../type.js';
 export type StringEncoding = 'ascii' | 'utf8' | 'utf-16le' | 'ucs2' | 'base64url' | 'latin1' | 'hex';
 export declare function getBit(buf: Uint8Array, off: number, bit: number): boolean;
 /**
- * Found delimiting zero in uint8Array
+ * Find delimiting zero in uint8Array
  * @param uint8Array Uint8Array to find the zero delimiter in
- * @param start Offset in uint8Array
- * @param end Last position to parse in uint8Array
  * @param encoding The string encoding used
- * @return Absolute position on uint8Array where zero found
+ * @return position in uint8Array where zero found, or uint8Array.length if not found
  */
-export declare function findZero(uint8Array: Uint8Array, start: number, end: number, encoding?: StringEncoding): number;
+export declare function findZero(uint8Array: Uint8Array, encoding?: StringEncoding): number;
 export declare function trimRightNull(x: string): string;
 /**
  * Decode string

package/lib/common/Util.js

@@ -5,33 +5,31 @@ export function getBit(buf, off, bit) {
     return (buf[off] & (1 << bit)) !== 0;
 }
 /**
- * Found delimiting zero in uint8Array
+ * Find delimiting zero in uint8Array
  * @param uint8Array Uint8Array to find the zero delimiter in
- * @param start Offset in uint8Array
- * @param end Last position to parse in uint8Array
  * @param encoding The string encoding used
- * @return Absolute position on uint8Array where zero found
+ * @return position in uint8Array where zero found, or uint8Array.length if not found
  */
-export function findZero(uint8Array, start, end, encoding) {
-    let i = start;
+export function findZero(uint8Array, encoding) {
+    const len = uint8Array.length;
     if (encoding === 'utf-16le') {
-        while (uint8Array[i] !== 0 || uint8Array[i + 1] !== 0) {
-            if (i >= end)
-                return end;
-            i += 2;
+        // Look for 0x00 0x00 on 2-byte boundary
+        for (let i = 0; i + 1 < len; i += 2) {
+            if (uint8Array[i] === 0 && uint8Array[i + 1] === 0)
+                return i;
         }
-        return i;
+        return len;
     }
-    while (uint8Array[i] !== 0) {
-        if (i >= end)
-            return end;
-        i++;
+    // latin1 / utf8 / utf16be (caller typically handles utf16be separately or via decode)
+    for (let i = 0; i < len; i++) {
+        if (uint8Array[i] === 0)
+            return i;
     }
-    return i;
+    return len;
 }
 export function trimRightNull(x) {
     const pos0 = x.indexOf('\0');
-    return pos0 === -1 ? x : x.substr(0, pos0);
+    return pos0 === -1 ? x : x.substring(0, pos0);
 }
 function swapBytes(uint8Array) {
     const l = uint8Array.length;

package/lib/ebml/EbmlIterator.d.ts

@@ -44,7 +44,6 @@ export type IElementListener = {
  * WEBM VP8 AUDIO FILE
  */
 export declare class EbmlIterator {
-    private padding;
     private parserMap;
     private ebmlMaxIDLength;
     private ebmlMaxSizeLength;

package/lib/ebml/EbmlIterator.js

@@ -27,7 +27,6 @@ export class EbmlIterator {
      * @param tokenizer
      */
     constructor(tokenizer) {
-        this.padding = 0;
         this.parserMap = new Map();
         this.ebmlMaxIDLength = 4;
         this.ebmlMaxSizeLength = 8;
@@ -110,12 +109,10 @@ export class EbmlIterator {
             else {
                 switch (element.id) {
                     case 0xec: // void
-                        this.padding += element.len;
                         await this.tokenizer.ignore(element.len);
                         break;
                     default:
                         debug(`parseEbml: parent=${getElementPath(dtdElement)}, unknown child: id=${element.id.toString(16)} at position=${elementPosition}`);
-                        this.padding += element.len;
                         await this.tokenizer.ignore(element.len);
                 }
             }
@@ -203,7 +200,7 @@ function linkParents(element) {
         Object.keys(element.container)
             .map(id => {
             const child = element.container[id];
-            child.id = Number.parseInt(id);
+            child.id = Number.parseInt(id, 10);
             return child;
         }).forEach(child => {
             child.parent = element;

package/lib/flac/FlacParser.d.ts

@@ -3,7 +3,6 @@ import { AbstractID3Parser } from '../id3v2/AbstractID3Parser.js';
 import type { IBlockStreamInfo } from './FlacToken.js';
 export declare class FlacParser extends AbstractID3Parser {
     private vorbisParser;
-    private padding;
     postId3v2Parse(): Promise<void>;
     private parseDataBlock;
     /**

package/lib/flac/FlacParser.js

@@ -14,7 +14,6 @@ export class FlacParser extends AbstractID3Parser {
     constructor() {
         super(...arguments);
         this.vorbisParser = new VorbisStream(this.metadata, this.options);
-        this.padding = 0;
     }
     async postId3v2Parse() {
         const fourCC = await this.tokenizer.readToken(FourCcToken);
@@ -39,7 +38,6 @@ export class FlacParser extends AbstractID3Parser {
             case Flac.BlockType.STREAMINFO:
                 return this.readBlockStreamInfo(blockHeader.length);
             case Flac.BlockType.PADDING:
-                this.padding += blockHeader.length;
                 break;
             case Flac.BlockType.APPLICATION:
                 break;

package/lib/id3v2/FrameHeader.d.ts

@@ -0,0 +1,31 @@
+import { type ID3v2MajorVersion } from './ID3v2Token.js';
+import type { IWarningCollector } from '../common/MetadataCollector.js';
+export interface IFrameFlags {
+    status: {
+        tag_alter_preservation: boolean;
+        file_alter_preservation: boolean;
+        read_only: boolean;
+    };
+    format: {
+        grouping_identity: boolean;
+        compression: boolean;
+        encryption: boolean;
+        unsynchronisation: boolean;
+        data_length_indicator: boolean;
+    };
+}
+export interface IFrameHeader {
+    id: string;
+    length: number;
+    flags?: IFrameFlags;
+}
+/**
+ * Frame header length (bytes) depending on ID3v2 major version.
+ */
+export declare function getFrameHeaderLength(majorVer: number): 6 | 10;
+/**
+ * Factory: parse a frame header from its header bytes (6 for v2.2, 10 for v2.3/v2.4).
+ *
+ * Note: It only *parses* and does light validation. It does not read payload bytes.
+ */
+export declare function readFrameHeader(uint8Array: Uint8Array, majorVer: ID3v2MajorVersion, warningCollector: IWarningCollector): IFrameHeader;