Version Bump

Thanks for all the fish, @Substack

CNAME

@@ -1 +0,0 @@
-torrent.parts

README.md

@@ -24,7 +24,6 @@ This project wouldn't be possible without the fantastic work of:
 - [@feross](https://github.com/feross) and contributors, for [`parse-torrent`](https://github.com/webtorrent/parse-torrent) and [`WebTorrent`](https://github.com/webtorrent/webtorrent)
 - [@cvisuri](https://github.com/cvisuri), for design work
 - [@CorralPeltzer](https://github.com/CorralPeltzer), for [`newTrackon`](https://github.com/CorralPeltzer/newTrackon)
-- [@substack](https://github.com/substack) and contributors, for [`Browserify`](https://github.com/browserify/browserify)
 - [Cloudflare Pages](https://pages.cloudflare.com/) hosting
 
 ## License
@@ -42,24 +41,53 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 ## About Me
 
 <a href="https://herzog.tech/" target="_blank">
-  <img src="https://herzog.tech/signature/link.svg.png" width="32px" />
+  <picture>
+    <source media="(prefers-color-scheme: dark)" srcset="https://herzog.tech/signature/link-light.svg.png">
+    <source media="(prefers-color-scheme: light)" srcset="https://herzog.tech/signature/link.svg.png">
+    <img src="https://herzog.tech/signature/link.svg.png" width="32px">
+  </picture>
 </a>
-<a href="https://twitter.com/xd1936" target="_blank">
+<a href="https://mastodon.social/@herzog" target="_blank">
-  <img src="https://herzog.tech/signature/twitter.svg.png" width="32px" />
+  <picture>
+    <source media="(prefers-color-scheme: dark)" srcset="https://herzog.tech/signature/mastodon-light.svg.png">
+    <source media="(prefers-color-scheme: light)" srcset="https://herzog.tech/signature/mastodon.svg.png">
+    <img src="https://herzog.tech/signature/mastodon.svg.png" width="32px">
+  </picture>
 </a>
 <a href="https://github.com/leoherzog" target="_blank">
-  <img src="https://herzog.tech/signature/github.svg.png" width="32px" />
+  <picture>
+    <source media="(prefers-color-scheme: dark)" srcset="https://herzog.tech/signature/github-light.svg.png">
+    <source media="(prefers-color-scheme: light)" srcset="https://herzog.tech/signature/github.svg.png">
+    <img src="https://herzog.tech/signature/github.svg.png" width="32px">
+  </picture>
 </a>
 <a href="https://keybase.io/leoherzog" target="_blank">
-  <img src="https://herzog.tech/signature/keybase.svg.png" width="32px" />
+  <picture>
+    <source media="(prefers-color-scheme: dark)" srcset="https://herzog.tech/signature/keybase-light.svg.png">
+    <source media="(prefers-color-scheme: light)" srcset="https://herzog.tech/signature/keybase.svg.png">
+    <img src="https://herzog.tech/signature/keybase.svg.png" width="32px">
+  </picture>
 </a>
 <a href="https://www.linkedin.com/in/leoherzog" target="_blank">
-  <img src="https://herzog.tech/signature/linkedin.svg.png" width="32px" />
+  <picture>
+    <source media="(prefers-color-scheme: dark)" srcset="https://herzog.tech/signature/linkedin-light.svg.png">
+    <source media="(prefers-color-scheme: light)" srcset="https://herzog.tech/signature/linkedin.svg.png">
+    <img src="https://herzog.tech/signature/linkedin.svg.png" width="32px">
+  </picture>
 </a>
 <a href="https://hope.edu/directory/people/herzog-leo/" target="_blank">
-  <img src="https://herzog.tech/signature/anchor.svg.png" width="32px" />
+  <picture>
+    <source media="(prefers-color-scheme: dark)" srcset="https://herzog.tech/signature/anchor-light.svg.png">
+    <source media="(prefers-color-scheme: light)" srcset="https://herzog.tech/signature/anchor.svg.png">
+    <img src="https://herzog.tech/signature/anchor.svg.png" width="32px">
+  </picture>
 </a>
 <br />
-<a href="https://www.buymeacoffee.com/leoherzog" target="_blank">
+<a href="https://herzog.tech/$" target="_blank">
-  <img src="https://cdn.buymeacoffee.com/buttons/lato-black.png" alt="Buy Me A Coffee" width="217px" />
+  <picture>
+    <source media="(prefers-color-scheme: dark)" srcset="https://herzog.tech/signature/mug-tea-saucer-solid-light.svg.png">
+    <source media="(prefers-color-scheme: light)" srcset="https://herzog.tech/signature/mug-tea-saucer-solid.svg.png">
+    <img src="https://herzog.tech/signature/mug-tea-saucer-solid.svg.png" alt="Buy Me A Tea" width="32px">
+  </picture>
+  Found this helpful? Buy me a tea!
 </a>

index.html

@@ -36,12 +36,12 @@
 
   <title>Torrent Parts | Inspect and edit what's in your Torrent file or Magnet link</title>
 
+  <link href="https://cdn.jsdelivr.net/npm/tippy.js@6/dist/tippy.css" rel="stylesheet" />
+  <link href="https://cdn.jsdelivr.net/npm/tippy.js@6/animations/shift-away-subtle.css" rel="stylesheet" />
+  <link href="https://cdn.jsdelivr.net/npm/notyf@3/notyf.min.css" rel="stylesheet" />
   <link href="/src/style.css" rel="stylesheet" />
-  <link href="/ext/alata-latin-400.woff2" rel="preload" as="style">
-  <link href="/ext/alata-latin-400.woff" rel="preload" as="style">
   <script async src="/ext/fa.min.js"></script>
   <script async defer src="https://buttons.github.io/buttons.js"></script>
-  <script src="/ext/notyf.min.js"></script>
 
   <script async defer src='https://static.cloudflareinsights.com/beacon.min.js' data-cf-beacon='{"token": "6f97f49b4c384ee197a2f319cebec274"}'></script>
 
@@ -51,9 +51,10 @@
 
   <header>
     <h1 id="logo">Torrent<span id="originalSourceIcon"><span class="fad fa-magnet fa-fw" aria-hidden="true"></span></span>Parts</h1>
-    <a class="github-button" href="https://github.com/leoherzog/TorrentParts" data-icon="octicon-star" data-show-count="true" aria-label="Star leoherzog/TorrentParts on GitHub">Star</a>
+    <a class="github-button" href="https://github.com/leoherzog/TorrentParts" data-icon="octicon-star" data-show-count="true" aria-label="Star TorrentParts on GitHub">Star</a>
   </header>
 
+  <form id="startForm">
     <div id="startButtons">
 
       <input id="magnet" type="text" placeholder="Enter URL" aria-label="Enter URL and press enter" />
@@ -67,21 +68,22 @@
       </label>
 
     </div>
+  </form>
 
-  <div id="examples">
+  <section id="examples">
     <div>...or, try some examples!</div>
     <button id="example1" aria-label="Load Magnet Example"><span class="fal fa-magnet" aria-hidden="true"></span> Magnet URL</button>
     <button id="example2" aria-label="Load URL to Torrent File Example"><span class="fal fa-link" aria-hidden="true"></span> URL to Torrent File</button>
     <button id="example3" aria-label="Load Torrent File Example"><span class="fal fa-file-alt" aria-hidden="true"></span> Torrent File</button>
-  </div>
+  </section>
 
-  <div id="properties" style="display:none">
+  <main id="properties" style="display:none">
 
     <button id="reset" aria-label="Reset the page">
       <span class="far fa-times"></span>
     </button>
     
-    <div id="share">
+    <nav id="share">
       <a id="openURLWrapper" target="_blank">
         <button id="openURL" aria-label="Open this Magnet URL in your Torrent client">
           <span class="fas fa-arrow-up-right-from-square fa-2x"></span>
@@ -102,37 +104,46 @@
           <span class="fas fa-file-download fa-2x"></span>
         </button>
       </div>
-    </div>
+    </nav>
 
-    <div class="property">
+    <fieldset class="property">
+      <legend>
+        <span class="info" data-tippy-content="This is the unique identifier that makes Torrents work. All of the files contained in this Torrent are run through an algorithm that generates a unique string, or &ldquo;hash&rdquo;."><span class="far fa-info-circle"></span></span>
+        Unique Hash
+      </legend>
       <div class="labels">
         <div>
-          <span class="info" data-tippy-content="This is the unique identifier that makes Torrents work. All of the files contained in this Torrent are run through an algorithm that generates a unique string, or &ldquo;hash&rdquo;."><span class="far fa-info-circle"></span></span>
+          <label for="hash" class="sr-only">Unique Hash</label>
-          <label for="hash">Unique Hash</label>
         </div>
       </div>
       <div class="content">
         <input id="hash" type="text" placeholder="" disabled/>
       </div>
-    </div>
+    </fieldset>
 
-    <div class="property">
+    <fieldset class="property">
+      <legend>
+        <span class="info" data-tippy-content="An optional title specified by the creator"><span class="far fa-info-circle"></span></span>
+        Torrent Name
+      </legend>
       <div class="labels">
         <div>
-          <span class="info" data-tippy-content="An optional title specified by the creator"><span class="far fa-info-circle"></span></span>
+          <label for="name" class="sr-only">Torrent Name</label>
-          <label for="name">Torrent Name</label>
         </div>
       </div>
       <div class="content">
-        <input id="name" type="text" placeholder="Unnamed" />
+        <input id="name" type="text" placeholder="Unnamed" dir="auto" />
-      </div>
       </div>
+    </fieldset>
 
-    <div class="property">
+    <fieldset class="property">
+      <legend>
+        <span class="info" data-tippy-content="Data embedded into a Torrent file that says what program created it and when. Not included in Magnet links."><span class="far fa-info-circle"></span></span>
+        Created
+      </legend>
       <div class="labels">
         <div>
-          <span class="info" data-tippy-content="Data embedded into a Torrent file that says what program created it and when. Not included in Magnet links."><span class="far fa-info-circle"></span></span>
+          <label for="created" class="sr-only">Created</label>
-          <label for="created">Created</label>
         </div>
         <label for="createdBy" style="display:none">Created By</label>
       </div>
@@ -141,85 +152,97 @@
         <br />
         <input id="createdBy" type="text" placeholder="Creation client unspecified" aria-label="Creation client" disabled />
       </div>
-    </div>
+    </fieldset>
 
-    <div class="property">
+    <fieldset class="property">
+      <legend>
+        <span class="info" data-tippy-content="An optional description specified by the creator"><span class="far fa-info-circle"></span></span>
+        Comment
+      </legend>
       <div class="labels">
         <div>
-          <span class="info" data-tippy-content="An optional description specified by the creator"><span class="far fa-info-circle"></span></span>
+          <label for="comment" class="sr-only">Comment</label>
-          <label for="comment">Comment</label>
         </div>
       </div>
       <div class="content">
-        <input id="comment" type="text" placeholder="Not included in the URL/File provided" />
+        <input id="comment" type="text" placeholder="Not included in the URL/File provided" dir="auto" />
-      </div>
       </div>
+    </fieldset>
 
-    <div class="property">
+    <fieldset class="property">
-      <div class="labels">
+      <legend>
-        <div>
         <span class="info" data-tippy-content="Servers that keep track of other users who are actively downloading this Torrent, called &ldquo;peers&rdquo;. Your client will contact these servers first to find out who else is available to download the files from."><span class="far fa-info-circle"></span></span>
-          <label for="announce">Tracker URLs</label>
+        Tracker URLs
-        </div>
+      </legend>
+      <div class="labels">
+        <div class="label-actions">
           <a id="addTrackers">Add Known Working Trackers</a>
           <a id="removeTrackers">Remove All</a>
         </div>
+      </div>
       <div class="content">
         <button id="addTracker" data-type="announce">
           <span class="far fa-plus-circle"></span> Add Tracker
         </button>
         <div id="announce"></div>
       </div>
-    </div>
+    </fieldset>
 
-    <div class="property">
+    <fieldset class="property">
-      <div class="labels">
+      <legend>
-        <div>
         <span class="info" data-tippy-content="A list of webservers on the internet that also have a copy of the file(s) in this Torrent, to use in case no peers are available"><span class="far fa-info-circle"></span></span>
-          <label for="urlList">Webseed URLs</label>
+        Webseed URLs
-        </div>
+      </legend>
+      <div class="labels">
+        <div class="label-actions">
           <a id="removeWebseeds">Remove All</a>
         </div>
+      </div>
       <div class="content">
         <button id="addWebseed" data-type="urlList">
           <span class="far fa-plus-circle"></span> Add Webseed
         </button>
         <div id="urlList"></div>
       </div>
-    </div>
+    </fieldset>
 
-    <div class="property">
+    <fieldset class="property">
+      <legend>
+        <span class="info" data-tippy-content="Torrents take files and split them into equal size pieces to make them easy to share. Piece size is configurable when a Torrent file is made."><span class="far fa-info-circle"></span></span>
+        Pieces
+      </legend>
       <div class="labels">
         <div>
-          <span class="info" data-tippy-content="Torrents take files and split them into equal size pieces to make them easy to share. Piece size is configurable when a Torrent file is made."><span class="far fa-info-circle"></span></span>
+          <label for="pieces" class="sr-only">Pieces</label>
-          <label for="pieces">Pieces</label>
         </div>
       </div>
       <div class="content">
         <input id="pieces" type="text" placeholder="Not included in the URL/File provided" aria-label="Piece size and length" disabled required />
       </div>
-    </div>
+    </fieldset>
 
-    <div class="property">
+    <fieldset class="property">
-      <div class="labels">
+      <legend>
-        <div>
         <span class="info" data-tippy-content="The files listed in this Torrent file. Not included in Magnet links."><span class="far fa-info-circle"></span></span>
-          <label for="files">Files</label>
+        Files
-        </div>
+      </legend>
+      <div class="labels">
+        <div class="label-actions">
           <a id="getFiles">Fetch Files List from WebTorrent</a>
         </div>
+      </div>
       <table id="files">
         <tbody id="filesBody"></tbody>
       </table>
-    </div>
+    </fieldset>
 
-  </div>
+  </main>
 
   <footer>
-    <a href="https://github.com/leoherzog/TorrentParts/releases" target="_blank" rel="noopener">v1.2</a>
+    <a href="https://github.com/leoherzog/TorrentParts/releases" target="_blank" rel="noopener">v2.0.2</a>
   </footer>
 
-  <script src="/bin/bundle.min.js"></script>
+  <script type="module" src="/src/parse.js"></script>
 
   <script>
     if ('serviceWorker' in navigator) {

package.json

@@ -1,42 +0,0 @@
-{
-  "name": "torrentparts",
-  "version": "1.2",
-  "description": "📑 A website to inspect and edit Torrent files and Magnet URLs",
-  "main": "bin/bundle.js",
-  "dependencies": {
-    "browserify": "^17.0.0",
-    "bytes": "^3.1.2",
-    "clipboard": "^2.0.10",
-    "magnet-uri": "^6.2.0",
-    "mime-types": "^2.1.35",
-    "parse-torrent": "^9.1.4",
-    "tippy.js": "^6.3.7",
-    "webtorrent": "^1.8.6"
-  },
-  "devDependencies": {
-    "buffer": "^6.0.3",
-    "notyf": "^3.10.0",
-    "terser": "^5.12.1",
-    "watchify": "^4.0.0"
-  },
-  "scripts": {
-    "watch": "watchify src/parse.js -o bin/bundle.js",
-    "compile": "browserify src/parse.js -o bin/bundle.js",
-    "minify": "terser bin/bundle.js -c -m -o bin/bundle.min.js",
-    "build": "npm run compile && npm run minify",
-    "update": "npm update -g && npm update && npm run build"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/leoherzog/TorrentParts.git"
-  },
-  "glitch": {
-    "projectType": "generated_static"
-  },
-  "author": "Leo Herzog",
-  "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/leoherzog/TorrentParts/issues"
-  },
-  "homepage": "https://github.com/leoherzog/TorrentParts"
-}

src/parse.js

@@ -1,10 +1,11 @@
-require('buffer');
+import { Buffer } from 'https://cdn.jsdelivr.net/npm/buffer@6/+esm';
-const clipboard = require('clipboard');
+import clipboard from 'https://cdn.jsdelivr.net/npm/clipboard@2/+esm';
-const parser = require('parse-torrent');
+import parseTorrent, { toMagnetURI, toTorrentFile, remote as parseTorrentRemote } from 'https://cdn.jsdelivr.net/npm/parse-torrent@11/+esm';
-const bytes = require('bytes');
+import bytes from 'https://cdn.jsdelivr.net/npm/bytes@3/+esm';
-const mime = require('mime-types');
+import mime from 'https://cdn.jsdelivr.net/npm/mime-types@2/+esm';
-const WebTorrent = require('webtorrent');
+import WebTorrent from 'https://cdn.jsdelivr.net/npm/webtorrent@2/dist/webtorrent.min.js';
-const tippy = require('tippy.js').default;
+import tippy from 'https://cdn.jsdelivr.net/npm/tippy.js@6/+esm';
+import { Notyf } from 'https://cdn.jsdelivr.net/npm/notyf@3/+esm';
 
 var examples = document.getElementById('examples');
 var example1 = document.getElementById('example1');
@@ -13,7 +14,7 @@ var example3 = document.getElementById('example3');
 var properties = document.getElementById('properties');
 var originalSourceIcon = document.getElementById('originalSourceIcon');
 var source;
-var sourceTooltip = tippy(originalSourceIcon, {"theme": "torrent-parts", "animation": "shift-away-subtle"});
+var sourceTooltip = tippy(originalSourceIcon, { theme: 'torrent-parts', animation: 'shift-away-subtle' });
 var name = document.getElementById('name');
 var reset = document.getElementById('reset');
 var created = document.getElementById('created');
@@ -36,45 +37,45 @@ var copyURL = document.getElementById('copyURL');
 var copyMagnet = document.getElementById('copyMagnet');
 var downloadTorrentWrapper = document.getElementById('downloadTorrentWrapper');
 var downloadTorrent = document.getElementById('downloadTorrent');
-var openURLTooltip = tippy(openURL, {"theme": "torrent-parts", "animation": "shift-away-subtle", "content": "Open this Magnet URL in your Torrent client"});
+var openURLTooltip = tippy(openURL, { theme: 'torrent-parts', animation: 'shift-away-subtle', content: 'Open this Magnet URL in your Torrent client' });
-var copyURLTooltip = tippy(copyURL, {"theme": "torrent-parts", "animation": "shift-away-subtle", "content": "Copy torrent.parts link to clipboard"});
+var copyURLTooltip = tippy(copyURL, { theme: 'torrent-parts', animation: 'shift-away-subtle', content: 'Copy torrent.parts link to clipboard' });
-var copyMagnetTooltip = tippy(copyMagnet, {"theme": "torrent-parts", "animation": "shift-away-subtle", "content": "Copy Magnet link to clipboard"});
+var copyMagnetTooltip = tippy(copyMagnet, { theme: 'torrent-parts', animation: 'shift-away-subtle', content: 'Copy Magnet link to clipboard' });
-var downloadTorrentTooltip = tippy(downloadTorrentWrapper, {"theme": "torrent-parts", "animation": "shift-away-subtle", "content": "Download Torrent file"});
+var downloadTorrentTooltip = tippy(downloadTorrentWrapper, { theme: 'torrent-parts', animation: 'shift-away-subtle', content: 'Download Torrent file' });
 var parsed;
 var client = new WebTorrent();
 var notyf = new Notyf({
-  "duration": 8000,
+  duration: 8000,
-  "dismissible": true,
+  dismissible: true,
-  "ripple": false,
+  ripple: false,
-  "position": {
+  position: {
-    "x": "right",
+    x: 'right',
-    "y": "top",
+    y: 'top',
   },
-  "types": [
+  types: [
     {
-      "type": "success",
+      type: 'success',
-      "background": "#46835C",
+      background: '#46835C',
-      "icon": false
+      icon: false,
     },
     {
-      "type": "error",
+      type: 'error',
-      "background": "#A60A0A",
+      background: '#A60A0A',
-      "icon": false
+      icon: false,
-    }
+    },
-  ]
+  ],
 });
 
 function placeDownloadTooltips(e) {
   if (window.innerWidth > 1080) {
-    openURLTooltip.setProps({"placement": "right"});
+    openURLTooltip.setProps({ placement: 'right' });
-    copyURLTooltip.setProps({"placement": "right"});
+    copyURLTooltip.setProps({ placement: 'right' });
-    copyMagnetTooltip.setProps({"placement": "right"});
+    copyMagnetTooltip.setProps({ placement: 'right' });
-    downloadTorrentTooltip.setProps({"placement": "right"});
+    downloadTorrentTooltip.setProps({ placement: 'right' });
   } else {
-    openURLTooltip.setProps({"placement": "top"});
+    openURLTooltip.setProps({ placement: 'top' });
-    copyURLTooltip.setProps({"placement": "top"});
+    copyURLTooltip.setProps({ placement: 'top' });
-    copyMagnetTooltip.setProps({"placement": "top"});
+    copyMagnetTooltip.setProps({ placement: 'top' });
-    downloadTorrentTooltip.setProps({"placement": "top"});
+    downloadTorrentTooltip.setProps({ placement: 'top' });
   }
 }
 
@@ -84,22 +85,26 @@ placeDownloadTooltips();
 document.addEventListener('DOMContentLoaded', start);
 
 function start() {
+  // form submission prevention
+  document.getElementById('startForm').addEventListener('submit', function (event) {
+    event.preventDefault();
+  });
 
   // magnet input
-  document.getElementById('magnet').addEventListener('keyup', function(event) {
+  document.getElementById('magnet').addEventListener('keyup', function (event) {
     event.preventDefault();
     if (event.key === 'Enter') {
       source = 'magnet';
       originalSourceIcon.innerHTML = '<span class="fad fa-magnet fa-fw"></span>';
       sourceTooltip.setContent('Currently loaded information sourced from Magnet URL');
-      parse(magnet.value);
+      parse(this.value);
     }
   });
 
   // torrent select button
-  document.getElementById('torrent').addEventListener('change', function(event) {
+  document.getElementById('torrent').addEventListener('change', function (event) {
     event.preventDefault();
-    event.target.files[0].arrayBuffer().then(function(arrayBuffer) {
+    event.target.files[0].arrayBuffer().then(function (arrayBuffer) {
       source = 'torrent-file';
       originalSourceIcon.innerHTML = '<span class="fad fa-file-alt fa-fw"></span>';
       sourceTooltip.setContent('Currently loaded information sourced from Torrent file');
@@ -108,13 +113,17 @@ function start() {
   });
 
   // body drag-and-drop torrent file support
-  document.addEventListener('dragover', function(event) {
+  document.addEventListener('dragover', function (event) {
     event.preventDefault();
   });
 
-  document.addEventListener('drop', function(event) {
+  document.addEventListener('drop', function (event) {
     event.preventDefault();
-    event.dataTransfer.items[0].getAsFile().arrayBuffer().then(function(arrayBuffer) {
+    if (event.dataTransfer.items.length === 0) return;
+    if (event.dataTransfer.items[0].kind !== 'file') return;
+    const file = event.dataTransfer.items[0].getAsFile();
+    if (!file) return;
+    file.arrayBuffer().then(function (arrayBuffer) {
       source = 'torrent-file';
       originalSourceIcon.innerHTML = '<span class="fad fa-file-alt fa-fw"></span>';
       sourceTooltip.setContent('Currently loaded information sourced from Torrent file');
@@ -123,16 +132,16 @@ function start() {
   });
 
   // example buttons
-  example1.addEventListener('click', function(event) {
+  example1.addEventListener('click', function (event) {
     event.preventDefault();
-    notyf.success('Parsing Ubuntu 22.04 Magnet URL');
+    notyf.success('Parsing Ubuntu 24.04 Magnet URL');
     source = 'magnet';
     originalSourceIcon.innerHTML = '<span class="fad fa-magnet fa-fw"></span>';
     sourceTooltip.setContent('Currently loaded information sourced from Magnet URL');
-    parse('magnet:?xt=urn:btih:2c6b6858d61da9543d4231a71db4b1c9264b0685&dn=ubuntu-22.04-desktop-amd64.iso&tr=https%3A%2F%2Ftorrent.ubuntu.com%2Fannounce&tr=https%3A%2F%2Fipv6.torrent.ubuntu.com%2Fannounce');
+    parse('magnet:?xt=urn:btih:2aa4f5a7e209e54b32803d43670971c4c8caaa05&dn=ubuntu-24.04-desktop-amd64.iso&tr=https%3A%2F%2Ftorrent.ubuntu.com%2Fannounce&tr=https%3A%2F%2Fipv6.torrent.ubuntu.com%2Fannounce');
   });
 
-  example2.addEventListener('click', async function(event) {
+  example2.addEventListener('click', async function (event) {
     event.preventDefault();
     notyf.success('Fetching and Parsing &ldquo;The WIRED CD&rdquo; Torrent File...');
     source = 'remote-torrent-file';
@@ -141,7 +150,7 @@ function start() {
     parseRemote('https://webtorrent.io/torrents/wired-cd.torrent');
   });
 
-  example3.addEventListener('click', async function(event) {
+  example3.addEventListener('click', async function (event) {
     event.preventDefault();
     notyf.success('Parsing Jack Johnson Archive.org Torrent File');
     let response = await fetch('/ext/jj2008-06-14.mk4_archive.torrent');
@@ -154,20 +163,20 @@ function start() {
 
   // share buttons
   let copyurl = new clipboard('#copyURL');
-  copyurl.on('success', function(e) {
+  copyurl.on('success', function (e) {
     notyf.success('Copied site URL to clipboard!');
     console.info(e);
   });
-  copyurl.on('failure', function(e) {
+  copyurl.on('failure', function (e) {
     notyf.error('Problem copying to clipboard');
     console.warn(e);
   });
 
   let copymagnet = new clipboard('#copyMagnet');
-  copymagnet.on('success', function(e) {
+  copymagnet.on('success', function (e) {
     notyf.success('Copied Magnet URL to clipboard!');
   });
-  copymagnet.on('failure', function(e) {
+  copymagnet.on('failure', function (e) {
     notyf.error('Problem copying to clipboard');
     console.warn(e);
   });
@@ -189,7 +198,7 @@ function start() {
   removeWebseeds.addEventListener('click', () => removeAllRows('urlList'));
   getFiles.addEventListener('click', getFilesFromPeers);
 
-  tippy('[data-tippy-content]', {"theme": "torrent-parts", "animation": "shift-away-subtle"}); // all element-defined tooltips
+  tippy('[data-tippy-content]', { theme: 'torrent-parts', animation: 'shift-away-subtle' }); // all element-defined tooltips
   sourceTooltip.disable();
 
   if (window.location.hash) {
@@ -198,50 +207,55 @@ function start() {
     sourceTooltip.setContent('Currently loaded information sourced from shared torrent.parts link');
     parse(window.location.hash.split('#')[1]);
   }
-
 }
 
-function parse(toLoad) {
+async function parse(toLoad) {
   resetProperties();
   try {
     console.info('Attempting parse');
-    parsed = parser(toLoad);
+    parsed = await parseTorrent(toLoad);
     display();
     if (parsed.xs) {
       console.info('Magnet includes xs, attempting remote parse');
       parseRemote(parsed.xs);
     }
-  }
+  } catch (e) {
-  catch(e) { // maybe they put a URL to a torrent file in the magnet box?
+    // maybe they put a URL to a torrent file in the magnet box?
     console.warn(e);
     if (source == 'magnet') {
       console.info('Attempting remote parse');
       parseRemote(toLoad);
-    } else { // probably not. Just a bad file.
+    } else {
+      // probably not. Just a bad file.
       notyf.error('Problem parsing input. Is this a .torrent file?');
       console.error('Problem parsing input');
     }
   }
 }
 
-function parseRemote(toLoad) {
+async function parseRemote(toLoad) {
-  parser.remote(toLoad, function(err, result) {
+  try {
+    parsed = await new Promise((resolve, reject) => {
+      parseTorrentRemote(toLoad, (err, result) => {
         if (err) {
-      notyf.error('Problem remotely fetching that file or parsing result');
+          reject(err);
-      console.warn(err);
+        } else {
-      resetProperties();
+          resolve(result);
-      return;
         }
+      });
+    });
     source = 'remote-torrent-file';
     originalSourceIcon.innerHTML = '<span class="fad fa-file-alt fa-fw"></span>';
     sourceTooltip.setContent('Currently loaded information sourced from remotely fetched Torrent file');
-    parsed = result;
     display();
-  });
+  } catch (err) {
+    console.warn(err);
+    notyf.error('Problem remotely fetching that file or parsing result');
+    resetProperties();
+  }
 }
 
 function display() {
-
   console.log(parsed);
 
   hash.value = parsed.infoHash;
@@ -254,7 +268,7 @@ function display() {
   }
   createdBy.value = parsed.createdBy ? ' by ' + parsed.createdBy : '';
   comment.value = parsed.comment ? parsed.comment : '';
-  pieces.value = parsed.pieces ? parsed.pieces.length.toLocaleString() + ' ' + bytes.format(parsed.pieceLength, {"decimalPlaces": 1, "unitSeparator": " "}) + ' pieces (last piece ' + bytes.format(parsed.lastPieceLength, {"decimalPlaces": 1, "unitSeparator": " "}) + ')' : '';
+  pieces.value = parsed.pieces ? parsed.pieces.length.toLocaleString() + ' ' + bytes.format(parsed.pieceLength, { decimalPlaces: 1, unitSeparator: ' ' }) + ' pieces (last piece ' + bytes.format(parsed.lastPieceLength, { decimalPlaces: 1, unitSeparator: ' ' }) + ')' : '';
 
   announce.innerHTML = '';
   if (parsed.announce && parsed.announce.length) {
@@ -270,10 +284,12 @@ function display() {
       tracker.setAttribute('aria-label', 'Tracker URL #' + i);
       tracker.addEventListener('input', propertyChange);
       row.appendChild(tracker);
-      let remove = document.createElement('a');
+      let remove = document.createElement('button');
+      remove.type = 'button';
       remove.className = 'remove';
       remove.dataset.index = i;
       remove.innerHTML = '<span class="far fa-trash"></span>';
+      remove.setAttribute('aria-label', 'Remove tracker #' + i);
       remove.addEventListener('click', removeRow);
       row.appendChild(remove);
       announce.appendChild(row);
@@ -296,10 +312,12 @@ function display() {
       webseed.setAttribute('aria-label', 'Webseed URL #' + i);
       webseed.addEventListener('input', propertyChange);
       row.appendChild(webseed);
-      let remove = document.createElement('a');
+      let remove = document.createElement('button');
+      remove.type = 'button';
       remove.className = 'remove';
       remove.dataset.index = i;
       remove.innerHTML = '<span class="far fa-trash"></span>';
+      remove.setAttribute('aria-label', 'Remove webseed #' + i);
       remove.addEventListener('click', removeRow);
       row.appendChild(remove);
       urlList.appendChild(row);
@@ -324,39 +342,38 @@ function display() {
       files.appendChild(createFileRow('', '...and another ' + (parsed.files.length - 100) + ' more files', ''));
     }
     files.appendChild(createFileRow('folder-tree', '', parsed.length));
-    openURLWrapper.href = parser.toMagnetURI(parsed);
+    openURLWrapper.href = toMagnetURI(parsed);
     downloadTorrentTooltip.setContent('Download Torrent file');
     downloadTorrent.addEventListener('click', saveTorrent);
     downloadTorrent.disabled = false;
   } else {
     if (client.torrents.length > 0) {
       getFiles.style.display = 'none';
-      files.innerHTML = '<input type="text" placeholder="Attempting fetching of files from Webtorrent..." aria-label="Attempting fetching of files from Webtorrent..." disabled>';
+      files.innerHTML = '<output>Attempting fetching of files from Webtorrent...</output>';
     } else {
       getFiles.style.display = 'block';
-      files.innerHTML = '<input type="text" placeholder="Not included in the URL/File provided" aria-label="Files information not included in the URL/File provided" disabled>';
+      files.innerHTML = '<output>Not included in the URL/File provided</output>';
     }
     downloadTorrentTooltip.setContent('Files metadata is required to generate a Torrent file. Try fetching files list from WebTorrent.');
     downloadTorrent.removeEventListener('click', saveTorrent);
     downloadTorrent.disabled = true;
   }
 
-  copyURL.setAttribute('data-clipboard-text', window.location.origin + '#' + parser.toMagnetURI(parsed));
+  copyURL.setAttribute('data-clipboard-text', window.location.origin + '#' + toMagnetURI(parsed));
-  copyMagnet.setAttribute('data-clipboard-text', parser.toMagnetURI(parsed));
+  copyMagnet.setAttribute('data-clipboard-text', toMagnetURI(parsed));
 
   examples.style.display = 'none';
   properties.style.display = 'flex';
 
-  window.location.hash = parser.toMagnetURI(parsed);
+  window.location.hash = toMagnetURI(parsed);
 
   if (parsed.name) {
     document.title = 'Torrent Parts | ' + parsed.name;
   } else {
-    document.title = 'Torrent Parts | Inspect and edit what\'s in your Torrent file or Magnet link';
+    document.title = "Torrent Parts | Inspect and edit what's in your Torrent file or Magnet link";
   }
 
   sourceTooltip.enable();
-
 }
 
 function createFileRow(icon, name, size) {
@@ -365,10 +382,10 @@ function createFileRow(icon, name, size) {
   if (icon) iconcell.innerHTML = '<span class="far fa-' + icon + '"></span>';
   row.appendChild(iconcell);
   let namecell = document.createElement('td');
-  namecell.innerHTML = name;
+  namecell.textContent = name;
   row.appendChild(namecell);
   let totalcell = document.createElement('td');
-  totalcell.innerHTML = bytes.format(size, {"decimalPlaces": 1, "unitSeparator": " "});
+  totalcell.innerHTML = bytes.format(size, { decimalPlaces: 1, unitSeparator: ' ' });
   row.appendChild(totalcell);
   return row;
 }
@@ -383,7 +400,7 @@ function getFontAwesomeIconForMimetype(mimetype) {
       return 'file-word';
     case mimetype.includes('ms-excel'):
     case mimetype.includes('spreadsheet'):
-      return 'file-powerpoint';
+      return 'file-spreadsheet';
     case mimetype.includes('powerpoint'):
     case mimetype.includes('presentation'):
       return 'file-powerpoint';
@@ -419,7 +436,7 @@ function propertyChange(e) {
   } else {
     parsed[this.id] = this.value ? this.value : '';
   }
-  window.location.hash = parser.toMagnetURI(parsed);
+  window.location.hash = toMagnetURI(parsed);
   updateModified();
 }
 
@@ -435,13 +452,13 @@ function resetProperties() {
   hash.value = '';
   announce.innerHTML = '';
   urlList.innerHTML = '';
-  client.torrents.forEach(torrent => torrent.destroy());
+  client.torrents.forEach((torrent) => torrent.destroy());
   getFiles.style.display = 'block';
   files.innerHTML = '';
   window.location.hash = '';
   copyURL.setAttribute('data-clipboard-text', '');
   copyMagnet.setAttribute('data-clipboard-text', '');
-  document.title = 'Torrent Parts | Inspect and edit what\'s in your Torrent file or Magnet link';
+  document.title = "Torrent Parts | Inspect and edit what's in your Torrent file or Magnet link";
   sourceTooltip.disable();
 }
 
@@ -451,14 +468,13 @@ async function addCurrentTrackers() {
   try {
     let response = await fetch('https://newtrackon.com/api/stable'); // get trackers with 95% uptime
     let trackers = await response.text();
-    parsed.announce = parsed.announce.concat(trackers.split('\n\n'));
+    parsed.announce = (parsed.announce || []).concat(trackers.split('\n\n'));
     parsed.announce.push('http://bt1.archive.org:6969/announce');
     parsed.announce.push('http://bt2.archive.org:6969/announce');
-    parsed.announce = parsed.announce.filter((v,i) => v && parsed.announce.indexOf(v) === i); // remove duplicates and empties
+    parsed.announce = parsed.announce.filter((v, i) => v && parsed.announce.indexOf(v) === i); // remove duplicates and empties
     notyf.success('Added known working trackers from newTrackon');
     updateModified();
-  }
+  } catch (e) {
-  catch(e) {
     notyf.error('Problem fetching trackers from newTrackon');
     console.warn(e);
   }
@@ -498,12 +514,14 @@ function updateModified() {
 function getFilesFromPeers() {
   console.info('Attempting fetching files from Webtorrent...');
   getFiles.style.display = 'none';
-  parsed.announce.push('wss://tracker.webtorrent.io');
+  parsed.announce = parsed.announce || [];
+  parsed.announce.push('wss://tracker.webtorrent.dev');
   parsed.announce.push('wss://tracker.openwebtorrent.com');
   parsed.announce.push('wss://tracker.btorrent.xyz');
   parsed.announce.push('wss://tracker.fastcast.nz');
-  parsed.announce = parsed.announce.filter((v,i) => v && parsed.announce.indexOf(v) === i); // remove duplicates and empties
+  parsed.announce.push('wss://tracker.files.fm:7073/announce');
-  client.add(parser.toMagnetURI(parsed), (torrent) => {
+  parsed.announce = parsed.announce.filter((v, i) => v && parsed.announce.indexOf(v) === i); // remove duplicates and empties
+  client.add(toMagnetURI(parsed), (torrent) => {
     parsed.info = Object.assign({}, torrent.info); // clone object
     parsed.files = torrent.files;
     parsed.infoBuffer = torrent.infoBuffer;
@@ -517,18 +535,13 @@ function getFilesFromPeers() {
   display();
 }
 
-// https://stackoverflow.com/a/36899900/2700296
 function saveTorrent() {
-  let data = parser.toTorrentFile(parsed);
+  const data = toTorrentFile(parsed);
-  if (data !== null && navigator.msSaveBlob)
+  const blob = new Blob([data], { type: 'application/x-bittorrent' });
-    return navigator.msSaveBlob(new Blob([data], { "type": "application/x-bittorrent" }), parsed.name + '.torrent');
+  const url = URL.createObjectURL(blob);
-  let a = document.createElement('a');
+  const a = document.createElement('a');
-  a.style.display = 'none';
+  a.href = url;
-  let url = window.URL.createObjectURL(new Blob([data], { "type": "application/x-bittorrent" }));
+  a.download = parsed.name + '.torrent';
-  a.setAttribute('href', url);
-  a.setAttribute('download', parsed.name + '.torrent');
-  document.body.appendChild(a);
   a.click();
-  window.URL.revokeObjectURL(url);
+  URL.revokeObjectURL(url);
-  a.remove();
 }

src/sw.js

@@ -1,33 +1,38 @@
-const assets = [
+const CACHE_NAME = 'torrent-parts-v2';
+const ASSETS = [
   '/',
   '/index.html',
-  '/bin/bundle.min.js',
+  '/src/parse.js',
   '/src/style.css',
-  '/ext/alata-latin-400.woff2',
+  '/ext/alata-v9-latin-regular.woff2',
-  '/ext/alata-latin-400.woff',
   '/ext/fa.min.js',
-  '/ext/notyf.min.js',
+  '/ext/jj2008-06-14.mk4_archive.torrent',
-  '/ext/jj2008-06-14.mk4_archive.torrent'
+  '/favicon.ico',
+  '/manifest.webmanifest',
 ];
 
-self.addEventListener('install', function(event) {
+self.addEventListener('install', (e) => {
-  event.waitUntil(
+  self.skipWaiting();
-    caches.open('assets')
+  e.waitUntil(caches.open(CACHE_NAME).then((cache) => cache.addAll(ASSETS)));
-      .then(function(cache) {
+});
-        return cache.addAll(assets);
+
-      })
+self.addEventListener('activate', (e) => {
+  e.waitUntil(
+    Promise.all([
+      self.clients.claim(),
+      caches.keys().then((keys) => Promise.all(keys.filter((k) => k !== CACHE_NAME).map((k) => caches.delete(k)))),
+    ])
   );
 });
 
-self.addEventListener('fetch', function(event) {
+self.addEventListener('fetch', (e) => {
-  event.respondWith(
+  if (e.request.method !== 'GET') return;
-    caches.match(event.request)
+
-      .then(function(response) {
+  const url = new URL(e.request.url);
-        if (response) {
+
-          return response;
+  // Only cache same-origin requests
-        }
+  if (url.origin !== self.location.origin) return;
-        return fetch(event.request);
+
-      }
+  // Cache-first for local assets
-    )
+  e.respondWith(caches.match(e.request).then((cached) => cached || fetch(e.request)));
-  );
 });