@start9labs/start-sdk 0.4.0-beta.34 → 0.4.0-beta.37

package/base/lib/util/Drop.js

@@ -0,0 +1,130 @@
+"use strict";
+var _a, _b;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DropGenerator = exports.DropPromise = exports.Drop = void 0;
+const dropId = Symbol("id");
+class Drop {
+    constructor() {
+        this.dropId = Drop.idCtr++;
+        this.dropRef = { [dropId]: this.dropId };
+        const weak = this.weak();
+        Drop.weak[this.dropId] = weak;
+        Drop.registry.register(this.dropRef, this.dropId, this.dropRef);
+        return new Proxy(this, {
+            set(target, prop, value) {
+                if (prop === "dropRef" || prop == "dropId")
+                    return false;
+                target[prop] = value;
+                weak[prop] = value;
+                return true;
+            },
+        });
+    }
+    register() { }
+    weak() {
+        const weak = Object.assign(Object.create(Object.getPrototypeOf(this)), this);
+        if (this.dropRef)
+            weak.ref = new WeakRef(this.dropRef);
+        return weak;
+    }
+    drop() {
+        if (!this.dropRef || !this.dropId)
+            return;
+        this.onDrop();
+        this.leak();
+    }
+    leak() {
+        if (!this.dropRef || !this.dropId)
+            return this;
+        Drop.registry.unregister(this.dropRef);
+        delete Drop.weak[this.dropId];
+        delete this.dropRef;
+        delete this.dropId;
+        return this;
+    }
+}
+exports.Drop = Drop;
+Drop.weak = {};
+Drop.registry = new FinalizationRegistry((id) => {
+    const weak = Drop.weak[id];
+    if (weak)
+        weak.drop();
+});
+Drop.idCtr = 0;
+class DropPromise {
+    constructor(promise, dropFnOrRef) {
+        this.promise = promise;
+        this[_a] = "DropPromise";
+        if (dropFnOrRef && dropId in dropFnOrRef) {
+            this.dropId = dropFnOrRef[dropId];
+            this.dropRef = dropFnOrRef;
+            return;
+        }
+        this.dropId = DropPromise.idCtr++;
+        this.dropRef = { [dropId]: this.dropId };
+        if (dropFnOrRef)
+            DropPromise.dropFns[this.dropId] = dropFnOrRef;
+        DropPromise.registry.register(this.dropRef, this.dropId, this.dropRef);
+    }
+    static of(promise, dropFn) {
+        return new DropPromise(promise, dropFn);
+    }
+    static ref(promise, dropRef) {
+        return new DropPromise(promise, dropRef);
+    }
+    then(onfulfilled, onrejected) {
+        return DropPromise.ref(this.promise.then(onfulfilled, onrejected), this.dropRef);
+    }
+    catch(onrejected) {
+        return DropPromise.ref(this.promise.catch(onrejected), this.dropRef);
+    }
+    finally(onfinally) {
+        return DropPromise.ref(this.promise.finally(onfinally), this.dropRef);
+    }
+}
+exports.DropPromise = DropPromise;
+_a = Symbol.toStringTag;
+DropPromise.dropFns = {};
+DropPromise.registry = new FinalizationRegistry((id) => {
+    const drop = DropPromise.dropFns[id];
+    if (drop) {
+        drop();
+        delete DropPromise.dropFns[id];
+    }
+});
+DropPromise.idCtr = 0;
+class DropGenerator {
+    constructor(generator, dropFn) {
+        this.generator = generator;
+        this[_b] = () => this;
+        this.dropId = DropGenerator.idCtr++;
+        this.dropRef = { [dropId]: this.dropId };
+        if (dropFn)
+            DropGenerator.dropFns[this.dropId] = dropFn;
+        DropGenerator.registry.register(this.dropRef, this.dropId, this.dropRef);
+    }
+    static of(generator, dropFn) {
+        return new DropGenerator(generator, dropFn);
+    }
+    next(...args) {
+        return DropPromise.ref(this.generator.next(...args), this.dropRef);
+    }
+    return(value) {
+        return DropPromise.ref(this.generator.return(value), this.dropRef);
+    }
+    throw(e) {
+        return DropPromise.ref(this.generator.throw(e), this.dropRef);
+    }
+}
+exports.DropGenerator = DropGenerator;
+_b = Symbol.asyncIterator;
+DropGenerator.dropFns = {};
+DropGenerator.registry = new FinalizationRegistry((id) => {
+    const drop = DropGenerator.dropFns[id];
+    if (drop) {
+        drop();
+        delete DropGenerator.dropFns[id];
+    }
+});
+DropGenerator.idCtr = 0;
+//# sourceMappingURL=Drop.js.map

package/base/lib/util/Drop.js.map

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

package/base/lib/util/GetSystemSmtp.d.ts

@@ -11,14 +11,19 @@ export declare class GetSystemSmtp {
      * Returns the system SMTP credentials. Does nothing if the credentials change
      */
     once(): Promise<T.SmtpValue | null>;
+    private watchGen;
     /**
      * Watches the system SMTP credentials. Returns an async iterator that yields whenever the value changes
      */
-    watch(): AsyncGenerator<T.SmtpValue | null, void, unknown>;
+    watch(abort?: AbortSignal): AsyncGenerator<T.SmtpValue | null, void, unknown>;
     /**
      * Watches the system SMTP credentials. Takes a custom callback function to run whenever the credentials change
      */
-    onChange(callback: (value: T.SmtpValue | null, error?: Error) => void | Promise<void>): void;
+    onChange(callback: (value: T.SmtpValue | null, error?: Error) => {
+        cancel: boolean;
+    } | Promise<{
+        cancel: boolean;
+    }>): void;
     /**
      * Watches the system SMTP credentials. Returns when the predicate is true
      */

package/base/lib/util/GetSystemSmtp.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GetSystemSmtp = void 0;
+const Drop_1 = require("./Drop");
 class GetSystemSmtp {
     constructor(effects) {
         this.effects = effects;
@@ -20,15 +21,13 @@ class GetSystemSmtp {
     once() {
         return this.effects.getSystemSmtp({});
     }
-    /**
-     * Watches the system SMTP credentials. 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;
@@ -40,15 +39,28 @@ class GetSystemSmtp {
             await waitForNext;
         }
     }
+    /**
+     * Watches the system SMTP credentials. 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 system SMTP credentials. Takes a custom callback function to run whenever the credentials change
      */
     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 @ GetSystemSmtp.onChange", e);
@@ -61,27 +73,16 @@ class GetSystemSmtp {
     /**
      * Watches the system SMTP credentials. Returns when the predicate is true
      */
-    async waitFor(pred) {
-        const resolveCell = { resolve: () => { } };
-        this.effects.onLeaveContext(() => {
-            resolveCell.resolve();
-        });
-        while (this.effects.isInContext) {
-            let callback = () => { };
-            const waitForNext = new Promise((resolve) => {
-                callback = resolve;
-                resolveCell.resolve = resolve;
-            });
-            const res = await this.effects.getSystemSmtp({
-                callback: () => callback(),
-            });
-            if (pred(res)) {
-                resolveCell.resolve();
-                return res;
+    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;
+                }
             }
-            await waitForNext;
-        }
-        return null;
+            return null;
+        }), () => ctrl.abort());
     }
 }
 exports.GetSystemSmtp = GetSystemSmtp;

package/base/lib/util/GetSystemSmtp.js.map

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

package/base/lib/util/getServiceInterface.d.ts

@@ -67,14 +67,19 @@ export declare class GetServiceInterface {
      * Returns the requested service interface. Does nothing if the value changes
      */
     once(): Promise<ServiceInterfaceFilled | null>;
+    private watchGen;
     /**
      * Watches the requested service interface. Returns an async iterator that yields whenever the value changes
      */
-    watch(): AsyncGenerator<ServiceInterfaceFilled | null, void, unknown>;
+    watch(abort?: AbortSignal): AsyncGenerator<ServiceInterfaceFilled | null, void, unknown>;
     /**
      * Watches the requested service interface. Takes a custom callback function to run whenever the value changes
      */
-    onChange(callback: (value: ServiceInterfaceFilled | null, error?: Error) => void | Promise<void>): void;
+    onChange(callback: (value: ServiceInterfaceFilled | null, error?: Error) => {
+        cancel: boolean;
+    } | Promise<{
+        cancel: boolean;
+    }>): void;
     /**
      * Watches the requested service interface. Returns when the predicate is true
      */

package/base/lib/util/getServiceInterface.js

@@ -3,6 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.GetServiceInterface = exports.filledAddress = exports.addressHostToUrl = exports.getHostname = void 0;
 exports.getServiceInterface = getServiceInterface;
 const Host_1 = require("../interfaces/Host");
+const Drop_1 = require("./Drop");
+const ip_1 = require("./ip");
 const getHostnameRegex = /^(\w+:\/\/)?([^\/\:]+)(:\d{1,3})?(\/)?/;
 const getHostname = (url) => {
     const founds = url.match(getHostnameRegex)?.[2];
@@ -28,10 +30,10 @@ const addressHostToUrl = ({ scheme, sslScheme, username, suffix }, host) => {
         }
         else if (host.kind === "ip") {
             if (host.hostname.kind === "domain") {
-                hostname = `${host.hostname.subdomain ? `${host.hostname.subdomain}.` : ""}${host.hostname.domain}`;
+                hostname = host.hostname.value;
             }
             else if (host.hostname.kind === "ipv6") {
-                hostname = host.hostname.value.startsWith("fe80::")
+                hostname = ip_1.IPV6_LINK_LOCAL.contains(host.hostname.value)
                     ? `[${host.hostname.value}%${host.hostname.scopeId}]`
                     : `[${host.hostname.value}]`;
             }
@@ -78,7 +80,7 @@ function filterRec(hostnames, filter, invert) {
 }
 const filledAddress = (host, addressInfo) => {
     const toUrl = exports.addressHostToUrl.bind(null, addressInfo);
-    const hostnames = host.hostnameInfo[addressInfo.internalPort];
+    const hostnames = host.hostnameInfo[addressInfo.internalPort] ?? [];
     return {
         ...addressInfo,
         hostnames,
@@ -198,16 +200,14 @@ class GetServiceInterface {
         });
         return interfaceFilled;
     }
-    /**
-     * Watches the requested service interface. Returns an async iterator that yields whenever the value changes
-     */
-    async *watch() {
+    async *watchGen(abort) {
         const { id, packageId } = this.opts;
         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;
@@ -222,15 +222,28 @@ class GetServiceInterface {
             await waitForNext;
         }
     }
+    /**
+     * Watches the requested service interface. 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 requested service interface. Takes a custom callback function to run whenever the value changes
      */
     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 @ GetServiceInterface.onChange", e);
@@ -243,31 +256,16 @@ class GetServiceInterface {
     /**
      * Watches the requested service interface. Returns when the predicate is true
      */
-    async waitFor(pred) {
-        const { id, packageId } = this.opts;
-        const resolveCell = { resolve: () => { } };
-        this.effects.onLeaveContext(() => {
-            resolveCell.resolve();
-        });
-        while (this.effects.isInContext) {
-            let callback = () => { };
-            const waitForNext = new Promise((resolve) => {
-                callback = resolve;
-                resolveCell.resolve = resolve;
-            });
-            const res = await makeInterfaceFilled({
-                effects: this.effects,
-                id,
-                packageId,
-                callback,
-            });
-            if (pred(res)) {
-                resolveCell.resolve();
-                return res;
+    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;
+                }
             }
-            await waitForNext;
-        }
-        return null;
+            return null;
+        }), () => ctrl.abort());
     }
 }
 exports.GetServiceInterface = GetServiceInterface;

package/base/lib/util/getServiceInterface.js.map

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

package/base/lib/util/getServiceInterfaces.d.ts

@@ -16,14 +16,19 @@ export declare class GetServiceInterfaces {
      * Returns the service interfaces for the package. Does nothing if the value changes
      */
     once(): Promise<ServiceInterfaceFilled[]>;
+    private watchGen;
     /**
      * Watches the service interfaces for the package. Returns an async iterator that yields whenever the value changes
      */
-    watch(): AsyncGenerator<ServiceInterfaceFilled[], void, unknown>;
+    watch(abort?: AbortSignal): AsyncGenerator<ServiceInterfaceFilled[], void, unknown>;
     /**
      * Watches the service interfaces for the package. Takes a custom callback function to run whenever the value changes
      */
-    onChange(callback: (value: ServiceInterfaceFilled[] | null, error?: Error) => void | Promise<void>): void;
+    onChange(callback: (value: ServiceInterfaceFilled[] | null, error?: Error) => {
+        cancel: boolean;
+    } | Promise<{
+        cancel: boolean;
+    }>): void;
     /**
      * Watches the service interfaces for the package. Returns when the predicate is true
      */

package/base/lib/util/getServiceInterfaces.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GetServiceInterfaces = void 0;
 exports.getServiceInterfaces = getServiceInterfaces;
+const Drop_1 = require("./Drop");
 const getServiceInterface_1 = require("./getServiceInterface");
 const makeManyInterfaceFilled = async ({ effects, packageId, callback, }) => {
     const serviceInterfaceValues = await effects.listServiceInterfaces({
@@ -56,16 +57,14 @@ class GetServiceInterfaces {
         });
         return interfaceFilled;
     }
-    /**
-     * Watches the service interfaces for the package. Returns an async iterator that yields whenever the value changes
-     */
-    async *watch() {
+    async *watchGen(abort) {
         const { packageId } = this.opts;
         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;
@@ -79,15 +78,28 @@ class GetServiceInterfaces {
             await waitForNext;
         }
     }
+    /**
+     * Watches the service interfaces for the package. 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 service interfaces for the package. Takes a custom callback function to run whenever the value changes
      */
     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 @ GetServiceInterfaces.onChange", e);
@@ -100,30 +112,16 @@ class GetServiceInterfaces {
     /**
      * Watches the service interfaces for the package. Returns when the predicate is true
      */
-    async waitFor(pred) {
-        const { packageId } = this.opts;
-        const resolveCell = { resolve: () => { } };
-        this.effects.onLeaveContext(() => {
-            resolveCell.resolve();
-        });
-        while (this.effects.isInContext) {
-            let callback = () => { };
-            const waitForNext = new Promise((resolve) => {
-                callback = resolve;
-                resolveCell.resolve = resolve;
-            });
-            const res = await makeManyInterfaceFilled({
-                effects: this.effects,
-                packageId,
-                callback,
-            });
-            if (pred(res)) {
-                resolveCell.resolve();
-                return res;
+    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;
+                }
             }
-            await waitForNext;
-        }
-        return null;
+            return null;
+        }), () => ctrl.abort());
     }
 }
 exports.GetServiceInterfaces = GetServiceInterfaces;

package/base/lib/util/getServiceInterfaces.js.map

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

package/base/lib/util/index.d.ts

@@ -1,5 +1,6 @@
 export { addressHostToUrl } from "./getServiceInterface";
 export { getDefaultString } from "./getDefaultString";
+export * from "./ip";
 export { GetServiceInterface, getServiceInterface } from "./getServiceInterface";
 export { getServiceInterfaces } from "./getServiceInterfaces";
 export { once } from "./once";
@@ -13,6 +14,5 @@ export { splitCommand } from "./splitCommand";
 export { nullIfEmpty } from "./nullIfEmpty";
 export { deepMerge, partialDiff } from "./deepMerge";
 export { deepEqual } from "./deepEqual";
-export { hostnameInfoToAddress } from "./Hostname";
 export * as regexes from "./regexes";
 export { stringFromStdErrOut } from "./stringFromStdErrOut";