pmtiles-swarm 0.16.0 → 0.16.1

package/CHANGELOG.md

@@ -7,6 +7,17 @@
 ### 🐞 Bug fixes
 - _...Add new stuff here..._
 
+## 0.16.1
+### 🐞 Bug fixes
+- **Client addresses are recorded without the IPv4-mapped prefix.** A dual-stack listener reports
+  IPv4 peers as `::ffff:172.16.1.2`, so the Traffic tab showed an address nobody types — and
+  would have counted one client twice had it reached the node over both stacks.
+
+  Only a display and counting matter: `trustProxy` matching is unaffected, since Express compares
+  mapped addresses against plain IPv4 entries correctly. Verified rather than assumed, because
+  `"trustProxy": "172.16.1.2, 172.16.1.3"` looking like it should not match a `::ffff:` socket is
+  exactly the sort of thing that would have been quietly wrong.
+
 ## 0.16.0
 ### ✨ Features and improvements
 - **A Traffic tab in the console**, which is where the statistics added in 0.10.0 should have been

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmtiles-swarm",
-  "version": "0.16.0",
+  "version": "0.16.1",
   "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/tile-stats.js

@@ -103,6 +103,12 @@ export class TileStats {
     const { infoHash, z, status } = entry;
     if (!infoHash) return;
 
+    // A dual-stack listener reports IPv4 peers as ::ffff:172.16.1.2, which is
+    // the same client written two ways -- so counting it as written would
+    // split one address across two entries the moment anything reached the
+    // node over plain IPv4 as well.
+    const ip = entry.ip ? entry.ip.replace(/^::ffff:/, '') : entry.ip;
+
     let archive = this.#archives.get(infoHash);
     if (!archive) {
       archive = {
@@ -135,20 +141,20 @@ export class TileStats {
     if (Number.isFinite(status)) {
       archive.byStatus.set(status, (archive.byStatus.get(status) ?? 0) + 1);
     }
-    if (entry.ip) {
+    if (ip) {
       // Counted rather than listed: a busy node sees a handful of distinct
       // sources — the proxy, a few LAN clients — and the count is the answer
       // to "is this arriving directly or through HAProxy".
-      const seen = archive.clients.get(entry.ip) ?? { requests: 0, bytes: 0 };
+      const seen = archive.clients.get(ip) ?? { requests: 0, bytes: 0 };
       seen.requests += 1;
       seen.bytes += bytes;
-      archive.clients.set(entry.ip, seen);
+      archive.clients.set(ip, seen);
     }
 
     if (this.#limit === 0) return;
     const row = {
       at: archive.lastSeen,
-      ip: entry.ip ?? null,
+      ip: ip ?? null,
       infoHash,
       name: archive.name ?? null,
       z: Number.isInteger(z) ? z : null,