chore: Update and fix the things

This commit is contained in:
J H
2024-03-28 10:40:47 -06:00
parent f41f5ebebd
commit 65ca038eee
9 changed files with 15 additions and 20 deletions

View File

@@ -179,7 +179,6 @@ export class Checker {
* @returns * @returns
*/ */
static parse(range: string | Checker): Checker { static parse(range: string | Checker): Checker {
console.log(`Parser (${range})`)
if (range instanceof Checker) { if (range instanceof Checker) {
return range return range
} }

View File

@@ -40,19 +40,21 @@ export function healthCheck(o: {
const { status, message } = await o.fn(overlay) const { status, message } = await o.fn(overlay)
await o.effects.setHealth({ await o.effects.setHealth({
name: o.name, name: o.name,
status, id: o.name,
message, result: status,
message: message || "",
}) })
currentValue.hadSuccess = true currentValue.hadSuccess = true
currentValue.lastResult = "passing" currentValue.lastResult = "success"
await triggerFirstSuccess().catch((err) => { await triggerFirstSuccess().catch((err) => {
console.error(err) console.error(err)
}) })
} catch (e) { } catch (e) {
await o.effects.setHealth({ await o.effects.setHealth({
name: o.name, name: o.name,
status: "failure", id: o.name,
message: asMessage(e), result: "failure",
message: asMessage(e) || "",
}) })
currentValue.lastResult = "failure" currentValue.lastResult = "failure"
} }

View File

@@ -45,7 +45,7 @@ export async function checkPortListening(
port, port,
) )
if (hasAddress) { if (hasAddress) {
return { status: "passing", message: options.successMessage } return { status: "success", message: options.successMessage }
} }
return { return {
status: "failure", status: "failure",

View File

@@ -22,7 +22,7 @@ export const checkWebUrl = async (
.then( .then(
(x) => (x) =>
({ ({
status: "passing", status: "success",
message: successMessage, message: successMessage,
}) as const, }) as const,
) )

View File

@@ -32,7 +32,7 @@ export const runHealthScript = async (
throw { status: "failure", message: errorMessage } as CheckResult throw { status: "failure", message: errorMessage } as CheckResult
}) })
return { return {
status: "passing", status: "success",
message: message(res.stdout.toString()), message: message(res.stdout.toString()),
} as CheckResult } as CheckResult
} }

View File

@@ -227,7 +227,7 @@ export class Daemons<Manifest extends SDKManifest, Ids extends string> {
}) as CheckResult, }) as CheckResult,
) )
currentInput.lastResult = response.status || null currentInput.lastResult = response.status || null
if (!currentInput.hadSuccess && response.status === "passing") { if (!currentInput.hadSuccess && response.status === "success") {
currentInput.hadSuccess = true currentInput.hadSuccess = true
resolve(child) resolve(child)
} }

View File

@@ -11,7 +11,7 @@ export function changeOnFirstSuccess(o: {
beforeFirstSuccess.next() beforeFirstSuccess.next()
for ( for (
let res = await beforeFirstSuccess.next(); let res = await beforeFirstSuccess.next();
currentValue?.lastResult !== "passing" && !res.done; currentValue?.lastResult !== "success" && !res.done;
res = await beforeFirstSuccess.next() res = await beforeFirstSuccess.next()
) { ) {
yield yield

View File

@@ -12,7 +12,7 @@ export function successFailure(o: {
beforeSuccess.next() beforeSuccess.next()
for ( for (
let res = await beforeSuccess.next(); let res = await beforeSuccess.next();
currentValue?.lastResult !== "passing" && !res.done; currentValue?.lastResult !== "success" && !res.done;
res = await beforeSuccess.next() res = await beforeSuccess.next()
) { ) {
yield yield
@@ -21,7 +21,7 @@ export function successFailure(o: {
const duringError = o.duringError(getInput) const duringError = o.duringError(getInput)
for ( for (
let res = await duringError.next(); let res = await duringError.next();
currentValue?.lastResult === "passing" && !res.done; currentValue?.lastResult === "success" && !res.done;
res = await duringError.next() res = await duringError.next()
) { ) {
yield yield

View File

@@ -143,13 +143,7 @@ export type Daemon = {
[DaemonProof]: never [DaemonProof]: never
} }
export type HealthStatus = export type HealthStatus = HealthCheckResult["result"]
| `passing`
| `disabled`
| `starting`
| `warning`
| `failure`
export type SmtpValue = { export type SmtpValue = {
server: string server: string
port: number port: number