music-metadata 8.3.0 → 9.0.1

package/lib/ogg/OggParser.d.ts

@@ -1,4 +1,4 @@
-import { IGetToken } from 'strtok3/core';
+import { IGetToken } from 'strtok3';
 import { BasicParser } from '../common/BasicParser.js';
 import * as Ogg from './Ogg.js';
 export declare class SegmentTable implements IGetToken<Ogg.ISegmentTable> {

package/lib/ogg/OggParser.js

@@ -1,5 +1,5 @@
 import * as Token from 'token-types';
-import { EndOfStreamError } from 'strtok3/core';
+import { EndOfStreamError } from 'strtok3';
 import initDebug from 'debug';
 import * as util from '../common/Util.js';
 import { FourCcToken } from '../common/FourCC.js';
@@ -51,7 +51,7 @@ export class OggParser extends BasicParser {
                 const pageData = await this.tokenizer.readToken(new Token.Uint8ArrayType(segmentTable.totalPageSize));
                 debug('firstPage=%s, lastPage=%s, continued=%s', header.headerType.firstPage, header.headerType.lastPage, header.headerType.continued);
                 if (header.headerType.firstPage) {
-                    const id = new Token.StringType(7, 'ascii').get(Buffer.from(pageData), 0);
+                    const id = new TextDecoder('ascii').decode(pageData.subarray(0, 7));
                     switch (id) {
                         case '\x01vorbis': // Ogg/Vorbis
                             debug('Set page consumer to Ogg/Vorbis');
@@ -74,7 +74,7 @@ export class OggParser extends BasicParser {
                             throw new Error('gg audio-codec not recognized (id=' + id + ')');
                     }
                 }
-                this.pageConsumer.parsePage(header, pageData);
+                await this.pageConsumer.parsePage(header, pageData);
             } while (!header.headerType.lastPage);
         }
         catch (err) {
@@ -90,7 +90,7 @@ export class OggParser extends BasicParser {
                 if (this.pageNumber > 0) {
                     // ignore this error: work-around if last OGG-page is not marked with last-page flag
                     this.metadata.addWarning('Invalid FourCC ID, maybe last OGG-page is not marked with last-page flag');
-                    this.pageConsumer.flush();
+                    await this.pageConsumer.flush();
                 }
             }
             else {
@@ -110,7 +110,7 @@ OggParser.Header = {
                 firstPage: util.getBit(buf, off + 5, 1),
                 lastPage: util.getBit(buf, off + 5, 2)
             },
-            // packet_flag: buf.readUInt8(off + 5),
+            // packet_flag: Token.UINT8.get(buf, off + 5),
             absoluteGranulePosition: Number(Token.UINT64_LE.get(buf, off + 6)),
             streamSerialNumber: Token.UINT32_LE.get(buf, off + 14),
             pageSequenceNo: Token.UINT32_LE.get(buf, off + 18),

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

@@ -1,4 +1,4 @@
-import { IGetToken } from 'strtok3/core';
+import type { IGetToken } from 'strtok3';
 /**
  * Opus ID Header interface
  * Ref: https://wiki.xiph.org/OggOpus#ID_Header

package/lib/ogg/opus/Opus.js

@@ -13,12 +13,12 @@ export class IdHeader {
     get(buf, off) {
         return {
             magicSignature: new Token.StringType(8, 'ascii').get(buf, off + 0),
-            version: buf.readUInt8(off + 8),
-            channelCount: buf.readUInt8(off + 9),
-            preSkip: buf.readInt16LE(off + 10),
-            inputSampleRate: buf.readInt32LE(off + 12),
-            outputGain: buf.readInt16LE(off + 16),
-            channelMapping: buf.readUInt8(off + 18)
+            version: Token.UINT8.get(buf, off + 8),
+            channelCount: Token.UINT8.get(buf, off + 9),
+            preSkip: Token.UINT16_LE.get(buf, off + 10),
+            inputSampleRate: Token.UINT32_LE.get(buf, off + 12),
+            outputGain: Token.UINT16_LE.get(buf, off + 16),
+            channelMapping: Token.UINT8.get(buf, off + 18)
         };
     }
 }

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

@@ -1,5 +1,4 @@
-/// <reference types="node" resolution-mode="require"/>
-import { ITokenizer } from 'strtok3/core';
+import { ITokenizer } from 'strtok3';
 import { IPageHeader } from '../Ogg.js';
 import { VorbisParser } from '../vorbis/VorbisParser.js';
 import { IOptions } from '../../type.js';
@@ -17,9 +16,9 @@ export declare class OpusParser extends VorbisParser {
     /**
      * Parse first Opus Ogg page
      * @param {IPageHeader} header
-     * @param {Buffer} pageData
+     * @param {Uint8Array} pageData
      */
-    protected parseFirstPage(header: IPageHeader, pageData: Buffer): void;
-    protected parseFullPage(pageData: Buffer): void;
+    protected parseFirstPage(header: IPageHeader, pageData: Uint8Array): void;
+    protected parseFullPage(pageData: Uint8Array): Promise<void>;
     calculateDuration(header: IPageHeader): void;
 }

package/lib/ogg/opus/OpusParser.js

@@ -15,7 +15,7 @@ export class OpusParser extends VorbisParser {
     /**
      * Parse first Opus Ogg page
      * @param {IPageHeader} header
-     * @param {Buffer} pageData
+     * @param {Uint8Array} pageData
      */
     parseFirstPage(header, pageData) {
         this.metadata.setFormat('codec', 'Opus');
@@ -26,11 +26,11 @@ export class OpusParser extends VorbisParser {
         this.metadata.setFormat('sampleRate', this.idHeader.inputSampleRate);
         this.metadata.setFormat('numberOfChannels', this.idHeader.channelCount);
     }
-    parseFullPage(pageData) {
+    async parseFullPage(pageData) {
         const magicSignature = new Token.StringType(8, 'ascii').get(pageData, 0);
         switch (magicSignature) {
             case 'OpusTags':
-                this.parseUserCommentList(pageData, 8);
+                await this.parseUserCommentList(pageData, 8);
                 this.lastPos = this.tokenizer.position - pageData.length;
                 break;
             default:

package/lib/ogg/speex/Speex.d.ts

@@ -1,4 +1,4 @@
-import { IGetToken } from 'strtok3/core';
+import type { IGetToken } from 'strtok3';
 /**
  * Speex Header Packet
  * Ref: https://www.speex.org/docs/manual/speex-manual/node8.html#SECTION00830000000000000000

package/lib/ogg/speex/Speex.js

@@ -10,19 +10,19 @@ export const Header = {
         return {
             speex: new Token.StringType(8, 'ascii').get(buf, off + 0),
             version: util.trimRightNull(new Token.StringType(20, 'ascii').get(buf, off + 8)),
-            version_id: buf.readInt32LE(off + 28),
-            header_size: buf.readInt32LE(off + 32),
-            rate: buf.readInt32LE(off + 36),
-            mode: buf.readInt32LE(off + 40),
-            mode_bitstream_version: buf.readInt32LE(off + 44),
-            nb_channels: buf.readInt32LE(off + 48),
-            bitrate: buf.readInt32LE(off + 52),
-            frame_size: buf.readInt32LE(off + 56),
-            vbr: buf.readInt32LE(off + 60),
-            frames_per_packet: buf.readInt32LE(off + 64),
-            extra_headers: buf.readInt32LE(off + 68),
-            reserved1: buf.readInt32LE(off + 72),
-            reserved2: buf.readInt32LE(off + 76)
+            version_id: Token.INT32_LE.get(buf, off + 28),
+            header_size: Token.INT32_LE.get(buf, off + 32),
+            rate: Token.INT32_LE.get(buf, off + 36),
+            mode: Token.INT32_LE.get(buf, off + 40),
+            mode_bitstream_version: Token.INT32_LE.get(buf, off + 44),
+            nb_channels: Token.INT32_LE.get(buf, off + 48),
+            bitrate: Token.INT32_LE.get(buf, off + 52),
+            frame_size: Token.INT32_LE.get(buf, off + 56),
+            vbr: Token.INT32_LE.get(buf, off + 60),
+            frames_per_packet: Token.INT32_LE.get(buf, off + 64),
+            extra_headers: Token.INT32_LE.get(buf, off + 68),
+            reserved1: Token.INT32_LE.get(buf, off + 72),
+            reserved2: Token.INT32_LE.get(buf, off + 76)
         };
     }
 };

package/lib/ogg/speex/SpeexParser.d.ts

@@ -1,5 +1,4 @@
-/// <reference types="node" resolution-mode="require"/>
-import { ITokenizer } from 'strtok3/core';
+import { ITokenizer } from 'strtok3';
 import { IPageHeader } from '../Ogg.js';
 import { VorbisParser } from '../vorbis/VorbisParser.js';
 import { IOptions } from '../../type.js';
@@ -16,7 +15,7 @@ export declare class SpeexParser extends VorbisParser {
     /**
      * Parse first Speex Ogg page
      * @param {IPageHeader} header
-     * @param {Buffer} pageData
+     * @param {Uint8Array} pageData
      */
-    protected parseFirstPage(header: IPageHeader, pageData: Buffer): void;
+    protected parseFirstPage(header: IPageHeader, pageData: Uint8Array): void;
 }

package/lib/ogg/speex/SpeexParser.js

@@ -16,7 +16,7 @@ export class SpeexParser extends VorbisParser {
     /**
      * Parse first Speex Ogg page
      * @param {IPageHeader} header
-     * @param {Buffer} pageData
+     * @param {Uint8Array} pageData
      */
     parseFirstPage(header, pageData) {
         debug('First Ogg/Speex page');

package/lib/ogg/theora/Theora.d.ts

@@ -1,4 +1,4 @@
-import { IGetToken } from 'strtok3/core';
+import type { IGetToken } from 'strtok3';
 /**
  * 6.2 Identification Header
  * Ref: https://theora.org/doc/Theora.pdf: 6.2 Identification Header Decode

package/lib/ogg/theora/Theora.js

@@ -8,13 +8,13 @@ export const IdentificationHeader = {
     get: (buf, off) => {
         return {
             id: new Token.StringType(7, 'ascii').get(buf, off),
-            vmaj: buf.readUInt8(off + 7),
-            vmin: buf.readUInt8(off + 8),
-            vrev: buf.readUInt8(off + 9),
-            vmbw: buf.readUInt16BE(off + 10),
-            vmbh: buf.readUInt16BE(off + 17),
+            vmaj: Token.UINT8.get(buf, off + 7),
+            vmin: Token.UINT8.get(buf, off + 8),
+            vrev: Token.UINT8.get(buf, off + 9),
+            vmbw: Token.UINT16_BE.get(buf, off + 10),
+            vmbh: Token.UINT16_BE.get(buf, off + 17),
             nombr: Token.UINT24_BE.get(buf, off + 37),
-            nqual: buf.readUInt8(off + 40)
+            nqual: Token.UINT8.get(buf, off + 40)
         };
     }
 };

package/lib/ogg/theora/TheoraParser.d.ts

@@ -1,5 +1,4 @@
-/// <reference types="node" resolution-mode="require"/>
-import { ITokenizer } from 'strtok3/core';
+import { ITokenizer } from 'strtok3';
 import * as Ogg from '../Ogg.js';
 import { IOptions } from '../../type.js';
 import { INativeMetadataCollector } from '../../common/MetadataCollector.js';
@@ -16,13 +15,13 @@ export declare class TheoraParser implements Ogg.IPageConsumer {
      * @param header Ogg Page Header
      * @param pageData Page data
      */
-    parsePage(header: Ogg.IPageHeader, pageData: Buffer): void;
-    flush(): void;
+    parsePage(header: Ogg.IPageHeader, pageData: Uint8Array): Promise<void>;
+    flush(): Promise<void>;
     calculateDuration(header: Ogg.IPageHeader): void;
     /**
      * Parse first Theora Ogg page. the initial identification header packet
      * @param {IPageHeader} header
      * @param {Buffer} pageData
      */
-    protected parseFirstPage(header: Ogg.IPageHeader, pageData: Buffer): void;
+    protected parseFirstPage(header: Ogg.IPageHeader, pageData: Uint8Array): Promise<void>;
 }

package/lib/ogg/theora/TheoraParser.js

@@ -15,12 +15,12 @@ export class TheoraParser {
      * @param header Ogg Page Header
      * @param pageData Page data
      */
-    parsePage(header, pageData) {
+    async parsePage(header, pageData) {
         if (header.headerType.firstPage) {
-            this.parseFirstPage(header, pageData);
+            await this.parseFirstPage(header, pageData);
         }
     }
-    flush() {
+    async flush() {
         debug('flush');
     }
     calculateDuration(header) {
@@ -31,7 +31,7 @@ export class TheoraParser {
      * @param {IPageHeader} header
      * @param {Buffer} pageData
      */
-    parseFirstPage(header, pageData) {
+    async parseFirstPage(header, pageData) {
         debug('First Ogg/Theora page');
         this.metadata.setFormat('codec', 'Theora');
         const idHeader = IdentificationHeader.get(pageData, 0);

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

@@ -1,6 +1,5 @@
-/// <reference types="node" resolution-mode="require"/>
 import { IPicture } from '../../type.js';
-import { IGetToken } from 'strtok3/core';
+import type { IGetToken } from 'strtok3';
 /**
  * Interface to parsed result of METADATA_BLOCK_PICTURE
  * Ref: https://wiki.xiph.org/VorbisComment#METADATA_BLOCK_PICTURE
@@ -23,9 +22,9 @@ export interface IVorbisPicture extends IPicture {
 export declare class VorbisPictureToken implements IGetToken<IVorbisPicture> {
     len: any;
     static fromBase64(base64str: string): IVorbisPicture;
-    static fromBuffer(buffer: Buffer): IVorbisPicture;
+    static fromBuffer(buffer: Uint8Array): IVorbisPicture;
     constructor(len: any);
-    get(buffer: Buffer, offset: number): IVorbisPicture;
+    get(buffer: Uint8Array, offset: number): IVorbisPicture;
 }
 /**
  * Vorbis 1 decoding tokens

package/lib/ogg/vorbis/Vorbis.js

@@ -8,7 +8,7 @@ import { AttachedPictureType } from '../../id3v2/ID3v2Token.js';
  */
 export class VorbisPictureToken {
     static fromBase64(base64str) {
-        return this.fromBuffer(Buffer.from(base64str, 'base64'));
+        return this.fromBuffer(Uint8Array.from(atob(base64str), c => c.charCodeAt(0)));
     }
     static fromBuffer(buffer) {
         const pic = new VorbisPictureToken(buffer.length);
@@ -20,15 +20,15 @@ export class VorbisPictureToken {
     get(buffer, offset) {
         const type = AttachedPictureType[Token.UINT32_BE.get(buffer, offset)];
         const mimeLen = Token.UINT32_BE.get(buffer, offset += 4);
-        const format = buffer.toString('utf-8', offset += 4, offset + mimeLen);
+        const format = new Token.StringType(mimeLen, 'utf-8').get(buffer, offset += 4);
         const descLen = Token.UINT32_BE.get(buffer, offset += mimeLen);
-        const description = buffer.toString('utf-8', offset += 4, offset + descLen);
+        const description = new Token.StringType(descLen, 'utf-8').get(buffer, offset += 4);
         const width = Token.UINT32_BE.get(buffer, offset += descLen);
         const height = Token.UINT32_BE.get(buffer, offset += 4);
         const colour_depth = Token.UINT32_BE.get(buffer, offset += 4);
         const indexed_color = Token.UINT32_BE.get(buffer, offset += 4);
         const picDataLen = Token.UINT32_BE.get(buffer, offset += 4);
-        const data = Buffer.from(buffer.slice(offset += 4, offset + picDataLen));
+        const data = Uint8Array.from(buffer.slice(offset += 4, offset + picDataLen));
         return {
             type,
             format,
@@ -49,7 +49,7 @@ export const CommonHeader = {
     len: 7,
     get: (buf, off) => {
         return {
-            packetType: buf.readUInt8(off),
+            packetType: Token.UINT8.get(buf, off),
             vorbis: new Token.StringType(6, 'ascii').get(buf, off + 1)
         };
     }
@@ -61,14 +61,13 @@ export const CommonHeader = {
 export const IdentificationHeader = {
     len: 23,
     get: (uint8Array, off) => {
-        const dataView = new DataView(uint8Array.buffer, uint8Array.byteOffset);
         return {
-            version: dataView.getUint32(off + 0, true),
-            channelMode: dataView.getUint8(off + 4),
-            sampleRate: dataView.getUint32(off + 5, true),
-            bitrateMax: dataView.getUint32(off + 9, true),
-            bitrateNominal: dataView.getUint32(off + 13, true),
-            bitrateMin: dataView.getUint32(off + 17, true)
+            version: Token.UINT32_LE.get(uint8Array, off + 0),
+            channelMode: Token.UINT8.get(uint8Array, off + 4),
+            sampleRate: Token.UINT32_LE.get(uint8Array, off + 5),
+            bitrateMax: Token.UINT32_LE.get(uint8Array, off + 9),
+            bitrateNominal: Token.UINT32_LE.get(uint8Array, off + 13),
+            bitrateMin: Token.UINT32_LE.get(uint8Array, off + 17)
         };
     }
 };

package/lib/ogg/vorbis/VorbisDecoder.js

@@ -11,7 +11,7 @@ export class VorbisDecoder {
     }
     readStringUtf8() {
         const len = this.readInt32();
-        const value = Buffer.from(this.data).toString('utf-8', this.offset, this.offset + len);
+        const value = new TextDecoder('utf-8').decode(this.data.subarray(this.offset, this.offset + len));
         this.offset += len;
         return value;
     }

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

@@ -1,4 +1,3 @@
-/// <reference types="node" resolution-mode="require"/>
 import { IVorbisPicture } from './Vorbis.js';
 import { IPageConsumer, IPageHeader } from '../Ogg.js';
 import { IOptions } from '../../type.js';
@@ -17,20 +16,21 @@ export declare class VorbisParser implements IPageConsumer {
      * @param header Ogg Page Header
      * @param pageData Page data
      */
-    parsePage(header: IPageHeader, pageData: Buffer): void;
-    flush(): void;
-    parseUserComment(pageData: Buffer, offset: number): number;
-    addTag(id: string, value: string | IVorbisPicture): void;
+    parsePage(header: IPageHeader, pageData: Uint8Array): Promise<void>;
+    private static mergeUint8Arrays;
+    flush(): Promise<void>;
+    parseUserComment(pageData: Uint8Array, offset: number): Promise<number>;
+    addTag(id: string, value: string | IVorbisPicture): Promise<void>;
     calculateDuration(header: IPageHeader): void;
     /**
      * Parse first Ogg/Vorbis page
      * @param header
      * @param pageData
      */
-    protected parseFirstPage(header: IPageHeader, pageData: Buffer): void;
-    protected parseFullPage(pageData: Buffer): void;
+    protected parseFirstPage(header: IPageHeader, pageData: Uint8Array): void;
+    protected parseFullPage(pageData: Uint8Array): Promise<void>;
     /**
      * Ref: https://xiph.org/vorbis/doc/Vorbis_I_spec.html#x1-840005.2
      */
-    protected parseUserCommentList(pageData: Buffer, offset: number): void;
+    protected parseUserCommentList(pageData: Uint8Array, offset: number): Promise<void>;
 }

package/lib/ogg/vorbis/VorbisParser.js

@@ -18,7 +18,7 @@ export class VorbisParser {
      * @param header Ogg Page Header
      * @param pageData Page data
      */
-    parsePage(header, pageData) {
+    async parsePage(header, pageData) {
         if (header.headerType.firstPage) {
             this.parseFirstPage(header, pageData);
         }
@@ -32,8 +32,8 @@ export class VorbisParser {
             if (header.headerType.lastPage || !header.headerType.continued) {
                 // Flush page segments
                 if (this.pageSegments.length > 0) {
-                    const fullPage = Buffer.concat(this.pageSegments);
-                    this.parseFullPage(fullPage);
+                    const fullPage = VorbisParser.mergeUint8Arrays(this.pageSegments);
+                    await this.parseFullPage(fullPage);
                 }
                 // Reset page segments
                 this.pageSegments = header.headerType.lastPage ? [] : [pageData];
@@ -43,16 +43,25 @@ export class VorbisParser {
             this.calculateDuration(header);
         }
     }
-    flush() {
-        this.parseFullPage(Buffer.concat(this.pageSegments));
+    static mergeUint8Arrays(arrays) {
+        const totalSize = arrays.reduce((acc, e) => acc + e.length, 0);
+        const merged = new Uint8Array(totalSize);
+        arrays.forEach((array, i, _arrays) => {
+            const offset = _arrays.slice(0, i).reduce((acc, e) => acc + e.length, 0);
+            merged.set(array, offset);
+        });
+        return merged;
     }
-    parseUserComment(pageData, offset) {
+    async flush() {
+        await this.parseFullPage(VorbisParser.mergeUint8Arrays(this.pageSegments));
+    }
+    async parseUserComment(pageData, offset) {
         const decoder = new VorbisDecoder(pageData, offset);
         const tag = decoder.parseUserComment();
-        this.addTag(tag.key, tag.value);
+        await this.addTag(tag.key, tag.value);
         return tag.len;
     }
-    addTag(id, value) {
+    async addTag(id, value) {
         if (id === 'METADATA_BLOCK_PICTURE' && (typeof value === 'string')) {
             if (this.options.skipCovers) {
                 debug(`Ignore picture`);
@@ -64,7 +73,7 @@ export class VorbisParser {
         else {
             debug(`Push tag: id=${id}, value=${value}`);
         }
-        this.metadata.addTag('vorbis', id, value);
+        await this.metadata.addTag('vorbis', id, value);
     }
     calculateDuration(header) {
         if (this.metadata.format.sampleRate && header.absoluteGranulePosition >= 0) {
@@ -95,7 +104,7 @@ export class VorbisParser {
         else
             throw new Error('First Ogg page should be type 1: the identification header');
     }
-    parseFullPage(pageData) {
+    async parseFullPage(pageData) {
         // New page
         const commonHeader = CommonHeader.get(pageData, 0);
         debug('Parse full page: type=%s, byteLength=%s', commonHeader.packetType, pageData.byteLength);
@@ -110,7 +119,7 @@ export class VorbisParser {
     /**
      * Ref: https://xiph.org/vorbis/doc/Vorbis_I_spec.html#x1-840005.2
      */
-    parseUserCommentList(pageData, offset) {
+    async parseUserCommentList(pageData, offset) {
         const strLen = Token.UINT32_LE.get(pageData, offset);
         offset += 4;
         // const vendorString = new Token.StringType(strLen, 'utf-8').get(pageData, offset);
@@ -118,7 +127,7 @@ export class VorbisParser {
         let userCommentListLength = Token.UINT32_LE.get(pageData, offset);
         offset += 4;
         while (userCommentListLength-- > 0) {
-            offset += this.parseUserComment(pageData, offset);
+            offset += (await this.parseUserComment(pageData, offset));
         }
     }
 }

package/lib/riff/RiffChunk.d.ts

@@ -1,4 +1,4 @@
-import { IGetToken } from 'strtok3/core';
+import type { IGetToken } from 'strtok3';
 import { IChunkHeader } from '../iff/index.js';
 export { IChunkHeader } from '../iff/index.js';
 /**

package/lib/riff/RiffChunk.js

@@ -7,9 +7,9 @@ export const Header = {
     get: (buf, off) => {
         return {
             // Group-ID
-            chunkID: buf.toString('binary', off, off + 4),
+            chunkID: new Token.StringType(4, 'latin1').get(buf, off),
             // Size
-            chunkSize: Token.UINT32_LE.get(buf, 4)
+            chunkSize: Token.UINT32_LE.get(buf, off + 4)
         };
     }
 };

package/lib/type.d.ts

@@ -1,5 +1,3 @@
-/// <reference types="node" resolution-mode="require"/>
-import { Buffer } from 'node:buffer';
 import { GenericTagId, TagType } from './common/GenericTagTypes.js';
 import { IFooter } from './apev2/APEv2Token.js';
 import { TrackType } from './matroska/types.js';
@@ -15,7 +13,7 @@ export interface IPicture {
     /**
      * Image data
      */
-    data: Buffer;
+    data: Uint8Array;
     /**
      * Optional description
      */
@@ -366,7 +364,7 @@ export interface IAudioTrack {
     samplingFrequency?: number;
     outputSamplingFrequency?: number;
     channels?: number;
-    channelPositions?: Buffer;
+    channelPositions?: Uint8Array;
     bitDepth?: number;
 }
 export interface IVideoTrack {
@@ -378,7 +376,7 @@ export interface IVideoTrack {
     displayHeight?: number;
     displayUnit?: number;
     aspectRatioType?: number;
-    colourSpace?: Buffer;
+    colourSpace?: Uint8Array;
     gammaValue?: number;
 }
 export interface ITrackInfo {
@@ -445,7 +443,7 @@ export interface IFormat {
     /**
      * 16-byte MD5 of raw audio
      */
-    readonly audioMD5?: Buffer;
+    readonly audioMD5?: Uint8Array;
     /**
      * Chapters in audio stream
      */
@@ -587,11 +585,11 @@ export interface IRandomReader {
     fileSize: number;
     /**
      * Read from a given position of an abstracted file or buffer.
-     * @param buffer {Buffer} is the buffer that the data will be written to.
-     * @param offset {number} is the offset in the buffer to start writing at.
-     * @param length {number}is an integer specifying the number of bytes to read.
-     * @param position {number} is an argument specifying where to begin reading from in the file.
+     * @param {Uint8Array} buffer the buffer that the data will be written to.
+     * @param {number} offset the offset in the buffer to start writing at.
+     * @param {number} length an integer specifying the number of bytes to read.
+     * @param {number} position an argument specifying where to begin reading from in the file.
      * @return {Promise<number>} bytes read
      */
-    randomRead(buffer: Buffer, offset: number, length: number, position: number): Promise<number>;
+    randomRead(buffer: Uint8Array, offset: number, length: number, position: number): Promise<number>;
 }

package/lib/wav/BwfChunk.d.ts

@@ -1,4 +1,4 @@
-import { IGetToken } from 'strtok3/core';
+import type { IGetToken } from 'strtok3';
 export interface IBroadcastAudioExtensionChunk {
     description: string;
     originator: string;

package/lib/wav/WaveChunk.d.ts

@@ -1,5 +1,4 @@
-/// <reference types="node" resolution-mode="require"/>
-import { IGetToken } from 'strtok3/core';
+import type { IGetToken } from 'strtok3';
 import { IChunkHeader } from '../iff/index.js';
 /**
  * Ref: https://msdn.microsoft.com/en-us/library/windows/desktop/dd317599(v=vs.85).aspx
@@ -47,7 +46,7 @@ export interface IWaveFormat {
 export declare class Format implements IGetToken<IWaveFormat> {
     len: number;
     constructor(header: IChunkHeader);
-    get(buf: Buffer, off: number): IWaveFormat;
+    get(buf: Uint8Array, off: number): IWaveFormat;
 }
 export interface IFactChunk {
     dwSampleLength: number;
@@ -60,5 +59,5 @@ export interface IFactChunk {
 export declare class FactChunk implements IGetToken<IFactChunk> {
     len: number;
     constructor(header: IChunkHeader);
-    get(buf: Buffer, off: number): IFactChunk;
+    get(buf: Uint8Array, off: number): IFactChunk;
 }

package/lib/wav/WaveChunk.js

@@ -1,3 +1,4 @@
+import * as Token from 'token-types';
 /**
  * Ref: https://msdn.microsoft.com/en-us/library/windows/desktop/dd317599(v=vs.85).aspx
  */
@@ -31,12 +32,12 @@ export class Format {
     }
     get(buf, off) {
         return {
-            wFormatTag: buf.readUInt16LE(off),
-            nChannels: buf.readUInt16LE(off + 2),
-            nSamplesPerSec: buf.readUInt32LE(off + 4),
-            nAvgBytesPerSec: buf.readUInt32LE(off + 8),
-            nBlockAlign: buf.readUInt16LE(off + 12),
-            wBitsPerSample: buf.readUInt16LE(off + 14)
+            wFormatTag: Token.UINT16_LE.get(buf, off),
+            nChannels: Token.UINT16_LE.get(buf, off + 2),
+            nSamplesPerSec: Token.UINT32_LE.get(buf, off + 4),
+            nAvgBytesPerSec: Token.UINT32_LE.get(buf, off + 8),
+            nBlockAlign: Token.UINT16_LE.get(buf, off + 12),
+            wBitsPerSample: Token.UINT16_LE.get(buf, off + 14)
         };
     }
 }
@@ -54,7 +55,7 @@ export class FactChunk {
     }
     get(buf, off) {
         return {
-            dwSampleLength: buf.readUInt32LE(off)
+            dwSampleLength: Token.UINT32_LE.get(buf, off)
         };
     }
 }

package/lib/wav/WaveParser.js

@@ -1,4 +1,4 @@
-import * as strtok3 from 'strtok3/core';
+import * as strtok3 from 'strtok3';
 import * as Token from 'token-types';
 import initDebug from 'debug';
 import * as riff from '../riff/RiffChunk.js';
@@ -129,7 +129,7 @@ export class WaveParser extends BasicParser {
         }
     }
     async parseListTag(listHeader) {
-        const listType = await this.tokenizer.readToken(new Token.StringType(4, 'binary'));
+        const listType = await this.tokenizer.readToken(new Token.StringType(4, 'latin1'));
         debug('pos=%s, parseListTag: chunkID=RIFF/WAVE/LIST/%s', this.tokenizer.position, listType);
         switch (listType) {
             case 'INFO':