chiitiler 1.14.1 → 1.15.0

package/README.md

@@ -87,9 +87,6 @@ docker run -p 3000:3000 -d \
 -e CHIITILER_S3CACHE_BUCKET=bucketname \
 -e CHIITILER_S3_REGION=ap-northeast-1 \
 ghcr.io/kanahiro/chiitiler
-
-# you also can pass options
-docker run -p 8000:8000 ghcr.io/kanahiro/chiitiler tile-server -p 8000 -c s3 -s3b bucketname -s3r ap-northeast-1
 ```
 
 #### Environment Variables
@@ -102,7 +99,7 @@ you can pass server options via environment variables
 | CHIITILER_PROCESSES                | 1        | num of chiitiler processes. 0 means all-CPUs   |
 | CHIITILER_DEBUG                    | false    | debug mode                                     |
 | CHIITILER_STREAM_MODE              | false    | stream mode                                    |
-| CHIITILER_CACHE_METHOD             | none     | cache method, `none`, `memory`, `file` or `s3` |
+| CHIITILER_CACHE_METHOD             | none     | cache method, `none`, `memory`, `file`, `s3` or `gcs` |
 | CHIITILER_CACHE_TTL_SEC            | 3600     | cache ttl, effect to `memory` and `file`       |
 | CHIITILER_MEMORYCACHE_MAXITEMCOUNT | 1000     | max items for memorycache                      |
 | CHIITILER_FILECACHE_DIR            | .cache   | filecache directory                            |
@@ -110,54 +107,31 @@ you can pass server options via environment variables
 | CHIITILER_S3_REGION                | us-east1 | s3 bucket region for caching/fetching          |
 | CHIITILER_S3_ENDPOINT              |          | s3 endpoint for caching/fetching               |
 | CHIITILER_S3_FORCE_PATH_STYLE      | false    | force path style for s3, needed for minio      |
+| CHIITILER_GCS_CACHE_BUCKE          |          | gcs cache bucket name                          |
+| CHIITILER_GCS_CACHE_PREFIX         |          | gcs cache prefix                               |
+| CHIITILER_GCS_PROJECT_ID           |          | gcs project id                                 |
+| CHIITILER_GCS_KEY_FILENAME         |          | gcs key filename                               |
+| CHIITILER_GCS_API_ENDPOINT         |          | gcs api endpoint                               |
 
-### CLI (deprecated)
-
-- Node.js v18 or v20
+### debug page
 
-```sh
-npm install
-npm run build
-node dist/main.js tile-server
-# running server: http://localhost:3000
-
-# develop
-npm run dev
-# running server: http://localhost:3000
-# debug page: http://localhost:3000/debug
-```
+- in debug mode, you can access:
+  - debug page: <http://localhost:3000/debug>
+    - You can pass style.json url: <http://localhost:3000/debug?url=https://tile.openstreetmap.jp/styles/osm-bright/style.json>
+  - editor page: <http://localhost:3000/editor>
 
-#### options
+## deployment
 
-```sh
-node dist/main.js tile-server -p 8000 -c file -ctl 60 -fcd cachedir -D
-# -p: port number
-# -c: cache method
-# -ctl: cache ttl
-# -fcd: cache directory
-# -D: debug mode
-
-node dist/main.js tile-server -c memory -ctl 60 -mci 1000
-# -mci: max cache items
-
-node dist/main.js tile-server -c s3 -s3b chiitiler -s3r ap-northeast-1
-# -s3b: S3 bucket name for cache
-# -s3r: S3 bucket region
-# caution: TTL is not supported in S3 cache, please utilize S3 lifecycle policy
-```
+### AWS CDK
 
-### debug page
-
-- in debug mode, you can access:
-    - debug page: <http://localhost:3000/debug>
-        - You can pass style.json url: <http://localhost:3000/debug?url=https://tile.openstreetmap.jp/styles/osm-bright/style.json>
-    - editor page: <http://localhost:3000/editor>
+- you can deploy chiitiler with AWS CDK, check [cdk](./cdk)
 
 ## supported protocols in style.json
 
 - `http://` or `https://` protocol are used in Style Specification
 - In addition, chiitiler supports following protocols:
   - `s3://` for S3 bucket
+  - `gs://` for Google Cloud Storage bucket
   - `file://` for file system
   - `mbtiles://` for MBTIles files
   - `pmtiles://` for PMTiles, remote or local or s3
@@ -200,6 +174,13 @@ node dist/main.js tile-server -c s3 -s3b chiitiler -s3r ap-northeast-1
       ],
       "maxzoom": 6
     },
+    "gcs": {
+      "type": "vector",
+      "tiles": [
+        "gs://tiles/{z}/{x}/{y}.pbf"
+      ],
+      "maxzoom": 6
+    },
     "cog": {
       "type": "raster",
       "tiles": [
@@ -249,6 +230,26 @@ node dist/main.js tile-server -c s3 -s3b chiitiler -s3r ap-northeast-1
         "circle-color": "green"
       }
     },
+    {
+      "id": "pmtiles-s3",
+      "source": "pmtiles-s3",
+      "source-layer": "P2921",
+      "type": "circle",
+      "paint": {
+        "circle-radius": 3,
+        "circle-color": "purple"
+      }
+    },
+    {
+      "id": "gcs",
+      "source": "gcs",
+      "source-layer": "P2921",
+      "type": "circle",
+      "paint": {
+        "circle-radius": 3,
+        "circle-color": "purple"
+      }
+    },
     {
       "id": "cog",
       "source": "cog",
@@ -290,6 +291,11 @@ const s3Cache = ChiitilerCache.s3Cache({
 });
 // credentials are loaded from environment variables: AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY
 
+const gcsCache = ChiitilerCache.gcsCache({
+    bucket: 'chiitiler',
+});
+// credentials are loaded from environment variables: GOOGLE_APPLICATION_CREDENTIALS
+
 const tileBuf = await getRenderedTileBuffer({
     stylejson: 'https://example.com/style.json', // or StyleSpecification object
     z: 0,
@@ -316,4 +322,5 @@ const bboxBuf = await getRenderedBboxBuffer({
 
 ## development
 
-- run `docker compose up`
+- To debug S3, run `docker compose up`
+- To debug GCS, change `CHIITILER_CACHE_METHOD` to `gcs` in `docker-compose.yml`, and then run `docker compose up`

package/dist/cache/gcs.d.ts

@@ -0,0 +1,10 @@
+import { type Cache } from './index.js';
+type GCSCacheOptions = {
+    bucket: string;
+    prefix?: string;
+    projectId?: string;
+    keyFilename?: string;
+    apiEndpoint?: string;
+};
+declare function gcsCache(options: GCSCacheOptions): Cache;
+export { gcsCache };

package/dist/cache/gcs.js

@@ -0,0 +1,66 @@
+import { getStorageClient } from '../gcs.js';
+function gcsCache(options) {
+    if (options.prefix?.endsWith('/')) {
+        options.prefix = options.prefix.slice(0, -1);
+    }
+    const storageClient = getStorageClient({
+        projectId: options.projectId,
+        keyFilename: options.keyFilename,
+        apiEndpoint: options.apiEndpoint,
+    });
+    const bucket = storageClient.bucket(options.bucket);
+    function bucketFile(key) {
+        const name = escapeFileName(key);
+        const nameWithPrefix = options.prefix ? `${options.prefix}/${name}` : name;
+        return bucket.file(nameWithPrefix);
+    }
+    return {
+        name: 'gcs',
+        set: async function (key, value) {
+            const file = bucketFile(key);
+            try {
+                await file.save(value, {
+                    resumable: false,
+                });
+            }
+            catch (e) {
+                console.log(`[error]: ${e}`);
+            }
+        },
+        get: async function (key) {
+            const file = bucketFile(key);
+            try {
+                const [content] = await file.download();
+                return Buffer.from(content);
+            }
+            catch {
+                // miss or any error
+                return undefined;
+            }
+        },
+    };
+}
+function escapeFileName(url) {
+    return url
+        .replace(/\//g, '_') // replace slashes with underscores
+        .replace(/\?/g, '-') // replace question marks with dashes
+        .replace(/&/g, '-') // replace ampersands with dashes
+        .replace(/=/g, '-') // replace equals signs with dashes
+        .replace(/%/g, '-') // replace percent signs with dashes
+        .replace(/#/g, '-') // replace hash signs with dashes
+        .replace(/:/g, '-') // replace colons with dashes
+        .replace(/\+/g, '-') // replace plus signs with dashes
+        .replace(/ /g, '-') // replace spaces with dashes
+        .replace(/</g, '-') // replace less than signs with dashes
+        .replace(/>/g, '-') // replace greater than signs with dashes
+        .replace(/\*/g, '-') // replace asterisks with dashes
+        .replace(/\|/g, '-') // replace vertical bars with dashes
+        .replace(/"/g, '-') // replace double quotes with dashes
+        .replace(/'/g, '-') // replace single quotes with dashes
+        .replace(/\?/g, '-') // replace question marks with dashes
+        .replace(/\./g, '-') // replace dots with dashes
+        .replace(/,/g, '-') // replace commas with dashes
+        .replace(/;/g, '-') // replace semicolons with dashes
+        .replace(/\\/g, '-'); // replace backslashes with dashes
+}
+export { gcsCache };

package/dist/cache/index.d.ts

@@ -1,5 +1,6 @@
 import { memoryCache } from './memory.js';
 import { s3Cache } from './s3.js';
+import { gcsCache } from './gcs.js';
 import { fileCache } from './file.js';
 type Value = Buffer;
 type Cache = {
@@ -8,4 +9,4 @@ type Cache = {
     set: (key: string, value: Value) => Promise<void>;
 };
 declare const noneCache: () => Cache;
-export { noneCache, memoryCache, s3Cache, fileCache, type Value, type Cache };
+export { noneCache, memoryCache, s3Cache, gcsCache, fileCache, type Value, type Cache };

package/dist/cache/index.js

@@ -1,9 +1,10 @@
 import { memoryCache } from './memory.js';
 import { s3Cache } from './s3.js';
+import { gcsCache } from './gcs.js';
 import { fileCache } from './file.js';
 const noneCache = () => ({
     name: 'none',
     get: async () => undefined,
     set: async () => undefined,
 });
-export { noneCache, memoryCache, s3Cache, fileCache };
+export { noneCache, memoryCache, s3Cache, gcsCache, fileCache };

package/dist/cli.js

@@ -21,6 +21,14 @@ function parseCacheStrategy(method, options) {
             endpoint: options.s3Endpoint,
             forcePathStyle: options.s3ForcePathStyle,
         });
+    if (method === 'gcs')
+        return caches.gcsCache({
+            bucket: options.gcsCacheBucket,
+            projectId: options.gcsProjectId,
+            keyFilename: options.gcsKeyFilename,
+            prefix: options.gcsCachePrefix,
+            apiEndpoint: options.gcsApiEndpoint,
+        });
     // command-line is not specified -> try to read from env
     const cacheEnv = process.env.CHIITILER_CACHE_METHOD;
     if (cacheEnv === 'memory')
@@ -40,6 +48,14 @@ function parseCacheStrategy(method, options) {
             endpoint: process.env.CHIITILER_S3_ENDPOINT,
             forcePathStyle: process.env.CHIITILER_S3_FORCE_PATH_STYLE === 'true',
         });
+    if (cacheEnv === 'gcs')
+        return caches.gcsCache({
+            bucket: process.env.CHIITILER_GCS_CACHE_BUCKET ?? '',
+            prefix: process.env.CHIITILER_GCS_CACHE_PREFIX,
+            projectId: process.env.CHIITILER_GCS_PROJECT_ID,
+            keyFilename: process.env.CHIITILER_GCS_KEY_FILENAME,
+            apiEndpoint: process.env.CHIITILER_GCS_API_ENDPOINT,
+        });
     // undefined or invalid
     return caches.noneCache();
 }
@@ -88,6 +104,11 @@ export function createProgram() {
         .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('-r --stream', 'stream mode')
         .option('-D --debug', 'debug mode')
@@ -101,6 +122,11 @@ export function createProgram() {
                 s3Region: options.s3Region,
                 s3Endpoint: options.s3Endpoint,
                 s3ForcePathStyle: options.s3ForcePathStyle === 'true',
+                gcsCacheBucket: options.gcsCacheBucket,
+                gcsCachePrefix: options.gcsCachePrefix,
+                gcsProjectId: options.gcsProjectId,
+                gcsKeyFilename: options.gcsKeyFilename,
+                gcsApiEndpoint: options.gcsApiEndpoint,
             }),
             port: parsePort(options.port),
             debug: parseDebug(options.debug),

package/dist/gcs.d.ts

@@ -0,0 +1,7 @@
+import { Storage } from '@google-cloud/storage';
+declare const getStorageClient: ({ projectId, keyFilename, apiEndpoint }: {
+    projectId?: string;
+    keyFilename?: string;
+    apiEndpoint?: string;
+}) => Storage;
+export { getStorageClient };

package/dist/gcs.js

@@ -0,0 +1,14 @@
+import { Storage } from '@google-cloud/storage';
+let storageClient; // singleton
+const getStorageClient = function ({ projectId, keyFilename, apiEndpoint }) {
+    if (storageClient !== undefined)
+        return storageClient;
+    const storageOptions = {
+        projectId,
+        keyFilename,
+        apiEndpoint
+    };
+    storageClient = new Storage(storageOptions);
+    return storageClient;
+};
+export { getStorageClient };

package/dist/source/gcs.d.ts

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

package/dist/source/gcs.js

@@ -0,0 +1,21 @@
+import { getStorageClient } from '../gcs.js';
+async function getGCSSource(uri) {
+    const storageClient = getStorageClient({
+        projectId: process.env.CHIITILER_GCS_PROJECT_ID,
+        keyFilename: process.env.CHIITILER_GCS_KEY_FILENAME,
+        apiEndpoint: process.env.CHIITILER_GCS_API_ENDPOINT,
+    });
+    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)
+            console.log(e);
+        return null;
+    }
+}
+export { getGCSSource };

package/dist/source/index.js

@@ -1,8 +1,9 @@
 import { getFilesystemSource } from './fs.js';
 import { getHttpSource } from './http.js';
-import { getPmtilesSoruce } from './pmtiles.js';
+import { getPmtilesSource } from './pmtiles.js';
 import { getMbtilesSource } from './mbtiles.js';
 import { getS3Source } from './s3.js';
+import { getGCSSource } from './gcs.js';
 import { getCogSource } from './cog.js';
 import { noneCache } from '../cache/index.js';
 /**
@@ -19,10 +20,12 @@ async function getSource(uri, cache = noneCache()) {
         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 getPmtilesSoruce(uri, cache);
+        data = await getPmtilesSource(uri, cache);
     else if (uri.startsWith('cog://'))
         data = await getCogSource(uri);
     else

package/dist/source/pmtiles.d.ts

@@ -4,5 +4,5 @@ import { type Cache } from '../cache/index.js';
  * uri = pmtiles://http://url/to/file.pmtiles/{z}/{x}/{y}
  * uri = pmtiles://s3://bucket/key/to/file.pmtiles/{z}/{x}/{y}
  */
-declare function getPmtilesSoruce(uri: string, cache?: Cache): Promise<Buffer | null>;
-export { getPmtilesSoruce };
+declare function getPmtilesSource(uri: string, cache?: Cache): Promise<Buffer | null>;
+export { getPmtilesSource };

package/dist/source/pmtiles.js

@@ -72,7 +72,7 @@ class S3Source {
  * uri = pmtiles://http://url/to/file.pmtiles/{z}/{x}/{y}
  * uri = pmtiles://s3://bucket/key/to/file.pmtiles/{z}/{x}/{y}
  */
-async function getPmtilesSoruce(uri, cache = noneCache()) {
+async function getPmtilesSource(uri, cache = noneCache()) {
     const pmtilesUri = uri
         .replace('pmtiles://', '')
         .replace(/\/\d+\/\d+\/\d+$/, '');
@@ -112,4 +112,4 @@ async function getPmtilesSoruce(uri, cache = noneCache()) {
         cache.set(uri, buf);
     return buf;
 }
-export { getPmtilesSoruce };
+export { getPmtilesSource };

package/dist/source/s3.d.ts

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

package/package.json

@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "chiitiler",
-	"version": "1.14.1",
+	"version": "1.15.0",
 	"description": "Tiny map rendering server for MapLibre Style Spec",
 	"main": "./dist/index.js",
 	"types": "./dist/index.d.ts",
@@ -26,15 +26,18 @@
 		"@vitest/coverage-v8": "^1.6.0",
 		"esbuild": "^0.25.0",
 		"image-size": "^1.1.1",
-		"maplibre-gl": "^3.3.1",
 		"ts-node": "^10.9.1",
 		"tsx": "^4.7.1",
 		"typescript": "^5.2.2",
-		"vitest": "^1.6.0",
+		"vitest": "^1.6.0"
+	},
+	"dependencies": {
 		"@aws-sdk/client-s3": "^3.418.0",
+		"@google-cloud/storage": "^7.15.2",
 		"@hono/node-server": "^1.12.0",
 		"@mapbox/sphericalmercator": "^1.2.0",
 		"@mapbox/tilebelt": "^1.0.2",
+		"@maplibre/maplibre-gl-native": "^5.4.0",
 		"@maplibre/maplibre-gl-style-spec": "^20.2.0",
 		"better-sqlite3": "^9.6.0",
 		"commander": "^11.0.0",
@@ -43,10 +46,8 @@
 		"hono": "^4.5.4",
 		"lightning-pool": "^4.2.2",
 		"lru-cache": "^11.0.0",
-		"pmtiles": "^3.0.5"
-	},
-	"dependencies": {
-		"@maplibre/maplibre-gl-native": "^5.4.0",
+		"maplibre-gl": "^3.3.1",
+		"pmtiles": "^3.0.5",
 		"sharp": "^0.32.5"
 	}
 }