@ctrl/torrent-file 4.3.0 → 4.4.0

package/dist/src/bencode/decode.js

@@ -1,5 +1,4 @@
 import { stringToUint8Array, uint8ArrayToString } from 'uint8array-extras';
-import { isValidUTF8 } from './utils.js';
 const td = new TextDecoder();
 class Decoder {
     idx = 0;
@@ -70,8 +69,7 @@ class Decoder {
     nextBufOrString() {
         const length = this.readNumber();
         this.assertByte(':');
-        const buf = this.readBytes(length);
-        return isValidUTF8(buf) ? td.decode(buf) : buf;
+        return this.readBytes(length);
     }
     nextString() {
         const length = this.readNumber();

package/dist/src/bencode/encode.js

@@ -1,5 +1,4 @@
 import { concatUint8Arrays, stringToUint8Array } from 'uint8array-extras';
-import { cmpRawString } from './utils.js';
 const te = new TextEncoder();
 const encodeString = (str) => {
     const lengthBytes = new TextEncoder().encode(str.length.toString());
@@ -33,7 +32,7 @@ const encodeNumber = (num) => {
 const encodeDictionary = (obj) => {
     const results = [];
     Object.keys(obj)
-        .sort(cmpRawString)
+        .sort()
         .forEach(key => {
         results.push(encodeString(key));
         results.push(new Uint8Array(encode(obj[key])));

package/dist/src/bencode/utils.d.ts

@@ -1,3 +1 @@
 export declare const cmpRawString: (str1: string, str2: string) => number;
-export declare const typedArraysAreEqual: <T extends Uint8Array>(a: T, b: T) => boolean;
-export declare const isValidUTF8: (buf: Uint8Array) => boolean;

package/dist/src/bencode/utils.js

@@ -18,73 +18,3 @@ export const cmpRawString = (str1, str2) => {
     }
     return v1.length < v2.length ? -1 : 1;
 };
-export const typedArraysAreEqual = (a, b) => {
-    if (a.byteLength !== b.byteLength) {
-        return false;
-    }
-    return a.every((val, i) => val === b[i]);
-};
-// Copied from https://github.com/hcodes/isutf8/blob/master/src/index.ts
-/*
-    https://tools.ietf.org/html/rfc3629
-    UTF8-char = UTF8-1 / UTF8-2 / UTF8-3 / UTF8-4
-    UTF8-1    = %x00-7F
-    UTF8-2    = %xC2-DF UTF8-tail
-    UTF8-3    = %xE0 %xA0-BF UTF8-tail
-                %xE1-EC 2( UTF8-tail )
-                %xED %x80-9F UTF8-tail
-                %xEE-EF 2( UTF8-tail )
-    UTF8-4    = %xF0 %x90-BF 2( UTF8-tail )
-                %xF1-F3 3( UTF8-tail )
-                %xF4 %x80-8F 2( UTF8-tail )
-    UTF8-tail = %x80-BF
-*/
-export const isValidUTF8 = (buf) => {
-    let i = 0;
-    const len = buf.length;
-    while (i < len) {
-        // UTF8-1 = %x00-7F
-        if (buf[i] <= 0x7f) {
-            i++;
-            continue;
-        }
-        // UTF8-2 = %xC2-DF UTF8-tail
-        if (buf[i] >= 0xc2 && buf[i] <= 0xdf) {
-            // if(buf[i + 1] >= 0x80 && buf[i + 1] <= 0xBF) {
-            if (buf[i + 1] >> 6 === 2) {
-                i += 2;
-                continue;
-            }
-            return false;
-        }
-        // UTF8-3 = %xE0 %xA0-BF UTF8-tail
-        // UTF8-3 = %xED %x80-9F UTF8-tail
-        if (((buf[i] === 0xe0 && buf[i + 1] >= 0xa0 && buf[i + 1] <= 0xbf) ||
-            (buf[i] === 0xed && buf[i + 1] >= 0x80 && buf[i + 1] <= 0x9f)) &&
-            buf[i + 2] >> 6 === 2) {
-            i += 3;
-            continue;
-        }
-        // UTF8-3 = %xE1-EC 2( UTF8-tail )
-        // UTF8-3 = %xEE-EF 2( UTF8-tail )
-        if (((buf[i] >= 0xe1 && buf[i] <= 0xec) || (buf[i] >= 0xee && buf[i] <= 0xef)) &&
-            buf[i + 1] >> 6 === 2 &&
-            buf[i + 2] >> 6 === 2) {
-            i += 3;
-            continue;
-        }
-        // UTF8-4 = %xF0 %x90-BF 2( UTF8-tail )
-        //          %xF1-F3 3( UTF8-tail )
-        //          %xF4 %x80-8F 2( UTF8-tail )
-        if (((buf[i] === 0xf0 && buf[i + 1] >= 0x90 && buf[i + 1] <= 0xbf) ||
-            (buf[i] >= 0xf1 && buf[i] <= 0xf3 && buf[i + 1] >> 6 === 2) ||
-            (buf[i] === 0xf4 && buf[i + 1] >= 0x80 && buf[i + 1] <= 0x8f)) &&
-            buf[i + 2] >> 6 === 2 &&
-            buf[i + 3] >> 6 === 2) {
-            i += 4;
-            continue;
-        }
-        return false;
-    }
-    return true;
-};

package/dist/src/torrentFile.d.ts

@@ -1,6 +1,6 @@
 export declare const sha1: (input: Uint8Array) => string;
 /**
- * sha1 of torrent file info. This hash is commenly used by torrent clients as the ID of the torrent.
+ * sha1 of torrent file info. This hash is commonly used by torrent clients as the ID of the torrent.
  */
 export declare function hash(file: Uint8Array): string;
 export interface TorrentFileData {

package/dist/src/torrentFile.js

@@ -2,6 +2,13 @@ import { createHash } from 'node:crypto';
 import { join, sep } from 'node:path';
 import { isUint8Array, uint8ArrayToHex, uint8ArrayToString } from 'uint8array-extras';
 import { decode, encode } from './bencode/index.js';
+// Helper function to convert Uint8Array to string for display
+const toString = (value) => {
+    if (value instanceof Uint8Array) {
+        return uint8ArrayToString(value);
+    }
+    return value.toString();
+};
 export const sha1 = (input) => {
     const hash = createHash('sha1');
     // Update the hash object with the data
@@ -9,7 +16,7 @@ export const sha1 = (input) => {
     return hash.digest('hex');
 };
 /**
- * sha1 of torrent file info. This hash is commenly used by torrent clients as the ID of the torrent.
+ * sha1 of torrent file info. This hash is commonly used by torrent clients as the ID of the torrent.
  */
 export function hash(file) {
     const torrent = decode(file);
@@ -28,9 +35,9 @@ export function files(file) {
         pieces: [],
     };
     const files = torrent.info.files || [torrent.info];
-    const name = (torrent.info['name.utf-8'] || torrent.info.name).toString();
+    const name = toString(torrent.info['name.utf-8'] || torrent.info.name);
     result.files = files.map((file, i) => {
-        const parts = [name, ...(file['path.utf-8'] || file.path || [])].map(p => p.toString());
+        const parts = [name, ...(file['path.utf-8'] || file.path || [])].map(p => toString(p));
         return {
             path: join(sep, ...parts).slice(1),
             name: parts[parts.length - 1],
@@ -61,7 +68,7 @@ function splitPieces(buf) {
 export function info(file) {
     const torrent = decode(file);
     const result = {
-        name: (torrent.info['name.utf-8'] || torrent.info.name).toString(),
+        name: toString(torrent.info['name.utf-8'] || torrent.info.name),
         announce: [],
         urlList: [],
     };
@@ -72,10 +79,10 @@ export function info(file) {
         result.created = new Date(torrent['creation date'] * 1000);
     }
     if (torrent['created by']) {
-        result.createdBy = torrent['created by'].toString();
+        result.createdBy = toString(torrent['created by']);
     }
-    if (isUint8Array(torrent.comment)) {
-        result.comment = uint8ArrayToString(torrent.comment);
+    if (torrent.comment) {
+        result.comment = toString(torrent.comment);
     }
     // announce and announce-list will be missing if metadata fetched via ut_metadata
     if (Array.isArray(torrent['announce-list']) &&
@@ -83,12 +90,12 @@ export function info(file) {
         torrent['announce-list'].length > 0) {
         torrent['announce-list'].forEach((urls) => {
             urls.forEach((url) => {
-                result.announce.push(url.toString());
+                result.announce.push(toString(url));
             });
         });
     }
     else if (torrent.announce) {
-        result.announce.push(torrent.announce.toString());
+        result.announce.push(toString(torrent.announce));
     }
     if (result.announce.length) {
         result.announce = Array.from(new Set(result.announce));
@@ -98,7 +105,7 @@ export function info(file) {
         // some clients set url-list to empty string
         torrent['url-list'] = torrent['url-list'].length > 0 ? [torrent['url-list']] : [];
     }
-    result.urlList = (torrent['url-list'] || []).map((url) => url.toString());
+    result.urlList = (torrent['url-list'] || []).map((url) => toString(url));
     if (result.urlList.length) {
         result.urlList = Array.from(new Set(result.urlList));
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ctrl/torrent-file",
-  "version": "4.3.0",
+  "version": "4.4.0",
   "description": "Parse a torrent file (name, hash, files, pieces)",
   "author": "Scott Cooper <scttcper@gmail.com>",
   "license": "MIT",