chiitiler 1.21.1 → 1.21.2

package/dist/render/pool.js

@@ -1,28 +1,10 @@
-import * as path from 'path';
 import mbgl from '@maplibre/maplibre-gl-native';
 import { Pool } from 'lightning-pool';
 import { LRUCache } from 'lru-cache';
 import { getSource } from '../source/index.js';
-const EMPTY_BUFFER = Buffer.alloc(0);
-const TRANSPARENT_BUFFER = {
-    // 1x1 transparent images
-    png: Buffer.from('iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR4nGP4//8/AwAI/AL+p5qgoAAAAABJRU5ErkJggg==', 'base64'),
-    webp: Buffer.from('UklGRkAAAABXRUJQVlA4WAoAAAAQAAAAAAAAAAAAQUxQSAIAAAAAAFZQOCAYAAAAMAEAnQEqAQABAAFAJiWkAANwAP789AAA', 'base64'),
-    jpeg: Buffer.from('/9j/4AAQSkZJRgABAQAAAQABAAD/2wBDAAgGBgcGBQgHBwcJCQgKDBQNDAsLDBkSEw8UHRofHh0aHBwgJC4nICIsIxwcKDcpLDAxNDQ0Hyc5PTgyPC4zNDL/2wBDAQkJCQwLDBgNDRgyIRwhMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjL/wAARCAABAAEDASIAAhEBAxEB/8QAHwAAAQUBAQEBAQEAAAAAAAAAAAECAwQFBgcICQoL/8QAtRAAAgEDAwIEAwUFBAQAAAF9AQIDAAQRBRIhMUEGE1FhByJxFDKBkaEII0KxwRVS0fAkM2JyggkKFhcYGRolJicoKSo0NTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uHi4+Tl5ufo6erx8vP09fb3+Pn6/8QAHwEAAwEBAQEBAQEBAQAAAAAAAAECAwQFBgcICQoL/8QAtREAAgECBAQDBAcFBAQAAQJ3AAECAxEEBSExBhJBUQdhcRMiMoEIFEKRobHBCSMzUvAVYnLRChYkNOEl8RcYGRomJygpKjU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6goOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4uPk5ebn6Onq8vP09fb3+Pn6/9oADAMBAAIRAxEAPwD3+iiigD//2Q=='),
-};
-function handleFileExt(uri) {
-    if (uri.startsWith('cog://'))
-        return 'png'; // cog:// always returns as png
-    // extract extension only, take into account query string or hash
-    const basename = path.basename(uri).split(/[?#]/)[0];
-    const ext = basename.split('.').pop();
-    if (ext === undefined)
-        return null;
-    const l = ext.toLowerCase();
-    if (l === 'jpeg')
-        return 'jpg';
-    return l;
-}
+// mbglはdataプロパティが無いレスポンスを「データなしタイル」として正常に扱う。
+// 型定義はdataを必須としているが、空タイルを表現するには渡さないのが正解。
+const EMPTY_RESPONSE = {};
 const mapPoolCache = new LRUCache({
     max: 10,
     dispose: (pool, key) => {
@@ -38,26 +20,18 @@ async function getRenderPool(style, cache, mode) {
         create: () => {
             const map = new mbgl.Map({
                 request: function (req, callback) {
-                    const ext = handleFileExt(req.url);
                     getSource(req.url, cache)
                         .then((buf) => {
-                        if (buf) {
+                        if (buf !== null && buf.length > 0) {
                             callback(undefined, { data: buf });
                         }
-                        else if (ext && TRANSPARENT_BUFFER[ext])
-                            callback(undefined, {
-                                data: TRANSPARENT_BUFFER[ext],
-                            });
-                        else
-                            callback(undefined, { data: EMPTY_BUFFER });
+                        else {
+                            // 204/空ボディ/404: 空タイルとして扱わせる
+                            callback(undefined, EMPTY_RESPONSE);
+                        }
                     })
                         .catch(() => {
-                        if (ext && TRANSPARENT_BUFFER[ext])
-                            callback(undefined, {
-                                data: TRANSPARENT_BUFFER[ext],
-                            });
-                        else
-                            callback(undefined, { data: EMPTY_BUFFER });
+                        callback(undefined, EMPTY_RESPONSE);
                     });
                 },
                 ratio: 1,

package/dist/source/http.js

@@ -13,7 +13,12 @@ async function getHttpSource(uri, cache = noneCache()) {
             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;
     }

package/package.json

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