From 20621ec58e1286e7ab6280f3a67c6bc7c4f05b33 Mon Sep 17 00:00:00 2001
From: Robin Tail <robin_tail@me.com>
Date: Fri, 6 Dec 2024 09:40:17 +0100
Subject: [PATCH] Extracting formatter, error resonding by format.

---
 coverage.svg |  2 +-
 src/sse.ts   | 57 +++++++++++++++++++++++++++++++++-------------------
 2 files changed, 37 insertions(+), 22 deletions(-)

diff --git a/coverage.svg b/coverage.svg
index 1abdc489f..0f3b1eb96 100644
--- a/coverage.svg
+++ b/coverage.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="116" height="20" role="img" aria-label="Coverage: 99.34%"><title>Coverage: 99.34%</title><linearGradient id="s" x2="0" y2="100%"><stop offset="0" stop-color="#bbb" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><clipPath id="r"><rect width="116" height="20" rx="3" fill="#fff"/></clipPath><g clip-path="url(#r)"><rect width="63" height="20" fill="#555"/><rect x="63" width="53" height="20" fill="#4c1"/><rect width="116" height="20" fill="url(#s)"/></g><g fill="#fff" text-anchor="middle" font-family="Verdana,Geneva,DejaVu Sans,sans-serif" text-rendering="geometricPrecision" font-size="110"><text aria-hidden="true" x="325" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="530">Coverage</text><text x="325" y="140" transform="scale(.1)" fill="#fff" textLength="530">Coverage</text><text aria-hidden="true" x="885" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="430">99.34%</text><text x="885" y="140" transform="scale(.1)" fill="#fff" textLength="430">99.34%</text></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="116" height="20" role="img" aria-label="Coverage: 99.03%"><title>Coverage: 99.03%</title><linearGradient id="s" x2="0" y2="100%"><stop offset="0" stop-color="#bbb" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><clipPath id="r"><rect width="116" height="20" rx="3" fill="#fff"/></clipPath><g clip-path="url(#r)"><rect width="63" height="20" fill="#555"/><rect x="63" width="53" height="20" fill="#4c1"/><rect width="116" height="20" fill="url(#s)"/></g><g fill="#fff" text-anchor="middle" font-family="Verdana,Geneva,DejaVu Sans,sans-serif" text-rendering="geometricPrecision" font-size="110"><text aria-hidden="true" x="325" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="530">Coverage</text><text x="325" y="140" transform="scale(.1)" fill="#fff" textLength="530">Coverage</text><text aria-hidden="true" x="885" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="430">99.03%</text><text x="885" y="140" transform="scale(.1)" fill="#fff" textLength="430">99.03%</text></g></svg>
\ No newline at end of file
diff --git a/src/sse.ts b/src/sse.ts
index a8ee9b690..300affefb 100644
--- a/src/sse.ts
+++ b/src/sse.ts
@@ -19,6 +19,30 @@ interface Emitter<E extends EventsMap> extends FlatObject {
   emit: <K extends keyof E>(event: K, data: z.input<E[K]>) => void;
 }
 
+const makeEventSchema = (event: string, data: z.ZodTypeAny) =>
+  z.object({
+    data,
+    event: z.literal(event),
+    id: z.string().optional(),
+    retry: z.number().int().positive().optional(),
+  });
+
+const formatEvent = <E extends EventsMap>(
+  events: E,
+  event: keyof E,
+  data: unknown,
+) =>
+  makeEventSchema(String(event), events[event])
+    .transform((props) =>
+      [
+        `event: ${props.event}`,
+        `data: ${JSON.stringify(props.data)}`,
+        "",
+        "", // empty line: events separator
+      ].join("\n"),
+    )
+    .parse({ event, data });
+
 const makeMiddleware = <E extends EventsMap>(events: E) =>
   new Middleware({
     handler: async ({ response }): Promise<Emitter<E>> => {
@@ -30,26 +54,16 @@ const makeMiddleware = <E extends EventsMap>(events: E) =>
       return {
         isClosed: () => response.writableEnded || response.closed,
         emit: (event, data) => {
-          response.write(
-            `event: ${String(event)}\ndata: ${JSON.stringify(events[event].parse(data))}\n\n`,
-            "utf-8",
-          );
+          response.write(formatEvent(events, event, data), "utf-8");
           response.flush();
         },
       };
     },
   });
 
-const makeEventSchema = (event: string, data: z.ZodTypeAny) =>
-  z.object({
-    data,
-    event: z.literal(event),
-    id: z.string().optional(),
-    retry: z.number().int().positive().optional(),
-  });
-
-const makeResultHandler = <E extends EventsMap>(events: E) =>
-  new ResultHandler({
+const makeResultHandler = <E extends EventsMap>(events: E) => {
+  const negativeSchema = makeEventSchema("error", z.string());
+  return new ResultHandler({
     positive: {
       mimeType: contentTypes.sse,
       schema: Object.entries(events)
@@ -58,21 +72,22 @@ const makeResultHandler = <E extends EventsMap>(events: E) =>
         )
         .reduce((agg, schema) => agg.or(schema)),
     },
-    negative: {
-      mimeType: contentTypes.sse,
-      schema: makeEventSchema("error", z.string()),
-    },
+    negative: { mimeType: contentTypes.sse, schema: negativeSchema },
     handler: async ({ response, error, logger, request, input }) => {
       if (error) {
         const httpError = ensureHttpError(error);
         logServerError(httpError, logger, request, input);
-        return void response
-          .status(httpError.statusCode)
-          .end(getPublicErrorMessage(httpError));
+        const output = formatEvent(
+          { error: negativeSchema },
+          "error",
+          getPublicErrorMessage(httpError),
+        );
+        return void response.status(httpError.statusCode).end(output);
       }
       response.status(200).end();
     },
   });
+};
 
 export const unstable_createEventStream = <
   E extends EventsMap,