chiitiler 1.12.6 → 1.12.7

package/README.md

@@ -264,6 +264,7 @@ const s3Cache = ChiitilerCache.s3Cache({
     region: 'ap-northeast-1',
     endpoint: null,
 });
+// credentials are loaded from environment variables: AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY
 
 const tileBuf = await getRenderedTileBuffer({
     stylejson: 'https://example.com/style.json', // or StyleSpecification object

package/dist/source/pmtiles.js

@@ -1,6 +1,6 @@
 import * as fs from 'fs';
 import { PMTiles } from 'pmtiles';
-import { GetObjectCommand } from '@aws-sdk/client-s3';
+import { GetObjectCommand, } from '@aws-sdk/client-s3';
 import { LRUCache } from 'lru-cache';
 import { getS3Client } from '../s3.js';
 import { noneCache } from '../cache/index.js';
@@ -39,24 +39,32 @@ class S3Source {
     getKey() {
         return `s3://${this.bucket}/${this.key}`;
     }
-    async getBytes(offset, length) {
-        const cmd = new GetObjectCommand({
-            Bucket: this.bucket,
-            Key: this.key,
-            Range: `bytes=${offset}-${offset + length - 1}`,
-        });
+    async getBytes(offset, length, signal, etag) {
+        let resp;
         try {
-            const obj = await this.s3Client.send(cmd);
-            if (obj.Body === undefined)
-                return { data: Buffer.alloc(0).buffer };
-            const buf = Buffer.from(await obj.Body.transformToByteArray());
-            return { data: buf.buffer };
+            resp = await this.s3Client.send(new GetObjectCommand({
+                Bucket: this.bucket,
+                Key: this.key,
+                Range: 'bytes=' + offset + '-' + (offset + length - 1),
+                IfMatch: etag,
+            }));
         }
         catch (e) {
-            if (e.name !== 'NoSuchKey')
-                console.log(e);
-            return { data: Buffer.alloc(0).buffer };
+            if (e instanceof Error &&
+                e.name === 'PreconditionFailed') {
+                throw new Error('etag mismatch');
+            }
+            throw e;
         }
+        const arr = await resp.Body?.transformToByteArray();
+        if (!arr)
+            throw Error('Failed to read S3 response body');
+        return {
+            data: arr.buffer,
+            etag: resp.ETag,
+            expires: resp.Expires?.toISOString(),
+            cacheControl: resp.CacheControl,
+        };
     }
 }
 /**

package/package.json

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