chiitiler 1.22.3 → 1.23.2

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.js

@@ -1,24 +1,10 @@
 import fs from 'node:fs/promises';
+import { loadWithDecodedPathFallback } from './path.js';
 async function getFilesystemSource(uri) {
     const path = uri.replace('file://', '');
-    const data = await fs.readFile(path).catch(() => null);
+    const data = await loadWithDecodedPathFallback(path, (candidate) => fs.readFile(candidate).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;
 }

package/dist/source/gcs.js

@@ -1,4 +1,5 @@
 import { getStorageClient } from '../gcs.js';
+import { loadWithDecodedPathFallback } from './path.js';
 async function getGCSSource(uri) {
     const storageClient = getStorageClient({
         projectId: process.env.CHIITILER_GCS_PROJECT_ID,
@@ -7,15 +8,20 @@ async function getGCSSource(uri) {
     });
     const bucket = uri.replace('gs://', '').split('/')[0];
     const path = uri.replace(`gs://${bucket}/`, '');
-    try {
-        const file = storageClient.bucket(bucket).file(path);
-        const [buffer] = await file.download();
-        return buffer;
-    }
-    catch (e) {
-        if (e.code !== 404)
+    return loadWithDecodedPathFallback(path, async (candidate) => {
+        try {
+            const file = storageClient.bucket(bucket).file(candidate);
+            const [buffer] = await file.download();
+            return buffer;
+        }
+        catch (e) {
+            // 404: オブジェクトが存在しない。空タイルとして扱わせる
+            if (e.code === 404)
+                return null;
+            // それ以外は有無が不明なのでthrowしてレンダリングを失敗させる
             console.log(e);
-        return null;
-    }
+            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/path.d.ts

@@ -0,0 +1,7 @@
+/**
+ * Load a percent-decoded path first, then retry its literal form when the
+ * resource is absent. MapLibre Native encodes glyph font stacks before passing
+ * their URLs to the source resolver, while object stores treat keys literally.
+ */
+declare function loadWithDecodedPathFallback<T>(path: string, load: (path: string) => Promise<T | null>): Promise<T | null>;
+export { loadWithDecodedPathFallback };

package/dist/source/path.js

@@ -0,0 +1,21 @@
+/**
+ * Load a percent-decoded path first, then retry its literal form when the
+ * resource is absent. MapLibre Native encodes glyph font stacks before passing
+ * their URLs to the source resolver, while object stores treat keys literally.
+ */
+async function loadWithDecodedPathFallback(path, load) {
+    let decodedPath;
+    try {
+        decodedPath = decodeURIComponent(path);
+    }
+    catch {
+        return load(path);
+    }
+    if (decodedPath === path)
+        return load(path);
+    const decodedData = await load(decodedPath);
+    if (decodedData !== null)
+        return decodedData;
+    return load(path);
+}
+export { loadWithDecodedPathFallback };

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

@@ -1,5 +1,6 @@
 import { GetObjectCommand } from '@aws-sdk/client-s3';
 import { getS3Client } from '../s3.js';
+import { loadWithDecodedPathFallback } from './path.js';
 async function getS3Source(uri) {
     const s3Client = getS3Client({
         region: process.env.CHIITILER_S3_REGION ?? 'us-east-1',
@@ -8,21 +9,26 @@ async function getS3Source(uri) {
     });
     const bucket = uri.replace('s3://', '').split('/')[0];
     const key = uri.replace(`s3://${bucket}/`, '');
-    const cmd = new GetObjectCommand({
-        Bucket: bucket,
-        Key: key,
-    });
-    try {
-        const obj = await s3Client.send(cmd);
-        if (obj.Body === undefined)
-            return null;
-        const buf = Buffer.from(await obj.Body.transformToByteArray());
-        return buf;
-    }
-    catch (e) {
-        if (e.name !== 'NoSuchKey')
+    return loadWithDecodedPathFallback(key, async (candidate) => {
+        const cmd = new GetObjectCommand({
+            Bucket: bucket,
+            Key: candidate,
+        });
+        try {
+            const obj = await s3Client.send(cmd);
+            if (obj.Body === undefined)
+                return null;
+            return Buffer.from(await obj.Body.transformToByteArray());
+        }
+        catch (e) {
+            // NoSuchKey: オブジェクトが存在しない。空タイルとして扱わせる
+            if (e.name === 'NoSuchKey')
+                return null;
+            // それ以外(スロットリング・ネットワークエラー等)は有無が不明なので
+            // throwしてレンダリングを失敗させる
             console.log(e);
-        return null;
-    }
+            throw e;
+        }
+    });
 }
 export { getS3Source };

package/package.json

@@ -1,7 +1,7 @@
 {
   "type": "module",
   "name": "chiitiler",
-  "version": "1.22.3",
+  "version": "1.23.2",
   "description": "Tiny map rendering server for MapLibre Style Spec",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",