chiitiler 1.22.1 → 1.23.0

package/README.md

@@ -60,6 +60,7 @@ You're done. That same endpoint works as an XYZ tile source for Leaflet, MapLibr
 - **[PLATEAU VIEW](https://plateauview.mlit.go.jp/)** — Cesium.js imagery via `/tiles`
 - **[qgis-amazonlocationservice-plugin](https://github.com/dayjournal/qgis-amazonlocationservice-plugin)** — QGIS integration
 - **[Allmaps Latest](https://bsky.app/profile/latest.allmaps.org)** — Bluesky bot
+- **[Kumoy](https://www.kumoy.io/)** - used for thumbnail image of designed maps
 
 ## HTTP API
 

package/dist/render/index.d.ts

@@ -1,4 +1,4 @@
-import sharp from 'sharp';
+import { type Sharp } from 'sharp';
 import type { StyleSpecification } from '@maplibre/maplibre-gl-style-spec';
 import type { Cache } from '../cache/index.js';
 type GetRenderedTileOptions = {
@@ -13,7 +13,7 @@ type GetRenderedTileOptions = {
     quality: number;
 };
 type SupportedFormat = 'png' | 'jpeg' | 'jpg' | 'webp';
-declare function getRenderedTile({ stylejson, z, x, y, tileSize, cache, margin, ext, quality, }: GetRenderedTileOptions): Promise<sharp.Sharp>;
+declare function getRenderedTile({ stylejson, z, x, y, tileSize, cache, margin, ext, quality, }: GetRenderedTileOptions): Promise<Sharp>;
 type GetRenderedClipOptions = {
     stylejson: string | StyleSpecification;
     bbox: [number, number, number, number];
@@ -22,7 +22,7 @@ type GetRenderedClipOptions = {
     ext: SupportedFormat;
     quality: number;
 };
-declare function getRenderedClip({ stylejson, bbox, size, cache, ext, quality, }: GetRenderedClipOptions): Promise<sharp.Sharp>;
+declare function getRenderedClip({ stylejson, bbox, size, cache, ext, quality, }: GetRenderedClipOptions): Promise<Sharp>;
 type GetRenderedCameraOptions = {
     stylejson: string | StyleSpecification;
     cache: Cache;
@@ -35,5 +35,5 @@ type GetRenderedCameraOptions = {
     height: number;
     width: number;
 };
-declare function getRenderedCamera(options: GetRenderedCameraOptions): Promise<sharp.Sharp>;
+declare function getRenderedCamera(options: GetRenderedCameraOptions): Promise<Sharp>;
 export { getRenderedTile, getRenderedClip, getRenderedCamera, type GetRenderedClipOptions, type GetRenderedTileOptions, type GetRenderedCameraOptions, type SupportedFormat, };

package/dist/render/pool.js

@@ -30,8 +30,13 @@ async function getRenderPool(style, cache, mode) {
                             callback(undefined, EMPTY_RESPONSE);
                         }
                     })
-                        .catch(() => {
-                        callback(undefined, EMPTY_RESPONSE);
+                        .catch((err) => {
+                        // 5xx/ネットワークエラー: 空タイルとして描画すると
+                        // 欠損タイルがCDN等にキャッシュされうるので、
+                        // エラーを渡してレンダリング自体を失敗させる
+                        callback(err instanceof Error
+                            ? err
+                            : new Error(String(err)));
                     });
                 },
                 ratio: 1,

package/dist/source/fs.d.ts

@@ -1,2 +1,2 @@
-declare function getFilesystemSource(uri: string): Promise<Buffer<ArrayBufferLike> | null>;
+declare function getFilesystemSource(uri: string): Promise<Buffer | null>;
 export { getFilesystemSource };

package/dist/source/fs.js

@@ -1,15 +1,25 @@
-import fs from 'fs';
-function getFilesystemSource(uri) {
-    return new Promise((resolve, _) => {
-        fs.readFile(uri.replace('file://', ''), (err, data) => {
-            if (err) {
-                console.error(`[ERROR]: ${err}`);
-                resolve(null);
-            }
-            else {
-                resolve(data);
-            }
-        });
-    });
+import fs from 'node:fs/promises';
+async function getFilesystemSource(uri) {
+    const path = uri.replace('file://', '');
+    const data = await fs.readFile(path).catch(() => null);
+    if (data !== null)
+        return data;
+    // maplibre-gl-native percent-encodes {fontstack} in glyphs URLs
+    // (e.g. "Noto Sans Regular" -> "Noto%20Sans%20Regular"),
+    // so retry with the percent-decoded path
+    let decodedPath;
+    try {
+        decodedPath = decodeURIComponent(path);
+    }
+    catch {
+        decodedPath = path;
+    }
+    if (decodedPath !== path) {
+        const decodedData = await fs.readFile(decodedPath).catch(() => null);
+        if (decodedData !== null)
+            return decodedData;
+    }
+    console.error(`[ERROR]: failed to read ${path}`);
+    return null;
 }
 export { getFilesystemSource };

package/dist/source/gcs.js

@@ -13,9 +13,12 @@ async function getGCSSource(uri) {
         return buffer;
     }
     catch (e) {
-        if (e.code !== 404)
-            console.log(e);
-        return null;
+        // 404: オブジェクトが存在しない。空タイルとして扱わせる
+        if (e.code === 404)
+            return null;
+        // それ以外は有無が不明なのでthrowしてレンダリングを失敗させる
+        console.log(e);
+        throw e;
     }
 }
 export { getGCSSource };

package/dist/source/http.js

@@ -8,27 +8,36 @@ async function getHttpSource(uri, cache = noneCache()) {
     if (val !== undefined)
         return val; // hit
     // miss
+    let res;
     try {
         const userAgent = getUserAgent();
-        const res = await fetch(uri, {
+        res = await fetch(uri, {
             headers: userAgent ? { 'User-Agent': userAgent } : undefined,
         });
-        if (!res.ok) {
-            console.log(`failed to fetch ${uri}`);
-            return null;
-        }
-        // 204/空ボディはキャッシュ汚染を避けるため書き込まずnullを返す
-        if (res.status === 204)
-            return null;
-        const buf = Buffer.from(await res.arrayBuffer());
-        if (buf.length === 0)
-            return null;
-        cache.set(uri, buf);
-        return buf;
     }
     catch (e) {
-        console.error(`[ERROR] ${e}`);
+        // ネットワークエラー: タイルの有無が不明なまま透明タイルを返すと
+        // CDN等に欠損タイルがキャッシュされうるので、throwしてレンダリングを失敗させる
+        console.error(`[ERROR] failed to fetch ${uri}: ${e}`);
+        throw new Error(`failed to fetch ${uri}: ${e}`);
+    }
+    if (res.status >= 500) {
+        // 5xx: 一時的な障害でタイルの有無は不明。ネットワークエラーと同様に扱う
+        console.error(`[ERROR] upstream error ${res.status} for ${uri}`);
+        throw new Error(`upstream error ${res.status} for ${uri}`);
+    }
+    if (!res.ok) {
+        // 4xx: タイルが存在しない(404など)。空タイルとして扱わせる
+        console.log(`failed to fetch ${uri}`);
         return null;
     }
+    // 204/空ボディはキャッシュ汚染を避けるため書き込まずnullを返す
+    if (res.status === 204)
+        return null;
+    const buf = Buffer.from(await res.arrayBuffer());
+    if (buf.length === 0)
+        return null;
+    cache.set(uri, buf);
+    return buf;
 }
 export { getHttpSource };

package/dist/source/pmtiles.js

@@ -1,5 +1,5 @@
 import * as fs from 'fs';
-import { PMTiles, FetchSource } from 'pmtiles';
+import { PMTiles, FetchSource, ResolvedValueCache, } from 'pmtiles';
 import { GetObjectCommand, } from '@aws-sdk/client-s3';
 import { LRUCache } from 'lru-cache';
 import { getS3Client } from '../s3.js';
@@ -88,7 +88,7 @@ async function getPmtilesSource(uri, cache = noneCache()) {
             if (userAgent)
                 headers.set('User-Agent', userAgent);
             const fetchSource = new FetchSource(pmtilesUri, headers);
-            pmtiles = new PMTiles(fetchSource);
+            pmtiles = new PMTiles(fetchSource, new ResolvedValueCache());
             pmtilesCache.set(pmtilesUri, pmtiles);
         }
     }
@@ -97,14 +97,14 @@ async function getPmtilesSource(uri, cache = noneCache()) {
             const bucket = pmtilesUri.replace('s3://', '').split('/')[0];
             const key = pmtilesUri.replace(`s3://${bucket}/`, '');
             const s3Source = new S3Source(bucket, key);
-            pmtiles = new PMTiles(s3Source);
+            pmtiles = new PMTiles(s3Source, new ResolvedValueCache());
             pmtilesCache.set(pmtilesUri, pmtiles);
         }
     }
     else {
         if (pmtiles === undefined) {
             const fileSource = new FilesystemSource(pmtilesUri);
-            pmtiles = new PMTiles(fileSource);
+            pmtiles = new PMTiles(fileSource, new ResolvedValueCache());
             pmtilesCache.set(pmtilesUri, pmtiles);
         }
     }

package/dist/source/s3.js

@@ -20,9 +20,13 @@ async function getS3Source(uri) {
         return buf;
     }
     catch (e) {
-        if (e.name !== 'NoSuchKey')
-            console.log(e);
-        return null;
+        // NoSuchKey: オブジェクトが存在しない。空タイルとして扱わせる
+        if (e.name === 'NoSuchKey')
+            return null;
+        // それ以外(スロットリング・ネットワークエラー等)は有無が不明なので
+        // throwしてレンダリングを失敗させる
+        console.log(e);
+        throw e;
     }
 }
 export { getS3Source };

package/package.json

@@ -1,7 +1,7 @@
 {
   "type": "module",
   "name": "chiitiler",
-  "version": "1.22.1",
+  "version": "1.23.0",
   "description": "Tiny map rendering server for MapLibre Style Spec",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -50,6 +50,6 @@
     "lru-cache": "^11.3.5",
     "maplibre-gl": "^5.23.0",
     "pmtiles": "^4.4.1",
-    "sharp": "^0.34.5"
+    "sharp": "^0.35.3"
   }
 }