@striae-org/striae 5.4.3 → 5.4.4

package/workers/user-worker/src/handlers/user-routes.ts

@@ -13,7 +13,20 @@ import type {
 function createJsonResponse(data: unknown, headers: ResponseHeaders, status: number = 200): Response {
   return new Response(JSON.stringify(data), {
     status,
-    headers
+    headers: {
+      ...headers,
+      'Content-Type': 'application/json; charset=utf-8'
+    }
+  });
+}
+
+function createTextResponse(message: string, headers: ResponseHeaders, status: number): Response {
+  return new Response(message, {
+    status,
+    headers: {
+      ...headers,
+      'Content-Type': 'text/plain; charset=utf-8'
+    }
   });
 }
 
@@ -25,10 +38,7 @@ export async function handleGetUser(
   try {
     const userData = await readUserRecord(env, userUid);
     if (userData === null) {
-      return new Response('User not found', {
-        status: 404,
-        headers: corsHeaders
-      });
+      return createTextResponse('User not found', corsHeaders, 404);
     }
 
     return createJsonResponse(userData, corsHeaders);
@@ -36,10 +46,7 @@ export async function handleGetUser(
     const errorMessage = error instanceof Error ? error.message : 'Unknown user data read error';
     console.error('Failed to get user data:', { uid: userUid, reason: errorMessage });
 
-    return new Response('Failed to get user data', {
-      status: 500,
-      headers: corsHeaders
-    });
+    return createTextResponse('Failed to get user data', corsHeaders, 500);
   }
 }
 
@@ -91,10 +98,7 @@ export async function handleAddUser(
 
     return createJsonResponse(userData, corsHeaders, existingUser !== null ? 200 : 201);
   } catch {
-    return new Response('Failed to save user data', {
-      status: 500,
-      headers: corsHeaders
-    });
+    return createTextResponse('Failed to save user data', corsHeaders, 500);
   }
 }
 
@@ -115,10 +119,7 @@ export async function handleDeleteUser(
     const errorMessage = error instanceof Error ? error.message : 'Unknown error occurred';
 
     if (errorMessage === 'User not found') {
-      return new Response('User not found', {
-        status: 404,
-        headers: corsHeaders
-      });
+      return createTextResponse('User not found', corsHeaders, 404);
     }
 
     return createJsonResponse({
@@ -135,7 +136,7 @@ export function handleDeleteUserWithProgress(
 ): Response {
   const sseHeaders: ResponseHeaders = {
     ...corsHeaders,
-    'Content-Type': 'text/event-stream',
+    'Content-Type': 'text/event-stream; charset=utf-8',
     'Cache-Control': 'no-cache, no-transform',
     Connection: 'keep-alive'
   };
@@ -188,10 +189,7 @@ export async function handleAddCases(
     const { cases = [] }: AddCasesRequest = await request.json();
     const userData = await readUserRecord(env, userUid);
     if (!userData) {
-      return new Response('User not found', {
-        status: 404,
-        headers: corsHeaders
-      });
+      return createTextResponse('User not found', corsHeaders, 404);
     }
 
     const existingCases = userData.cases || [];
@@ -205,10 +203,7 @@ export async function handleAddCases(
 
     return createJsonResponse(userData, corsHeaders);
   } catch {
-    return new Response('Failed to add cases', {
-      status: 500,
-      headers: corsHeaders
-    });
+    return createTextResponse('Failed to add cases', corsHeaders, 500);
   }
 }
 
@@ -222,10 +217,7 @@ export async function handleDeleteCases(
     const { casesToDelete }: DeleteCasesRequest = await request.json();
     const userData = await readUserRecord(env, userUid);
     if (!userData) {
-      return new Response('User not found', {
-        status: 404,
-        headers: corsHeaders
-      });
+      return createTextResponse('User not found', corsHeaders, 404);
     }
 
     userData.cases = userData.cases.filter((caseItem) => !casesToDelete.includes(caseItem.caseNumber));
@@ -234,9 +226,6 @@ export async function handleDeleteCases(
 
     return createJsonResponse(userData, corsHeaders);
   } catch {
-    return new Response('Failed to delete cases', {
-      status: 500,
-      headers: corsHeaders
-    });
+    return createTextResponse('Failed to delete cases', corsHeaders, 500);
   }
 }

package/workers/user-worker/src/user-worker.example.ts

@@ -13,10 +13,19 @@ import type { Env } from './types';
 const corsHeaders: Record<string, string> = {
   'Access-Control-Allow-Origin': 'PAGES_CUSTOM_DOMAIN',
   'Access-Control-Allow-Methods': 'GET, PUT, DELETE, OPTIONS',
-  'Access-Control-Allow-Headers': 'Content-Type, X-Custom-Auth-Key',
-  'Content-Type': 'application/json'
+  'Access-Control-Allow-Headers': 'Content-Type, X-Custom-Auth-Key'
 };
 
+function createTextResponse(message: string, status: number, headers: Record<string, string>): Response {
+  return new Response(message, {
+    status,
+    headers: {
+      ...headers,
+      'Content-Type': 'text/plain; charset=utf-8'
+    }
+  });
+}
+
 export default {
   async fetch(request: Request, env: Env): Promise<Response> {
     if (request.method === 'OPTIONS') {
@@ -39,7 +48,7 @@ export default {
       const isCasesEndpoint = parts[2] === USER_CASES_SEGMENT;
       
       if (!userUid) {
-        return new Response('Not Found', { status: 404 });
+        return createTextResponse('Not Found', 404, corsHeaders);
       }
 
       // Handle regular cases endpoint
@@ -47,10 +56,7 @@ export default {
         switch (request.method) {
           case 'PUT': return handleAddCases(request, env, userUid, corsHeaders);
           case 'DELETE': return handleDeleteCases(request, env, userUid, corsHeaders);
-          default: return new Response('Method not allowed', {
-            status: 405,
-            headers: corsHeaders
-          });
+          default: return createTextResponse('Method not allowed', 405, corsHeaders);
         }
       }
 
@@ -64,31 +70,19 @@ export default {
         case 'DELETE': return streamProgress
           ? handleDeleteUserWithProgress(env, userUid, corsHeaders)
           : handleDeleteUser(env, userUid, corsHeaders);
-        default: return new Response('Method not allowed', {
-          status: 405,
-          headers: corsHeaders
-        });
+        default: return createTextResponse('Method not allowed', 405, corsHeaders);
       }
     } catch (error) {
       const errorMessage = error instanceof Error ? error.message : 'Unknown error occurred';
       if (errorMessage === 'Unauthorized') {
-        return new Response('Forbidden', { 
-          status: 403, 
-          headers: corsHeaders 
-        });
+        return createTextResponse('Forbidden', 403, corsHeaders);
       }
 
       if (errorMessage === 'User KV encryption is not fully configured') {
-        return new Response(errorMessage, {
-          status: 500,
-          headers: corsHeaders
-        });
+        return createTextResponse(errorMessage, 500, corsHeaders);
       }
       
-      return new Response('Internal Server Error', { 
-        status: 500, 
-        headers: corsHeaders 
-      });
+      return createTextResponse('Internal Server Error', 500, corsHeaders);
     }
   }
 };