pmtiles-swarm 0.98.2 → 0.98.3

package/CHANGELOG.md

@@ -7,6 +7,22 @@
 ### 🐞 Bug fixes
 - _...Add new stuff here..._
 
+## 0.98.3
+### ✨ Features and improvements
+
+### 🐞 Bug fixes
+- **A stack could not be pointed at a completed MBTiles archive.** The source picker offered only
+  PMTiles, so an MBTiles the node was perfectly able to serve tiles from was simply absent from the
+  menu. It offers a complete one now, by the same rule the tile route enforces — and still hides one
+  that is arriving, since a stack naming that would answer 503 for every tile until the download
+  finished.
+- **A planet dump was offered as a stack source.** The same filter read an archive with no recorded
+  kind as PMTiles, which is not a harmless default: a mirrored `.osm.pbf` appeared in the menu, and
+  naming it would have produced a recipe that failed at its first tile. The kind now falls back to
+  the filename before anything is assumed, which is how `prewarm.js` resolves it after the identical
+  mistake sent every mirrored dump round the header-read backoff for ever. Such an archive is also
+  labelled `unknown · not servable` in the list, where it previously said nothing at all.
+
 ## 0.98.2
 ### ✨ Features and improvements
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmtiles-swarm",
-  "version": "0.98.2",
+  "version": "0.98.3",
   "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

@@ -1836,11 +1836,31 @@
        * @returns {boolean} - Whether to offer the tile endpoints.
        */
       const isServable = (entry) => {
-        const kind = entry.kind ?? 'pmtiles';
+        const kind = kindOf(entry);
         if (kind === 'pmtiles') return true;
         return kind === 'mbtiles' && entry.complete === true;
       };
 
+      /**
+       * What kind of archive this is, from the record or failing that the name.
+       *
+       * An entry from before the kind was recorded carries none, and reading
+       * that as PMTiles is not a harmless default: it is how a planet dump ends
+       * up labelled servable and offered as a stack source, where naming it
+       * would produce a recipe that fails at its first tile. `prewarm.js`
+       * resolves it exactly this way, after the same mistake sent every
+       * mirrored .osm.pbf round the header-read backoff for ever.
+       * @param {object} entry - A catalog entry.
+       * @returns {string} - 'pmtiles', 'mbtiles', or 'unknown'.
+       */
+      const kindOf = (entry) => {
+        if (entry.kind) return entry.kind;
+        const name = entry.name ?? '';
+        if (/\.pmtiles$/i.test(name)) return 'pmtiles';
+        if (/\.mbtiles$/i.test(name)) return 'mbtiles';
+        return 'unknown';
+      };
+
       /**
        * What to say under the size about an archive that is not PMTiles.
        *
@@ -1852,7 +1872,7 @@
        * @returns {string} - The note, or empty for a PMTiles archive.
        */
       const kindNote = (entry) => {
-        const kind = entry.kind ?? 'pmtiles';
+        const kind = kindOf(entry);
         if (kind === 'pmtiles') return '';
         if (kind !== 'mbtiles') return `${escapeHtml(kind)} · not servable`;
         return entry.complete === true
@@ -2563,7 +2583,7 @@
         // anything for an archive read out of the swarm. An MBTiles is read
         // whole or not at all — once it is here there is nothing left to
         // fetch, and before that there is no tile to warm.
-        const warmable = (entry.kind ?? 'pmtiles') === 'pmtiles';
+        const warmable = kindOf(entry) === 'pmtiles';
         const torrentUrl = `${base}/archives/${entry.infoHash}/archive.torrent`;
         const summary = entry.pmtiles ?? {};
         const mode = entry.mode ?? 'mirror';
@@ -2648,7 +2668,7 @@
           ${
             servable
               ? `<div class="sub" style="margin-bottom:1rem"><code>${escapeHtml(tileJson)}</code></div>`
-              : (entry.kind ?? 'pmtiles') === 'mbtiles'
+              : kindOf(entry) === 'mbtiles'
                 ? `<div class="sub" style="margin-bottom:1rem">
                      This MBTiles archive is still arriving, so it has no tile endpoint yet. It is
                      SQLite, which cannot be read a byte range at a time out of the swarm the way
@@ -8175,10 +8195,12 @@ Every piece is hashed against the ` +
           // missing from a menu the operator is looking at. This is the same
           // endpoint the Archives view reads, and it answers a bare array.
           const held = await api('/api/torrents');
+          // The same rule the tile route enforces, because a stack source is
+          // read through exactly that path: a complete MBTiles belongs here,
+          // and one still arriving does not -- a stack naming it would answer
+          // 503 for every tile until the download finished.
           const free = (held ?? []).filter(
-            (entry) =>
-              !taken.has(entry.infoHash) &&
-              (entry.kind ?? 'pmtiles') === 'pmtiles',
+            (entry) => !taken.has(entry.infoHash) && isServable(entry),
           );
           if (free.length) {
             groups.push(