chiitiler 1.18.0 → 1.20.0

package/README.md

@@ -197,11 +197,11 @@ Chiitiler is also published as an npm library. Core helpers return Sharp instanc
 ```ts
 import {
     getRenderedTileBuffer,
-    getRenderedBboxBuffer,
-    getRenderedImageBuffer,
+    getRenderedClipBuffer,
+    getRenderedCameraBuffer,
     getRenderedTileStream,
-    getRenderedBboxStream,
-    getRenderedImageStream,
+    getRenderedClipStream,
+    getRenderedCameraStream,
     ChiitilerCache,
 } from 'chiitiler';
 
@@ -219,7 +219,7 @@ const tile = await getRenderedTileBuffer({
     cache,
 });
 
-const clip = await getRenderedBboxBuffer({
+const clip = await getRenderedClipBuffer({
     stylejson: 'file://localdata/style.json',
     bbox: [123.4, 34.5, 124.5, 35.6],
     size: 1024,
@@ -228,7 +228,7 @@ const clip = await getRenderedBboxBuffer({
     cache: ChiitilerCache.noneCache(),
 });
 
-const image = await getRenderedImageBuffer({
+const camera = await getRenderedCameraBuffer({
     stylejson: 'file://localdata/style.json',
     center: [139.69, 35.68],
     zoom: 10,
@@ -254,7 +254,7 @@ const tileStream = await getRenderedTileStream({
     cache,
 });
 
-const bboxStream = await getRenderedBboxStream({
+const clipStream = await getRenderedClipStream({
     stylejson: 'file://localdata/style.json',
     bbox: [123.4, 34.5, 124.5, 35.6],
     size: 1024,
@@ -263,7 +263,7 @@ const bboxStream = await getRenderedBboxStream({
     cache,
 });
 
-const imageStream = await getRenderedImageStream({
+const cameraStream = await getRenderedCameraStream({
     stylejson: 'file://localdata/style.json',
     center: [139.69, 35.68],
     zoom: 10,

package/dist/cli.js

@@ -86,20 +86,20 @@ export function createProgram() {
     program
         .command('tile-server')
         .option('-c, --cache <type>', 'cache type', 'none')
-        .option('-ctl --cache-ttl', 'cache ttl', '3600')
-        .option('-mci --memory-cache-max-item-count', 'memory cache max item count', '1000')
-        .option('-fcd --file-cache-dir <dir>', 'file cache directory', './.cache')
-        .option('-s3r --s3-region <region-name>', 's3 bucket region for get/put', 'us-east-1')
-        .option('-s3b --s3-cache-bucket <bucket-name>', 's3 cache bucket name', '')
-        .option('-s3e --s3-endpoint <url>', 's3 endpoint url', '')
-        .option('-3p --s3-force-path-style', 's3 force path style', '')
-        .option('-gcsb --gcs-cache-bucket <bucket-name>', 'gcs cache bucket name', '')
-        .option('-gcsp --gcs-project-id <project-id>', 'gcs project id', '')
-        .option('-gcsk --gcs-key-filename <key-filename>', 'gcs key filename', '')
-        .option('-gcsp --gcs-cache-prefix <prefix>', 'gcs cache prefix', '')
-        .option('-gcse --gcs-api-endpoint <api-endpoint>', 'gcs api endpoint', '')
-        .option('-p --port <port>', 'port number')
-        .option('-D --debug', 'debug mode')
+        .option('--cache-ttl', 'cache ttl', '3600')
+        .option('--memory-cache-max-item-count', 'memory cache max item count', '1000')
+        .option('--file-cache-dir <dir>', 'file cache directory', './.cache')
+        .option('--s3-region <region-name>', 's3 bucket region for get/put', 'us-east-1')
+        .option('--s3-cache-bucket <bucket-name>', 's3 cache bucket name', '')
+        .option('--s3-endpoint <url>', 's3 endpoint url', '')
+        .option('--s3-force-path-style', 's3 force path style', '')
+        .option('--gcs-cache-bucket <bucket-name>', 'gcs cache bucket name', '')
+        .option('--gcs-project-id <project-id>', 'gcs project id', '')
+        .option('--gcs-key-filename <key-filename>', 'gcs key filename', '')
+        .option('--gcs-cache-prefix <prefix>', 'gcs cache prefix', '')
+        .option('--gcs-api-endpoint <api-endpoint>', 'gcs api endpoint', '')
+        .option('-p, --port <port>', 'port number')
+        .option('-D, --debug', 'debug mode')
         .action((options) => {
         const serverOptions = {
             cache: parseCacheStrategy(options.cache, {

package/dist/index.d.ts

@@ -1,8 +1,8 @@
-import { getRenderedBbox, getRenderedTile, getRenderedImage, GetRenderedBboxOptions, GetRenderedTileOptions, GetRenderedImageOptions } from './render/index.js';
-export declare function getRenderedBboxBuffer(options: GetRenderedBboxOptions): Promise<Buffer>;
-export { getRenderedBbox as getRenderedBboxStream };
-export declare function getRenderedImageBuffer(options: GetRenderedImageOptions): Promise<Buffer>;
-export { getRenderedImage as getRenderedImageStream };
+import { getRenderedClip, getRenderedTile, getRenderedCamera, GetRenderedClipOptions, GetRenderedTileOptions, GetRenderedCameraOptions } from './render/index.js';
+export declare function getRenderedClipBuffer(options: GetRenderedClipOptions): Promise<Buffer>;
+export { getRenderedClip as getRenderedClipStream };
+export declare function getRenderedCameraBuffer(options: GetRenderedCameraOptions): Promise<Buffer>;
+export { getRenderedCamera as getRenderedCameraStream };
 export declare function getRenderedTileBuffer(options: GetRenderedTileOptions): Promise<Buffer>;
 export { getRenderedTile as getRenderedTileStream };
 export * as ChiitilerCache from './cache/index.js';

package/dist/index.js

@@ -1,14 +1,14 @@
-import { getRenderedBbox, getRenderedTile, getRenderedImage, } from './render/index.js';
-export async function getRenderedBboxBuffer(options) {
-    const sharp = await getRenderedBbox(options);
+import { getRenderedClip, getRenderedTile, getRenderedCamera, } from './render/index.js';
+export async function getRenderedClipBuffer(options) {
+    const sharp = await getRenderedClip(options);
     return sharp.toBuffer();
 }
-export { getRenderedBbox as getRenderedBboxStream };
-export async function getRenderedImageBuffer(options) {
-    const sharp = await getRenderedImage(options);
+export { getRenderedClip as getRenderedClipStream };
+export async function getRenderedCameraBuffer(options) {
+    const sharp = await getRenderedCamera(options);
     return sharp.toBuffer();
 }
-export { getRenderedImage as getRenderedImageStream };
+export { getRenderedCamera as getRenderedCameraStream };
 export async function getRenderedTileBuffer(options) {
     const sharp = await getRenderedTile(options);
     return sharp.toBuffer();

package/dist/render/index.d.ts

@@ -14,7 +14,7 @@ type GetRenderedTileOptions = {
 };
 type SupportedFormat = 'png' | 'jpeg' | 'jpg' | 'webp';
 declare function getRenderedTile({ stylejson, z, x, y, tileSize, cache, margin, ext, quality, }: GetRenderedTileOptions): Promise<sharp.Sharp>;
-type GetRenderedBboxOptions = {
+type GetRenderedClipOptions = {
     stylejson: string | StyleSpecification;
     bbox: [number, number, number, number];
     size: number;
@@ -22,8 +22,8 @@ type GetRenderedBboxOptions = {
     ext: SupportedFormat;
     quality: number;
 };
-declare function getRenderedBbox({ stylejson, bbox, size, cache, ext, quality, }: GetRenderedBboxOptions): Promise<sharp.Sharp>;
-type GetRenderedImageOptions = {
+declare function getRenderedClip({ stylejson, bbox, size, cache, ext, quality, }: GetRenderedClipOptions): Promise<sharp.Sharp>;
+type GetRenderedCameraOptions = {
     stylejson: string | StyleSpecification;
     cache: Cache;
     ext: SupportedFormat;
@@ -35,5 +35,5 @@ type GetRenderedImageOptions = {
     height: number;
     width: number;
 };
-declare function getRenderedImage(options: GetRenderedImageOptions): Promise<sharp.Sharp>;
-export { getRenderedTile, getRenderedBbox, getRenderedImage, type GetRenderedBboxOptions, type GetRenderedTileOptions, type GetRenderedImageOptions, type SupportedFormat, };
+declare function getRenderedCamera(options: GetRenderedCameraOptions): Promise<sharp.Sharp>;
+export { getRenderedTile, getRenderedClip, getRenderedCamera, type GetRenderedClipOptions, type GetRenderedTileOptions, type GetRenderedCameraOptions, type SupportedFormat, };

package/dist/render/index.js

@@ -1,6 +1,5 @@
 import sharp from 'sharp';
-// @ts-ignore
-import SphericalMercator from '@mapbox/sphericalmercator';
+import { SphericalMercator } from '@mapbox/sphericalmercator';
 const mercator = new SphericalMercator();
 import { LRUCache } from 'lru-cache';
 import { renderTile, render } from './rasterize.js';
@@ -112,7 +111,7 @@ const calcRenderingParams = (bbox, size) => {
     const center = mercator.ll(mercCenter, 25); // latlon
     return { zoom, width, height, center };
 };
-async function getRenderedBbox({ stylejson, bbox, size, cache, ext, quality, }) {
+async function getRenderedClip({ stylejson, bbox, size, cache, ext, quality, }) {
     const style = await loadStyle(stylejson, cache);
     const { zoom, width, height, center } = calcRenderingParams(bbox, size);
     const pixels = await render(style, {
@@ -138,7 +137,7 @@ async function getRenderedBbox({ stylejson, bbox, size, cache, ext, quality, })
             return _sharp.webp({ quality, effort: 0 });
     }
 }
-async function getRenderedImage(options) {
+async function getRenderedCamera(options) {
     const style = await loadStyle(options.stylejson, options.cache);
     const pixels = await render(style, {
         center: options.center,
@@ -165,4 +164,4 @@ async function getRenderedImage(options) {
             return _sharp.webp({ quality: options.quality, effort: 0 });
     }
 }
-export { getRenderedTile, getRenderedBbox, getRenderedImage, };
+export { getRenderedTile, getRenderedClip, getRenderedCamera, };

package/dist/render/rasterize.js

@@ -1,5 +1,4 @@
-// @ts-ignore
-import SphericalMercator from '@mapbox/sphericalmercator';
+import { SphericalMercator } from '@mapbox/sphericalmercator';
 import { getRenderPool } from './pool.js';
 function getTileCenter(z, x, y, tileSize = 256) {
     const mercator = new SphericalMercator({

package/dist/server/routes/camera.js

@@ -1,6 +1,6 @@
 import { Hono } from 'hono';
 import { isSupportedFormat, isValidStylejson } from '../utils.js';
-import { getRenderedImage } from '../../render/index.js';
+import { getRenderedCamera } from '../../render/index.js';
 function isValidCamera({ zoom, lat, lon, bearing, pitch, }) {
     if (Number.isNaN(lat) || lat < -90 || lat > 90)
         return false;
@@ -51,7 +51,7 @@ function createCameraRouter(options) {
         const quality = Number(c.req.query('quality') ?? 100);
         c.header('Content-Type', `image/${ext}`);
         try {
-            const sharp = await getRenderedImage({
+            const sharp = await getRenderedCamera({
                 stylejson: url,
                 cache: options.cache,
                 ext,
@@ -104,7 +104,7 @@ function createCameraRouter(options) {
         const quality = Number(c.req.query('quality') ?? 100);
         c.header('Content-Type', `image/${ext}`);
         try {
-            const sharp = await getRenderedImage({
+            const sharp = await getRenderedCamera({
                 stylejson: style,
                 cache: options.cache,
                 ext,

package/dist/server/routes/clip.js

@@ -1,6 +1,6 @@
 import { Hono } from 'hono';
 import { isSupportedFormat, isValidStylejson } from '../utils.js';
-import { getRenderedBbox } from '../../render/index.js';
+import { getRenderedClip } from '../../render/index.js';
 function createClipRouter(options) {
     const clip = new Hono()
         .get('/:filename_ext', async (c) => {
@@ -24,7 +24,7 @@ function createClipRouter(options) {
         const size = Number(c.req.query('size') ?? 1024);
         c.header('Content-Type', `image/${ext}`);
         try {
-            const sharp = await getRenderedBbox({
+            const sharp = await getRenderedClip({
                 stylejson: url,
                 bbox: [minx, miny, maxx, maxy],
                 size,
@@ -62,7 +62,7 @@ function createClipRouter(options) {
         const size = Number(c.req.query('size') ?? 1024);
         c.header('Content-Type', `image/${ext}`);
         try {
-            const sharp = await getRenderedBbox({
+            const sharp = await getRenderedClip({
                 stylejson: style,
                 bbox: [minx, miny, maxx, maxy],
                 size,

package/dist/source/index.d.ts

@@ -1,6 +1,8 @@
 import { Cache } from '../cache/index.js';
 /**
- * retrieve sources from the uri
+ * retrieve sources from the uri.
+ * Concurrent requests for the same uri share a single in-flight fetch
+ * (single-flight) to avoid duplicate downloads.
  * @param uri
  * @param cache {Cache} - Cache Strategy. Affect only for http(s) sources.
  * @returns

package/dist/source/index.js

@@ -6,30 +6,40 @@ import { getS3Source } from './s3.js';
 import { getGCSSource } from './gcs.js';
 import { getCogSource } from './cog.js';
 import { noneCache } from '../cache/index.js';
+async function fetchSource(uri, cache) {
+    if (uri.startsWith('http://') || uri.startsWith('https://'))
+        return getHttpSource(uri, cache);
+    if (uri.startsWith('file://'))
+        return getFilesystemSource(uri);
+    if (uri.startsWith('s3://'))
+        return getS3Source(uri);
+    if (uri.startsWith('gs://'))
+        return getGCSSource(uri);
+    if (uri.startsWith('mbtiles://'))
+        return getMbtilesSource(uri);
+    if (uri.startsWith('pmtiles://'))
+        return getPmtilesSource(uri, cache);
+    if (uri.startsWith('cog://'))
+        return getCogSource(uri);
+    return null;
+}
+const inFlight = new Map();
 /**
- * retrieve sources from the uri
+ * retrieve sources from the uri.
+ * Concurrent requests for the same uri share a single in-flight fetch
+ * (single-flight) to avoid duplicate downloads.
  * @param uri
  * @param cache {Cache} - Cache Strategy. Affect only for http(s) sources.
  * @returns
  */
 async function getSource(uri, cache = noneCache()) {
-    let data = null;
-    if (uri.startsWith('http://') || uri.startsWith('https://'))
-        data = await getHttpSource(uri, cache);
-    else if (uri.startsWith('file://'))
-        data = await getFilesystemSource(uri);
-    else if (uri.startsWith('s3://'))
-        data = await getS3Source(uri);
-    else if (uri.startsWith('gs://'))
-        data = await getGCSSource(uri);
-    else if (uri.startsWith('mbtiles://'))
-        data = await getMbtilesSource(uri);
-    else if (uri.startsWith('pmtiles://'))
-        data = await getPmtilesSource(uri, cache);
-    else if (uri.startsWith('cog://'))
-        data = await getCogSource(uri);
-    else
-        return null;
-    return data;
+    const existing = inFlight.get(uri);
+    if (existing !== undefined)
+        return existing;
+    const promise = fetchSource(uri, cache).finally(() => {
+        inFlight.delete(uri);
+    });
+    inFlight.set(uri, promise);
+    return promise;
 }
 export { getSource };

package/package.json

@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "chiitiler",
-	"version": "1.18.0",
+	"version": "1.20.0",
 	"description": "Tiny map rendering server for MapLibre Style Spec",
 	"main": "./dist/index.js",
 	"types": "./dist/index.d.ts",
@@ -24,33 +24,33 @@
 		"url": "https://github.com/Kanahiro/chiitiler"
 	},
 	"devDependencies": {
-		"@tsconfig/node24": "^24.0.0",
+		"@tsconfig/node24": "^24.0.4",
 		"@types/better-sqlite3": "^7.6.13",
-		"@types/node": "^24.0.0",
-		"@vitest/coverage-v8": "^4.0.16",
-		"esbuild": "^0.27.2",
-		"image-size": "^1.1.1",
+		"@types/node": "^25.6.0",
+		"@vitest/coverage-v8": "^4.1.4",
+		"esbuild": "^0.28.0",
+		"image-size": "^2.0.2",
 		"tsx": "^4.21.0",
-		"typescript": "^5.9.3",
-		"vitest": "^4.0.16"
+		"typescript": "^6.0.3",
+		"vitest": "^4.1.4"
 	},
 	"dependencies": {
-		"@aws-sdk/client-s3": "^3.418.0",
-		"@google-cloud/storage": "^7.15.2",
-		"@hono/node-server": "^1.19.8",
-		"@mapbox/sphericalmercator": "^1.2.0",
-		"@mapbox/tilebelt": "^1.0.2",
-		"@maplibre/maplibre-gl-native": "^6.3.0",
-		"@maplibre/maplibre-gl-style-spec": "^24.4.1",
-		"better-sqlite3": "12.6.0",
-		"commander": "^11.0.0",
-		"file-system-cache": "^2.4.4",
+		"@aws-sdk/client-s3": "^3.1032.0",
+		"@google-cloud/storage": "^7.19.0",
+		"@hono/node-server": "^1.19.14",
+		"@mapbox/sphericalmercator": "^2.0.2",
+		"@mapbox/tilebelt": "^2.0.3",
+		"@maplibre/maplibre-gl-native": "^6.4.1",
+		"@maplibre/maplibre-gl-style-spec": "^24.8.1",
+		"better-sqlite3": "12.9.0",
+		"commander": "^14.0.3",
+		"file-system-cache": "^2.4.7",
 		"higuruma": "^0.1.6",
-		"hono": "^4.11.3",
-		"lightning-pool": "^4.2.2",
-		"lru-cache": "^11.0.0",
-		"maplibre-gl": "^5.15.0",
-		"pmtiles": "^3.0.5",
+		"hono": "^4.12.14",
+		"lightning-pool": "^4.12.0",
+		"lru-cache": "^11.3.5",
+		"maplibre-gl": "^5.23.0",
+		"pmtiles": "^4.4.1",
 		"sharp": "^0.34.5"
 	}
 }