@start9labs/start-sdk 0.3.6-alpha6 → 0.3.6-alpha8

package/mjs/lib/dependencies/dependencies.js

@@ -1,87 +1,134 @@
-export function checkAllDependencies(effects) {
-    const dependenciesPromise = effects.getDependencies();
-    const resultsPromise = dependenciesPromise.then((dependencies) => effects.checkDependencies({
-        packageIds: dependencies.map((dep) => dep.id),
-    }));
-    const dependenciesByIdPromise = dependenciesPromise.then((d) => d.reduce((acc, dep) => {
-        acc[dep.id] = dep;
-        return acc;
-    }, {}));
-    const healthErrors = async () => {
-        const results = await resultsPromise;
-        const dependenciesById = await dependenciesByIdPromise;
-        const answer = {};
-        for (const result of results) {
-            const dependency = dependenciesById[result.packageId];
-            if (!dependency)
-                continue;
-            if (dependency.kind !== "running")
-                continue;
-            const healthChecks = Object.entries(result.healthChecks)
-                .map(([id, hc]) => ({ ...hc, id }))
-                .filter((x) => !!x.message);
-            if (healthChecks.length === 0)
-                continue;
-            answer[result.packageId] = healthChecks;
+import { ExtendedVersion, VersionRange } from "../exver";
+export async function checkDependencies(effects, packageIds) {
+    let [dependencies, results] = await Promise.all([
+        effects.getDependencies(),
+        effects.checkDependencies({
+            packageIds,
+        }),
+    ]);
+    if (packageIds) {
+        dependencies = dependencies.filter((d) => packageIds.includes(d.id));
+    }
+    const find = (packageId) => {
+        const dependencyRequirement = dependencies.find((d) => d.id === packageId);
+        const dependencyResult = results.find((d) => d.packageId === packageId);
+        if (!dependencyRequirement || !dependencyResult) {
+            throw new Error(`Unknown DependencyId ${packageId}`);
         }
-        return answer;
+        return { requirement: dependencyRequirement, result: dependencyResult };
     };
-    const configNotSatisfied = () => resultsPromise.then((x) => x.filter((x) => !x.configSatisfied));
-    const notInstalled = () => resultsPromise.then((x) => x.filter((x) => !x.isInstalled));
-    const notRunning = async () => {
-        const results = await resultsPromise;
-        const dependenciesById = await dependenciesByIdPromise;
-        return results.filter((x) => {
-            const dependency = dependenciesById[x.packageId];
-            if (!dependency)
-                return false;
-            if (dependency.kind !== "running")
-                return false;
-            return !x.isRunning;
-        });
+    const installedSatisfied = (packageId) => !!find(packageId).result.installedVersion;
+    const installedVersionSatisfied = (packageId) => {
+        const dep = find(packageId);
+        return (!!dep.result.installedVersion &&
+            ExtendedVersion.parse(dep.result.installedVersion).satisfies(VersionRange.parse(dep.requirement.versionRange)));
     };
-    const entries = (x) => Object.entries(x);
-    const first = (x) => x[0];
-    const sinkVoid = (x) => void 0;
-    const throwIfHealthError = () => healthErrors()
-        .then(entries)
-        .then(first)
-        .then((x) => {
-        if (!x)
-            return;
-        const [id, healthChecks] = x;
-        if (healthChecks.length > 0)
-            throw `Package ${id} has the following errors: ${healthChecks.map((x) => x.message).join(", ")}`;
-    });
-    const throwIfConfigNotSatisfied = () => configNotSatisfied().then((results) => {
-        throw new Error(`Package ${results[0].packageId} does not have a valid configuration`);
-    });
-    const throwIfNotRunning = () => notRunning().then((results) => {
-        if (results[0])
-            throw new Error(`Package ${results[0].packageId} is not running`);
-    });
-    const throwIfNotInstalled = () => notInstalled().then((results) => {
-        if (results[0])
-            throw new Error(`Package ${results[0].packageId} is not installed`);
-    });
-    const throwIfNotValid = async () => Promise.all([
-        throwIfNotRunning(),
-        throwIfNotInstalled(),
-        throwIfConfigNotSatisfied(),
-        throwIfHealthError(),
-    ]).then(sinkVoid);
-    const isValid = () => throwIfNotValid().then(() => true, () => false);
+    const runningSatisfied = (packageId) => {
+        const dep = find(packageId);
+        return dep.requirement.kind !== "running" || dep.result.isRunning;
+    };
+    const configSatisfied = (packageId) => find(packageId).result.configSatisfied;
+    const healthCheckSatisfied = (packageId, healthCheckId) => {
+        const dep = find(packageId);
+        if (healthCheckId &&
+            (dep.requirement.kind !== "running" ||
+                !dep.requirement.healthChecks.includes(healthCheckId))) {
+            throw new Error(`Unknown HealthCheckId ${healthCheckId}`);
+        }
+        const errors = Object.entries(dep.result.healthChecks)
+            .filter(([id, _]) => (healthCheckId ? id === healthCheckId : true))
+            .filter(([_, res]) => res.result !== "success");
+        return errors.length === 0;
+    };
+    const pkgSatisfied = (packageId) => installedSatisfied(packageId) &&
+        installedVersionSatisfied(packageId) &&
+        runningSatisfied(packageId) &&
+        configSatisfied(packageId) &&
+        healthCheckSatisfied(packageId);
+    const satisfied = (packageId) => packageId
+        ? pkgSatisfied(packageId)
+        : dependencies.every((d) => pkgSatisfied(d.id));
+    const throwIfInstalledNotSatisfied = (packageId) => {
+        const dep = find(packageId);
+        if (!dep.result.installedVersion) {
+            throw new Error(`${dep.result.title || packageId} is not installed`);
+        }
+    };
+    const throwIfInstalledVersionNotSatisfied = (packageId) => {
+        const dep = find(packageId);
+        if (!dep.result.installedVersion) {
+            throw new Error(`${dep.result.title || packageId} is not installed`);
+        }
+        if (![dep.result.installedVersion, ...dep.result.satisfies].find((v) => ExtendedVersion.parse(v).satisfies(VersionRange.parse(dep.requirement.versionRange)))) {
+            throw new Error(`Installed version ${dep.result.installedVersion} of ${dep.result.title || packageId} does not match expected version range ${dep.requirement.versionRange}`);
+        }
+    };
+    const throwIfRunningNotSatisfied = (packageId) => {
+        const dep = find(packageId);
+        if (dep.requirement.kind === "running" && !dep.result.isRunning) {
+            throw new Error(`${dep.result.title || packageId} is not running`);
+        }
+    };
+    const throwIfConfigNotSatisfied = (packageId) => {
+        const dep = find(packageId);
+        if (!dep.result.configSatisfied) {
+            throw new Error(`${dep.result.title || packageId}'s configuration does not satisfy requirements`);
+        }
+    };
+    const throwIfHealthNotSatisfied = (packageId, healthCheckId) => {
+        const dep = find(packageId);
+        if (healthCheckId &&
+            (dep.requirement.kind !== "running" ||
+                !dep.requirement.healthChecks.includes(healthCheckId))) {
+            throw new Error(`Unknown HealthCheckId ${healthCheckId}`);
+        }
+        const errors = Object.entries(dep.result.healthChecks)
+            .filter(([id, _]) => (healthCheckId ? id === healthCheckId : true))
+            .filter(([_, res]) => res.result !== "success");
+        if (errors.length) {
+            throw new Error(errors
+                .map(([_, e]) => `Health Check ${e.name} of ${dep.result.title || packageId} failed with status ${e.result}${e.message ? `: ${e.message}` : ""}`)
+                .join("; "));
+        }
+    };
+    const throwIfPkgNotSatisfied = (packageId) => {
+        throwIfInstalledNotSatisfied(packageId);
+        throwIfInstalledVersionNotSatisfied(packageId);
+        throwIfRunningNotSatisfied(packageId);
+        throwIfConfigNotSatisfied(packageId);
+        throwIfHealthNotSatisfied(packageId);
+    };
+    const throwIfNotSatisfied = (packageId) => packageId
+        ? throwIfPkgNotSatisfied(packageId)
+        : (() => {
+            const err = dependencies.flatMap((d) => {
+                try {
+                    throwIfPkgNotSatisfied(d.id);
+                }
+                catch (e) {
+                    if (e instanceof Error)
+                        return [e.message];
+                    throw e;
+                }
+                return [];
+            });
+            if (err.length) {
+                throw new Error(err.join("; "));
+            }
+        })();
     return {
-        notRunning,
-        notInstalled,
-        configNotSatisfied,
-        healthErrors,
-        throwIfNotRunning,
+        installedSatisfied,
+        installedVersionSatisfied,
+        runningSatisfied,
+        configSatisfied,
+        healthCheckSatisfied,
+        satisfied,
+        throwIfInstalledNotSatisfied,
+        throwIfInstalledVersionNotSatisfied,
+        throwIfRunningNotSatisfied,
         throwIfConfigNotSatisfied,
-        throwIfNotValid,
-        throwIfNotInstalled,
-        throwIfHealthError,
-        isValid,
+        throwIfHealthNotSatisfied,
+        throwIfNotSatisfied,
     };
 }
 //# sourceMappingURL=dependencies.js.map

package/mjs/lib/dependencies/dependencies.js.map

@@ -1 +1 @@
-{"version":3,"file":"dependencies.js","sourceRoot":"","sources":["../../../../lib/dependencies/dependencies.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"dependencies.js","sourceRoot":"","sources":["../../../../lib/dependencies/dependencies.ts"],"names":[],"mappings":"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"}

package/mjs/lib/exver/index.d.ts

@@ -1,16 +1,30 @@
 import * as P from "./exver";
-export type ValidateVersion<T extends String> = T extends `-${infer A}` ? never : T extends `${infer A}-${infer B}` ? ValidateVersion<A> & ValidateVersion<B> : T extends `${bigint}` ? unknown : T extends `${bigint}.${infer A}` ? ValidateVersion<A> : never;
+export type ValidateVersion<T extends String> = T extends `-${infer A}` ? never : T extends `${infer A}-${string}` ? ValidateVersion<A> : T extends `${bigint}` ? unknown : T extends `${bigint}.${infer A}` ? ValidateVersion<A> : never;
 export type ValidateExVer<T extends string> = T extends `#${string}:${infer A}:${infer B}` ? ValidateVersion<A> & ValidateVersion<B> : T extends `${infer A}:${infer B}` ? ValidateVersion<A> & ValidateVersion<B> : never;
-export type ValidateExVers<T> = T extends [] ? unknown : T extends [infer A, ...infer B] ? ValidateExVer<A & string> & ValidateExVers<B> : never;
+export type ValidateExVers<T> = T extends [] ? unknown[] : T extends [infer A, ...infer B] ? ValidateExVer<A & string> & ValidateExVers<B> : never[];
+type Anchor = {
+    type: "Anchor";
+    operator: P.CmpOp;
+    version: ExtendedVersion;
+};
+type And = {
+    type: "And";
+    left: VersionRange;
+    right: VersionRange;
+};
+type Or = {
+    type: "Or";
+    left: VersionRange;
+    right: VersionRange;
+};
+type Not = {
+    type: "Not";
+    value: VersionRange;
+};
 export declare class VersionRange {
-    private atom;
+    atom: Anchor | And | Or | Not | P.Any | P.None;
     private constructor();
     toString(): string;
-    /**
-     * Returns a boolean indicating whether a given version satisfies the VersionRange
-     * !( >= 1:1 <= 2:2) || <=#bitcoin:1.2.0-alpha:0
-     */
-    satisfiedBy(version: ExtendedVersion): boolean;
     private static parseAtom;
     private static parseRange;
     static parse(range: string): VersionRange;
@@ -20,6 +34,7 @@ export declare class VersionRange {
     static anchor(operator: P.CmpOp, version: ExtendedVersion): VersionRange;
     static any(): VersionRange;
     static none(): VersionRange;
+    satisfiedBy(version: Version | ExtendedVersion): boolean;
 }
 export declare class Version {
     number: number[];
@@ -28,6 +43,7 @@ export declare class Version {
     toString(): string;
     compare(other: Version): "greater" | "equal" | "less";
     static parse(version: string): Version;
+    satisfies(versionRange: VersionRange): boolean;
 }
 export declare class ExtendedVersion {
     flavor: string | null;
@@ -57,6 +73,12 @@ export declare class ExtendedVersion {
      * If no non-zero upstream digit can be found the last digit will be incremented.
      */
     incrementMinor(): ExtendedVersion;
+    /**
+     * Returns a boolean indicating whether a given version satisfies the VersionRange
+     * !( >= 1:1 <= 2:2) || <=#bitcoin:1.2.0-alpha:0
+     */
+    satisfies(versionRange: VersionRange): boolean;
 }
 export declare const testTypeExVer: <T extends string>(t: T & ValidateExVer<T>) => T & ValidateExVer<T>;
 export declare const testTypeVersion: <T extends string>(t: T & ValidateVersion<T>) => T & ValidateVersion<T>;
+export {};

package/mjs/lib/exver/index.js

@@ -20,60 +20,6 @@ export class VersionRange {
                 return "!";
         }
     }
-    /**
-     * Returns a boolean indicating whether a given version satisfies the VersionRange
-     * !( >= 1:1 <= 2:2) || <=#bitcoin:1.2.0-alpha:0
-     */
-    satisfiedBy(version) {
-        switch (this.atom.type) {
-            case "Anchor":
-                const otherVersion = this.atom.version;
-                switch (this.atom.operator) {
-                    case "=":
-                        return version.equals(otherVersion);
-                    case ">":
-                        return version.greaterThan(otherVersion);
-                    case "<":
-                        return version.lessThan(otherVersion);
-                    case ">=":
-                        return version.greaterThanOrEqual(otherVersion);
-                    case "<=":
-                        return version.lessThanOrEqual(otherVersion);
-                    case "!=":
-                        return !version.equals(otherVersion);
-                    case "^":
-                        const nextMajor = this.atom.version.incrementMajor();
-                        if (version.greaterThanOrEqual(otherVersion) &&
-                            version.lessThan(nextMajor)) {
-                            return true;
-                        }
-                        else {
-                            return false;
-                        }
-                    case "~":
-                        const nextMinor = this.atom.version.incrementMinor();
-                        if (version.greaterThanOrEqual(otherVersion) &&
-                            version.lessThan(nextMinor)) {
-                            return true;
-                        }
-                        else {
-                            return false;
-                        }
-                }
-            case "And":
-                return (this.atom.left.satisfiedBy(version) &&
-                    this.atom.right.satisfiedBy(version));
-            case "Or":
-                return (this.atom.left.satisfiedBy(version) ||
-                    this.atom.right.satisfiedBy(version));
-            case "Not":
-                return !this.atom.value.satisfiedBy(version);
-            case "Any":
-                return true;
-            case "None":
-                return false;
-        }
-    }
     static parseAtom(atom) {
         switch (atom.type) {
             case "Not":
@@ -137,6 +83,9 @@ export class VersionRange {
     static none() {
         return new VersionRange({ type: "None" });
     }
+    satisfiedBy(version) {
+        return version.satisfies(this);
+    }
 }
 export class Version {
     number;
@@ -195,6 +144,9 @@ export class Version {
         const parsed = P.parse(version, { startRule: "Version" });
         return new Version(parsed.number, parsed.prerelease);
     }
+    satisfies(versionRange) {
+        return new ExtendedVersion(null, this, new Version([0], [])).satisfies(versionRange);
+    }
 }
 // #flavor:0.1.2-beta.1:0
 export class ExtendedVersion {
@@ -304,6 +256,60 @@ export class ExtendedVersion {
         const updatedDownstream = new Version([0], []);
         return new ExtendedVersion(this.flavor, incrementedUpstream, updatedDownstream);
     }
+    /**
+     * Returns a boolean indicating whether a given version satisfies the VersionRange
+     * !( >= 1:1 <= 2:2) || <=#bitcoin:1.2.0-alpha:0
+     */
+    satisfies(versionRange) {
+        switch (versionRange.atom.type) {
+            case "Anchor":
+                const otherVersion = versionRange.atom.version;
+                switch (versionRange.atom.operator) {
+                    case "=":
+                        return this.equals(otherVersion);
+                    case ">":
+                        return this.greaterThan(otherVersion);
+                    case "<":
+                        return this.lessThan(otherVersion);
+                    case ">=":
+                        return this.greaterThanOrEqual(otherVersion);
+                    case "<=":
+                        return this.lessThanOrEqual(otherVersion);
+                    case "!=":
+                        return !this.equals(otherVersion);
+                    case "^":
+                        const nextMajor = versionRange.atom.version.incrementMajor();
+                        if (this.greaterThanOrEqual(otherVersion) &&
+                            this.lessThan(nextMajor)) {
+                            return true;
+                        }
+                        else {
+                            return false;
+                        }
+                    case "~":
+                        const nextMinor = versionRange.atom.version.incrementMinor();
+                        if (this.greaterThanOrEqual(otherVersion) &&
+                            this.lessThan(nextMinor)) {
+                            return true;
+                        }
+                        else {
+                            return false;
+                        }
+                }
+            case "And":
+                return (this.satisfies(versionRange.atom.left) &&
+                    this.satisfies(versionRange.atom.right));
+            case "Or":
+                return (this.satisfies(versionRange.atom.left) ||
+                    this.satisfies(versionRange.atom.right));
+            case "Not":
+                return !this.satisfies(versionRange.atom.value);
+            case "Any":
+                return true;
+            case "None":
+                return false;
+        }
+    }
 }
 export const testTypeExVer = (t) => t;
 export const testTypeVersion = (t) => t;
@@ -313,6 +319,7 @@ function tests() {
     testTypeVersion("12.34.56");
     testTypeVersion("1.2-3");
     testTypeVersion("1-3");
+    testTypeVersion("1-alpha");
     // @ts-expect-error
     testTypeVersion("-3");
     // @ts-expect-error

package/mjs/lib/exver/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../lib/exver/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../lib/exver/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,SAAS,CAAA;AA6C5B,MAAM,OAAO,YAAY;IACI;IAA3B,YAA2B,IAA8C;QAA9C,SAAI,GAAJ,IAAI,CAA0C;IAAG,CAAC;IAE7E,QAAQ;QACN,QAAQ,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE;YACtB,KAAK,QAAQ;gBACX,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAA;YACpD,KAAK,KAAK;gBACR,OAAO,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,SAAS,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,GAAG,CAAA;YAC5E,KAAK,IAAI;gBACP,OAAO,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,SAAS,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,GAAG,CAAA;YAC5E,KAAK,KAAK;gBACR,OAAO,KAAK,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,GAAG,CAAA;YAC3C,KAAK,KAAK;gBACR,OAAO,GAAG,CAAA;YACZ,KAAK,MAAM;gBACT,OAAO,GAAG,CAAA;SACb;IACH,CAAC;IAEO,MAAM,CAAC,SAAS,CAAC,IAAwB;QAC/C,QAAQ,IAAI,CAAC,IAAI,EAAE;YACjB,KAAK,KAAK;gBACR,OAAO,IAAI,YAAY,CAAC;oBACtB,IAAI,EAAE,KAAK;oBACX,KAAK,EAAE,YAAY,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC;iBAC1C,CAAC,CAAA;YACJ,KAAK,QAAQ;gBACX,OAAO,YAAY,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;YAC3C,KAAK,QAAQ;gBACX,OAAO,IAAI,YAAY,CAAC;oBACtB,IAAI,EAAE,QAAQ;oBACd,QAAQ,EAAE,IAAI,CAAC,QAAQ,IAAI,GAAG;oBAC9B,OAAO,EAAE,IAAI,eAAe,CAC1B,IAAI,CAAC,OAAO,CAAC,MAAM,EACnB,IAAI,OAAO,CACT,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,EAC5B,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,UAAU,CACjC,EACD,IAAI,OAAO,CACT,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,MAAM,EAC9B,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,UAAU,CACnC,CACF;iBACF,CAAC,CAAA;YACJ;gBACE,OAAO,IAAI,YAAY,CAAC,IAAI,CAAC,CAAA;SAChC;IACH,CAAC;IAEO,MAAM,CAAC,UAAU,CAAC,KAAqB;QAC7C,IAAI,MAAM,GAAG,YAAY,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAA;QAC7C,KAAK,MAAM,IAAI,IAAI,KAAK,CAAC,CAAC,CAAC,EAAE;YAC3B,QAAQ,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE;gBACpB,KAAK,IAAI;oBACP,MAAM,GAAG,IAAI,YAAY,CAAC;wBACxB,IAAI,EAAE,IAAI;wBACV,IAAI,EAAE,MAAM;wBACZ,KAAK,EAAE,YAAY,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;qBACvC,CAAC,CAAA;oBACF,MAAK;gBACP,KAAK,IAAI,CAAC;gBACV;oBACE,MAAM,GAAG,IAAI,YAAY,CAAC;wBACxB,IAAI,EAAE,KAAK;wBACX,IAAI,EAAE,MAAM;wBACZ,KAAK,EAAE,YAAY,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;qBACvC,CAAC,CAAA;oBACF,MAAK;aACR;SACF;QACD,OAAO,MAAM,CAAA;IACf,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,KAAa;QACxB,OAAO,YAAY,CAAC,UAAU,CAC5B,CAAC,CAAC,KAAK,CAAC,KAAK,EAAE,EAAE,SAAS,EAAE,cAAc,EAAE,CAAC,CAC9C,CAAA;IACH,CAAC;IAED,GAAG,CAAC,KAAmB;QACrB,OAAO,IAAI,YAAY,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAA;IAC7D,CAAC;IAED,EAAE,CAAC,KAAmB;QACpB,OAAO,IAAI,YAAY,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAA;IAC5D,CAAC;IAED,GAAG;QACD,OAAO,IAAI,YAAY,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAA;IACvD,CAAC;IAED,MAAM,CAAC,MAAM,CAAC,QAAiB,EAAE,OAAwB;QACvD,OAAO,IAAI,YAAY,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAA;IAChE,CAAC;IAED,MAAM,CAAC,GAAG;QACR,OAAO,IAAI,YAAY,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAA;IAC1C,CAAC;IAED,MAAM,CAAC,IAAI;QACT,OAAO,IAAI,YAAY,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAA;IAC3C,CAAC;IAED,WAAW,CAAC,OAAkC;QAC5C,OAAO,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,CAAA;IAChC,CAAC;CACF;AAED,MAAM,OAAO,OAAO;IAET;IACA;IAFT,YACS,MAAgB,EAChB,UAA+B;QAD/B,WAAM,GAAN,MAAM,CAAU;QAChB,eAAU,GAAV,UAAU,CAAqB;IACrC,CAAC;IAEJ,QAAQ;QACN,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAA;IACvG,CAAC;IAED,OAAO,CAAC,KAAc;QACpB,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;QAChE,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,EAAE,CAAC,EAAE,EAAE;YAC/B,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE;gBAClD,OAAO,SAAS,CAAA;aACjB;iBAAM,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE;gBACzD,OAAO,MAAM,CAAA;aACd;SACF;QAED,IAAI,IAAI,CAAC,UAAU,CAAC,MAAM,KAAK,CAAC,IAAI,KAAK,CAAC,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE;YACjE,OAAO,SAAS,CAAA;SACjB;aAAM,IAAI,IAAI,CAAC,UAAU,CAAC,MAAM,KAAK,CAAC,IAAI,KAAK,CAAC,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE;YACxE,OAAO,MAAM,CAAA;SACd;QAED,MAAM,aAAa,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;QACvE,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,aAAa,EAAE,CAAC,EAAE,EAAE;YACtC,IAAI,OAAO,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,KAAK,OAAO,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE;gBAC5D,IAAI,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE;oBAC5C,OAAO,SAAS,CAAA;iBACjB;qBAAM,IAAI,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE;oBACnD,OAAO,MAAM,CAAA;iBACd;aACF;iBAAM;gBACL,QAAQ,GAAG,OAAO,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,OAAO,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,EAAE;oBACpE,KAAK,eAAe;wBAClB,OAAO,MAAM,CAAA;oBACf,KAAK,eAAe;wBAClB,OAAO,SAAS,CAAA;oBAClB,KAAK,kBAAkB,CAAC;oBACxB,KAAK,kBAAkB;wBACrB,OAAO,SAAS,CAAA;oBAClB,KAAK,kBAAkB,CAAC;oBACxB,KAAK,kBAAkB;wBACrB,OAAO,MAAM,CAAA;iBAChB;aACF;SACF;QAED,OAAO,OAAO,CAAA;IAChB,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,OAAe;QAC1B,MAAM,MAAM,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,SAAS,EAAE,CAAC,CAAA;QACzD,OAAO,IAAI,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,UAAU,CAAC,CAAA;IACtD,CAAC;IAED,SAAS,CAAC,YAA0B;QAClC,OAAO,IAAI,eAAe,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CACpE,YAAY,CACb,CAAA;IACH,CAAC;CACF;AAED,yBAAyB;AACzB,MAAM,OAAO,eAAe;IAEjB;IACA;IACA;IAHT,YACS,MAAqB,EACrB,QAAiB,EACjB,UAAmB;QAFnB,WAAM,GAAN,MAAM,CAAe;QACrB,aAAQ,GAAR,QAAQ,CAAS;QACjB,eAAU,GAAV,UAAU,CAAS;IACzB,CAAC;IAEJ,QAAQ;QACN,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,IAAI,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE,EAAE,CAAA;IAC5G,CAAC;IAED,OAAO,CAAC,KAAsB;QAC5B,IAAI,IAAI,CAAC,MAAM,KAAK,KAAK,CAAC,MAAM,EAAE;YAChC,OAAO,IAAI,CAAA;SACZ;QACD,MAAM,WAAW,GAAG,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAA;QACzD,IAAI,WAAW,KAAK,OAAO,EAAE;YAC3B,OAAO,WAAW,CAAA;SACnB;QACD,OAAO,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,CAAA;IAClD,CAAC;IAED,oBAAoB,CAAC,KAAsB;QACzC,IAAI,CAAC,IAAI,CAAC,MAAM,IAAI,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,IAAI,EAAE,CAAC,EAAE;YAC9C,OAAO,SAAS,CAAA;SACjB;aAAM,IAAI,CAAC,IAAI,CAAC,MAAM,IAAI,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,IAAI,EAAE,CAAC,EAAE;YACrD,OAAO,MAAM,CAAA;SACd;aAAM;YACL,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,CAAE,CAAA;SAC5B;IACH,CAAC;IAED,cAAc,CAAC,KAAsB;QACnC,QAAQ,IAAI,CAAC,oBAAoB,CAAC,KAAK,CAAC,EAAE;YACxC,KAAK,SAAS;gBACZ,OAAO,CAAC,CAAA;YACV,KAAK,OAAO;gBACV,OAAO,CAAC,CAAA;YACV,KAAK,MAAM;gBACT,OAAO,CAAC,CAAC,CAAA;SACZ;IACH,CAAC;IAED,WAAW,CAAC,KAAsB;QAChC,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,SAAS,CAAA;IAC1C,CAAC;IAED,kBAAkB,CAAC,KAAsB;QACvC,OAAO,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAW,CAAC,CAAA;IACrE,CAAC;IAED,MAAM,CAAC,KAAsB;QAC3B,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,OAAO,CAAA;IACxC,CAAC;IAED,QAAQ,CAAC,KAAsB;QAC7B,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,MAAM,CAAA;IACvC,CAAC;IAED,eAAe,CAAC,KAAsB;QACpC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAW,CAAC,CAAA;IAClE,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,eAAuB;QAClC,MAAM,MAAM,GAAG,CAAC,CAAC,KAAK,CAAC,eAAe,EAAE,EAAE,SAAS,EAAE,iBAAiB,EAAE,CAAC,CAAA;QACzE,OAAO,IAAI,eAAe,CACxB,MAAM,CAAC,MAAM,EACb,IAAI,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,EAC/D,IAAI,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,CAAC,UAAU,CAAC,UAAU,CAAC,CACpE,CAAA;IACH,CAAC;IAED,MAAM,CAAC,UAAU,CAAC,eAAuB;QACvC,MAAM,MAAM,GAAG,CAAC,CAAC,KAAK,CAAC,eAAe,EAAE,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC,CAAA;QAC/D,OAAO,IAAI,eAAe,CACxB,MAAM,CAAC,MAAM,EACb,IAAI,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,EAC/D,IAAI,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,CAAC,UAAU,CAAC,UAAU,CAAC,CACpE,CAAA;IACH,CAAC;IAED;;;;OAIG;IACH,cAAc;QACZ,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,GAAW,EAAE,EAAE,CAAC,GAAG,KAAK,CAAC,CAAC,CAAA;QAE3E,MAAM,WAAW,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,GAAG,EAAU,EAAE;YAChE,IAAI,GAAG,GAAG,QAAQ,EAAE;gBAClB,OAAO,CAAC,CAAA;aACT;iBAAM,IAAI,GAAG,KAAK,QAAQ,EAAE;gBAC3B,OAAO,GAAG,GAAG,CAAC,CAAA;aACf;YACD,OAAO,GAAG,CAAA;QACZ,CAAC,CAAC,CAAA;QAEF,MAAM,mBAAmB,GAAG,IAAI,OAAO,CAAC,WAAW,EAAE,EAAE,CAAC,CAAA;QACxD,MAAM,iBAAiB,GAAG,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAA;QAE9C,OAAO,IAAI,eAAe,CACxB,IAAI,CAAC,MAAM,EACX,mBAAmB,EACnB,iBAAiB,CAClB,CAAA;IACH,CAAC;IAED;;;;OAIG;IACH,cAAc;QACZ,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,GAAW,EAAE,EAAE,CAAC,GAAG,KAAK,CAAC,CAAC,CAAA;QAC3E,IAAI,QAAQ,GAAG,QAAQ,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,GAAG,CAAC,CAAA;QAExD,MAAM,WAAW,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,GAAG,EAAU,EAAE;YAChE,IAAI,GAAG,GAAG,QAAQ,EAAE;gBAClB,OAAO,CAAC,CAAA;aACT;iBAAM,IAAI,GAAG,KAAK,QAAQ,EAAE;gBAC3B,OAAO,GAAG,GAAG,CAAC,CAAA;aACf;YACD,OAAO,GAAG,CAAA;QACZ,CAAC,CAAC,CAAA;QAEF,MAAM,mBAAmB,GAAG,IAAI,OAAO,CAAC,WAAW,EAAE,EAAE,CAAC,CAAA;QACxD,MAAM,iBAAiB,GAAG,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAA;QAE9C,OAAO,IAAI,eAAe,CACxB,IAAI,CAAC,MAAM,EACX,mBAAmB,EACnB,iBAAiB,CAClB,CAAA;IACH,CAAC;IAED;;;OAGG;IACH,SAAS,CAAC,YAA0B;QAClC,QAAQ,YAAY,CAAC,IAAI,CAAC,IAAI,EAAE;YAC9B,KAAK,QAAQ;gBACX,MAAM,YAAY,GAAG,YAAY,CAAC,IAAI,CAAC,OAAO,CAAA;gBAC9C,QAAQ,YAAY,CAAC,IAAI,CAAC,QAAQ,EAAE;oBAClC,KAAK,GAAG;wBACN,OAAO,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,CAAA;oBAClC,KAAK,GAAG;wBACN,OAAO,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,CAAA;oBACvC,KAAK,GAAG;wBACN,OAAO,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAA;oBACpC,KAAK,IAAI;wBACP,OAAO,IAAI,CAAC,kBAAkB,CAAC,YAAY,CAAC,CAAA;oBAC9C,KAAK,IAAI;wBACP,OAAO,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC,CAAA;oBAC3C,KAAK,IAAI;wBACP,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,CAAA;oBACnC,KAAK,GAAG;wBACN,MAAM,SAAS,GAAG,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE,CAAA;wBAC5D,IACE,IAAI,CAAC,kBAAkB,CAAC,YAAY,CAAC;4BACrC,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,EACxB;4BACA,OAAO,IAAI,CAAA;yBACZ;6BAAM;4BACL,OAAO,KAAK,CAAA;yBACb;oBACH,KAAK,GAAG;wBACN,MAAM,SAAS,GAAG,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE,CAAA;wBAC5D,IACE,IAAI,CAAC,kBAAkB,CAAC,YAAY,CAAC;4BACrC,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,EACxB;4BACA,OAAO,IAAI,CAAA;yBACZ;6BAAM;4BACL,OAAO,KAAK,CAAA;yBACb;iBACJ;YACH,KAAK,KAAK;gBACR,OAAO,CACL,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC;oBACtC,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,CACxC,CAAA;YACH,KAAK,IAAI;gBACP,OAAO,CACL,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC;oBACtC,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,CACxC,CAAA;YACH,KAAK,KAAK;gBACR,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;YACjD,KAAK,KAAK;gBACR,OAAO,IAAI,CAAA;YACb,KAAK,MAAM;gBACT,OAAO,KAAK,CAAA;SACf;IACH,CAAC;CACF;AAED,MAAM,CAAC,MAAM,aAAa,GAAG,CAAmB,CAAuB,EAAE,EAAE,CAAC,CAAC,CAAA;AAE7E,MAAM,CAAC,MAAM,eAAe,GAAG,CAAmB,CAAyB,EAAE,EAAE,CAC7E,CAAC,CAAA;AACH,SAAS,KAAK;IACZ,eAAe,CAAC,OAAO,CAAC,CAAA;IACxB,eAAe,CAAC,GAAG,CAAC,CAAA;IACpB,eAAe,CAAC,UAAU,CAAC,CAAA;IAC3B,eAAe,CAAC,OAAO,CAAC,CAAA;IACxB,eAAe,CAAC,KAAK,CAAC,CAAA;IACtB,eAAe,CAAC,SAAS,CAAC,CAAA;IAC1B,mBAAmB;IACnB,eAAe,CAAC,IAAI,CAAC,CAAA;IACrB,mBAAmB;IACnB,eAAe,CAAC,SAAS,CAAC,CAAA;IAC1B,mBAAmB;IACnB,eAAe,CAAC,UAAU,CAAC,CAAA;IAE3B,aAAa,CAAC,aAAa,CAAC,CAAA;IAC5B,aAAa,CAAC,uBAAuB,CAAC,CAAA;IACtC,aAAa,CAAC,OAAO,CAAC,CAAA;IACtB,aAAa,CAAC,UAAU,CAAC,CAAA;IACzB,aAAa,CAAC,8BAA8B,CAAC,CAAA;IAC7C,aAAa,CAAC,OAAO,CAAC,CAAA;IACtB,aAAa,CAAC,OAAO,CAAC,CAAA;IACtB,mBAAmB;IACnB,aAAa,CAAC,OAAO,CAAC,CAAA;IACtB,mBAAmB;IACnB,aAAa,CAAC,KAAK,CAAC,CAAA;IACpB,mBAAmB;IACnB,aAAa,CAAC,0BAAoC,CAAC,CAAA;IACnD,mBAAmB;IACnB,aAAa,CAAC,QAAQ,CAAC,CAAA;IACvB,mBAAmB;IACnB,aAAa,CAAC,UAAU,CAAC,CAAA;AAC3B,CAAC"}

package/mjs/lib/health/HealthCheck.d.ts

@@ -1,18 +1,12 @@
 import { Effects } from "../types";
-import { CheckResult } from "./checkFns/CheckResult";
+import { HealthCheckResult } from "./checkFns/HealthCheckResult";
 import { HealthReceipt } from "./HealthReceipt";
 import { Trigger } from "../trigger";
-import { Overlay } from "../util/Overlay";
-import * as T from "../types";
-export type HealthCheckParams<Manifest extends T.Manifest> = {
+export type HealthCheckParams = {
     effects: Effects;
     name: string;
-    image: {
-        id: keyof Manifest["images"] & T.ImageId;
-        sharedRun?: boolean;
-    };
     trigger?: Trigger;
-    fn(overlay: Overlay): Promise<CheckResult> | CheckResult;
+    fn(): Promise<HealthCheckResult> | HealthCheckResult;
     onFirstSuccess?: () => unknown | Promise<unknown>;
 };
-export declare function healthCheck<Manifest extends T.Manifest>(o: HealthCheckParams<Manifest>): HealthReceipt;
+export declare function healthCheck(o: HealthCheckParams): HealthReceipt;

package/mjs/lib/health/HealthCheck.js

@@ -1,47 +1,38 @@
 import { defaultTrigger } from "../trigger/defaultTrigger";
 import { once } from "../util/once";
-import { Overlay } from "../util/Overlay";
 import { object, unknown } from "ts-matches";
+import { asError } from "../util/asError";
 export function healthCheck(o) {
     new Promise(async () => {
-        const overlay = await Overlay.of(o.effects, o.image);
-        try {
-            let currentValue = {
-                hadSuccess: false,
-            };
-            const getCurrentValue = () => currentValue;
-            const trigger = (o.trigger ?? defaultTrigger)(getCurrentValue);
-            const triggerFirstSuccess = once(() => Promise.resolve("onFirstSuccess" in o && o.onFirstSuccess
-                ? o.onFirstSuccess()
-                : undefined));
-            for (let res = await trigger.next(); !res.done; res = await trigger.next()) {
-                try {
-                    const { status, message } = await o.fn(overlay);
-                    await o.effects.setHealth({
-                        name: o.name,
-                        id: o.name,
-                        result: status,
-                        message: message || "",
-                    });
-                    currentValue.hadSuccess = true;
-                    currentValue.lastResult = "success";
-                    await triggerFirstSuccess().catch((err) => {
-                        console.error(err);
-                    });
-                }
-                catch (e) {
-                    await o.effects.setHealth({
-                        name: o.name,
-                        id: o.name,
-                        result: "failure",
-                        message: asMessage(e) || "",
-                    });
-                    currentValue.lastResult = "failure";
-                }
+        let currentValue = {};
+        const getCurrentValue = () => currentValue;
+        const trigger = (o.trigger ?? defaultTrigger)(getCurrentValue);
+        const triggerFirstSuccess = once(() => Promise.resolve("onFirstSuccess" in o && o.onFirstSuccess
+            ? o.onFirstSuccess()
+            : undefined));
+        for (let res = await trigger.next(); !res.done; res = await trigger.next()) {
+            try {
+                const { result, message } = await o.fn();
+                await o.effects.setHealth({
+                    name: o.name,
+                    id: o.name,
+                    result,
+                    message: message || "",
+                });
+                currentValue.lastResult = result;
+                await triggerFirstSuccess().catch((err) => {
+                    console.error(asError(err));
+                });
+            }
+            catch (e) {
+                await o.effects.setHealth({
+                    name: o.name,
+                    id: o.name,
+                    result: "failure",
+                    message: asMessage(e) || "",
+                });
+                currentValue.lastResult = "failure";
             }
-        }
-        finally {
-            await overlay.destroy();
         }
     });
     return {};