chore: Update types

lib/health/HealthCheck.ts

@@ -1,55 +1,43 @@
-// import { InterfaceReceipt } from "../mainFn/interfaceReceipt";
-// import { Daemon, Effects } from "../types";
-// import { CheckResult } from "./checkFns/CheckResult";
-// import { ReadyReceipt } from "./ReadyProof";
-// import { HealthReceipt } from "./HealthReceipt";
-// import { Trigger } from "./trigger";
-// import { TriggerInput } from "./trigger/TriggerInput";
-// import { defaultTrigger } from "./trigger/defaultTrigger";
+import { InterfaceReceipt } from "../mainFn/interfaceReceipt";
+import { Daemon, Effects } from "../types";
+import { CheckResult } from "./checkFns/CheckResult";
+import { HealthReceipt } from "./HealthReceipt";
+import { Trigger } from "./trigger";
+import { TriggerInput } from "./trigger/TriggerInput";
+import { defaultTrigger } from "./trigger/defaultTrigger";
 
-// function readReciptOf<A extends { daemon: Daemon }>(a: A) {
-//   return a as A & ReadyReceipt;
-// }
-// export function readyCheck(o: {
-//   effects: Effects;
-//   started(onTerm: () => void): null;
-//   interfaceReceipt: InterfaceReceipt;
-//   healthReceipts: Iterable<HealthReceipt>;
-//   daemonReceipt: Daemon;
-//   name: string;
-//   trigger?: Trigger;
-//   fn(): Promise<CheckResult> | CheckResult;
-//   onFirstSuccess?: () => () => Promise<unknown> | unknown;
-// }) {
-//   new Promise(async () => {
-//     const trigger = (o.trigger ?? defaultTrigger)();
-//     let currentValue: TriggerInput = {
-//       lastResult: null,
-//       hadSuccess: false,
-//     };
-//     for (
-//       let res = await trigger.next(currentValue);
-//       !res.done;
-//       res = await trigger.next(currentValue)
-//     ) {
-//       try {
-//         const { status, message } = await o.fn();
-//         if (!currentValue.hadSuccess) {
-//           await o.started(o?.onFirstSuccess ?? (() => o.daemonReceipt.term()));
-//         }
-//         await o.effects.setHealth({
-//           name: o.name,
-//           status,
-//           message,
-//         });
-//         currentValue.hadSuccess = true;
-//         currentValue.lastResult = "success";
-//       } catch (_) {
-//         currentValue.lastResult = "failure";
-//       }
-//     }
-//   });
-//   return readReciptOf({
-//     daemon: o.daemonReceipt,
-//   });
-// }
+export function healthCheck(o: {
+  effects: Effects;
+  name: string;
+  trigger?: Trigger;
+  fn(): Promise<CheckResult> | CheckResult;
+  onFirstSuccess?: () => () => Promise<unknown> | unknown;
+}) {
+  new Promise(async () => {
+    let currentValue: TriggerInput = {
+      lastResult: null,
+      hadSuccess: false,
+    };
+    const getCurrentValue = () => currentValue;
+    const trigger = (o.trigger ?? defaultTrigger)(getCurrentValue);
+    for (
+      let res = await trigger.next();
+      !res.done;
+      res = await trigger.next()
+    ) {
+      try {
+        const { status, message } = await o.fn();
+        await o.effects.setHealth({
+          name: o.name,
+          status,
+          message,
+        });
+        currentValue.hadSuccess = true;
+        currentValue.lastResult = "success";
+      } catch (_) {
+        currentValue.lastResult = "failure";
+      }
+    }
+  });
+  return {} as HealthReceipt;
+}

lib/health/trigger/changeOnFirstSuccess.ts

@@ -4,25 +4,28 @@ import { Trigger } from "./index";
 export function changeOnFirstSuccess(o: {
   beforeFirstSuccess: Trigger;
   afterFirstSuccess: Trigger;
-}) {
-  return async function* () {
-    const beforeFirstSuccess = o.beforeFirstSuccess();
-    let currentValue: TriggerInput = yield;
-    beforeFirstSuccess.next(currentValue);
+}): Trigger {
+  return async function* (getInput) {
+    const beforeFirstSuccess = o.beforeFirstSuccess(getInput);
+    yield;
+    let currentValue = getInput();
+    beforeFirstSuccess.next();
     for (
-      let res = await beforeFirstSuccess.next(currentValue);
+      let res = await beforeFirstSuccess.next();
       currentValue?.lastResult !== "success" && !res.done;
-      res = await beforeFirstSuccess.next(currentValue)
+      res = await beforeFirstSuccess.next()
     ) {
-      currentValue = yield;
+      yield;
+      currentValue = getInput();
     }
-    const afterFirstSuccess = o.afterFirstSuccess();
+    const afterFirstSuccess = o.afterFirstSuccess(getInput);
     for (
-      let res = await afterFirstSuccess.next(currentValue);
+      let res = await afterFirstSuccess.next();
       !res.done;
-      res = await afterFirstSuccess.next(currentValue)
+      res = await afterFirstSuccess.next()
     ) {
-      currentValue = yield;
+      yield;
+      currentValue = getInput();
     }
   };
 }

lib/health/trigger/index.ts

@@ -2,4 +2,6 @@ import { TriggerInput } from "./TriggerInput";
 export { changeOnFirstSuccess } from "./changeOnFirstSuccess";
 export { cooldownTrigger } from "./cooldownTrigger";
 
-export type Trigger = () => AsyncIterator<unknown, unknown, TriggerInput>;
+export type Trigger = (
+  getInput: () => TriggerInput,
+) => AsyncIterator<unknown, unknown, never>;