@start9labs/start-sdk 0.4.0-beta.5 → 0.4.0-beta.50

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

@@ -1,5 +1,5 @@
-import { Effects } from "../Effects";
-import * as T from "../types";
+import { Effects } from '../Effects';
+import * as T from '../types';
 export declare class GetSystemSmtp {
     readonly effects: Effects;
     constructor(effects: Effects);
@@ -11,12 +11,21 @@ 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, never, 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
+     */
+    waitFor(pred: (value: T.SmtpValue | null) => boolean): Promise<T.SmtpValue | null>;
 }

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;
@@ -39,6 +38,15 @@ class GetSystemSmtp {
             });
             await waitForNext;
         }
+        return new Promise((_, rej) => rej(new Error('aborted')));
+    }
+    /**
+     * 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
@@ -46,17 +54,36 @@ class GetSystemSmtp {
     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);
+                    console.error('callback function threw an error @ GetSystemSmtp.onChange', e);
                 }
             }
         })()
             .catch((e) => callback(null, e))
-            .catch((e) => console.error("callback function threw an error @ GetSystemSmtp.onChange", e));
+            .catch((e) => console.error('callback function threw an error @ GetSystemSmtp.onChange', e));
+    }
+    /**
+     * Watches the system SMTP credentials. 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.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":";;;AAGA,MAAa,aAAa;IACxB,YAAqB,OAAgB;QAAhB,YAAO,GAAP,OAAO,CAAS;IAAG,CAAC;IAEzC;;OAEG;IACH,KAAK;QACH,OAAO,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC;YAChC,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,aAAa,CAAC,EAAE,CAAC,CAAA;IACvC,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,aAAa,CAAC;gBACrC,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,2DAA2D,EAC3D,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,2DAA2D,EAC3D,CAAC,CACF,CACF,CAAA;IACL,CAAC;CACF;AAtED,sCAsEC"}
+{"version":3,"file":"GetSystemSmtp.js","sourceRoot":"","sources":["../../../../base/lib/util/GetSystemSmtp.ts"],"names":[],"mappings":"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"}

package/base/lib/util/asError.js

@@ -5,7 +5,7 @@ const asError = (e) => {
     if (e instanceof Error) {
         return new Error(e);
     }
-    if (typeof e === "string") {
+    if (typeof e === 'string') {
         return new Error(`${e}`);
     }
     return new Error(`${JSON.stringify(e)}`);

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

@@ -1 +1 @@
-export declare function deepEqual(...args: unknown[]): unknown;
+export declare function deepEqual(...args: unknown[]): boolean;

package/base/lib/util/deepEqual.js

@@ -3,8 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.deepEqual = deepEqual;
 const ts_matches_1 = require("ts-matches");
 function deepEqual(...args) {
-    if (!ts_matches_1.object.test(args[args.length - 1]))
-        return args[args.length - 1];
     const objects = args.filter(ts_matches_1.object.test);
     if (objects.length === 0) {
         for (const x of args)
@@ -14,6 +12,8 @@ function deepEqual(...args) {
     }
     if (objects.length !== args.length)
         return false;
+    if (objects.some(Array.isArray) && !objects.every(Array.isArray))
+        return false;
     const allKeys = new Set(objects.flatMap((x) => Object.keys(x)));
     for (const key of allKeys) {
         for (const x of objects) {

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

@@ -1 +1 @@
-{"version":3,"file":"deepEqual.js","sourceRoot":"","sources":["../../../../base/lib/util/deepEqual.ts"],"names":[],"mappings":";;AAEA,8BAgBC;AAlBD,2CAAmC;AAEnC,SAAgB,SAAS,CAAC,GAAG,IAAe;IAC1C,IAAI,CAAC,mBAAM,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QAAE,OAAO,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAA;IACrE,MAAM,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC,mBAAM,CAAC,IAAI,CAAC,CAAA;IACxC,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACzB,KAAK,MAAM,CAAC,IAAI,IAAI;YAAE,IAAI,CAAC,KAAK,IAAI,CAAC,CAAC,CAAC;gBAAE,OAAO,KAAK,CAAA;QACrD,OAAO,IAAI,CAAA;IACb,CAAC;IACD,IAAI,OAAO,CAAC,MAAM,KAAK,IAAI,CAAC,MAAM;QAAE,OAAO,KAAK,CAAA;IAChD,MAAM,OAAO,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;IAC/D,KAAK,MAAM,GAAG,IAAI,OAAO,EAAE,CAAC;QAC1B,KAAK,MAAM,CAAC,IAAI,OAAO,EAAE,CAAC;YACxB,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC;gBAAE,OAAO,KAAK,CAAA;YAC7B,IAAI,CAAC,SAAS,CAAE,OAAO,CAAC,CAAC,CAAS,CAAC,GAAG,CAAC,EAAG,CAAS,CAAC,GAAG,CAAC,CAAC;gBAAE,OAAO,KAAK,CAAA;QACzE,CAAC;IACH,CAAC;IACD,OAAO,IAAI,CAAA;AACb,CAAC"}
+{"version":3,"file":"deepEqual.js","sourceRoot":"","sources":["../../../../base/lib/util/deepEqual.ts"],"names":[],"mappings":";;AAEA,8BAgBC;AAlBD,2CAAmC;AAEnC,SAAgB,SAAS,CAAC,GAAG,IAAe;IAC1C,MAAM,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC,mBAAM,CAAC,IAAI,CAAC,CAAA;IACxC,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACzB,KAAK,MAAM,CAAC,IAAI,IAAI;YAAE,IAAI,CAAC,KAAK,IAAI,CAAC,CAAC,CAAC;gBAAE,OAAO,KAAK,CAAA;QACrD,OAAO,IAAI,CAAA;IACb,CAAC;IACD,IAAI,OAAO,CAAC,MAAM,KAAK,IAAI,CAAC,MAAM;QAAE,OAAO,KAAK,CAAA;IAChD,IAAI,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC;QAAE,OAAO,KAAK,CAAA;IAC9E,MAAM,OAAO,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;IAC/D,KAAK,MAAM,GAAG,IAAI,OAAO,EAAE,CAAC;QAC1B,KAAK,MAAM,CAAC,IAAI,OAAO,EAAE,CAAC;YACxB,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC;gBAAE,OAAO,KAAK,CAAA;YAC7B,IAAI,CAAC,SAAS,CAAE,OAAO,CAAC,CAAC,CAAS,CAAC,GAAG,CAAC,EAAG,CAAS,CAAC,GAAG,CAAC,CAAC;gBAAE,OAAO,KAAK,CAAA;QACzE,CAAC;IACH,CAAC;IACD,OAAO,IAAI,CAAA;AACb,CAAC"}

package/base/lib/util/deepMerge.js

@@ -27,11 +27,16 @@ function partialDiff(prev, next) {
             return;
         }
     }
-    else if (typeof prev === "object" && typeof next === "object") {
+    else if (typeof prev === 'object' && typeof next === 'object') {
         if (prev === null || next === null)
             return { diff: next };
         const res = { diff: {} };
-        for (let key in next) {
+        const keys = Object.keys(next);
+        for (let key in prev) {
+            if (!keys.includes(key))
+                keys.push(key);
+        }
+        for (let key of keys) {
             const diff = partialDiff(prev[key], next[key]);
             if (diff) {
                 res.diff[key] = diff.diff;
@@ -50,11 +55,11 @@ function partialDiff(prev, next) {
 }
 function deepMerge(...args) {
     const lastItem = args[args.length - 1];
-    if (typeof lastItem !== "object" || !lastItem)
+    if (typeof lastItem !== 'object' || !lastItem)
         return lastItem;
     if (Array.isArray(lastItem))
         return deepMergeList(...args.filter((x) => Array.isArray(x)));
-    return deepMergeObject(...args.filter((x) => typeof x === "object" && x && !Array.isArray(x)));
+    return deepMergeObject(...args.filter((x) => typeof x === 'object' && x && !Array.isArray(x)));
 }
 function deepMergeList(...args) {
     const res = [];

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

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

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

@@ -1,2 +1,2 @@
-import { DefaultString } from "../actions/input/inputSpecTypes";
+import { DefaultString } from '../actions/input/inputSpecTypes';
 export declare function getDefaultString(defaultSpec: DefaultString): string;

package/base/lib/util/getDefaultString.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getDefaultString = getDefaultString;
 const getRandomString_1 = require("./getRandomString");
 function getDefaultString(defaultSpec) {
-    if (typeof defaultSpec === "string") {
+    if (typeof defaultSpec === 'string') {
         return defaultSpec;
     }
     else {

package/base/lib/util/getRandomCharInSet.js

@@ -11,7 +11,7 @@ function getRandomCharInSet(charset) {
         }
         charIdx -= range.len;
     }
-    throw new Error("unreachable");
+    throw new Error('unreachable');
 }
 function stringToCharSet(charset) {
     let set = { ranges: [], len: 0 };
@@ -20,10 +20,10 @@ function stringToCharSet(charset) {
     let in_range = false;
     for (let char of charset) {
         switch (char) {
-            case ",":
+            case ',':
                 if (start !== null && end !== null) {
                     if (start.charCodeAt(0) > end.charCodeAt(0)) {
-                        throw new Error("start > end of charset");
+                        throw new Error('start > end of charset');
                     }
                     const len = end.charCodeAt(0) - start.charCodeAt(0) + 1;
                     set.ranges.push({
@@ -42,24 +42,24 @@ function stringToCharSet(charset) {
                     start = null;
                 }
                 else if (start !== null && in_range) {
-                    end = ",";
+                    end = ',';
                 }
                 else if (start === null && end === null && !in_range) {
-                    start = ",";
+                    start = ',';
                 }
                 else {
                     throw new Error('unexpected ","');
                 }
                 break;
-            case "-":
+            case '-':
                 if (start === null) {
-                    start = "-";
+                    start = '-';
                 }
                 else if (!in_range) {
                     in_range = true;
                 }
                 else if (in_range && end === null) {
-                    end = "-";
+                    end = '-';
                 }
                 else {
                     throw new Error('unexpected "-"');
@@ -79,7 +79,7 @@ function stringToCharSet(charset) {
     }
     if (start !== null && end !== null) {
         if (start.charCodeAt(0) > end.charCodeAt(0)) {
-            throw new Error("start > end of charset");
+            throw new Error('start > end of charset');
         }
         const len = end.charCodeAt(0) - start.charCodeAt(0) + 1;
         set.ranges.push({

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

@@ -1,2 +1,2 @@
-import { RandomString } from "../actions/input/inputSpecTypes";
+import { RandomString } from '../actions/input/inputSpecTypes';
 export declare function getRandomString(generator: RandomString): string;

package/base/lib/util/getRandomString.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getRandomString = getRandomString;
 const getRandomCharInSet_1 = require("./getRandomCharInSet");
 function getRandomString(generator) {
-    let s = "";
+    let s = '';
     for (let i = 0; i < generator.len; i++) {
         s = s + (0, getRandomCharInSet_1.getRandomCharInSet)(generator.charset);
     }

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

@@ -1,35 +1,68 @@
-import { ServiceInterfaceType } from "../types";
-import { AddressInfo, Host, Hostname, HostnameInfo } from "../types";
-import { Effects } from "../Effects";
+import { PackageId, ServiceInterfaceId, ServiceInterfaceType } from '../types';
+import { AddressInfo, Host, Hostname, HostnameInfo } from '../types';
+import { Effects } from '../Effects';
 export type UrlString = string;
 export type HostId = string;
 export declare const getHostname: (url: string) => Hostname | null;
-type FilterKinds = "onion" | "local" | "domain" | "ip" | "ipv4" | "ipv6";
+type FilterKinds = 'mdns' | 'domain' | 'ip' | 'ipv4' | 'ipv6' | 'localhost' | 'link-local';
 export type Filter = {
-    visibility?: "public" | "private";
+    visibility?: 'public' | 'private';
     kind?: FilterKinds | FilterKinds[];
+    predicate?: (h: HostnameInfo) => boolean;
     exclude?: Filter;
 };
-type Formats = "hostname-info" | "urlstring" | "url";
-type FormatReturnTy<Format extends Formats> = Format extends "hostname-info" ? HostnameInfo : Format extends "url" ? URL : UrlString;
-export type Filled = {
+type VisibilityFilter<V extends 'public' | 'private'> = V extends 'public' ? (HostnameInfo & {
+    public: true;
+}) | VisibilityFilter<Exclude<V, 'public'>> : V extends 'private' ? (HostnameInfo & {
+    public: false;
+}) | VisibilityFilter<Exclude<V, 'private'>> : never;
+type KindFilter<K extends FilterKinds> = K extends 'mdns' ? (HostnameInfo & {
+    metadata: {
+        kind: 'mdns';
+    };
+}) | KindFilter<Exclude<K, 'mdns'>> : K extends 'domain' ? (HostnameInfo & {
+    metadata: {
+        kind: 'private-domain';
+    };
+}) | (HostnameInfo & {
+    metadata: {
+        kind: 'public-domain';
+    };
+}) | KindFilter<Exclude<K, 'domain'>> : K extends 'ipv4' ? (HostnameInfo & {
+    metadata: {
+        kind: 'ipv4';
+    };
+}) | KindFilter<Exclude<K, 'ipv4'>> : K extends 'ipv6' ? (HostnameInfo & {
+    metadata: {
+        kind: 'ipv6';
+    };
+}) | KindFilter<Exclude<K, 'ipv6'>> : K extends 'ip' ? KindFilter<Exclude<K, 'ip'> | 'ipv4' | 'ipv6'> : never;
+type FilterReturnTy<F extends Filter> = F extends {
+    visibility: infer V extends 'public' | 'private';
+} ? VisibilityFilter<V> & FilterReturnTy<Omit<F, 'visibility'>> : F extends {
+    kind: (infer K extends FilterKinds) | (infer K extends FilterKinds)[];
+} ? KindFilter<K> & FilterReturnTy<Omit<F, 'kind'>> : F extends {
+    predicate: (h: HostnameInfo) => h is infer H extends HostnameInfo;
+} ? H & FilterReturnTy<Omit<F, 'predicate'>> : F extends {
+    exclude: infer E extends Filter;
+} ? HostnameInfo extends FilterReturnTy<E> ? HostnameInfo : Exclude<HostnameInfo, FilterReturnTy<E>> : HostnameInfo;
+declare const nonLocalFilter: {
+    readonly exclude: {
+        readonly kind: ("localhost" | "link-local")[];
+    };
+};
+declare const publicFilter: {
+    readonly visibility: "public";
+};
+type Formats = 'hostname-info' | 'urlstring' | 'url';
+type FormatReturnTy<F extends Filter, Format extends Formats> = Format extends 'hostname-info' ? FilterReturnTy<F> | FormatReturnTy<F, Exclude<Format, 'hostname-info'>> : Format extends 'url' ? URL | FormatReturnTy<F, Exclude<Format, 'url'>> : Format extends 'urlstring' ? UrlString | FormatReturnTy<F, Exclude<Format, 'urlstring'>> : never;
+export type Filled<F extends Filter = {}> = {
     hostnames: HostnameInfo[];
-    filter: <Format extends Formats = "urlstring">(filter: Filter, format?: Format) => FormatReturnTy<Format>[];
-    publicHostnames: HostnameInfo[];
-    onionHostnames: HostnameInfo[];
-    localHostnames: HostnameInfo[];
-    ipHostnames: HostnameInfo[];
-    ipv4Hostnames: HostnameInfo[];
-    ipv6Hostnames: HostnameInfo[];
-    nonIpHostnames: HostnameInfo[];
-    urls: UrlString[];
-    publicUrls: UrlString[];
-    onionUrls: UrlString[];
-    localUrls: UrlString[];
-    ipUrls: UrlString[];
-    ipv4Urls: UrlString[];
-    ipv6Urls: UrlString[];
-    nonIpUrls: UrlString[];
+    toUrl: (h: HostnameInfo) => UrlString;
+    format: <Format extends Formats = 'urlstring'>(format?: Format) => FormatReturnTy<{}, Format>[];
+    filter: <NewFilter extends Filter>(filter: NewFilter) => Filled<NewFilter & Filter>;
+    nonLocal: Filled<typeof nonLocalFilter & Filter>;
+    public: Filled<typeof publicFilter & Filter>;
 };
 export type FilledAddressInfo = AddressInfo & Filled;
 export type ServiceInterfaceFilled = {
@@ -47,37 +80,54 @@ export type ServiceInterfaceFilled = {
     /** Indicates if we are a ui/p2p/api for the kind of interface that this is representing */
     type: ServiceInterfaceType;
 };
-export declare const addressHostToUrl: ({ scheme, sslScheme, username, suffix }: AddressInfo, host: HostnameInfo) => UrlString[];
+export declare const addressHostToUrl: ({ scheme, sslScheme, username, suffix }: AddressInfo, hostname: HostnameInfo) => UrlString;
 export declare const filledAddress: (host: Host, addressInfo: AddressInfo) => FilledAddressInfo;
-export declare class GetServiceInterface {
+export declare class GetServiceInterface<Mapped = ServiceInterfaceFilled | null> {
     readonly effects: Effects;
     readonly opts: {
         id: string;
         packageId?: string;
     };
+    readonly map: (interfaces: ServiceInterfaceFilled | null) => Mapped;
+    readonly eq: (a: Mapped, b: Mapped) => boolean;
     constructor(effects: Effects, opts: {
         id: string;
         packageId?: string;
-    });
+    }, map: (interfaces: ServiceInterfaceFilled | null) => Mapped, eq: (a: Mapped, b: Mapped) => boolean);
     /**
      * Returns the requested service interface. Reruns the context from which it has been called if the underlying value changes
      */
-    const(): Promise<ServiceInterfaceFilled | null>;
+    const(): Promise<Mapped>;
     /**
      * Returns the requested service interface. Does nothing if the value changes
      */
-    once(): Promise<ServiceInterfaceFilled | null>;
+    once(): Promise<Mapped>;
+    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<Mapped, never, 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: Mapped | null, error?: Error) => {
+        cancel: boolean;
+    } | Promise<{
+        cancel: boolean;
+    }>): void;
+    /**
+     * Watches the requested service interface. Returns when the predicate is true
+     */
+    waitFor(pred: (value: Mapped) => boolean): Promise<Mapped>;
 }
+export declare function getOwnServiceInterface(effects: Effects, id: ServiceInterfaceId): GetServiceInterface;
+export declare function getOwnServiceInterface<Mapped>(effects: Effects, id: ServiceInterfaceId, map: (interfaces: ServiceInterfaceFilled | null) => Mapped, eq?: (a: Mapped, b: Mapped) => boolean): GetServiceInterface<Mapped>;
 export declare function getServiceInterface(effects: Effects, opts: {
-    id: string;
-    packageId?: string;
+    id: ServiceInterfaceId;
+    packageId: PackageId;
 }): GetServiceInterface;
+export declare function getServiceInterface<Mapped>(effects: Effects, opts: {
+    id: ServiceInterfaceId;
+    packageId: PackageId;
+}, map: (interfaces: ServiceInterfaceFilled | null) => Mapped, eq?: (a: Mapped, b: Mapped) => boolean): GetServiceInterface<Mapped>;
 export {};