From fb7031fc8995ed298b178ed6cf8bc62f3e94ed85 Mon Sep 17 00:00:00 2001
From: geoffsee <>
Date: Tue, 27 May 2025 15:07:11 -0400
Subject: [PATCH] **Migrate from TOML to JSON configuration for workers**

Replaced Wrangler TOML files with JSON configuration for email and analytics workers, updating compatibility dates and maintaining existing settings. Updated email metadata and replaced hardcoded email addresses with example addresses for better abstraction. Adjusted deployment scripts in `package.json` to align with the new worker structure.
---
 package.json                              |  4 ++--
 src/renderer/+onRenderHtml.tsx            |  2 +-
 workers/analytics/wrangler-analytics.toml | 17 -----------------
 workers/analytics/wrangler.jsonc          | 23 +++++++++++++++++++++++
 workers/email/email_worker.js             |  6 +++---
 workers/email/wrangler-email.toml         | 14 --------------
 workers/email/wrangler.jsonc              | 18 ++++++++++++++++++
 7 files changed, 47 insertions(+), 37 deletions(-)
 delete mode 100644 workers/analytics/wrangler-analytics.toml
 create mode 100644 workers/analytics/wrangler.jsonc
 delete mode 100644 workers/email/wrangler-email.toml
 create mode 100644 workers/email/wrangler.jsonc

diff --git a/package.json b/package.json
index 7ea0055..eeb317c 100644
--- a/package.json
+++ b/package.json
@@ -9,8 +9,8 @@
     "client:build": "vite build",
     "server:build": "WRANGLER_LOG=info wrangler build",
     "deploy": "CI=true vite build && wrangler deploy --minify",
-    "deploy:email-service": "wrangler deploy -c workers/email/wrangler-email.toml",
-    "deploy:analytics-service": "wrangler deploy -c workers/analytics/wrangler-analytics.toml",
+    "deploy:email-service": "wrangler deploy --cwd workers/email",
+    "deploy:analytics-service": "wrangler deploy --cwd workers/analytics",
     "tail": "wrangler tail",
     "tail:email-service": "wrangler tail -c workers/email/wrangler-email.toml",
     "tail:analytics-service": "wrangler tail -c workers/analytics/wrangler-analytics.toml",
diff --git a/src/renderer/+onRenderHtml.tsx b/src/renderer/+onRenderHtml.tsx
index 8669e3c..de79ff2 100644
--- a/src/renderer/+onRenderHtml.tsx
+++ b/src/renderer/+onRenderHtml.tsx
@@ -37,7 +37,7 @@ const onRenderHtml: OnRenderHtmlAsync = async (
 <meta charset="UTF-8">
 <meta name="description" content="Maker Site">
 <script>
-window.ga_tid = "resume-site";
+window.ga_tid = "open-gsio";
 window.ga_api = "/api/metrics";
 </script>
 <script src="/cfga.min.js" async></script>
diff --git a/workers/analytics/wrangler-analytics.toml b/workers/analytics/wrangler-analytics.toml
deleted file mode 100644
index d3684c9..0000000
--- a/workers/analytics/wrangler-analytics.toml
+++ /dev/null
@@ -1,17 +0,0 @@
-main="analytics_worker.js"
-name = "analytics"
-compatibility_date = "2024-12-20"
-
-routes = [
-    { pattern = "metrics.seemueller.io", custom_domain = true }
-]
-
-[dev]
-port = 3003
-
-[placement]
-mode = "smart"
-
-[[analytics_engine_datasets]]
-binding = "ANALYTICS_ENGINE"
-dataset = "global_analytics"
\ No newline at end of file
diff --git a/workers/analytics/wrangler.jsonc b/workers/analytics/wrangler.jsonc
new file mode 100644
index 0000000..066c035
--- /dev/null
+++ b/workers/analytics/wrangler.jsonc
@@ -0,0 +1,23 @@
+{
+  "compatibility_date": "2025-05-27",
+  "main": "analytics_worker.js",
+  "name": "analytics",
+  "analytics_engine_datasets": [
+    {
+      "binding": "ANALYTICS_ENGINE",
+      "dataset": "global_analytics"
+    }
+  ],
+  "routes": [
+    {
+      "custom_domain": true,
+      "pattern": "your.route.here"
+    }
+  ],
+  "dev": {
+    "port": 3003
+  },
+  "placement": {
+    "mode": "smart"
+  }
+}
\ No newline at end of file
diff --git a/workers/email/email_worker.js b/workers/email/email_worker.js
index bd6145f..0618a50 100644
--- a/workers/email/email_worker.js
+++ b/workers/email/email_worker.js
@@ -14,7 +14,7 @@ export default class EmailWorker extends WorkerEntrypoint {
     const msg = createMimeMessage();
     msg.setSender({
       name: "New Website Contact",
-      addr: "contact@seemueller.io",
+      addr: "contact@example.com",
     });
     console.log("Recipient:", to);
     // msg.setRecipient(to);
@@ -27,8 +27,8 @@ export default class EmailWorker extends WorkerEntrypoint {
 
     try {
       const message = new EmailMessage(
-        "contact@seemueller.io",
-        "geoff@seemueller.io",
+        "contact@example.com",
+        "team@example.com",
         msg.asRaw(),
       );
       await this.env.SEB.send(message);
diff --git a/workers/email/wrangler-email.toml b/workers/email/wrangler-email.toml
deleted file mode 100644
index 5f9e053..0000000
--- a/workers/email/wrangler-email.toml
+++ /dev/null
@@ -1,14 +0,0 @@
-main="email_worker.js"
-name = "email-service-rpc"
-compatibility_date = "2024-12-20"
-node_compat = true
-
-[dev]
-port = 3002
-
-[placement]
-mode = "smart"
-
-send_email = [
-    {name = "SEB", destination_address = "contact@seemueller.io"},
-]
\ No newline at end of file
diff --git a/workers/email/wrangler.jsonc b/workers/email/wrangler.jsonc
new file mode 100644
index 0000000..c3b9a4c
--- /dev/null
+++ b/workers/email/wrangler.jsonc
@@ -0,0 +1,18 @@
+{
+  "compatibility_date": "2025-05-27",
+  "main": "email_worker.js",
+  "name": "email-service-rpc",
+  "node_compat": true,
+  "dev": {
+    "port": 3002
+  },
+  "placement": {
+    "mode": "smart",
+    "send_email": [
+      {
+        "destination_address": "contact@example.com",
+        "name": "SEB"
+      }
+    ]
+  }
+}
\ No newline at end of file