Implement ETag logic for AWS and Cloudflare [#90] (#354)

serverless/aws/src/index.ts

@@ -5,6 +5,7 @@ import {
 } from "aws-lambda";
 import {
   Compression,
+  EtagMismatch,
   PMTiles,
   RangeResponse,
   ResolvedValueCache,
@@ -16,7 +17,11 @@ import { pmtiles_path, tileJSON, tile_path } from "../../shared/index";
 import { createHash } from "crypto";
 import zlib from "zlib";
 
-import { GetObjectCommand, S3Client } from "@aws-sdk/client-s3";
+import {
+  GetObjectCommand,
+  GetObjectCommandOutput,
+  S3Client,
+} from "@aws-sdk/client-s3";
 import { NodeHttpHandler } from "@aws-sdk/node-http-handler";
 
 // the region should default to the same one as the function
@@ -60,7 +65,9 @@ class S3Source implements Source {
     signal?: AbortSignal,
     etag?: string
   ): Promise<RangeResponse> {
-    const resp = await s3client.send(
+    let resp: GetObjectCommandOutput;
+    try {
+      resp = await s3client.send(
         new GetObjectCommand({
           // biome-ignore lint: aws api
           Bucket: process.env.BUCKET!,
@@ -68,8 +75,16 @@ class S3Source implements Source {
           Key: pmtiles_path(this.archiveName, process.env.PMTILES_PATH),
           // biome-ignore lint: aws api
           Range: "bytes=" + offset + "-" + (offset + length - 1),
+          // biome-ignore lint: aws api
+          IfMatch: etag,
         })
       );
+    } catch (e: unknown) {
+      if (e instanceof Error && (e as Error).name === "PreconditionFailed") {
+        throw new EtagMismatch();
+      }
+      throw e;
+    }
 
     const arr = await resp.Body?.transformToByteArray();
 

serverless/cloudflare/src/index.ts

@@ -1,5 +1,6 @@
 import {
   Compression,
+  EtagMismatch,
   PMTiles,
   RangeResponse,
   ResolvedValueCache,
@@ -63,12 +64,19 @@ class R2Source implements Source {
       pmtiles_path(this.archiveName, this.env.PMTILES_PATH),
       {
         range: { offset: offset, length: length },
+        onlyIf: { etagMatches: etag },
       }
     );
     if (!resp) {
       throw new KeyNotFoundError("Archive not found");
     }
+
     const o = resp as R2ObjectBody;
+
+    if (!o.body) {
+      throw new EtagMismatch();
+    }
+
     const a = await o.arrayBuffer();
     return {
       data: a,