@start9labs/start-sdk 0.4.0-beta.8 → 0.4.0

package/package/lib/test/output.sdk.js

@@ -5,31 +5,28 @@ const StartSdk_1 = require("../StartSdk");
 const setupManifest_1 = require("../manifest/setupManifest");
 exports.sdk = StartSdk_1.StartSdk.of()
     .withManifest((0, setupManifest_1.setupManifest)({
-    id: "testOutput",
-    title: "",
-    license: "",
-    replaces: [],
-    wrapperRepo: "",
-    upstreamRepo: "",
-    supportSite: "",
-    marketingSite: "",
+    id: 'testOutput',
+    title: '',
+    license: '',
+    packageRepo: '',
+    upstreamRepo: '',
+    marketingUrl: '',
     donationUrl: null,
+    docsUrls: [],
     description: {
-        short: "",
-        long: "",
+        short: '',
+        long: '',
     },
-    containers: {},
     images: {
         main: {
             source: {
-                dockerTag: "start9/hello-world",
+                dockerTag: 'start9/hello-world',
             },
-            arch: ["aarch64", "x86_64"],
-            emulateMissingAs: "aarch64",
+            arch: ['aarch64', 'x86_64'],
+            emulateMissingAs: 'aarch64',
         },
     },
     volumes: [],
-    assets: [],
     alerts: {
         install: null,
         update: null,
@@ -39,13 +36,12 @@ exports.sdk = StartSdk_1.StartSdk.of()
         stop: null,
     },
     dependencies: {
-        "remote-test": {
-            description: "",
+        'remote-test': {
+            description: '',
             optional: false,
-            s9pk: "https://example.com/remote-test.s9pk",
+            s9pk: 'https://example.com/remote-test.s9pk',
         },
     },
 }))
-    .withStore()
     .build(true);
 //# sourceMappingURL=output.sdk.js.map

package/package/lib/test/output.sdk.js.map

@@ -1 +1 @@
-{"version":3,"file":"output.sdk.js","sourceRoot":"","sources":["../../../../package/lib/test/output.sdk.ts"],"names":[],"mappings":";;;AACA,0CAAsC;AACtC,6DAAyD;AAI5C,QAAA,GAAG,GAAG,mBAAQ,CAAC,EAAE,EAAE;KAC7B,YAAY,CACX,IAAA,6BAAa,EAAC;IACZ,EAAE,EAAE,YAAY;IAChB,KAAK,EAAE,EAAE;IACT,OAAO,EAAE,EAAE;IACX,QAAQ,EAAE,EAAE;IACZ,WAAW,EAAE,EAAE;IACf,YAAY,EAAE,EAAE;IAChB,WAAW,EAAE,EAAE;IACf,aAAa,EAAE,EAAE;IACjB,WAAW,EAAE,IAAI;IACjB,WAAW,EAAE;QACX,KAAK,EAAE,EAAE;QACT,IAAI,EAAE,EAAE;KACT;IACD,UAAU,EAAE,EAAE;IACd,MAAM,EAAE;QACN,IAAI,EAAE;YACJ,MAAM,EAAE;gBACN,SAAS,EAAE,oBAAoB;aAChC;YACD,IAAI,EAAE,CAAC,SAAS,EAAE,QAAQ,CAAC;YAC3B,gBAAgB,EAAE,SAAS;SAC5B;KACF;IACD,OAAO,EAAE,EAAE;IACX,MAAM,EAAE,EAAE;IACV,MAAM,EAAE;QACN,OAAO,EAAE,IAAI;QACb,MAAM,EAAE,IAAI;QACZ,SAAS,EAAE,IAAI;QACf,OAAO,EAAE,IAAI;QACb,KAAK,EAAE,IAAI;QACX,IAAI,EAAE,IAAI;KACX;IACD,YAAY,EAAE;QACZ,aAAa,EAAE;YACb,WAAW,EAAE,EAAE;YACf,QAAQ,EAAE,KAAK;YACf,IAAI,EAAE,sCAAsC;SAC7C;KACF;CACF,CAAC,CACH;KACA,SAAS,EAAyC;KAClD,KAAK,CAAC,IAAI,CAAC,CAAA"}
+{"version":3,"file":"output.sdk.js","sourceRoot":"","sources":["../../../../package/lib/test/output.sdk.ts"],"names":[],"mappings":";;;AAAA,0CAAsC;AACtC,6DAAyD;AAI5C,QAAA,GAAG,GAAG,mBAAQ,CAAC,EAAE,EAAE;KAC7B,YAAY,CACX,IAAA,6BAAa,EAAC;IACZ,EAAE,EAAE,YAAY;IAChB,KAAK,EAAE,EAAE;IACT,OAAO,EAAE,EAAE;IACX,WAAW,EAAE,EAAE;IACf,YAAY,EAAE,EAAE;IAChB,YAAY,EAAE,EAAE;IAChB,WAAW,EAAE,IAAI;IACjB,QAAQ,EAAE,EAAE;IACZ,WAAW,EAAE;QACX,KAAK,EAAE,EAAE;QACT,IAAI,EAAE,EAAE;KACT;IACD,MAAM,EAAE;QACN,IAAI,EAAE;YACJ,MAAM,EAAE;gBACN,SAAS,EAAE,oBAAoB;aAChC;YACD,IAAI,EAAE,CAAC,SAAS,EAAE,QAAQ,CAAC;YAC3B,gBAAgB,EAAE,SAAS;SAC5B;KACF;IACD,OAAO,EAAE,EAAE;IACX,MAAM,EAAE;QACN,OAAO,EAAE,IAAI;QACb,MAAM,EAAE,IAAI;QACZ,SAAS,EAAE,IAAI;QACf,OAAO,EAAE,IAAI;QACb,KAAK,EAAE,IAAI;QACX,IAAI,EAAE,IAAI;KACX;IACD,YAAY,EAAE;QACZ,aAAa,EAAE;YACb,WAAW,EAAE,EAAE;YACf,QAAQ,EAAE,KAAK;YACf,IAAI,EAAE,sCAAsC;SAC7C;KACF;CACF,CAAC,CACH;KACA,KAAK,CAAC,IAAI,CAAC,CAAA"}

package/package/lib/trigger/TriggerInput.d.ts

@@ -1,4 +1,4 @@
-import { HealthStatus } from "../../../base/lib/types";
+import { HealthStatus } from '../../../base/lib/types';
 export type TriggerInput = {
     lastResult?: HealthStatus;
 };

package/package/lib/trigger/changeOnFirstSuccess.d.ts

@@ -1,4 +1,4 @@
-import { Trigger } from "./index";
+import { Trigger } from './index';
 export declare function changeOnFirstSuccess(o: {
     beforeFirstSuccess: Trigger;
     afterFirstSuccess: Trigger;

package/package/lib/trigger/changeOnFirstSuccess.js

@@ -9,7 +9,7 @@ function changeOnFirstSuccess(o) {
             currentValue = getInput();
         }
         const beforeFirstSuccess = o.beforeFirstSuccess(getInput);
-        for (let res = await beforeFirstSuccess.next(); currentValue?.lastResult !== "success" && !res.done; res = await beforeFirstSuccess.next()) {
+        for (let res = await beforeFirstSuccess.next(); currentValue?.lastResult !== 'success' && !res.done; res = await beforeFirstSuccess.next()) {
             yield;
             currentValue = getInput();
         }

package/package/lib/trigger/index.d.ts

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

package/package/lib/trigger/lastStatus.d.ts

@@ -1,5 +1,5 @@
-import { Trigger } from ".";
-import { HealthStatus } from "../../../base/lib/types";
+import { Trigger } from '.';
+import { HealthStatus } from '../../../base/lib/types';
 export type LastStatusTriggerParams = {
     [k in HealthStatus]?: Trigger;
 } & {

package/package/lib/trigger/lastStatus.js

@@ -15,7 +15,7 @@ function lastStatus(o) {
                 continue;
             }
             if (!(prev in o)) {
-                prev = "default";
+                prev = 'default';
             }
             if (!triggers[prev]) {
                 triggers[prev] = o[prev](getInput);

package/package/lib/trigger/successFailure.d.ts

@@ -1,4 +1,4 @@
-import { Trigger } from ".";
+import { Trigger } from '.';
 export declare const successFailure: (o: {
     duringSuccess: Trigger;
     duringError: Trigger;

package/package/lib/types.d.ts

@@ -1,2 +1,2 @@
-export * from "../../base/lib/types";
-export { HealthCheck } from "./health";
+export * from '../../base/lib/types';
+export { HealthCheck } from './health';

package/package/lib/util/GetServiceManifest.d.ts

@@ -0,0 +1,36 @@
+import { Effects } from '../../../base/lib/Effects';
+import { Manifest, PackageId } from '../../../base/lib/osBindings';
+export declare class GetServiceManifest<Mapped = Manifest> {
+    readonly effects: Effects;
+    readonly packageId: PackageId;
+    readonly map: (manifest: Manifest | null) => Mapped;
+    readonly eq: (a: Mapped, b: Mapped) => boolean;
+    constructor(effects: Effects, packageId: PackageId, map: (manifest: Manifest | null) => Mapped, eq: (a: Mapped, b: Mapped) => boolean);
+    /**
+     * Returns the manifest of a service. Reruns the context from which it has been called if the underlying value changes
+     */
+    const(): Promise<Mapped>;
+    /**
+     * Returns the manifest of a service. Does nothing if it changes
+     */
+    once(): Promise<Mapped>;
+    private watchGen;
+    /**
+     * Watches the manifest of a service. Returns an async iterator that yields whenever the value changes
+     */
+    watch(abort?: AbortSignal): AsyncGenerator<Mapped, never, unknown>;
+    /**
+     * Watches the manifest of a service. Takes a custom callback function to run whenever it changes
+     */
+    onChange(callback: (value: Mapped | null, error?: Error) => {
+        cancel: boolean;
+    } | Promise<{
+        cancel: boolean;
+    }>): void;
+    /**
+     * Watches the manifest of a service. Returns when the predicate is true
+     */
+    waitFor(pred: (value: Mapped) => boolean): Promise<Mapped>;
+}
+export declare function getServiceManifest(effects: Effects, packageId: PackageId): GetServiceManifest<Manifest>;
+export declare function getServiceManifest<Mapped>(effects: Effects, packageId: PackageId, map: (manifest: Manifest | null) => Mapped, eq?: (a: Mapped, b: Mapped) => boolean): GetServiceManifest<Mapped>;

package/package/lib/util/GetServiceManifest.js

@@ -0,0 +1,117 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GetServiceManifest = void 0;
+exports.getServiceManifest = getServiceManifest;
+const AbortedError_1 = require("../../../base/lib/util/AbortedError");
+const Drop_1 = require("../../../base/lib/util/Drop");
+const deepEqual_1 = require("../../../base/lib/util/deepEqual");
+class GetServiceManifest {
+    constructor(effects, packageId, map, eq) {
+        this.effects = effects;
+        this.packageId = packageId;
+        this.map = map;
+        this.eq = eq;
+    }
+    /**
+     * Returns the manifest of a service. Reruns the context from which it has been called if the underlying value changes
+     */
+    async const() {
+        let abort = new AbortController();
+        const watch = this.watch(abort.signal);
+        const res = await watch.next();
+        if (this.effects.constRetry) {
+            watch
+                .next()
+                .then(() => {
+                abort.abort();
+                this.effects.constRetry && this.effects.constRetry();
+            })
+                .catch();
+        }
+        return res.value;
+    }
+    /**
+     * Returns the manifest of a service. Does nothing if it changes
+     */
+    async once() {
+        const manifest = await this.effects.getServiceManifest({
+            packageId: this.packageId,
+        });
+        return this.map(manifest);
+    }
+    async *watchGen(abort) {
+        let prev = null;
+        const resolveCell = { resolve: () => { } };
+        this.effects.onLeaveContext(() => {
+            resolveCell.resolve();
+        });
+        abort?.addEventListener('abort', () => resolveCell.resolve());
+        while (this.effects.isInContext && !abort?.aborted) {
+            let callback = () => { };
+            const waitForNext = new Promise((resolve) => {
+                callback = resolve;
+                resolveCell.resolve = resolve;
+            });
+            const next = this.map(await this.effects.getServiceManifest({
+                packageId: this.packageId,
+                callback: () => callback(),
+            }));
+            if (!prev || !this.eq(prev.value, next)) {
+                prev = { value: next };
+                yield next;
+            }
+            await waitForNext;
+        }
+        return new Promise((_, rej) => rej(new AbortedError_1.AbortedError()));
+    }
+    /**
+     * Watches the manifest of a service. Returns an async iterator that yields whenever the value changes
+     */
+    watch(abort) {
+        const ctrl = new AbortController();
+        abort?.addEventListener('abort', () => ctrl.abort());
+        return Drop_1.DropGenerator.of(this.watchGen(ctrl.signal), () => ctrl.abort());
+    }
+    /**
+     * Watches the manifest of a service. Takes a custom callback function to run whenever it changes
+     */
+    onChange(callback) {
+        ;
+        (async () => {
+            const ctrl = new AbortController();
+            for await (const value of this.watch(ctrl.signal)) {
+                try {
+                    const res = await callback(value);
+                    if (res.cancel) {
+                        ctrl.abort();
+                        break;
+                    }
+                }
+                catch (e) {
+                    console.error('callback function threw an error @ GetServiceManifest.onChange', e);
+                }
+            }
+        })()
+            .catch((e) => callback(null, e))
+            .catch((e) => console.error('callback function threw an error @ GetServiceManifest.onChange', e));
+    }
+    /**
+     * Watches the manifest of a service. Returns when the predicate is true
+     */
+    waitFor(pred) {
+        const ctrl = new AbortController();
+        return Drop_1.DropPromise.of(Promise.resolve().then(async () => {
+            for await (const next of this.watchGen(ctrl.signal)) {
+                if (pred(next)) {
+                    return next;
+                }
+            }
+            throw new Error('context left before predicate passed');
+        }), () => ctrl.abort());
+    }
+}
+exports.GetServiceManifest = GetServiceManifest;
+function getServiceManifest(effects, packageId, map, eq) {
+    return new GetServiceManifest(effects, packageId, map ?? ((a) => a), eq ?? ((a, b) => (0, deepEqual_1.deepEqual)(a, b)));
+}
+//# sourceMappingURL=GetServiceManifest.js.map

package/package/lib/util/GetServiceManifest.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"GetServiceManifest.js","sourceRoot":"","sources":["../../../../package/lib/util/GetServiceManifest.ts"],"names":[],"mappings":";;;AA+IA,gDAYC;AAzJD,sEAAkE;AAClE,sDAAwE;AACxE,gEAA4D;AAE5D,MAAa,kBAAkB;IAC7B,YACW,OAAgB,EAChB,SAAoB,EACpB,GAA0C,EAC1C,EAAqC;QAHrC,YAAO,GAAP,OAAO,CAAS;QAChB,cAAS,GAAT,SAAS,CAAW;QACpB,QAAG,GAAH,GAAG,CAAuC;QAC1C,OAAE,GAAF,EAAE,CAAmC;IAC7C,CAAC;IAEJ;;OAEG;IACH,KAAK,CAAC,KAAK;QACT,IAAI,KAAK,GAAG,IAAI,eAAe,EAAE,CAAA;QACjC,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,CAAA;QACtC,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,IAAI,EAAE,CAAA;QAC9B,IAAI,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC;YAC5B,KAAK;iBACF,IAAI,EAAE;iBACN,IAAI,CAAC,GAAG,EAAE;gBACT,KAAK,CAAC,KAAK,EAAE,CAAA;gBACb,IAAI,CAAC,OAAO,CAAC,UAAU,IAAI,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,CAAA;YACtD,CAAC,CAAC;iBACD,KAAK,EAAE,CAAA;QACZ,CAAC;QACD,OAAO,GAAG,CAAC,KAAK,CAAA;IAClB,CAAC;IACD;;OAEG;IACH,KAAK,CAAC,IAAI;QACR,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,kBAAkB,CAAC;YACrD,SAAS,EAAE,IAAI,CAAC,SAAS;SAC1B,CAAC,CAAA;QACF,OAAO,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA;IAC3B,CAAC;IAEO,KAAK,CAAC,CAAC,QAAQ,CAAC,KAAmB;QACzC,IAAI,IAAI,GAAG,IAAgC,CAAA;QAC3C,MAAM,WAAW,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,GAAE,CAAC,EAAE,CAAA;QACzC,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,GAAG,EAAE;YAC/B,WAAW,CAAC,OAAO,EAAE,CAAA;QACvB,CAAC,CAAC,CAAA;QACF,KAAK,EAAE,gBAAgB,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC,CAAA;QAC7D,OAAO,IAAI,CAAC,OAAO,CAAC,WAAW,IAAI,CAAC,KAAK,EAAE,OAAO,EAAE,CAAC;YACnD,IAAI,QAAQ,GAAe,GAAG,EAAE,GAAE,CAAC,CAAA;YACnC,MAAM,WAAW,GAAG,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,EAAE;gBAChD,QAAQ,GAAG,OAAO,CAAA;gBAClB,WAAW,CAAC,OAAO,GAAG,OAAO,CAAA;YAC/B,CAAC,CAAC,CAAA;YACF,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CACnB,MAAM,IAAI,CAAC,OAAO,CAAC,kBAAkB,CAAC;gBACpC,SAAS,EAAE,IAAI,CAAC,SAAS;gBACzB,QAAQ,EAAE,GAAG,EAAE,CAAC,QAAQ,EAAE;aAC3B,CAAC,CACH,CAAA;YACD,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,EAAE,CAAC;gBACxC,IAAI,GAAG,EAAE,KAAK,EAAE,IAAI,EAAE,CAAA;gBACtB,MAAM,IAAI,CAAA;YACZ,CAAC;YACD,MAAM,WAAW,CAAA;QACnB,CAAC;QACD,OAAO,IAAI,OAAO,CAAQ,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,2BAAY,EAAE,CAAC,CAAC,CAAA;IAChE,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,KAAmB;QACvB,MAAM,IAAI,GAAG,IAAI,eAAe,EAAE,CAAA;QAClC,KAAK,EAAE,gBAAgB,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,CAAA;QACpD,OAAO,oBAAa,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,CAAA;IACzE,CAAC;IAED;;OAEG;IACH,QAAQ,CACN,QAGuD;QAEvD,CAAC;QAAA,CAAC,KAAK,IAAI,EAAE;YACX,MAAM,IAAI,GAAG,IAAI,eAAe,EAAE,CAAA;YAClC,IAAI,KAAK,EAAE,MAAM,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;gBAClD,IAAI,CAAC;oBACH,MAAM,GAAG,GAAG,MAAM,QAAQ,CAAC,KAAK,CAAC,CAAA;oBACjC,IAAI,GAAG,CAAC,MAAM,EAAE,CAAC;wBACf,IAAI,CAAC,KAAK,EAAE,CAAA;wBACZ,MAAK;oBACP,CAAC;gBACH,CAAC;gBAAC,OAAO,CAAC,EAAE,CAAC;oBACX,OAAO,CAAC,KAAK,CACX,gEAAgE,EAChE,CAAC,CACF,CAAA;gBACH,CAAC;YACH,CAAC;QACH,CAAC,CAAC,EAAE;aACD,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;aAC/B,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CACX,OAAO,CAAC,KAAK,CACX,gEAAgE,EAChE,CAAC,CACF,CACF,CAAA;IACL,CAAC;IAED;;OAEG;IACH,OAAO,CAAC,IAAgC;QACtC,MAAM,IAAI,GAAG,IAAI,eAAe,EAAE,CAAA;QAClC,OAAO,kBAAW,CAAC,EAAE,CACnB,OAAO,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC,KAAK,IAAI,EAAE;YAChC,IAAI,KAAK,EAAE,MAAM,IAAI,IAAI,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;gBACpD,IAAI,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;oBACf,OAAO,IAAI,CAAA;gBACb,CAAC;YACH,CAAC;YACD,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAA;QACzD,CAAC,CAAC,EACF,GAAG,EAAE,CAAC,IAAI,CAAC,KAAK,EAAE,CACnB,CAAA;IACH,CAAC;CACF;AA7HD,gDA6HC;AAYD,SAAgB,kBAAkB,CAChC,OAAgB,EAChB,SAAoB,EACpB,GAA2C,EAC3C,EAAsC;IAEtC,OAAO,IAAI,kBAAkB,CAC3B,OAAO,EACP,SAAS,EACT,GAAG,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAW,CAAC,EAC3B,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,IAAA,qBAAS,EAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAClC,CAAA;AACH,CAAC"}

package/package/lib/util/GetSslCertificate.d.ts

@@ -1,5 +1,5 @@
-import { T } from "..";
-import { Effects } from "../../../base/lib/Effects";
+import { T } from '..';
+import { Effects } from '../../../base/lib/Effects';
 export declare class GetSslCertificate {
     readonly effects: Effects;
     readonly hostnames: string[];
@@ -13,12 +13,21 @@ export declare class GetSslCertificate {
      * Returns the an SSL Certificate for the given hostnames if permitted. Does nothing if it changes
      */
     once(): Promise<[string, string, string]>;
+    private watchGen;
     /**
      * Watches the SSL Certificate for the given hostnames if permitted. Returns an async iterator that yields whenever the value changes
      */
-    watch(): AsyncGenerator<[string, string, string], void, unknown>;
+    watch(abort?: AbortSignal): AsyncGenerator<[string, string, string], never, unknown>;
     /**
      * Watches the SSL Certificate for the given hostnames if permitted. Takes a custom callback function to run whenever it changes
      */
-    onChange(callback: (value: [string, string, string] | null, error?: Error) => void | Promise<void>): void;
+    onChange(callback: (value: [string, string, string] | null, error?: Error) => {
+        cancel: boolean;
+    } | Promise<{
+        cancel: boolean;
+    }>): void;
+    /**
+     * Watches the SSL Certificate for the given hostnames if permitted. Returns when the predicate is true
+     */
+    waitFor(pred: (value: [string, string, string] | null) => boolean): Promise<[string, string, string] | null>;
 }

package/package/lib/util/GetSslCertificate.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GetSslCertificate = void 0;
+const AbortedError_1 = require("../../../base/lib/util/AbortedError");
+const Drop_1 = require("../../../base/lib/util/Drop");
 class GetSslCertificate {
     constructor(effects, hostnames, algorithm) {
         this.effects = effects;
@@ -27,15 +29,13 @@ class GetSslCertificate {
             algorithm: this.algorithm,
         });
     }
-    /**
-     * Watches the SSL Certificate for the given hostnames if permitted. Returns an async iterator that yields whenever the value changes
-     */
-    async *watch() {
+    async *watchGen(abort) {
         const resolveCell = { resolve: () => { } };
         this.effects.onLeaveContext(() => {
             resolveCell.resolve();
         });
-        while (this.effects.isInContext) {
+        abort?.addEventListener('abort', () => resolveCell.resolve());
+        while (this.effects.isInContext && !abort?.aborted) {
             let callback = () => { };
             const waitForNext = new Promise((resolve) => {
                 callback = resolve;
@@ -48,6 +48,15 @@ class GetSslCertificate {
             });
             await waitForNext;
         }
+        return new Promise((_, rej) => rej(new AbortedError_1.AbortedError()));
+    }
+    /**
+     * Watches the SSL Certificate for the given hostnames if permitted. Returns an async iterator that yields whenever the value changes
+     */
+    watch(abort) {
+        const ctrl = new AbortController();
+        abort?.addEventListener('abort', () => ctrl.abort());
+        return Drop_1.DropGenerator.of(this.watchGen(ctrl.signal), () => ctrl.abort());
     }
     /**
      * Watches the SSL Certificate for the given hostnames if permitted. Takes a custom callback function to run whenever it changes
@@ -55,17 +64,36 @@ class GetSslCertificate {
     onChange(callback) {
         ;
         (async () => {
-            for await (const value of this.watch()) {
+            const ctrl = new AbortController();
+            for await (const value of this.watch(ctrl.signal)) {
                 try {
-                    await callback(value);
+                    const res = await callback(value);
+                    if (res.cancel) {
+                        ctrl.abort();
+                        break;
+                    }
                 }
                 catch (e) {
-                    console.error("callback function threw an error @ GetSslCertificate.onChange", e);
+                    console.error('callback function threw an error @ GetSslCertificate.onChange', e);
                 }
             }
         })()
             .catch((e) => callback(null, e))
-            .catch((e) => console.error("callback function threw an error @ GetSslCertificate.onChange", e));
+            .catch((e) => console.error('callback function threw an error @ GetSslCertificate.onChange', e));
+    }
+    /**
+     * Watches the SSL Certificate for the given hostnames if permitted. Returns when the predicate is true
+     */
+    waitFor(pred) {
+        const ctrl = new AbortController();
+        return Drop_1.DropPromise.of(Promise.resolve().then(async () => {
+            for await (const next of this.watchGen(ctrl.signal)) {
+                if (pred(next)) {
+                    return next;
+                }
+            }
+            return null;
+        }), () => ctrl.abort());
     }
 }
 exports.GetSslCertificate = GetSslCertificate;

package/package/lib/util/GetSslCertificate.js.map

@@ -1 +1 @@
-{"version":3,"file":"GetSslCertificate.js","sourceRoot":"","sources":["../../../../package/lib/util/GetSslCertificate.ts"],"names":[],"mappings":";;;AAGA,MAAa,iBAAiB;IAC5B,YACW,OAAgB,EAChB,SAAmB,EACnB,SAAuB;QAFvB,YAAO,GAAP,OAAO,CAAS;QAChB,cAAS,GAAT,SAAS,CAAU;QACnB,cAAS,GAAT,SAAS,CAAc;IAC/B,CAAC;IAEJ;;OAEG;IACH,KAAK;QACH,OAAO,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC;YACpC,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,QAAQ,EACN,IAAI,CAAC,OAAO,CAAC,UAAU;gBACvB,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,IAAI,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC;SAC/D,CAAC,CAAA;IACJ,CAAC;IACD;;OAEG;IACH,IAAI;QACF,OAAO,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC;YACpC,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,SAAS,EAAE,IAAI,CAAC,SAAS;SAC1B,CAAC,CAAA;IACJ,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,CAAC,KAAK;QACV,MAAM,WAAW,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,GAAE,CAAC,EAAE,CAAA;QACzC,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,GAAG,EAAE;YAC/B,WAAW,CAAC,OAAO,EAAE,CAAA;QACvB,CAAC,CAAC,CAAA;QACF,OAAO,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC;YAChC,IAAI,QAAQ,GAAe,GAAG,EAAE,GAAE,CAAC,CAAA;YACnC,MAAM,WAAW,GAAG,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,EAAE;gBAChD,QAAQ,GAAG,OAAO,CAAA;gBAClB,WAAW,CAAC,OAAO,GAAG,OAAO,CAAA;YAC/B,CAAC,CAAC,CAAA;YACF,MAAM,MAAM,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC;gBACzC,SAAS,EAAE,IAAI,CAAC,SAAS;gBACzB,SAAS,EAAE,IAAI,CAAC,SAAS;gBACzB,QAAQ,EAAE,GAAG,EAAE,CAAC,QAAQ,EAAE;aAC3B,CAAC,CAAA;YACF,MAAM,WAAW,CAAA;QACnB,CAAC;IACH,CAAC;IAED;;OAEG;IACH,QAAQ,CACN,QAGyB;QAEzB,CAAC;QAAA,CAAC,KAAK,IAAI,EAAE;YACX,IAAI,KAAK,EAAE,MAAM,KAAK,IAAI,IAAI,CAAC,KAAK,EAAE,EAAE,CAAC;gBACvC,IAAI,CAAC;oBACH,MAAM,QAAQ,CAAC,KAAK,CAAC,CAAA;gBACvB,CAAC;gBAAC,OAAO,CAAC,EAAE,CAAC;oBACX,OAAO,CAAC,KAAK,CACX,+DAA+D,EAC/D,CAAC,CACF,CAAA;gBACH,CAAC;YACH,CAAC;QACH,CAAC,CAAC,EAAE;aACD,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;aAC/B,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CACX,OAAO,CAAC,KAAK,CACX,+DAA+D,EAC/D,CAAC,CACF,CACF,CAAA;IACL,CAAC;CACF;AAjFD,8CAiFC"}
+{"version":3,"file":"GetSslCertificate.js","sourceRoot":"","sources":["../../../../package/lib/util/GetSslCertificate.ts"],"names":[],"mappings":"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"}