music-metadata 11.8.1 → 11.8.2

package/lib/apev2/APEv2Parser.js

@@ -5,7 +5,7 @@ import * as util from '../common/Util.js';
 import { BasicParser } from '../common/BasicParser.js';
 import { DataType, DescriptorParser, Header, TagFooter, TagItemHeader } from './APEv2Token.js';
 import { makeUnexpectedFileContentError } from '../ParseError.js';
-import { TextDecoder } from '@kayahr/text-encoding';
+import { textDecode } from '@borewit/text-codec';
 const debug = initDebug('music-metadata:parser:APEv2');
 const tagFormat = 'APEv2';
 const preamble = 'APETAGEX';
@@ -132,7 +132,7 @@ export class APEv2Parser extends BasicParser {
                         const picData = new Uint8Array(tagItemHeader.size);
                         await this.tokenizer.readBuffer(picData);
                         zero = util.findZero(picData, 0, picData.length);
-                        const description = new TextDecoder('utf-8').decode(picData.slice(0, zero));
+                        const description = textDecode(picData.slice(0, zero), 'utf-8');
                         const data = picData.slice(zero + 1);
                         await this.metadata.addTag(tagFormat, key, {
                             description,

package/lib/common/FourCC.js

@@ -1,4 +1,4 @@
-import { TextDecoder, TextEncoder } from '@kayahr/text-encoding';
+import { textDecode, textEncode } from '@borewit/text-codec';
 import * as util from './Util.js';
 import { InternalParserError, FieldDecodingError } from '../ParseError.js';
 const validFourCC = /^[\x21-\x7e©][\x20-\x7e\x00()]{3}/;
@@ -9,14 +9,14 @@ const validFourCC = /^[\x21-\x7e©][\x20-\x7e\x00()]{3}/;
 export const FourCcToken = {
     len: 4,
     get: (buf, off) => {
-        const id = new TextDecoder('latin1').decode(buf.slice(off, off + FourCcToken.len));
+        const id = textDecode(buf.slice(off, off + FourCcToken.len), 'latin1');
         if (!id.match(validFourCC)) {
             throw new FieldDecodingError(`FourCC contains invalid characters: ${util.a2hex(id)} "${id}"`);
         }
         return id;
     },
     put: (buffer, offset, id) => {
-        const str = new TextEncoder('latin1').encode(id);
+        const str = textEncode(id, 'latin1');
         if (str.length !== 4)
             throw new InternalParserError('Invalid length');
         buffer.set(str, offset);

package/lib/id3v1/ID3v1Parser.js

@@ -3,7 +3,7 @@ import { StringType, UINT8 } from 'token-types';
 import * as util from '../common/Util.js';
 import { BasicParser } from '../common/BasicParser.js';
 import { APEv2Parser } from '../apev2/APEv2Parser.js';
-import { TextDecoder } from '@kayahr/text-encoding';
+import { textDecode } from '@borewit/text-codec';
 const debug = initDebug('music-metadata:parser:ID3v1');
 /**
  * ID3v1 Genre mappings
@@ -131,7 +131,7 @@ export async function hasID3v1Header(tokenizer) {
         const position = tokenizer.position;
         await tokenizer.readBuffer(tag, { position: tokenizer.fileInfo.size - 128 });
         tokenizer.setPosition(position); // Restore tokenizer position
-        return new TextDecoder('latin1').decode(tag) === 'TAG';
+        return textDecode(tag, 'latin1') === 'TAG';
     }
     return false;
 }

package/lib/id3v2/ID3v2Parser.js

@@ -2,8 +2,7 @@ import * as Token from 'token-types';
 import * as util from '../common/Util.js';
 import { FrameParser, Id3v2ContentError } from './FrameParser.js';
 import { ExtendedHeader, ID3v2Header, UINT32SYNCSAFE } from './ID3v2Token.js';
-import { TextDecoder } from '@kayahr/text-encoding';
-const asciiDecoder = new TextDecoder('ascii');
+import { textDecode } from '@borewit/text-codec';
 export class ID3v2Parser {
     constructor() {
         this.tokenizer = undefined;
@@ -150,7 +149,7 @@ export class ID3v2Parser {
         switch (majorVer) {
             case 2:
                 header = {
-                    id: asciiDecoder.decode(uint8Array.slice(0, 3)),
+                    id: textDecode(uint8Array.slice(0, 3), 'ascii'),
                     length: Token.UINT24_BE.get(uint8Array, 3)
                 };
                 if (!header.id.match(/[A-Z0-9]{3}/g)) {
@@ -160,7 +159,7 @@ export class ID3v2Parser {
             case 3:
             case 4:
                 header = {
-                    id: asciiDecoder.decode(uint8Array.slice(0, 4)),
+                    id: textDecode(uint8Array.slice(0, 4), 'ascii'),
                     length: (majorVer === 4 ? UINT32SYNCSAFE : Token.UINT32_BE).get(uint8Array, 4),
                     flags: ID3v2Parser.readFrameFlags(uint8Array.slice(8, 10))
                 };

package/lib/lyrics3/Lyrics3.js

@@ -1,4 +1,4 @@
-import { TextDecoder } from '@kayahr/text-encoding';
+import { textDecode } from '@borewit/text-codec';
 export const endTag2 = 'LYRICS200';
 export async function getLyricsHeaderLength(tokenizer) {
     const fileSize = tokenizer.fileInfo.size;
@@ -7,7 +7,7 @@ export async function getLyricsHeaderLength(tokenizer) {
         const position = tokenizer.position;
         await tokenizer.readBuffer(buf, { position: fileSize - 143 });
         tokenizer.setPosition(position); // Restore position
-        const txt = new TextDecoder('latin1').decode(buf);
+        const txt = textDecode(buf, 'latin1');
         const tag = txt.slice(6);
         if (tag === endTag2) {
             return Number.parseInt(txt.slice(0, 6), 10) + 15;

package/lib/mp4/MP4Parser.js

@@ -7,7 +7,7 @@ import * as AtomToken from './AtomToken.js';
 import { ChapterTrackReferenceBox, Mp4ContentError, } from './AtomToken.js';
 import { TrackType } from '../type.js';
 import { uint8ArrayToHex } from '../common/Util.js';
-import { TextDecoder } from '@kayahr/text-encoding';
+import { textDecode } from '@borewit/text-codec';
 const debug = initDebug('music-metadata:parser:MP4');
 const tagFormat = 'iTunes';
 const encoderDict = {
@@ -354,7 +354,7 @@ export class MP4Parser extends BasicParser {
                 }
                 default: {
                     const uint8Array = await this.tokenizer.readToken(new Token.Uint8ArrayType(payLoadLength));
-                    this.addWarning(`Unsupported meta-item: ${tagKey}[${child.header.name}] => value=${uint8ArrayToHex(uint8Array)} ascii=${new TextDecoder('ascii').decode(uint8Array)}`);
+                    this.addWarning(`Unsupported meta-item: ${tagKey}[${child.header.name}] => value=${uint8ArrayToHex(uint8Array)} ascii=${textDecode(uint8Array, 'ascii')}`);
                 }
             }
         }, metaAtom.getPayloadLength(0));
@@ -385,7 +385,7 @@ export class MP4Parser extends BasicParser {
                         break;
                     }
                     case 'rate': {
-                        const rate = new TextDecoder('ascii').decode(dataAtom.value);
+                        const rate = textDecode(dataAtom.value, 'ascii');
                         await this.addTag(tagKey, rate);
                         break;
                     }
@@ -395,7 +395,7 @@ export class MP4Parser extends BasicParser {
                 break;
             case 1: // UTF-8: Without any count or NULL terminator
             case 18: // Unknown: Found in m4b in combination with a '©gen' tag
-                await this.addTag(tagKey, new TextDecoder('utf-8').decode(dataAtom.value));
+                await this.addTag(tagKey, textDecode(dataAtom.value));
                 break;
             case 13: // JPEG
                 if (this.options.skipCovers)

package/lib/musepack/sv7/StreamVersion7.js

@@ -1,6 +1,6 @@
 import * as Token from 'token-types';
 import * as util from '../../common/Util.js';
-import { TextDecoder } from '@kayahr/text-encoding';
+import { textDecode } from '@borewit/text-codec';
 /**
  * BASIC STRUCTURE
  */
@@ -9,7 +9,7 @@ export const Header = {
     get: (buf, off) => {
         const header = {
             // word 0
-            signature: new TextDecoder('latin1').decode(buf.subarray(off, off + 3)),
+            signature: textDecode(buf.subarray(off, off + 3), 'latin1'),
             // versionIndex number * 1000 (3.81 = 3810) (remember that 4-byte alignment causes this to take 4-bytes)
             streamMinorVersion: util.getBitAllignedNumber(buf, off + 3, 0, 4),
             streamMajorVersion: util.getBitAllignedNumber(buf, off + 3, 4, 4),

package/lib/ogg/vorbis/VorbisDecoder.js

@@ -1,5 +1,5 @@
 import * as Token from 'token-types';
-import { TextDecoder } from '@kayahr/text-encoding';
+import { textDecode } from '@borewit/text-codec';
 export class VorbisDecoder {
     constructor(data, offset) {
         this.data = data;
@@ -12,7 +12,7 @@ export class VorbisDecoder {
     }
     readStringUtf8() {
         const len = this.readInt32();
-        const value = new TextDecoder('utf-8').decode(this.data.subarray(this.offset, this.offset + len));
+        const value = textDecode(this.data.subarray(this.offset, this.offset + len), 'utf-8');
         this.offset += len;
         return value;
     }

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": "11.8.1",
+  "version": "11.8.2",
   "author": {
     "name": "Borewit",
     "url": "https://github.com/Borewit"
@@ -106,14 +106,14 @@
     "update-biome": "yarn add -D --exact @biomejs/biome && npx @biomejs/biome migrate --write"
   },
   "dependencies": {
-    "@kayahr/text-encoding": "^2.0.1",
+    "@borewit/text-codec": "^0.1.0",
     "@tokenizer/token": "^0.3.0",
     "content-type": "^1.0.5",
     "debug": "^4.4.1",
     "file-type": "^21.0.0",
     "media-typer": "^1.1.0",
     "strtok3": "^10.3.4",
-    "token-types": "^6.1.0"
+    "token-types": "^6.1.1"
   },
   "devDependencies": {
     "@biomejs/biome": "2.1.4",