snapshottheBigRefactor

1 files changed, 23 insertions, 20 deletions

diff --git a/u/server/filter/json.ts b/u/server/filter/json.ts
index c839707..4a2961e 100644
--- a/u/server/filter/json.ts
+++ b/u/server/filter/json.ts
@@ -3,46 +3,49 @@ import {
   type IEither,
   type ITraceable,
   LogLevel,
+  Metric,
+  PenguenoError,
   type PenguenoRequest,
   type RequestFilter,
   type ServerTrace,
   TraceUtil,
 } from "@emprespresso/pengueno";
-import { Metric } from "../../trace/mod.ts";
 
-type JsonTransformer<R, ParsedJson = unknown> = (
-  json: ITraceable<ParsedJson, ServerTrace>,
-) => IEither<Error, R>;
+export interface JsonTransformer<R, ParsedJson = unknown> {
+  (json: ITraceable<ParsedJson, ServerTrace>): IEither<PenguenoError, R>;
+}
 
 const ParseJsonMetric = Metric.fromName("JsonParse");
 export const jsonModel = <MessageT>(
   jsonTransformer: JsonTransformer<MessageT>,
-): RequestFilter<MessageT, Error> =>
+): RequestFilter<MessageT> =>
 (r: ITraceable<PenguenoRequest, ServerTrace>) =>
-  r
-    .bimap(TraceUtil.withMetricTrace(ParseJsonMetric))
+  r.bimap(TraceUtil.withMetricTrace(ParseJsonMetric))
     .map((j) =>
       Either.fromFailableAsync<Error, MessageT>(j.get().json())
         .then((either) =>
           either.mapLeft((errReason) => {
             j.trace.addTrace(LogLevel.WARN).trace(`${errReason}`);
-            return new Error("seems to be invalid JSON (>//<) can you fix?");
+            return new PenguenoError(
+              "seems to be invalid JSON (>//<) can you fix?",
+              400,
+            );
           })
         )
     )
-    .flatMapAsync(
-      TraceUtil.promiseify((traceableEitherJson) =>
-        traceableEitherJson.map((t) =>
-          t.get().mapRight(traceableEitherJson.move).flatMap(
-            jsonTransformer,
-          )
+    .peek(
+      TraceUtil.promiseify((traceableEither) =>
+        traceableEither.get().mapBoth(
+          () => traceableEither.trace.trace(ParseJsonMetric.failure),
+          () => traceableEither.trace.trace(ParseJsonMetric.success),
         )
       ),
     )
-    .peek(TraceUtil.promiseify((traceableEither) =>
-      traceableEither.get().mapBoth(
-        () => traceableEither.trace.trace(ParseJsonMetric.failure),
-        () => traceableEither.trace.trace(ParseJsonMetric.success),
-      )
-    ))
+    .map(
+      TraceUtil.promiseify((traceableEitherJson) =>
+        traceableEitherJson.get()
+          .mapRight(traceableEitherJson.move)
+          .flatMap(jsonTransformer)
+      ),
+    )
     .get();