1 files changed, 54 insertions, 37 deletions
diff --git a/hooks/server/mod.ts b/hooks/server/mod.ts
index c484af4..cc20827 100644
--- a/hooks/server/mod.ts
+++ b/hooks/server/mod.ts
@@ -1,39 +1,56 @@
-import { Either, type ITraceable } from "@emprespresso/pengueno";
+import {
+  getRequiredEnv,
+  getStdout,
+  type HealthCheckInput,
+  HealthCheckOutput,
+  type IEither,
+  type ITraceable,
+  TraceUtil,
+} from "@emprespresso/pengueno";
+import {} from "../../u/trace/mod.ts";
 
-const healthCheck = async <Trace>(in: ITraceable<"healthy?", Trace>) => {
-  return getRequiredEnv("LAMINAR_HOST").flatMap((_host) => Either.fromFailableAsync(
-    getStdout(in.move(["laminarc", "show-jobs"]))
-  ))
-}
+const healthCheck = <Trace>(
+  input: ITraceable<HealthCheckInput, Trace>,
+): Promise<IEither<Error, HealthCheckOutput>> =>
+  input.bimap(TraceUtil.withFunctionTrace(healthCheck))
+    .move(getRequiredEnv("LAMINAR_HOST"))
+    // we need to test LAMINAR_HOST is propagated to getStdout for other procedures
+    .map(({ item }) => item.moveRight(["laminarc", "show-jobs"]))
+    .map((i) =>
+      i.item.mapRight(i.move.apply)
+        .flatMapAsync(getStdout.apply)
+        .then((gotJobs) => gotJobs.moveRight(HealthCheckOutput.YAASQUEEN))
+    )
+    .item;
 
-export class LizCIServer {
-  private constructor(
-   private readonly healthCheckActivity = HealthCheckActivity(healthCheck),
-   private readonly jobHookActivity = JobHookActivity(jobQueuer)
-  ) {}
-
-  private async route(req: ITraceable<req: Request, LogTraceable>) {
-    return req.flatMap((req) => {
-      const { logger, item: { method, pathname } } = req;
-      if (pathname === "/health") {
-        return this.healthCheckActivity.healthCheck(req);
-      }
-      return this.jobHookActivity.processHook(req);
-    });
-  }
-
-  public async serve(req: Request): Promise<Response> {
-    return LogTraceable(req).bimap(TraceUtil.withClassTrace(this)).map(this.route)
-  }
-}
-private route(
-  req: Traceable<Request & { pathname: string }>,
-): Traceable<Promise<Response>> {
-  return req.flatMap((req) => {
-    const { logger, item: { method, pathname } } = req;
-    if (pathname === "/health") {
-      return this.healthCheckActivity.healthCheck(req);
-    }
-    return this.jobHookActivity.processHook(req);
-  });
-}
+//export class LizCIServer {
+//  private constructor(
+//   private readonly healthCheckActivity = HealthCheckActivity(healthCheck),
+//   private readonly jobHookActivity = JobHookActivity(jobQueuer)
+//  ) {}
+//
+//  private async route(req: ITraceable<req: Request, LogTraceable>) {
+//    return req.flatMap((req) => {
+//      const { logger, item: { method, pathname } } = req;
+//      if (pathname === "/health") {
+//        return this.healthCheckActivity.healthCheck(req);
+//      }
+//      return this.jobHookActivity.processHook(req);
+//    });
+//  }
+//
+//  public async serve(req: Request): Promise<Response> {
+//    return LogTraceable(req).bimap(TraceUtil.withClassTrace(this)).map(this.route)
+//  }
+//}
+//private route(
+//  req: Traceable<Request & { pathname: string }>,
+//): Traceable<Promise<Response>> {
+//  return req.flatMap((req) => {
+//    const { logger, item: { method, pathname } } = req;
+//    if (pathname === "/health") {
+//      return this.healthCheckActivity.healthCheck(req);
+//    }
+//    return this.jobHookActivity.processHook(req);
+//  });
+//}