@start9labs/start-sdk 0.3.6-alpha1 → 0.3.6-alpha3

package/mjs/lib/types.d.ts

@@ -1,9 +1,8 @@
 export * as configTypes from "./config/configTypes";
-import { DependencyRequirement, SetHealth, HealthCheckResult, SetMainStatus } from "./osBindings";
-import { MainEffects, ServiceInterfaceType, Signals } from "./StartSdk";
+import { DependencyRequirement, SetHealth, HealthCheckResult, SetMainStatus, ServiceInterface, Host, ExportServiceInterfaceParams, GetPrimaryUrlParams, LanInfo, BindParams, Manifest } from "./osBindings";
+import { MainEffects, Signals } from "./StartSdk";
 import { InputSpec } from "./config/configTypes";
 import { DependenciesReceipt } from "./config/setupConfig";
-import { BindOptions } from "./interfaces/Host";
 import { Daemons } from "./mainFn/Daemons";
 import { StorePath } from "./store/PathBuilder";
 import { ExposedStorePaths } from "./store/setupExposeStore";
@@ -86,10 +85,26 @@ export declare namespace ExpectedExports {
      * that this service could use.
      */
     type dependencyConfig = Record<PackageId, DependencyConfig | null>;
-    type Properties = (options: {
+    type properties = (options: {
         effects: Effects;
     }) => Promise<PropertiesReturn>;
+    type manifest = Manifest;
 }
+export type ABI = {
+    setConfig: ExpectedExports.setConfig;
+    getConfig: ExpectedExports.getConfig;
+    createBackup: ExpectedExports.createBackup;
+    restoreBackup: ExpectedExports.restoreBackup;
+    actions: ExpectedExports.actions;
+    actionsMetadata: ExpectedExports.actionsMetadata;
+    main: ExpectedExports.main;
+    afterShutdown: ExpectedExports.afterShutdown;
+    init: ExpectedExports.init;
+    uninit: ExpectedExports.uninit;
+    dependencyConfig: ExpectedExports.dependencyConfig;
+    properties: ExpectedExports.properties;
+    manifest: ExpectedExports.manifest;
+};
 export type TimeMs = number;
 export type VersionString = string;
 /**
@@ -155,13 +170,6 @@ export declare const hostName: unique symbol;
 export type Hostname = string & {
     [hostName]: never;
 };
-/** ${scheme}://${username}@${host}:${externalPort}${suffix} */
-export type AddressInfo = {
-    username: string | null;
-    hostId: string;
-    bindOptions: BindOptions;
-    suffix: string;
-};
 export type HostnameInfoIp = {
     kind: "ip";
     networkInterfaceId: string;
@@ -188,38 +196,8 @@ export type HostnameInfoOnion = {
     };
 };
 export type HostnameInfo = HostnameInfoIp | HostnameInfoOnion;
-export type SingleHost = {
-    id: string;
-    kind: "single" | "static";
-    hostname: HostnameInfo | null;
-};
-export type MultiHost = {
-    id: string;
-    kind: "multi";
-    hostnames: HostnameInfo[];
-};
-export type HostInfo = SingleHost | MultiHost;
 export type ServiceInterfaceId = string;
-export type ServiceInterface = {
-    id: ServiceInterfaceId;
-    /** The title of this field to be displayed */
-    name: string;
-    /** Human readable description, used as tooltip usually */
-    description: string;
-    /** Whether or not one address must be the primary address */
-    hasPrimary: boolean;
-    /** Disabled interfaces do not serve, but they retain their metadata and addresses */
-    disabled: boolean;
-    /** Whether or not to mask the URIs for this interface. Useful if the URIs contain sensitive information, such as a password, macaroon, or API key */
-    masked: boolean;
-    /** URI Information */
-    addressInfo: AddressInfo;
-    /** The network interface could be several types, something like ui, p2p, or network */
-    type: ServiceInterfaceType;
-};
-export type ServiceInterfaceWithHostInfo = ServiceInterface & {
-    hostInfo: HostInfo;
-};
+export { ServiceInterface };
 export type ExposeServicePaths<Store = never> = {
     /** The path to the value in the Store. [JsonPath](https://jsonpath.com/)  */
     paths: ExposedStorePaths;
@@ -285,18 +263,13 @@ export type Effects = {
     /** Removes all network bindings */
     clearBindings(): Promise<void>;
     /** Creates a host connected to the specified port with the provided options */
-    bind(options: {
-        kind: "static" | "single" | "multi";
-        id: string;
-        internalPort: number;
-    } & BindOptions): Promise<void>;
+    bind(options: BindParams): Promise<void>;
     /** Retrieves the current hostname(s) associated with a host id */
     getHostInfo(options: {
-        kind: "multi" | null;
-        serviceInterfaceId: string;
+        hostId: string;
         packageId: string | null;
         callback: () => void;
-    }): Promise<MultiHost>;
+    }): Promise<Host>;
     store: {
         /** Get a value in a json like data, can be observed and subscribed */
         get<Store = never, ExtractStore = unknown>(options: {
@@ -325,13 +298,13 @@ export type Effects = {
     getServicePortForward(options: {
         internalPort: number;
         packageId: string | null;
-    }): Promise<number>;
+    }): Promise<LanInfo>;
     /** Removes all network interfaces */
     clearServiceInterfaces(): Promise<void>;
     /** When we want to create a link in the front end interfaces, and example is
      * exposing a url to view a web service
      */
-    exportServiceInterface(options: ServiceInterface): Promise<string>;
+    exportServiceInterface(options: ExportServiceInterfaceParams): Promise<string>;
     exposeForDependents(options: {
         paths: string[];
     }): Promise<void>;
@@ -350,11 +323,7 @@ export type Effects = {
      * The user sets the primary url for a interface
      * @param options
      */
-    getPrimaryUrl(options: {
-        packageId: PackageId | null;
-        serviceInterfaceId: ServiceInterfaceId;
-        callback: () => void;
-    }): Promise<UrlString | null>;
+    getPrimaryUrl(options: GetPrimaryUrlParams): Promise<UrlString | null>;
     /**
      * There are times that we want to see the addresses that where exported
      * @param options.addressId If we want to filter the address id
@@ -364,7 +333,7 @@ export type Effects = {
     listServiceInterfaces(options: {
         packageId: PackageId | null;
         callback: () => void;
-    }): Promise<ServiceInterface[]>;
+    }): Promise<Record<ServiceInterfaceId, ServiceInterface>>;
     /**
      *Remove an address that was exported. Used problably during main or during setConfig.
      * @param options
@@ -432,26 +401,6 @@ export type Effects = {
     running(options: {
         packageId: PackageId;
     }): Promise<boolean>;
-    /** Instead of creating proxies with nginx, we have a utility to create and maintain a proxy in the lifetime of this running. */
-    reverseProxy(options: {
-        bind: {
-            /** Optional, default is 0.0.0.0 */
-            ip: string | null;
-            port: number;
-            ssl: boolean;
-        };
-        dst: {
-            /** Optional: default is 127.0.0.1 */
-            ip: string | null;
-            port: number;
-            ssl: boolean;
-        };
-        http: {
-            headers: Record<string, string> | null;
-        } | null;
-    }): Promise<{
-        stop(): Promise<void>;
-    }>;
     restart(): void;
     shutdown(): void;
     mount(options: {

package/mjs/lib/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../lib/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,WAAW,MAAM,sBAAsB,CAAA;AAiBnD,cAAc,cAAc,CAAA;AAS5B,MAAM,KAAW,eAAe,CAmF/B;AAnFD,WAAiB,eAAe;IAC9B,OAAO,EAAE,CAAC,CAAA;AAkFZ,CAAC,EAnFgB,eAAe,KAAf,eAAe,QAmF/B"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../lib/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,WAAW,MAAM,sBAAsB,CAAA;AAwBnD,cAAc,cAAc,CAAA;AAS5B,MAAM,KAAW,eAAe,CAqF/B;AArFD,WAAiB,eAAe;IAC9B,OAAO,EAAE,CAAC,CAAA;AAoFZ,CAAC,EArFgB,eAAe,KAAf,eAAe,QAqF/B"}

package/mjs/lib/util/Hostname.d.ts

@@ -0,0 +1,2 @@
+import { HostnameInfo } from "../types";
+export declare function hostnameInfoToAddress(hostInfo: HostnameInfo): string;

package/mjs/lib/util/Hostname.js

@@ -0,0 +1,22 @@
+export function hostnameInfoToAddress(hostInfo) {
+    if (hostInfo.kind === "onion") {
+        return `${hostInfo.hostname.value}`;
+    }
+    if (hostInfo.kind !== "ip") {
+        throw Error("Expecting that the kind is ip.");
+    }
+    const hostname = hostInfo.hostname;
+    if (hostname.kind === "domain") {
+        return `${hostname.subdomain ? `${hostname.subdomain}.` : ""}${hostname.domain}`;
+    }
+    const port = hostname.sslPort || hostname.port;
+    const portString = port ? `:${port}` : "";
+    if ("ipv4" === hostname.kind || "ipv6" === hostname.kind) {
+        return `${hostname.value}${portString}`;
+    }
+    if ("local" === hostname.kind) {
+        return `${hostname.value}${portString}`;
+    }
+    throw Error("Expecting to have a valid hostname kind." + JSON.stringify(hostname));
+}
+//# sourceMappingURL=Hostname.js.map

package/mjs/lib/util/Hostname.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Hostname.js","sourceRoot":"","sources":["../../../../lib/util/Hostname.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,qBAAqB,CAAC,QAAsB;IAC1D,IAAI,QAAQ,CAAC,IAAI,KAAK,OAAO,EAAE;QAC7B,OAAO,GAAG,QAAQ,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAA;KACpC;IACD,IAAI,QAAQ,CAAC,IAAI,KAAK,IAAI,EAAE;QAC1B,MAAM,KAAK,CAAC,gCAAgC,CAAC,CAAA;KAC9C;IACD,MAAM,QAAQ,GAAG,QAAQ,CAAC,QAAQ,CAAA;IAClC,IAAI,QAAQ,CAAC,IAAI,KAAK,QAAQ,EAAE;QAC9B,OAAO,GAAG,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,QAAQ,CAAC,SAAS,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAA;KACjF;IACD,MAAM,IAAI,GAAG,QAAQ,CAAC,OAAO,IAAI,QAAQ,CAAC,IAAI,CAAA;IAC9C,MAAM,UAAU,GAAG,IAAI,CAAC,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAA;IACzC,IAAI,MAAM,KAAK,QAAQ,CAAC,IAAI,IAAI,MAAM,KAAK,QAAQ,CAAC,IAAI,EAAE;QACxD,OAAO,GAAG,QAAQ,CAAC,KAAK,GAAG,UAAU,EAAE,CAAA;KACxC;IACD,IAAI,OAAO,KAAK,QAAQ,CAAC,IAAI,EAAE;QAC7B,OAAO,GAAG,QAAQ,CAAC,KAAK,GAAG,UAAU,EAAE,CAAA;KACxC;IACD,MAAM,KAAK,CACT,0CAA0C,GAAG,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CACtE,CAAA;AACH,CAAC"}

package/mjs/lib/util/Overlay.d.ts

@@ -7,12 +7,12 @@ import { Buffer } from "node:buffer";
 export declare const execFile: typeof cp.execFile.__promisify__;
 export declare class Overlay {
     readonly effects: T.Effects;
-    readonly imageId: string;
+    readonly imageId: T.ImageId;
     readonly rootfs: string;
-    readonly guid: string;
+    readonly guid: T.Guid;
     private constructor();
     static of(effects: T.Effects, image: {
-        id: string;
+        id: T.ImageId;
         sharedRun?: boolean;
     }): Promise<Overlay>;
     mount(options: MountOptions, path: string): Promise<Overlay>;

package/mjs/lib/util/Overlay.js

@@ -16,8 +16,10 @@ export class Overlay {
         this.guid = guid;
     }
     static async of(effects, image) {
-        const { id: imageId, sharedRun } = image;
-        const [rootfs, guid] = await effects.createOverlayedImage({ imageId });
+        const { id, sharedRun } = image;
+        const [rootfs, guid] = await effects.createOverlayedImage({
+            imageId: id,
+        });
         const shared = ["dev", "sys", "proc"];
         if (!!sharedRun) {
             shared.push("run");
@@ -30,7 +32,7 @@ export class Overlay {
                 `${rootfs}/${dirPart}`,
             ]);
         }
-        return new Overlay(effects, imageId, rootfs, guid);
+        return new Overlay(effects, id, rootfs, guid);
     }
     async mount(options, path) {
         path = path.startsWith("/")

package/mjs/lib/util/Overlay.js.map

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

package/mjs/lib/util/fileHelper.d.ts

@@ -52,6 +52,7 @@ export declare class FileHelper<A> {
     protected constructor(path: string, writeData: (dataIn: A) => string, readData: (stringValue: string) => A);
     write(data: A, effects: T.Effects): Promise<void>;
     read(effects: T.Effects): Promise<A | null>;
+    merge(data: A, effects: T.Effects): Promise<void>;
     /**
      * Create a File Helper for an arbitrary file type.
      *

package/mjs/lib/util/fileHelper.js

@@ -1,6 +1,7 @@
 import * as YAML from "yaml";
 import * as TOML from "@iarna/toml";
-import * as fs from "fs";
+import _ from "lodash";
+import * as fs from "node:fs/promises";
 const previousPath = /(.+?)\/([^/]*)$/;
 /**
  * Used in the get config and the set config exported functions.
@@ -57,16 +58,22 @@ export class FileHelper {
         this.readData = readData;
     }
     async write(data, effects) {
-        if (previousPath.exec(this.path)) {
-            await new Promise((resolve, reject) => fs.mkdir(this.path, (err) => (!err ? resolve(null) : reject(err))));
+        const parent = previousPath.exec(this.path);
+        if (parent) {
+            await fs.mkdir(parent[1], { recursive: true });
         }
-        await new Promise((resolve, reject) => fs.writeFile(this.path, this.writeData(data), (err) => !err ? resolve(null) : reject(err)));
+        await fs.writeFile(this.path, this.writeData(data));
     }
     async read(effects) {
-        if (!fs.existsSync(this.path)) {
+        if (!(await fs.access(this.path).then(() => true, () => false))) {
             return null;
         }
-        return this.readData(await new Promise((resolve, reject) => fs.readFile(this.path, (err, data) => !err ? resolve(data.toString("utf-8")) : reject(err))));
+        return this.readData(await fs.readFile(this.path).then((data) => data.toString("utf-8")));
+    }
+    async merge(data, effects) {
+        const fileData = (await this.read(effects).catch(() => ({}))) || {};
+        const mergeData = _.merge({}, fileData, data);
+        return await this.write(mergeData, effects);
     }
     /**
      * Create a File Helper for an arbitrary file type.
@@ -101,7 +108,7 @@ export class FileHelper {
      */
     static yaml(path, shape) {
         return new FileHelper(path, (inData) => {
-            return JSON.stringify(inData, null, 2);
+            return YAML.stringify(inData, null, 2);
         }, (inString) => {
             return shape.unsafeCast(YAML.parse(inString));
         });

package/mjs/lib/util/fileHelper.js.map

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

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

@@ -1,16 +1,16 @@
 import { ServiceInterfaceType } from "../StartSdk";
-import { AddressInfo, Effects, HostInfo, Hostname } from "../types";
+import { AddressInfo, Effects, Host, Hostname, HostnameInfo } from "../types";
 export type UrlString = string;
 export type HostId = string;
 export declare const getHostname: (url: string) => Hostname | null;
 export type Filled = {
-    hostnames: Hostname[];
-    onionHostnames: Hostname[];
-    localHostnames: Hostname[];
-    ipHostnames: Hostname[];
-    ipv4Hostnames: Hostname[];
-    ipv6Hostnames: Hostname[];
-    nonIpHostnames: Hostname[];
+    hostnames: HostnameInfo[];
+    onionHostnames: HostnameInfo[];
+    localHostnames: HostnameInfo[];
+    ipHostnames: HostnameInfo[];
+    ipv4Hostnames: HostnameInfo[];
+    ipv6Hostnames: HostnameInfo[];
+    nonIpHostnames: HostnameInfo[];
     urls: UrlString[];
     onionUrls: UrlString[];
     localUrls: UrlString[];
@@ -33,7 +33,7 @@ export type ServiceInterfaceFilled = {
     /** Whether or not to mask the URIs for this interface. Useful if the URIs contain sensitive information, such as a password, macaroon, or API key */
     masked: boolean;
     /** Information about the host for this binding */
-    hostInfo: HostInfo;
+    host: Host;
     /** URI information */
     addressInfo: FilledAddressInfo;
     /** Indicates if we are a ui/p2p/api for the kind of interface that this is representing */
@@ -43,7 +43,8 @@ export type ServiceInterfaceFilled = {
     /** The primary URL for the service, as chosen by the user */
     primaryUrl: UrlString | null;
 };
-export declare const filledAddress: (hostInfo: HostInfo, addressInfo: AddressInfo) => FilledAddressInfo;
+export declare const addressHostToUrl: ({ scheme, sslScheme, username, suffix }: AddressInfo, host: HostnameInfo) => UrlString[];
+export declare const filledAddress: (host: Host, addressInfo: AddressInfo) => FilledAddressInfo;
 export declare class GetServiceInterface {
     readonly effects: Effects;
     readonly opts: {

package/mjs/lib/util/getServiceInterface.js

@@ -1,3 +1,4 @@
+import { knownProtocols } from "../interfaces/Host";
 const getHostnameRegex = /^(\w+:\/\/)?([^\/\:]+)(:\d{1,3})?(\/)?/;
 export const getHostname = (url) => {
     const founds = url.match(getHostnameRegex)?.[2];
@@ -10,98 +11,81 @@ export const getHostname = (url) => {
 const either = (...args) => (a) => args.some((x) => x(a));
 const negate = (fn) => (a) => !fn(a);
 const unique = (values) => Array.from(new Set(values));
-function stringifyHostname(info) {
-    let base;
-    if ("kind" in info.hostname && info.hostname.kind === "domain") {
-        base = info.hostname.subdomain
-            ? `${info.hostname.subdomain}.${info.hostname.domain}`
-            : info.hostname.domain;
-    }
-    else {
-        base = info.hostname.value;
-    }
-    if (info.hostname.port && info.hostname.sslPort) {
-        return `${base}:${info.hostname.port}`;
-    }
-    else if (info.hostname.sslPort) {
-        return `${base}:${info.hostname.sslPort}`;
+export const addressHostToUrl = ({ scheme, sslScheme, username, suffix }, host) => {
+    const res = [];
+    const fmt = (scheme, host, port) => {
+        const includePort = scheme &&
+            scheme in knownProtocols &&
+            port === knownProtocols[scheme].defaultPort;
+        let hostname;
+        if (host.kind === "onion") {
+            hostname = host.hostname.value;
+        }
+        else if (host.kind === "ip") {
+            if (host.hostname.kind === "domain") {
+                hostname = `${host.hostname.subdomain ? `${host.hostname.subdomain}.` : ""}${host.hostname.domain}`;
+            }
+            else {
+                hostname = host.hostname.value;
+            }
+        }
+        return `${scheme ? `${scheme}://` : ""}${username ? `${username}@` : ""}${hostname}${includePort ? `:${port}` : ""}${suffix}`;
+    };
+    if (host.hostname.sslPort !== null) {
+        res.push(fmt(sslScheme, host, host.hostname.sslPort));
     }
-    else if (info.hostname.port) {
-        return `${base}:${info.hostname.port}`;
+    if (host.hostname.port !== null) {
+        res.push(fmt(scheme, host, host.hostname.port));
     }
-    return base;
-}
-const addressHostToUrl = ({ bindOptions, username, suffix }, host) => {
-    const scheme = host.endsWith(".onion")
-        ? bindOptions.scheme
-        : bindOptions.addSsl
-            ? bindOptions.addSsl.scheme
-            : bindOptions.scheme; // TODO: encode whether hostname transport is "secure"?
-    return `${scheme ? `${scheme}//` : ""}${username ? `${username}@` : ""}${host}${suffix}`;
+    return res;
 };
-export const filledAddress = (hostInfo, addressInfo) => {
+export const filledAddress = (host, addressInfo) => {
     const toUrl = addressHostToUrl.bind(null, addressInfo);
-    const hostnameInfo = hostInfo.kind == "multi"
-        ? hostInfo.hostnames
-        : hostInfo.hostname
-            ? [hostInfo.hostname]
-            : [];
+    const hostnames = host.hostnameInfo[addressInfo.internalPort];
     return {
         ...addressInfo,
-        hostnames: hostnameInfo.flatMap((h) => stringifyHostname(h)),
+        hostnames,
         get onionHostnames() {
-            return hostnameInfo
-                .filter((h) => h.kind === "onion")
-                .map((h) => stringifyHostname(h));
+            return hostnames.filter((h) => h.kind === "onion");
         },
         get localHostnames() {
-            return hostnameInfo
-                .filter((h) => h.kind === "ip" && h.hostname.kind === "local")
-                .map((h) => stringifyHostname(h));
+            return hostnames.filter((h) => h.kind === "ip" && h.hostname.kind === "local");
         },
         get ipHostnames() {
-            return hostnameInfo
-                .filter((h) => h.kind === "ip" &&
-                (h.hostname.kind === "ipv4" || h.hostname.kind === "ipv6"))
-                .map((h) => stringifyHostname(h));
+            return hostnames.filter((h) => h.kind === "ip" &&
+                (h.hostname.kind === "ipv4" || h.hostname.kind === "ipv6"));
         },
         get ipv4Hostnames() {
-            return hostnameInfo
-                .filter((h) => h.kind === "ip" && h.hostname.kind === "ipv4")
-                .map((h) => stringifyHostname(h));
+            return hostnames.filter((h) => h.kind === "ip" && h.hostname.kind === "ipv4");
         },
         get ipv6Hostnames() {
-            return hostnameInfo
-                .filter((h) => h.kind === "ip" && h.hostname.kind === "ipv6")
-                .map((h) => stringifyHostname(h));
+            return hostnames.filter((h) => h.kind === "ip" && h.hostname.kind === "ipv6");
         },
         get nonIpHostnames() {
-            return hostnameInfo
-                .filter((h) => h.kind === "ip" &&
+            return hostnames.filter((h) => h.kind === "ip" &&
                 h.hostname.kind !== "ipv4" &&
-                h.hostname.kind !== "ipv6")
-                .map((h) => stringifyHostname(h));
+                h.hostname.kind !== "ipv6");
         },
         get urls() {
-            return this.hostnames.map(toUrl);
+            return this.hostnames.flatMap(toUrl);
         },
         get onionUrls() {
-            return this.onionHostnames.map(toUrl);
+            return this.onionHostnames.flatMap(toUrl);
         },
         get localUrls() {
-            return this.localHostnames.map(toUrl);
+            return this.localHostnames.flatMap(toUrl);
         },
         get ipUrls() {
-            return this.ipHostnames.map(toUrl);
+            return this.ipHostnames.flatMap(toUrl);
         },
         get ipv4Urls() {
-            return this.ipv4Hostnames.map(toUrl);
+            return this.ipv4Hostnames.flatMap(toUrl);
         },
         get ipv6Urls() {
-            return this.ipv6Hostnames.map(toUrl);
+            return this.ipv6Hostnames.flatMap(toUrl);
         },
         get nonIpUrls() {
-            return this.nonIpHostnames.map(toUrl);
+            return this.nonIpHostnames.flatMap(toUrl);
         },
     };
 };
@@ -111,22 +95,24 @@ const makeInterfaceFilled = async ({ effects, id, packageId, callback, }) => {
         packageId,
         callback,
     });
-    const hostInfo = await effects.getHostInfo({
+    const hostId = serviceInterfaceValue.addressInfo.hostId;
+    const host = await effects.getHostInfo({
         packageId,
-        kind: null,
-        serviceInterfaceId: serviceInterfaceValue.id,
+        hostId,
         callback,
     });
-    const primaryUrl = await effects.getPrimaryUrl({
+    const primaryUrl = await effects
+        .getPrimaryUrl({
         serviceInterfaceId: id,
         packageId,
         callback,
-    });
+    })
+        .catch((e) => null);
     const interfaceFilled = {
         ...serviceInterfaceValue,
         primaryUrl: primaryUrl,
-        hostInfo,
-        addressInfo: filledAddress(hostInfo, serviceInterfaceValue.addressInfo),
+        host,
+        addressInfo: filledAddress(host, serviceInterfaceValue.addressInfo),
         get primaryHostname() {
             if (primaryUrl == null)
                 return null;

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

@@ -1 +1 @@
-{"version":3,"file":"getServiceInterface.js","sourceRoot":"","sources":["../../../../lib/util/getServiceInterface.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"getServiceInterface.js","sourceRoot":"","sources":["../../../../lib/util/getServiceInterface.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAA;AAgBnD,MAAM,gBAAgB,GAAG,wCAAwC,CAAA;AACjE,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,GAAW,EAAmB,EAAE;IAC1D,MAAM,MAAM,GAAG,GAAG,CAAC,KAAK,CAAC,gBAAgB,CAAC,EAAE,CAAC,CAAC,CAAC,CAAA;IAC/C,IAAI,CAAC,MAAM;QAAE,OAAO,IAAI,CAAA;IACxB,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;IAC/B,MAAM,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAoB,CAAA;IACvD,OAAO,IAAI,CAAA;AACb,CAAC,CAAA;AA2CD,MAAM,MAAM,GACV,CAAI,GAAG,IAA2B,EAAE,EAAE,CACtC,CAAC,CAAI,EAAE,EAAE,CACP,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;AAC1B,MAAM,MAAM,GACV,CAAI,EAAqB,EAAE,EAAE,CAC7B,CAAC,CAAI,EAAE,EAAE,CACP,CAAC,EAAE,CAAC,CAAC,CAAC,CAAA;AACV,MAAM,MAAM,GAAG,CAAI,MAAW,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,MAAM,CAAC,CAAC,CAAA;AAC9D,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAC9B,EAAE,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,EAAe,EACpD,IAAkB,EACL,EAAE;IACf,MAAM,GAAG,GAAG,EAAE,CAAA;IACd,MAAM,GAAG,GAAG,CAAC,MAAqB,EAAE,IAAkB,EAAE,IAAY,EAAE,EAAE;QACtE,MAAM,WAAW,GACf,MAAM;YACN,MAAM,IAAI,cAAc;YACxB,IAAI,KAAK,cAAc,CAAC,MAAqC,CAAC,CAAC,WAAW,CAAA;QAC5E,IAAI,QAAQ,CAAA;QACZ,IAAI,IAAI,CAAC,IAAI,KAAK,OAAO,EAAE;YACzB,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAA;SAC/B;aAAM,IAAI,IAAI,CAAC,IAAI,KAAK,IAAI,EAAE;YAC7B,IAAI,IAAI,CAAC,QAAQ,CAAC,IAAI,KAAK,QAAQ,EAAE;gBACnC,QAAQ,GAAG,GAAG,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,SAAS,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAA;aACpG;iBAAM;gBACL,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAA;aAC/B;SACF;QACD,OAAO,GAAG,MAAM,CAAC,CAAC,CAAC,GAAG,MAAM,KAAK,CAAC,CAAC,CAAC,EAAE,GACpC,QAAQ,CAAC,CAAC,CAAC,GAAG,QAAQ,GAAG,CAAC,CAAC,CAAC,EAC9B,GAAG,QAAQ,GAAG,WAAW,CAAC,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,GAAG,MAAM,EAAE,CAAA;IACxD,CAAC,CAAA;IACD,IAAI,IAAI,CAAC,QAAQ,CAAC,OAAO,KAAK,IAAI,EAAE;QAClC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAA;KACtD;IACD,IAAI,IAAI,CAAC,QAAQ,CAAC,IAAI,KAAK,IAAI,EAAE;QAC/B,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAA;KAChD;IAED,OAAO,GAAG,CAAA;AACZ,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,aAAa,GAAG,CAC3B,IAAU,EACV,WAAwB,EACL,EAAE;IACrB,MAAM,KAAK,GAAG,gBAAgB,CAAC,IAAI,CAAC,IAAI,EAAE,WAAW,CAAC,CAAA;IACtD,MAAM,SAAS,GAAG,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,YAAY,CAAC,CAAA;IAE7D,OAAO;QACL,GAAG,WAAW;QACd,SAAS;QACT,IAAI,cAAc;YAChB,OAAO,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,OAAO,CAAC,CAAA;QACpD,CAAC;QACD,IAAI,cAAc;YAChB,OAAO,SAAS,CAAC,MAAM,CACrB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,IAAI,CAAC,CAAC,QAAQ,CAAC,IAAI,KAAK,OAAO,CACtD,CAAA;QACH,CAAC;QACD,IAAI,WAAW;YACb,OAAO,SAAS,CAAC,MAAM,CACrB,CAAC,CAAC,EAAE,EAAE,CACJ,CAAC,CAAC,IAAI,KAAK,IAAI;gBACf,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,KAAK,MAAM,IAAI,CAAC,CAAC,QAAQ,CAAC,IAAI,KAAK,MAAM,CAAC,CAC7D,CAAA;QACH,CAAC;QACD,IAAI,aAAa;YACf,OAAO,SAAS,CAAC,MAAM,CACrB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,IAAI,CAAC,CAAC,QAAQ,CAAC,IAAI,KAAK,MAAM,CACrD,CAAA;QACH,CAAC;QACD,IAAI,aAAa;YACf,OAAO,SAAS,CAAC,MAAM,CACrB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,IAAI,CAAC,CAAC,QAAQ,CAAC,IAAI,KAAK,MAAM,CACrD,CAAA;QACH,CAAC;QACD,IAAI,cAAc;YAChB,OAAO,SAAS,CAAC,MAAM,CACrB,CAAC,CAAC,EAAE,EAAE,CACJ,CAAC,CAAC,IAAI,KAAK,IAAI;gBACf,CAAC,CAAC,QAAQ,CAAC,IAAI,KAAK,MAAM;gBAC1B,CAAC,CAAC,QAAQ,CAAC,IAAI,KAAK,MAAM,CAC7B,CAAA;QACH,CAAC;QACD,IAAI,IAAI;YACN,OAAO,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;QACtC,CAAC;QACD,IAAI,SAAS;YACX,OAAO,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;QAC3C,CAAC;QACD,IAAI,SAAS;YACX,OAAO,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;QAC3C,CAAC;QACD,IAAI,MAAM;YACR,OAAO,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;QACxC,CAAC;QACD,IAAI,QAAQ;YACV,OAAO,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;QAC1C,CAAC;QACD,IAAI,QAAQ;YACV,OAAO,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;QAC1C,CAAC;QACD,IAAI,SAAS;YACX,OAAO,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;QAC3C,CAAC;KACF,CAAA;AACH,CAAC,CAAA;AAED,MAAM,mBAAmB,GAAG,KAAK,EAAE,EACjC,OAAO,EACP,EAAE,EACF,SAAS,EACT,QAAQ,GAMT,EAAE,EAAE;IACH,MAAM,qBAAqB,GAAG,MAAM,OAAO,CAAC,mBAAmB,CAAC;QAC9D,kBAAkB,EAAE,EAAE;QACtB,SAAS;QACT,QAAQ;KACT,CAAC,CAAA;IACF,MAAM,MAAM,GAAG,qBAAqB,CAAC,WAAW,CAAC,MAAM,CAAA;IACvD,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,WAAW,CAAC;QACrC,SAAS;QACT,MAAM;QACN,QAAQ;KACT,CAAC,CAAA;IACF,MAAM,UAAU,GAAG,MAAM,OAAO;SAC7B,aAAa,CAAC;QACb,kBAAkB,EAAE,EAAE;QACtB,SAAS;QACT,QAAQ;KACT,CAAC;SACD,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,CAAA;IAErB,MAAM,eAAe,GAA2B;QAC9C,GAAG,qBAAqB;QACxB,UAAU,EAAE,UAAU;QACtB,IAAI;QACJ,WAAW,EAAE,aAAa,CAAC,IAAI,EAAE,qBAAqB,CAAC,WAAW,CAAC;QACnE,IAAI,eAAe;YACjB,IAAI,UAAU,IAAI,IAAI;gBAAE,OAAO,IAAI,CAAA;YACnC,OAAO,WAAW,CAAC,UAAU,CAAC,CAAA;QAChC,CAAC;KACF,CAAA;IACD,OAAO,eAAe,CAAA;AACxB,CAAC,CAAA;AAED,MAAM,OAAO,mBAAmB;IAEnB;IACA;IAFX,YACW,OAAgB,EAChB,IAA8C;QAD9C,YAAO,GAAP,OAAO,CAAS;QAChB,SAAI,GAAJ,IAAI,CAA0C;IACtD,CAAC;IAEJ;;OAEG;IACH,KAAK,CAAC,KAAK;QACT,MAAM,EAAE,EAAE,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC,IAAI,CAAA;QACnC,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAA;QACrC,MAAM,eAAe,GAA2B,MAAM,mBAAmB,CAAC;YACxE,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,EAAE;YACF,SAAS;YACT,QAAQ;SACT,CAAC,CAAA;QAEF,OAAO,eAAe,CAAA;IACxB,CAAC;IACD;;OAEG;IACH,KAAK,CAAC,IAAI;QACR,MAAM,EAAE,EAAE,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC,IAAI,CAAA;QACnC,MAAM,QAAQ,GAAG,GAAG,EAAE,GAAE,CAAC,CAAA;QACzB,MAAM,eAAe,GAA2B,MAAM,mBAAmB,CAAC;YACxE,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,EAAE;YACF,SAAS;YACT,QAAQ;SACT,CAAC,CAAA;QAEF,OAAO,eAAe,CAAA;IACxB,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,CAAC,KAAK;QACV,MAAM,EAAE,EAAE,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC,IAAI,CAAA;QACnC,OAAO,IAAI,EAAE;YACX,IAAI,QAAQ,GAAe,GAAG,EAAE,GAAE,CAAC,CAAA;YACnC,MAAM,WAAW,GAAG,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,EAAE;gBAChD,QAAQ,GAAG,OAAO,CAAA;YACpB,CAAC,CAAC,CAAA;YACF,MAAM,MAAM,mBAAmB,CAAC;gBAC9B,OAAO,EAAE,IAAI,CAAC,OAAO;gBACrB,EAAE;gBACF,SAAS;gBACT,QAAQ;aACT,CAAC,CAAA;YACF,MAAM,WAAW,CAAA;SAClB;IACH,CAAC;CACF;AACD,MAAM,UAAU,mBAAmB,CACjC,OAAgB,EAChB,IAA8C;IAE9C,OAAO,IAAI,mBAAmB,CAAC,OAAO,EAAE,IAAI,CAAC,CAAA;AAC/C,CAAC"}