music-metadata 7.11.6 → 7.11.9

package/lib/type.js

@@ -1,14 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TrackType = void 0;
-var TrackType;
-(function (TrackType) {
-    TrackType[TrackType["video"] = 1] = "video";
-    TrackType[TrackType["audio"] = 2] = "audio";
-    TrackType[TrackType["complex"] = 3] = "complex";
-    TrackType[TrackType["logo"] = 4] = "logo";
-    TrackType[TrackType["subtitle"] = 17] = "subtitle";
-    TrackType[TrackType["button"] = 18] = "button";
-    TrackType[TrackType["control"] = 32] = "control";
-})(TrackType = exports.TrackType || (exports.TrackType = {}));
+var types_1 = require("./matroska/types");
+Object.defineProperty(exports, "TrackType", { enumerable: true, get: function () { return types_1.TrackType; } });
 //# sourceMappingURL=type.js.map

package/lib/wav/BwfChunk.d.ts

@@ -0,0 +1,17 @@
+import { IGetToken } from 'strtok3/lib/core';
+export interface IBroadcastAudioExtensionChunk {
+    description: string;
+    originator: string;
+    originatorReference: string;
+    originationDate: string;
+    originationTime: string;
+    timeReferenceLow: number;
+    timeReferenceHigh: number;
+    version: number;
+    umid: Uint8Array;
+}
+/**
+ * Broadcast Audio Extension Chunk
+ * Ref: https://tech.ebu.ch/docs/tech/tech3285.pdf
+ */
+export declare const BroadcastAudioExtensionChunk: IGetToken<IBroadcastAudioExtensionChunk>;

package/lib/wav/BwfChunk.js

@@ -0,0 +1,28 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.BroadcastAudioExtensionChunk = void 0;
+const Token = require("token-types");
+/**
+ * Broadcast Audio Extension Chunk
+ * Ref: https://tech.ebu.ch/docs/tech/tech3285.pdf
+ */
+exports.BroadcastAudioExtensionChunk = {
+    len: 420,
+    get: (uint8array, off) => {
+        return {
+            description: new Token.StringType(256, 'ascii').get(uint8array, off).trim(),
+            originator: new Token.StringType(32, 'ascii').get(uint8array, off + 256).trim(),
+            originatorReference: new Token.StringType(32, 'ascii').get(uint8array, off + 288).trim(),
+            originationDate: new Token.StringType(10, 'ascii').get(uint8array, off + 320).trim(),
+            originationTime: new Token.StringType(8, 'ascii').get(uint8array, off + 330).trim(),
+            timeReferenceLow: Token.UINT32_LE.get(uint8array, off + 338),
+            timeReferenceHigh: Token.UINT32_LE.get(uint8array, off + 342),
+            version: Token.UINT16_LE.get(uint8array, off + 346),
+            umid: new Token.Uint8ArrayType(64).get(uint8array, off + 348),
+            loudnessValue: Token.UINT16_LE.get(uint8array, off + 412),
+            maxTruePeakLevel: Token.UINT16_LE.get(uint8array, off + 414),
+            maxMomentaryLoudness: Token.UINT16_LE.get(uint8array, off + 416),
+            maxShortTermLoudness: Token.UINT16_LE.get(uint8array, off + 418)
+        };
+    }
+};

package/lib/wav/WaveParser.d.ts

@@ -6,10 +6,10 @@ import { BasicParser } from '../common/BasicParser';
  * WAVE PCM soundfile format
  *
  * Ref:
- *  http://www.johnloomis.org/cpe102/asgn/asgn1/riff.html
- *  http://soundfile.sapp.org/doc/WaveFormat
+ * - http://www.johnloomis.org/cpe102/asgn/asgn1/riff.html
+ * - http://soundfile.sapp.org/doc/WaveFormat
  *
- *  ToDo: Split WAVE part from RIFF parser
+ * ToDo: Split WAVE part from RIFF parser
  */
 export declare class WaveParser extends BasicParser {
     private fact;

package/lib/wav/WaveParser.js

@@ -10,6 +10,7 @@ const ID3v2Parser_1 = require("../id3v2/ID3v2Parser");
 const util = require("../common/Util");
 const FourCC_1 = require("../common/FourCC");
 const BasicParser_1 = require("../common/BasicParser");
+const BwfChunk_1 = require("../wav/BwfChunk");
 const debug = initDebug('music-metadata:parser:RIFF');
 /**
  * Resource Interchange File Format (RIFF) Parser
@@ -17,10 +18,10 @@ const debug = initDebug('music-metadata:parser:RIFF');
  * WAVE PCM soundfile format
  *
  * Ref:
- *  http://www.johnloomis.org/cpe102/asgn/asgn1/riff.html
- *  http://soundfile.sapp.org/doc/WaveFormat
+ * - http://www.johnloomis.org/cpe102/asgn/asgn1/riff.html
+ * - http://soundfile.sapp.org/doc/WaveFormat
  *
- *  ToDo: Split WAVE part from RIFF parser
+ * ToDo: Split WAVE part from RIFF parser
  */
 class WaveParser extends BasicParser_1.BasicParser {
     async parse() {
@@ -101,6 +102,17 @@ class WaveParser extends BasicParser_1.BasicParser {
                     this.metadata.setFormat('bitrate', this.metadata.format.numberOfChannels * this.blockAlign * this.metadata.format.sampleRate); // ToDo: check me
                     await this.tokenizer.ignore(header.chunkSize);
                     break;
+                case 'bext': // Broadcast Audio Extension chunk	https://tech.ebu.ch/docs/tech/tech3285.pdf
+                    const bext = await this.tokenizer.readToken(BwfChunk_1.BroadcastAudioExtensionChunk);
+                    Object.keys(bext).forEach(key => {
+                        this.metadata.addTag('exif', 'bext.' + key, bext[key]);
+                    });
+                    break;
+                case '\x00\x00\x00\x00': // padding ??
+                    debug(`Ignore padding chunk: RIFF/${header.chunkID} of ${header.chunkSize} bytes`);
+                    this.metadata.addWarning('Ignore chunk: RIFF/' + header.chunkID);
+                    await this.tokenizer.ignore(header.chunkSize);
+                    break;
                 default:
                     debug(`Ignore chunk: RIFF/${header.chunkID} of ${header.chunkSize} bytes`);
                     this.metadata.addWarning('Ignore chunk: RIFF/' + header.chunkID);

package/lib/wavpack/WavPackParser.js

@@ -43,13 +43,7 @@ class WavPackParser extends BasicParser_1.BasicParser {
                 this.metadata.setFormat('codec', header.flags.isDSD ? 'DSD' : 'PCM');
             }
             const ignoreBytes = header.blockSize - (WavPackToken_1.WavPack.BlockHeaderToken.len - 8);
-            if (header.blockIndex === 0) {
-                // Meta-data block
-                await this.parseMetadataSubBlock(header, ignoreBytes);
-            }
-            else {
-                await this.tokenizer.ignore(ignoreBytes);
-            }
+            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
             }

package/lib/wavpack/WavPackToken.d.ts

@@ -5,7 +5,7 @@ import { IGetToken } from 'strtok3/lib/core';
  * 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")
+ * - http://www.wavpack.com/WavPack5FileFormat.pdf (page 2/6: 2.0 "Block Header")
  */
 export interface IBlockHeader {
     BlockID: string;
@@ -56,7 +56,7 @@ export declare class WavPack {
     static BlockHeaderToken: IGetToken<IBlockHeader>;
     /**
      * 3.0 Metadata Sub-Blocks
-     *  Ref: http://www.wavpack.com/WavPack5FileFormat.pdf (page 4/6: 3.0 "Metadata Sub-Block")
+     * Ref: http://www.wavpack.com/WavPack5FileFormat.pdf (page 4/6: 3.0 "Metadata Sub-Block")
      */
     static MetadataIdToken: IGetToken<IMetadataId>;
     private static isBitSet;

package/lib/wavpack/WavPackToken.js

@@ -61,7 +61,7 @@ WavPack.BlockHeaderToken = {
 };
 /**
  * 3.0 Metadata Sub-Blocks
- *  Ref: http://www.wavpack.com/WavPack5FileFormat.pdf (page 4/6: 3.0 "Metadata Sub-Block")
+ * Ref: http://www.wavpack.com/WavPack5FileFormat.pdf (page 4/6: 3.0 "Metadata Sub-Block")
  */
 WavPack.MetadataIdToken = {
     len: 1,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "music-metadata",
   "description": "Music metadata parser for Node.js, supporting virtual any audio and tag format.",
-  "version": "7.11.6",
+  "version": "7.11.9",
   "author": {
     "name": "Borewit",
     "url": "https://github.com/Borewit"
@@ -57,7 +57,8 @@
     "chapter",
     "info",
     "parse",
-    "parser"
+    "parser",
+    "bwf"
   ],
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -66,14 +67,14 @@
     "lib/**/*.d.ts"
   ],
   "scripts": {
-    "clean": "del-cli lib/**/*.js lib/**/*.js.map lib/**/*.d.ts src/**/*.d.ts test/**/*.js test/**/*.js.map",
+    "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": "npm run compile-src && npm run compile-test && npm run compile-doc",
-    "lint-ts": "tslint 'lib/**/*.ts' 'example/typescript/*.ts' --exclude 'lib/**/*.d.ts' 'test/**/*.ts' --exclude 'test/**/*.d.ts' 'doc-gen/**/*.ts'",
+    "eslint": "eslint lib/**/*.ts --ignore-pattern lib/**/*.d.ts example/typescript/**/*.ts test/**/*.ts doc-gen/**/*.ts",
     "lint-md": "remark -u preset-lint-recommended .",
-    "lint": "npm run lint-md && npm run lint-ts",
+    "lint": "npm run lint-md && npm run eslint",
     "test": "mocha --require ts-node/register --require source-map-support/register --full-trace test/test-*.ts",
     "build": "npm run clean && npm run compile && npm run doc-gen",
     "start": "npm-run-all compile lint cover-test",
@@ -83,6 +84,7 @@
     "doc-gen": "node doc-gen/gen.js"
   },
   "dependencies": {
+    "@tokenizer/token": "^0.3.0",
     "content-type": "^1.0.4",
     "debug": "^4.3.3",
     "file-type": "16.5.3",
@@ -91,26 +93,32 @@
     "token-types": "^4.1.1"
   },
   "devDependencies": {
-    "@tokenizer/token": "^0.3.0",
     "@types/chai": "^4.3.0",
     "@types/debug": "^4.1.7",
     "@types/file-type": "^10.9.1",
-    "@types/mocha": "^9.0.0",
-    "@types/node": "^17.0.8",
-    "chai": "^4.3.4",
+    "@types/mocha": "^9.1.0",
+    "@types/node": "^17.0.17",
+    "@typescript-eslint/eslint-plugin": "^5.11.0",
+    "@typescript-eslint/parser": "^5.11.0",
+    "chai": "^4.3.6",
     "coveralls": "^3.1.1",
     "del-cli": "4.0.1",
-    "eslint": "8.6.0",
+    "eslint": "^8.8.0",
+    "eslint-config-prettier": "^8.3.0",
+    "eslint-import-resolver-typescript": "^2.5.0",
+    "eslint-plugin-import": "^2.25.4",
+    "eslint-plugin-jsdoc": "^37.8.2",
+    "eslint-plugin-node": "^11.1.0",
+    "eslint-plugin-unicorn": "^40.1.0",
     "mime": "^3.0.0",
-    "mocha": "^9.1.3",
+    "mocha": "^9.2.0",
     "npm-run-all": "^4.1.5",
     "nyc": "^15.1.0",
     "remark-cli": "^10.0.1",
     "remark-preset-lint-recommended": "^6.1.2",
     "source-map-support": "^0.5.21",
-    "ts-node": "^10.3.0",
-    "tslint": "^6.1.3",
-    "typescript": "^4.5.4"
+    "ts-node": "^10.5.0",
+    "typescript": "^4.5.5"
   },
   "engines": {
     "node": ">=10"