catch more errors, remove unneeded validation step

Andre Bluehs · Andre Bluehs · commit 08060197a69a · 2025-05-28T14:00:56.000+01:00
diff --git a/README.md b/README.md
@@ -24,7 +24,7 @@
 ## Configure and Deploy
 
 1. Edit `wrangler.toml` to add `DOMAIN`, `SUBDOMAIN`, and `ACCOUNTID`.
-2. Edit `src/index.ts` (line 45) to send the decoded data anywhere you would like.
+2. Edit `src/index.ts` (line 36) to send the decoded data anywhere you would like.
 3. Run `npx wrangler secret put MATCHED_PAYLOAD_PRIVATE_KEY`:
    - Enter the private key generated when deploying a matched payload.
    - Refer to the [documentation](https://developers.cloudflare.com/waf/managed-rules/payload-logging/) for more information on generating the private/public key pair.
diff --git a/src/index.ts b/src/index.ts
@@ -10,17 +10,12 @@ const router = AutoRouter();
 
 router
   .put("/logs/:logdata+", async (req: IRequest, env: Env) => {
-    // Validation step
-    if (/\/ownership-challenge-[a-fA-F0-9]{8}.txt/.test(req.params.logdata)) {
-      return new Response("OK");
-    }
-
-    // Test push
-    // for some reason the inflate() from pako doesn't like the test.txt.gz file
-    // so we'll just accept it and move on as there's nothing of value in there anyway
+    // When configuring logpush the test.txt.gz isn't actually gzipped
+    // so our DecompressionStream("gzip") below fails, but we can just accept it
     if (/\d{8}\/test.txt.gz/.test(req.params.logdata)) {
       return new Response("OK");
     }
+
     // sanity check
     if (!req.body) {
       return new Response("No body", { status: 400 });
@@ -48,7 +43,8 @@ router
       )
       // we need to have a writable stream (even if it's a no-op)
       // so that we can await on a promise and complete our work
-      .pipeTo(new WritableStream());
+      .pipeTo(new WritableStream())
+      .catch((err) => console.error(err));
 
     return new Response("OK");
   })
diff --git a/src/matched_data.ts b/src/matched_data.ts
@@ -19,11 +19,15 @@ export function matchedDataTransformer(
   dataProcessor: (data: string | null) => void
 ) {
   return new TransformNewlineStream(async (line: string) => {
-    const data = await decode(line, privateKey);
-    // we are pre-emptively await-ing this even though
-    // in the default example we don't need to in case
-    // any users in the future need to send the data somewhere
-    await dataProcessor(data);
+    try {
+      const data = await decode(line, privateKey);
+      // we are pre-emptively await-ing this even though
+      // in the default example we don't need to in case
+      // any users in the future need to send the data somewhere
+      await dataProcessor(data);
+    } catch (err) {
+      console.error(err);
+    }
   });
 }
 
diff --git a/src/transform_newline_stream.ts b/src/transform_newline_stream.ts
@@ -17,9 +17,13 @@ export class TransformNewlineStream extends TransformStream {
       const end = flush ? "" : parts.pop() ?? "";
 
       for (const line of [start].concat(parts)) {
-        const res = await lineProcessor(line);
-        if (res) {
-          controller.enqueue(res + (flush ? "\n" : ""));
+        try {
+          const res = await lineProcessor(line);
+          if (res) {
+            controller.enqueue(res + (flush ? "\n" : ""));
+          }
+        } catch (err) {
+          console.error(err);
         }
       }
 
@@ -29,8 +33,9 @@ export class TransformNewlineStream extends TransformStream {
     super({
       start() {},
       async transform(chunk, controller) {
-        if (!chunk) return;
-        prevChunkEnd = await processChunk(chunk, prevChunkEnd, controller);
+        if (chunk) {
+          prevChunkEnd = await processChunk(chunk, prevChunkEnd, controller);
+        }
       },
       async flush(controller) {
         if (prevChunkEnd.length > 0) {
