music-metadata 10.0.1 → 10.1.0

package/lib/wavpack/WavPackParser.js

@@ -2,7 +2,7 @@ import * as Token from 'token-types';
 import { APEv2Parser } from '../apev2/APEv2Parser.js';
 import { FourCcToken } from '../common/FourCC.js';
 import { BasicParser } from '../common/BasicParser.js';
-import { WavPack } from './WavPackToken.js';
+import { BlockHeaderToken, MetadataIdToken } from './WavPackToken.js';
 import initDebug from 'debug';
 import { uint8ArrayToHex } from 'uint8array-extras';
 const debug = initDebug('music-metadata:parser:WavPack');
@@ -10,6 +10,10 @@ const debug = initDebug('music-metadata:parser:WavPack');
  * WavPack Parser
  */
 export class WavPackParser extends BasicParser {
+    constructor() {
+        super(...arguments);
+        this.audioDataSize = 0;
+    }
     async parse() {
         this.audioDataSize = 0;
         // First parse all WavPack blocks
@@ -22,10 +26,10 @@ export class WavPackParser extends BasicParser {
             const blockId = await this.tokenizer.peekToken(FourCcToken);
             if (blockId !== 'wvpk')
                 break;
-            const header = await this.tokenizer.readToken(WavPack.BlockHeaderToken);
+            const header = await this.tokenizer.readToken(BlockHeaderToken);
             if (header.BlockID !== 'wvpk')
                 throw new Error('Invalid WavPack Block-ID');
-            debug(`WavPack header blockIndex=${header.blockIndex}, len=${WavPack.BlockHeaderToken.len}`);
+            debug(`WavPack header blockIndex=${header.blockIndex}, len=${BlockHeaderToken.len}`);
             if (header.blockIndex === 0 && !this.metadata.format.container) {
                 this.metadata.setFormat('container', 'WavPack');
                 this.metadata.setFormat('lossless', !header.flags.isHybrid);
@@ -40,22 +44,25 @@ export class WavPackParser extends BasicParser {
                 this.metadata.setFormat('numberOfSamples', header.totalSamples);
                 this.metadata.setFormat('codec', header.flags.isDSD ? 'DSD' : 'PCM');
             }
-            const ignoreBytes = header.blockSize - (WavPack.BlockHeaderToken.len - 8);
+            const ignoreBytes = header.blockSize - (BlockHeaderToken.len - 8);
             await (header.blockIndex === 0 ? this.parseMetadataSubBlock(header, ignoreBytes) : this.tokenizer.ignore(ignoreBytes));
             if (header.blockSamples > 0) {
                 this.audioDataSize += header.blockSize; // Count audio data for bit-rate calculation
             }
-        } while (!this.tokenizer.fileInfo.size || this.tokenizer.fileInfo.size - this.tokenizer.position >= WavPack.BlockHeaderToken.len);
-        this.metadata.setFormat('bitrate', this.audioDataSize * 8 / this.metadata.format.duration);
+        } while (!this.tokenizer.fileInfo.size || this.tokenizer.fileInfo.size - this.tokenizer.position >= BlockHeaderToken.len);
+        if (this.metadata.format.duration) {
+            this.metadata.setFormat('bitrate', this.audioDataSize * 8 / this.metadata.format.duration);
+        }
     }
     /**
      * Ref: http://www.wavpack.com/WavPack5FileFormat.pdf, 3.0 Metadata Sub-blocks
      * @param header Header
-     * @param remainingLength
+     * @param remainingLength Remaining length
      */
     async parseMetadataSubBlock(header, remainingLength) {
-        while (remainingLength > WavPack.MetadataIdToken.len) {
-            const id = await this.tokenizer.readToken(WavPack.MetadataIdToken);
+        let remaining = remainingLength;
+        while (remaining > MetadataIdToken.len) {
+            const id = await this.tokenizer.readToken(MetadataIdToken);
             const dataSizeInWords = await this.tokenizer.readNumber(id.largeBlock ? Token.UINT24_LE : Token.UINT8);
             const data = new Uint8Array(dataSizeInWords * 2 - (id.isOddSize ? 1 : 0));
             await this.tokenizer.readBuffer(data);
@@ -63,7 +70,7 @@ export class WavPackParser extends BasicParser {
             switch (id.functionId) {
                 case 0x0: // ID_DUMMY: could be used to pad WavPack blocks
                     break;
-                case 0xe: // ID_DSD_BLOCK
+                case 0xe: { // ID_DSD_BLOCK
                     debug('ID_DSD_BLOCK');
                     // https://github.com/dbry/WavPack/issues/71#issuecomment-483094813
                     const mp = 1 << Token.UINT8.get(data, 0);
@@ -73,6 +80,7 @@ export class WavPackParser extends BasicParser {
                     this.metadata.setFormat('sampleRate', samplingRate);
                     this.metadata.setFormat('duration', header.totalSamples / samplingRate);
                     break;
+                }
                 case 0x24: // ID_ALT_TRAILER: maybe used to embed original ID3 tag header
                     debug('ID_ALT_TRAILER: trailer for non-wav files');
                     break;
@@ -86,12 +94,13 @@ export class WavPackParser extends BasicParser {
                     debug(`Ignore unsupported meta-sub-block-id functionId=0x${id.functionId.toString(16)}`);
                     break;
             }
-            remainingLength -= WavPack.MetadataIdToken.len + (id.largeBlock ? Token.UINT24_LE.len : Token.UINT8.len) + dataSizeInWords * 2;
-            debug(`remainingLength=${remainingLength}`);
+            remaining -= MetadataIdToken.len + (id.largeBlock ? Token.UINT24_LE.len : Token.UINT8.len) + dataSizeInWords * 2;
+            debug(`remainingLength=${remaining}`);
             if (id.isOddSize)
                 this.tokenizer.ignore(1);
         }
-        if (remainingLength !== 0)
+        if (remaining !== 0)
             throw new Error('metadata-sub-block should fit it remaining length');
     }
 }
+//# sourceMappingURL=WavPackParser.js.map

package/lib/wavpack/WavPackToken.d.ts

@@ -45,20 +45,16 @@ export interface IMetadataId {
      */
     largeBlock: boolean;
 }
-export declare class WavPack {
-    /**
-     * WavPack Block Header
-     *
-     * 32-byte little-endian header at the front of every WavPack block
-     *
-     * Ref: http://www.wavpack.com/WavPack5FileFormat.pdf (page 2/6: 2.0 "Block Header")
-     */
-    static BlockHeaderToken: IGetToken<IBlockHeader>;
-    /**
-     * 3.0 Metadata Sub-Blocks
-     * Ref: http://www.wavpack.com/WavPack5FileFormat.pdf (page 4/6: 3.0 "Metadata Sub-Block")
-     */
-    static MetadataIdToken: IGetToken<IMetadataId>;
-    private static isBitSet;
-    private static getBitAllignedNumber;
-}
+/**
+ * WavPack Block Header
+ *
+ * 32-byte little-endian header at the front of every WavPack block
+ *
+ * Ref: http://www.wavpack.com/WavPack5FileFormat.pdf (page 2/6: 2.0 "Block Header")
+ */
+export declare const BlockHeaderToken: IGetToken<IBlockHeader>;
+/**
+ * 3.0 Metadata Sub-Blocks
+ * Ref: http://www.wavpack.com/WavPack5FileFormat.pdf (page 4/6: 3.0 "Metadata Sub-Block")
+ */
+export declare const MetadataIdToken: IGetToken<IMetadataId>;

package/lib/wavpack/WavPackToken.js

@@ -2,14 +2,6 @@ import * as Token from 'token-types';
 import { FourCcToken } from '../common/FourCC.js';
 const SampleRates = [6000, 8000, 9600, 11025, 12000, 16000, 22050, 24000, 32000, 44100,
     48000, 64000, 88200, 96000, 192000, -1];
-export class WavPack {
-    static isBitSet(flags, bitOffset) {
-        return WavPack.getBitAllignedNumber(flags, bitOffset, 1) === 1;
-    }
-    static getBitAllignedNumber(flags, bitOffset, len) {
-        return (flags >>> bitOffset) & (0xffffffff >>> (32 - len));
-    }
-}
 /**
  * WavPack Block Header
  *
@@ -17,7 +9,7 @@ export class WavPack {
  *
  * Ref: http://www.wavpack.com/WavPack5FileFormat.pdf (page 2/6: 2.0 "Block Header")
  */
-WavPack.BlockHeaderToken = {
+export const BlockHeaderToken = {
     len: 32,
     get: (buf, off) => {
         const flags = Token.UINT32_LE.get(buf, off + 24);
@@ -36,15 +28,15 @@ WavPack.BlockHeaderToken = {
             blockSamples: Token.UINT32_LE.get(buf, off + 20),
             // various flags for id and decoding
             flags: {
-                bitsPerSample: (1 + WavPack.getBitAllignedNumber(flags, 0, 2)) * 8,
-                isMono: WavPack.isBitSet(flags, 2),
-                isHybrid: WavPack.isBitSet(flags, 3),
-                isJointStereo: WavPack.isBitSet(flags, 4),
-                crossChannel: WavPack.isBitSet(flags, 5),
-                hybridNoiseShaping: WavPack.isBitSet(flags, 6),
-                floatingPoint: WavPack.isBitSet(flags, 7),
-                samplingRate: SampleRates[WavPack.getBitAllignedNumber(flags, 23, 4)],
-                isDSD: WavPack.isBitSet(flags, 31)
+                bitsPerSample: (1 + getBitAllignedNumber(flags, 0, 2)) * 8,
+                isMono: isBitSet(flags, 2),
+                isHybrid: isBitSet(flags, 3),
+                isJointStereo: isBitSet(flags, 4),
+                crossChannel: isBitSet(flags, 5),
+                hybridNoiseShaping: isBitSet(flags, 6),
+                floatingPoint: isBitSet(flags, 7),
+                samplingRate: SampleRates[getBitAllignedNumber(flags, 23, 4)],
+                isDSD: isBitSet(flags, 31)
             },
             // crc for actual decoded data
             crc: new Token.Uint8ArrayType(4).get(buf, off + 28)
@@ -59,14 +51,21 @@ WavPack.BlockHeaderToken = {
  * 3.0 Metadata Sub-Blocks
  * Ref: http://www.wavpack.com/WavPack5FileFormat.pdf (page 4/6: 3.0 "Metadata Sub-Block")
  */
-WavPack.MetadataIdToken = {
+export const MetadataIdToken = {
     len: 1,
     get: (buf, off) => {
         return {
-            functionId: WavPack.getBitAllignedNumber(buf[off], 0, 6), // functionId overlaps with isOptional flag
-            isOptional: WavPack.isBitSet(buf[off], 5),
-            isOddSize: WavPack.isBitSet(buf[off], 6),
-            largeBlock: WavPack.isBitSet(buf[off], 7)
+            functionId: getBitAllignedNumber(buf[off], 0, 6), // functionId overlaps with isOptional flag
+            isOptional: isBitSet(buf[off], 5),
+            isOddSize: isBitSet(buf[off], 6),
+            largeBlock: isBitSet(buf[off], 7)
         };
     }
 };
+function isBitSet(flags, bitOffset) {
+    return getBitAllignedNumber(flags, bitOffset, 1) === 1;
+}
+function getBitAllignedNumber(flags, bitOffset, len) {
+    return (flags >>> bitOffset) & (0xffffffff >>> (32 - len));
+}
+//# sourceMappingURL=WavPackToken.js.map

package/package.json

@@ -1,150 +1,139 @@
-{
-  "name": "music-metadata",
-  "description": "Music metadata parser for Node.js, supporting virtual any audio and tag format.",
-  "version": "10.0.1",
-  "author": {
-    "name": "Borewit",
-    "url": "https://github.com/Borewit"
-  },
-  "funding": [
-    {
-      "type": "github",
-      "url": "https://github.com/sponsors/Borewit"
-    },
-    {
-      "type": "buymeacoffee",
-      "url": "https://buymeacoffee.com/borewit"
-    }
-  ],
-  "type": "module",
-  "exports": {
-    ".": {
-      "node": "./lib/index.js",
-      "default": "./lib/core.js"
-    }
-  },
-  "types": "lib/index.d.ts",
-  "files": [
-    "lib/**/*.js",
-    "lib/**/*.d.ts"
-  ],
-  "keywords": [
-    "music",
-    "metadata",
-    "meta",
-    "audio",
-    "tag",
-    "tags",
-    "duration",
-    "MusicBrainz",
-    "Discogs",
-    "Picard",
-    "ID3",
-    "ID3v1",
-    "ID3v2",
-    "m4a",
-    "m4b",
-    "mp3",
-    "mp4",
-    "Vorbis",
-    "ogg",
-    "flac",
-    "Matroska",
-    "WebM",
-    "EBML",
-    "asf",
-    "wma",
-    "wmv",
-    "ape",
-    "MonkeyAudio",
-    "aiff",
-    "wav",
-    "WavPack",
-    "Opus",
-    "speex",
-    "musepack",
-    "mpc",
-    "dsd",
-    "dsf",
-    "mpc",
-    "dff",
-    "dsdiff",
-    "aac",
-    "adts",
-    "length",
-    "chapter",
-    "info",
-    "parse",
-    "parser",
-    "bwf"
-  ],
-  "scripts": {
-    "clean": "del-cli 'lib/**/*.js' 'lib/**/*.js.map' 'lib/**/*.d.ts' 'src/**/*.d.ts' 'test/**/*.js' 'test/**/*.js.map' 'test/**/*.js' 'test/**/*.js.map' 'doc-gen/**/*.js' 'doc-gen/**/*.js.map'",
-    "compile-src": "tsc -p lib",
-    "compile-test": "tsc -p test",
-    "compile-doc": "tsc -p doc-gen",
-    "compile": "yarn run  compile-src && yarn compile-test && yarn compile-doc",
-    "eslint": "eslint lib test doc-gen",
-    "lint-md": "yarn run remark -u preset-lint-markdown-style-guide .",
-    "lint": "yarn run lint-md && yarn run eslint",
-    "test": "mocha",
-    "build": "yarn run clean && yarn compile && yarn run doc-gen",
-    "start": "yarn run compile && yarn run lint && yarn run cover-test",
-    "test-coverage": "c8 yarn run test",
-    "send-codacy": "c8 report --reporter=text-lcov | codacy-coverage",
-    "doc-gen": "yarn node doc-gen/gen.js"
-  },
-  "dependencies": {
-    "@tokenizer/token": "^0.3.0",
-    "content-type": "^1.0.5",
-    "debug": "^4.3.4",
-    "file-type": "^19.2.0",
-    "media-typer": "^1.1.0",
-    "strtok3": "^8.0.0",
-    "token-types": "^6.0.0",
-    "uint8array-extras": "^1.4.0"
-  },
-  "devDependencies": {
-    "@eslint/compat": "^1.1.1",
-    "@eslint/eslintrc": "^3.1.0",
-    "@eslint/js": "^9.7.0",
-    "@types/chai": "^4.3.16",
-    "@types/chai-as-promised": "^7.1.8",
-    "@types/debug": "^4.1.12",
-    "@types/mocha": "^10.0.7",
-    "@types/node": "^22.0.3",
-    "@typescript-eslint/eslint-plugin": "^7.16.1",
-    "@typescript-eslint/parser": "^7.16.1",
-    "c8": "^10.1.2",
-    "chai": "^5.1.1",
-    "chai-as-promised": "^8.0.0",
-    "del-cli": "^5.1.0",
-    "eslint": "^9.7.0",
-    "eslint-config-prettier": "^9.1.0",
-    "eslint-import-resolver-typescript": "^3.6.1",
-    "eslint-plugin-import": "^2.29.1",
-    "eslint-plugin-jsdoc": "^48.7.0",
-    "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-unicorn": "^55.0.0",
-    "globals": "^15.8.0",
-    "mime": "^4.0.4",
-    "mocha": "^10.6.0",
-    "prettier": "^3.3.3",
-    "remark-cli": "^12.0.1",
-    "remark-preset-lint-markdown-style-guide": "^6.0.0",
-    "ts-node": "^10.9.2",
-    "typescript": "^5.5.3"
-  },
-  "engines": {
-    "node": ">=16.0.0"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/borewit/music-metadata.git"
-  },
-  "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/Borewit/music-metadata/issues"
-  },
-  "packageManager": "yarn@4.3.1"
-}
+{
+  "name": "music-metadata",
+  "description": "Music metadata parser for Node.js, supporting virtual any audio and tag format.",
+  "version": "10.1.0",
+  "author": {
+    "name": "Borewit",
+    "url": "https://github.com/Borewit"
+  },
+  "funding": [
+    {
+      "type": "github",
+      "url": "https://github.com/sponsors/Borewit"
+    },
+    {
+      "type": "buymeacoffee",
+      "url": "https://buymeacoffee.com/borewit"
+    }
+  ],
+  "type": "module",
+  "exports": {
+    ".": {
+      "node": "./lib/index.js",
+      "default": "./lib/core.js"
+    }
+  },
+  "types": "lib/index.d.ts",
+  "files": [
+    "lib/**/*.js",
+    "lib/**/*.d.ts"
+  ],
+  "keywords": [
+    "music",
+    "metadata",
+    "meta",
+    "audio",
+    "tag",
+    "tags",
+    "duration",
+    "MusicBrainz",
+    "Discogs",
+    "Picard",
+    "ID3",
+    "ID3v1",
+    "ID3v2",
+    "m4a",
+    "m4b",
+    "mp3",
+    "mp4",
+    "Vorbis",
+    "ogg",
+    "flac",
+    "Matroska",
+    "WebM",
+    "EBML",
+    "asf",
+    "wma",
+    "wmv",
+    "ape",
+    "MonkeyAudio",
+    "aiff",
+    "wav",
+    "WavPack",
+    "Opus",
+    "speex",
+    "musepack",
+    "mpc",
+    "dsd",
+    "dsf",
+    "mpc",
+    "dff",
+    "dsdiff",
+    "aac",
+    "adts",
+    "length",
+    "chapter",
+    "info",
+    "parse",
+    "parser",
+    "bwf"
+  ],
+  "scripts": {
+    "clean": "del-cli 'lib/**/*.js' 'lib/**/*.js.map' 'lib/**/*.d.ts' 'src/**/*.d.ts' 'test/**/*.js' 'test/**/*.js.map' 'test/**/*.js' 'test/**/*.js.map' 'doc-gen/**/*.js' 'doc-gen/**/*.js.map'",
+    "compile-src": "tsc -p lib",
+    "compile-test": "tsc -p test",
+    "compile-doc": "tsc -p doc-gen",
+    "compile": "yarn run  compile-src && yarn compile-test && yarn compile-doc",
+    "lint-ts": "biome check",
+    "lint-md": "yarn run remark -u preset-lint-markdown-style-guide .",
+    "lint": "yarn run lint-ts && yarn run lint-md",
+    "test": "mocha",
+    "build": "yarn run clean && yarn compile && yarn run doc-gen",
+    "test-coverage": "c8 yarn run test",
+    "send-codacy": "c8 report --reporter=text-lcov | codacy-coverage",
+    "doc-gen": "yarn node doc-gen/gen.js"
+  },
+  "dependencies": {
+    "@tokenizer/token": "^0.3.0",
+    "content-type": "^1.0.5",
+    "debug": "^4.3.4",
+    "file-type": "^19.4.0",
+    "media-typer": "^1.1.0",
+    "strtok3": "^8.0.5",
+    "token-types": "^6.0.0",
+    "uint8array-extras": "^1.4.0"
+  },
+  "devDependencies": {
+    "@biomejs/biome": "1.8.3",
+    "@types/chai": "^4.3.16",
+    "@types/chai-as-promised": "^7.1.8",
+    "@types/content-type": "^1.1.8",
+    "@types/debug": "^4.1.12",
+    "@types/media-typer": "^1.1.3",
+    "@types/mocha": "^10.0.7",
+    "@types/node": "^22.2.0",
+    "c8": "^10.1.2",
+    "chai": "^5.1.1",
+    "chai-as-promised": "^8.0.0",
+    "del-cli": "^5.1.0",
+    "mime": "^4.0.4",
+    "mocha": "^10.7.3",
+    "prettier": "^3.3.3",
+    "remark-cli": "^12.0.1",
+    "remark-preset-lint-markdown-style-guide": "^6.0.0",
+    "ts-node": "^10.9.2",
+    "typescript": "^5.5.3"
+  },
+  "engines": {
+    "node": ">=16.0.0"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/borewit/music-metadata.git"
+  },
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/Borewit/music-metadata/issues"
+  },
+  "packageManager": "yarn@4.3.1"
+}