Split into seperate workflows to improve observability

Author: Jbithell

website/app/routes.ts

@@ -10,6 +10,6 @@ export default [
     "/upload-from-weather-station/:secret",
     "./routes/uploadFromWeatherStation.ts"
   ),
-  route("/download", "./routes/download.ts"),
+  route("/download", "./routes/download.tsx"),
   layout("./routes/layout.tsx", [index("./routes/index.tsx")]),
 ] satisfies RouteConfig;

website/app/routes/uploadFromWeatherStation.ts

@@ -2,7 +2,6 @@ import { data } from "react-router";
 import {
   observationFromWeatherStation,
   observationInsertSchema,
-  Observations,
 } from "../../database/schema.d";
 import type { Route } from "./+types/uploadFromWeatherStation";
 
@@ -85,14 +84,22 @@ export async function action({ request, context, params }: Route.LoaderArgs) {
     });
   } else {
     // The data is valid, so we need to insert it into the database
-    const workflowInstance =
-      await context.cloudflare.env.WORKFLOW_HANDLE_RECEIVED_OBSERVATION.create({
+    await context.cloudflare.env.WORKFLOW_UPLOAD_RECEIVED_OBSERVATION_TO_DB.create(
+      {
         params: fullValidation.data,
-      });
-    const workflowStatus = await workflowInstance.status();
+      }
+    );
+    await context.cloudflare.env.WORKFLOW_UPLOAD_TO_METOFFICE.create({
+      params: fullValidation.data,
+    });
+    await context.cloudflare.env.WORKFLOW_UPLOAD_TO_WINDGURU.create({
+      params: fullValidation.data,
+    });
+    await context.cloudflare.env.WORKFLOW_UPLOAD_TO_WINDY.create({
+      params: fullValidation.data,
+    });
     return data({
       message: "Observation received",
-      status: workflowStatus.status,
     });
   }
 }

website/worker-configuration.d.ts

@@ -1,14 +1,17 @@
-// Generated by Wrangler by running `wrangler types` (hash: 85699d413fb8f19b191b43ace5ddd221)
+// Generated by Wrangler by running `wrangler types` (hash: 7b4d44cc09fc21104015bfeac3c0ef1c)
 // Runtime types generated with workerd@1.20250405.0 2025-04-05 nodejs_compat
 declare namespace Cloudflare {
 	interface Env {
 		KV: KVNamespace;
 		R2_BUCKET: R2Bucket;
 		DB: D1Database;
 		CF_VERSION_METADATA: { id: string; tag: string };
-		WORKFLOW_HANDLE_RECEIVED_OBSERVATION: Workflow;
+		WORKFLOW_UPLOAD_RECEIVED_OBSERVATION_TO_DB: Workflow;
 		WORKFLOW_HANDLE_DISREGARD_OBSERVATION: Workflow;
 		WORKFLOW_OVERNIGHT_SAVE_TO_R2: Workflow;
+		WORKFLOW_UPLOAD_TO_WINDGURU: Workflow;
+		WORKFLOW_UPLOAD_TO_METOFFICE: Workflow;
+		WORKFLOW_UPLOAD_TO_WINDY: Workflow;
 	}
 }
 interface Env extends Cloudflare.Env {}

website/workers/app.ts

@@ -47,15 +47,15 @@ export default {
   },
 } satisfies ExportedHandler<Env>;
 
-export class HandleReceivedObservation extends WorkflowEntrypoint<
+export class UploadReceivedObservation extends WorkflowEntrypoint<
   Env,
   schema.ObservationInsert
 > {
   async run(
     event: WorkflowEvent<schema.ObservationInsert>,
     step: WorkflowStep
   ) {
-    const upload = await step.do(
+    await step.do(
       "Upload incoming data into database",
       {
         retries: {
@@ -88,6 +88,17 @@ export class HandleReceivedObservation extends WorkflowEntrypoint<
         };
       }
     );
+  }
+}
+
+export class UploadToWindGuru extends WorkflowEntrypoint<
+  Env,
+  schema.ObservationInsert
+> {
+  async run(
+    event: WorkflowEvent<schema.ObservationInsert>,
+    step: WorkflowStep
+  ) {
     await step.do(
       "Upload to WindGuru",
       {
@@ -144,6 +155,17 @@ export class HandleReceivedObservation extends WorkflowEntrypoint<
         }
       }
     );
+  }
+}
+
+export class UploadToMetOffice extends WorkflowEntrypoint<
+  Env,
+  schema.ObservationInsert
+> {
+  async run(
+    event: WorkflowEvent<schema.ObservationInsert>,
+    step: WorkflowStep
+  ) {
     await step.do(
       "Upload to Met Office",
       {
@@ -209,6 +231,17 @@ export class HandleReceivedObservation extends WorkflowEntrypoint<
           );
       }
     );
+  }
+}
+
+export class UploadToWindy extends WorkflowEntrypoint<
+  Env,
+  schema.ObservationInsert
+> {
+  async run(
+    event: WorkflowEvent<schema.ObservationInsert>,
+    step: WorkflowStep
+  ) {
     await step.do(
       "Upload to Windy",
       {

website/wrangler.jsonc

@@ -18,19 +18,28 @@
   ],
   "workflows": [
     {
-      "name": "PSCWeather-HandleReceivedObservation",
-      "binding": "WORKFLOW_HANDLE_RECEIVED_OBSERVATION",
-      "class_name": "HandleReceivedObservation"
+      "name": "PSCWeather-UploadReceivedObservationToDB",
+      "binding": "WORKFLOW_UPLOAD_RECEIVED_OBSERVATION_TO_DB",
+      "class_name": "UploadReceivedObservation"
     },
     {
-      "name": "PSCWeather-DisregardReceivedObservation",
       "binding": "WORKFLOW_HANDLE_DISREGARD_OBSERVATION",
       "class_name": "DisregardReceivedObservation"
     },
     {
       "name": "PSCWeather-SaveToR2Overnight",
       "binding": "WORKFLOW_OVERNIGHT_SAVE_TO_R2",
       "class_name": "OvernightSaveToR2"
+    },
+    {
+      "name": "PSCWeather-UploadReceivedObservationToMetOffice",
+      "binding": "WORKFLOW_UPLOAD_TO_METOFFICE",
+      "class_name": "UploadToMetOffice"
+    },
+    {
+      "name": "PSCWeather-UploadReceivedObservationToWindy",
+      "binding": "WORKFLOW_UPLOAD_TO_WINDY",
+      "class_name": "UploadToWindy"
     }
   ],
   "r2_buckets": [