pmtiles-swarm 0.45.0 → 0.45.2

package/CHANGELOG.md

@@ -7,6 +7,31 @@
 ### 🐞 Bug fixes
 - _...Add new stuff here..._
 
+## 0.45.2
+### ✨ Features and improvements
+
+### 🐞 Bug fixes
+- **A peer's pieces bar now gets a row of its own on the Peers tab.** As a column it took most of the
+  table and left every other cell wrapping a word at a time — `WebT orrent 0.3. 0` down four lines —
+  while the bar itself was still too narrow to read. The figures go on one line and the bar spans the
+  table beneath them, labelled **pieces** rather than **Has**.
+- **A peer that describes itself with an object is no longer shown as `[object Object]`.** Engines
+  disagree about the shape: libtorrent sends a version string and a WebTorrent peer arrives as an
+  object, which went into the column unchanged — and that reads as a fault in this node rather than a
+  peer describing itself differently. Whatever the object carries that names it is used, and a dash
+  where nothing does.
+
+## 0.45.1
+### ✨ Features and improvements
+
+### 🐞 Bug fixes
+- **The virtualenv route for libtorrent now says it can hand you an older version.** pip installs the
+  newest wheel the *Python* can take, not the newest libtorrent, and the wheels for Python 3.8 stop
+  at 2.0.9 — so on Ubuntu 20.04 the recipe as written produced a downgrade from the distribution's
+  own package, silently. The section now says how to read the `cp` tag in the filename, to compare
+  both interpreters before committing, and that a newer libtorrent on an older release needs a newer
+  Python first.
+
 ## 0.45.0
 ### ✨ Features and improvements
 - **Requires pmtiles-torrent 0.9.1**, which stops the sidecar rewriting resume data that has not

package/docs/running-as-a-service.md

@@ -573,6 +573,22 @@ sudo -u pmtiles-swarm /var/lib/pmtiles-swarm/venv/bin/python   -c "import libtor
 { "libtorrent": { "python": "/var/lib/pmtiles-swarm/venv/bin/python" } }
 ```
 
+**Check what you got before pointing anything at it.** pip installs the newest
+wheel _your Python_ can take, which is not the newest libtorrent. The filename
+says which: `libtorrent-2.1.1-cp312-…` is Python 3.12, `libtorrent-2.0.9-cp38-…`
+is Python 3.8 — and 2.0.9 is where the wheels for 3.8 stop. On Ubuntu 20.04,
+whose `python3` is 3.8, this route hands you something **older** than the
+distribution's own package. Compare the two before you commit to it:
+
+```sh
+sudo -u pmtiles-swarm python3 -c "import libtorrent; print(libtorrent.__version__)"
+sudo -u pmtiles-swarm /var/lib/pmtiles-swarm/venv/bin/python   -c "import libtorrent; print(libtorrent.__version__)"
+```
+
+If the venv is not newer, delete it and keep the distribution package. Getting a
+newer libtorrent on an older release means a newer Python first — deadsnakes, or
+the release upgrade — and building the venv from that interpreter.
+
 Reversible in one line: delete the key and the node is back on the distribution
 package, with no uninstall and nothing done to apt. `ReadWritePaths` already
 covers `/var/lib/pmtiles-swarm`, so the venv needs no unit change — put it

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmtiles-swarm",
-  "version": "0.45.0",
+  "version": "0.45.2",
   "description": "BitTorrent distribution for PMTiles map archives: create torrents, watch folders, publish and subscribe to RSS feeds, and seed through qBittorrent or an embedded client",
   "type": "module",
   "main": "src/index.js",

package/src/web/index.html

@@ -252,6 +252,12 @@
         word-break: break-all;
       }
       .rows th { color: var(--muted); font-size: 0.75rem; white-space: nowrap; }
+      /* A peer's figures fit on one line once the bar is not competing with
+         them for width; the bar gets the whole table on the row below. */
+      .rows.peers td { white-space: nowrap; word-break: normal; }
+      .rows.peers tr.peerbar > td { border-bottom: 1px solid var(--line); }
+      .rows.peers tr.peerbar .piecerow { margin: 0; }
+      .rows.peers tr:not(.peerbar) > td { border-bottom: none; padding-bottom: 0.1rem; }
       [hidden] { display: none !important; }
 
       /* A radio or checkbox beside its own label.
@@ -1588,6 +1594,30 @@
        * @param {object} entry - What the detail endpoint already returned.
        * @returns {Promise<void>} - Resolves once rendered.
        */
+      /**
+       * What a peer says it is, as a string.
+       *
+       * Engines disagree about the shape: libtorrent sends a version string,
+       * and a WebTorrent peer arrives as an object. The object went through
+       * escapeHtml unchanged and the column read "[object Object]" — which
+       * looks like a fault in this node rather than a peer that described
+       * itself differently.
+       * @param {object} peer - One peer from the engine.
+       * @returns {string} - Something worth printing.
+       */
+      function clientOf(peer) {
+        const said = peer?.client;
+        if (typeof said === 'string' && said.trim()) return said;
+        if (said && typeof said === 'object') {
+          // Whatever it does carry, in the order most likely to name it.
+          for (const key of ['name', 'client', 'version', 'id', 'peerId']) {
+            const value = said[key];
+            if (typeof value === 'string' && value.trim()) return value;
+          }
+        }
+        return '—';
+      }
+
       async function fillPane(name, infoHash, entry) {
         const pane = document.querySelector(`[data-pane="${name}"]`);
         if (!pane) return;
@@ -1677,39 +1707,58 @@
               (peer) => !listed.has(peer.address),
             );
 
-            const rows = [...peers, ...extra].map((peer, index) => {
-              const address = peer.address ?? peer.ip ?? '—';
-              const have = bitfields.get(address);
-              return [
-                escapeHtml(address),
-                escapeHtml(peer.client ?? '—'),
-                escapeHtml(peer.kind ?? 'peer'),
-                escapeHtml(peer.connection ?? '—'),
-                have
-                  ? `<canvas class="piecebar thin" data-bar="peer-${index}"></canvas>`
-                  : '<span class="sub">not reported</span>',
-                peer.progress != null ? pct(peer.progress) : '—',
-                rate(peer.downloadSpeed ?? peer.dlSpeed),
-                rate(peer.uploadSpeed ?? peer.upSpeed),
-              ];
-            });
+            // Two rows a peer: the figures, then its pieces across the full
+            // width. As a column the bar took most of the table and left every
+            // other cell wrapping a word at a time -- "WebT orrent 0.3. 0" in
+            // four lines -- while the bar itself was still too narrow to read.
+            const columns = ['Address', 'Client', 'Kind', 'Conn', 'Progress', 'Down', 'Up'];
+            const body = [...peers, ...extra]
+              .map((peer, index) => {
+                const address = peer.address ?? peer.ip ?? '—';
+                const have = bitfields.get(address);
+                const cells = [
+                  escapeHtml(address),
+                  escapeHtml(clientOf(peer)),
+                  escapeHtml(peer.kind ?? 'peer'),
+                  escapeHtml(peer.connection ?? '—'),
+                  peer.progress != null ? pct(peer.progress) : '—',
+                  rate(peer.downloadSpeed ?? peer.dlSpeed),
+                  rate(peer.uploadSpeed ?? peer.upSpeed),
+                ];
+                return (
+                  `<tr>${cells.map((cell) => `<td>${cell}</td>`).join('')}</tr>` +
+                  `<tr class="peerbar"><td colspan="${columns.length}">
+                     <div class="piecerow">
+                       <span class="label">pieces</span>
+                       ${
+                         have
+                           ? `<canvas class="piecebar thin" data-bar="peer-${index}"></canvas>`
+                           : '<span class="sub">not reported</span>'
+                       }
+                       <span class="value">${peer.progress != null ? pct(peer.progress) : ''}</span>
+                     </div>
+                   </td></tr>`
+                );
+              })
+              .join('');
 
             pane.innerHTML =
-              table(
-                ['Address', 'Client', 'Kind', 'Conn', 'Has', 'Progress', 'Down', 'Up'],
-                rows,
-              ) +
+              (body === ''
+                ? '<div class="sub">Nothing to show.</div>'
+                : `<table class="rows peers"><thead><tr>${columns
+                    .map((header) => `<th>${escapeHtml(header)}</th>`)
+                    .join('')}</tr></thead><tbody>${body}</tbody></table>`) +
               (failed
                 ? `<div class="sub" style="margin-top:0.5rem">
                      The engine could not list peers: ${escapeHtml(failed)}
                    </div>`
                 : '') +
-              (rows.length > 0
+              (body !== ''
                 ? `<div class="sub" style="margin-top:0.5rem">
-                     <b>Has</b> is drawn the same way as the bars on General —
-                     a column covers many pieces and is only filled when all of
-                     them are held. <b>Progress</b> is the engine's own figure
-                     for the same peer, which is exact.
+                     Each peer's <b>pieces</b> bar is drawn the way the bars on
+                     General are — a column covers many pieces and is only
+                     filled when all of them are held. <b>Progress</b> is the
+                     engine's own figure for the same peer, which is exact.
                    </div>`
                 : '');