@ctrl/magnet-link 3.1.2 → 4.0.0

package/README.md

@@ -71,7 +71,7 @@ const uri = magnetEncode({
 });
 
 
-You can also use convenience key names like name (dn), infoHash (xt), infoHashBuffer (xt), announce (tr), and keywords (kt).
+You can also use convenience key names like name (dn), infoHash (xt), infoHashIntArray (xt), announce (tr), and keywords (kt).
 ```
 
 ### See Also

package/dist/src/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" resolution-mode="require"/>
 export interface MagnetData {
     /**
      * Is the info-hash hex encoded, for a total of 40 characters. For compatability with existing links in the wild, clients should also support the 32 character base32 encoded info-hash.
@@ -13,9 +12,9 @@ export interface MagnetData {
      * Parsed xt= parameter see xt
      */
     infoHash?: string;
-    infoHashBuffer?: Buffer;
+    infoHashIntArray?: Uint8Array;
     infoHashV2?: string;
-    infoHashV2Buffer?: Buffer;
+    infoHashV2IntArray?: Uint8Array;
     /**
      * The display name that may be used by the client to display while waiting for metadata
      */
@@ -68,7 +67,7 @@ export interface MagnetData {
     urlList?: string[];
     peerAddresses?: string[];
     publicKey?: string;
-    publicKeyBuffer?: Buffer;
+    publicKeyIntArray?: Uint8Array;
 }
 export declare function magnetDecode(uri: string): MagnetData;
 export declare function magnetEncode(data: MagnetData): string;

package/dist/src/index.js

@@ -1,4 +1,5 @@
-import { base32Decode } from '@ctrl/ts-base32';
+import { base32 } from 'rfc4648';
+import { hexToUint8Array, uint8ArrayToHex } from 'uint8array-extras';
 import * as bep53Range from './bep53.js';
 const start = 'magnet:?';
 export function magnetDecode(uri) {
@@ -39,8 +40,8 @@ export function magnetDecode(uri) {
                 result.infoHash = m[1].toLowerCase();
             }
             else if ((m = xt.match(/^urn:btih:(.{32})/))) {
-                const decodedStr = base32Decode(m[1]);
-                result.infoHash = Buffer.from(decodedStr).toString('hex');
+                const decodedStr = base32.parse(m[1]);
+                result.infoHash = uint8ArrayToHex(decodedStr);
             }
             else if ((m = xt.match(/^urn:btmh:1220(.{64})/))) {
                 result.infoHashV2 = m[1].toLowerCase();
@@ -57,13 +58,13 @@ export function magnetDecode(uri) {
         });
     }
     if (result.infoHash) {
-        result.infoHashBuffer = Buffer.from(result.infoHash, 'hex');
+        result.infoHashIntArray = hexToUint8Array(result.infoHash);
     }
     if (result.infoHashV2) {
-        result.infoHashV2Buffer = Buffer.from(result.infoHashV2, 'hex');
+        result.infoHashV2IntArray = hexToUint8Array(result.infoHashV2);
     }
     if (result.publicKey) {
-        result.publicKeyBuffer = Buffer.from(result.publicKey, 'hex');
+        result.publicKeyIntArray = hexToUint8Array(result.publicKey);
     }
     if (result.dn) {
         result.name = result.dn;
@@ -133,14 +134,14 @@ export function magnetEncode(data) {
     if (obj.xt && Array.isArray(obj.xt)) {
         xts = new Set(obj.xt);
     }
-    if (obj.infoHashBuffer) {
-        xts.add(`urn:btih:${obj.infoHashBuffer.toString('hex')}`);
+    if (obj.infoHashIntArray) {
+        xts.add(`urn:btih:${uint8ArrayToHex(obj.infoHashIntArray)}`);
     }
     if (obj.infoHash) {
         xts.add(`urn:btih:${obj.infoHash}`);
     }
-    if (obj.infoHashV2Buffer) {
-        xts.add((obj.xt = `urn:btmh:1220${obj.infoHashV2Buffer.toString('hex')}`));
+    if (obj.infoHashV2IntArray) {
+        xts.add((obj.xt = `urn:btmh:1220${uint8ArrayToHex(obj.infoHashV2IntArray)}`));
     }
     if (obj.infoHashV2) {
         xts.add(`urn:btmh:1220${obj.infoHashV2}`);
@@ -157,8 +158,8 @@ export function magnetEncode(data) {
     if (obj.infoHash) {
         obj.xt = `urn:btih:${obj.infoHash}`;
     }
-    if (obj.publicKeyBuffer) {
-        obj.xs = `urn:btpk:${obj.publicKeyBuffer.toString('hex')}`;
+    if (obj.publicKeyIntArray) {
+        obj.xs = `urn:btpk:${uint8ArrayToHex(obj.publicKeyIntArray)}`;
     }
     if (obj.publicKey) {
         obj.xs = `urn:btpk:${obj.publicKey}`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ctrl/magnet-link",
-  "version": "3.1.2",
+  "version": "4.0.0",
   "description": "Parse a magnet URI into an object",
   "author": "Scott Cooper <scttcper@gmail.com>",
   "homepage": "https://magnet-link.vercel.app",
@@ -20,6 +20,7 @@
   ],
   "sideEffects": false,
   "scripts": {
+    "dev": "npm run demo:watch",
     "demo:build": "npm run build --workspace=demo",
     "demo:watch": "npm run dev --workspace=demo",
     "lint": "eslint --ext .ts .",
@@ -31,23 +32,24 @@
     "test:ci": "vitest run --coverage --reporter=default --reporter=junit --outputFile=./junit.xml"
   },
   "dependencies": {
-    "@ctrl/ts-base32": "^2.1.3"
+    "rfc4648": "^1.5.3",
+    "uint8array-extras": "^0.5.1"
   },
   "devDependencies": {
-    "@ctrl/eslint-config": "3.7.0",
-    "@sindresorhus/tsconfig": "3.0.1",
-    "@types/node": "20.1.0",
-    "@vitest/coverage-c8": "0.31.0",
-    "buffer": "6.0.3",
-    "c8": "7.13.0",
-    "typescript": "5.0.4",
-    "vitest": "0.31.0"
+    "@ctrl/eslint-config": "4.0.10",
+    "@sindresorhus/tsconfig": "5.0.0",
+    "@types/node": "20.9.0",
+    "@vitest/coverage-v8": "0.34.6",
+    "c8": "8.0.1",
+    "typescript": "5.2.2",
+    "vitest": "0.34.6"
   },
   "workspaces": [
     "demo"
   ],
   "publishConfig": {
-    "access": "public"
+    "access": "public",
+    "provenance": true
   },
   "release": {
     "branches": [
@@ -55,6 +57,6 @@
     ]
   },
   "engines": {
-    "node": ">=14.16"
+    "node": ">=18"
   }
 }