@start9labs/start-sdk 0.3.6-beta.2 → 0.3.6-beta.4

package/base/lib/types.d.ts

@@ -118,32 +118,6 @@ export declare const hostName: unique symbol;
 export type Hostname = string & {
     [hostName]: never;
 };
-export type HostnameInfoIp = {
-    kind: "ip";
-    networkInterfaceId: string;
-    public: boolean;
-    hostname: {
-        kind: "ipv4" | "ipv6" | "local";
-        value: string;
-        port: number | null;
-        sslPort: number | null;
-    } | {
-        kind: "domain";
-        domain: string;
-        subdomain: string | null;
-        port: number | null;
-        sslPort: number | null;
-    };
-};
-export type HostnameInfoOnion = {
-    kind: "onion";
-    hostname: {
-        value: string;
-        port: number | null;
-        sslPort: number | null;
-    };
-};
-export type HostnameInfo = HostnameInfoIp | HostnameInfoOnion;
 export type ServiceInterfaceId = string;
 export { ServiceInterface };
 export type ExposeServicePaths<Store = never> = {

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

@@ -27,8 +27,6 @@ export type ServiceInterfaceFilled = {
     name: string;
     /** Human readable description, used as tooltip usually */
     description: string;
-    /** Whether or not the interface has a primary URL */
-    hasPrimary: 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;
     /** Information about the host for this binding */
@@ -37,10 +35,6 @@ export type ServiceInterfaceFilled = {
     addressInfo: FilledAddressInfo | null;
     /** Indicates if we are a ui/p2p/api for the kind of interface that this is representing */
     type: ServiceInterfaceType;
-    /** The primary hostname for the service, as chosen by the user */
-    primaryHostname: Hostname | null;
-    /** The primary URL for the service, as chosen by the user */
-    primaryUrl: UrlString | null;
 };
 export declare const addressHostToUrl: ({ scheme, sslScheme, username, suffix }: AddressInfo, host: HostnameInfo) => UrlString[];
 export declare const filledAddress: (host: Host, addressInfo: AddressInfo) => FilledAddressInfo;

package/base/lib/util/getServiceInterface.js

@@ -31,7 +31,9 @@ const addressHostToUrl = ({ scheme, sslScheme, username, suffix }, host) => {
                 hostname = `${host.hostname.subdomain ? `${host.hostname.subdomain}.` : ""}${host.hostname.domain}`;
             }
             else if (host.hostname.kind === "ipv6") {
-                hostname = `[${host.hostname.value}]`;
+                hostname = host.hostname.value.startsWith("fe80::")
+                    ? `[${host.hostname.value}%${host.hostname.scopeId}]`
+                    : `[${host.hostname.value}]`;
             }
             else {
                 hostname = host.hostname.value;
@@ -114,23 +116,12 @@ const makeInterfaceFilled = async ({ effects, id, packageId, callback, }) => {
         hostId,
         callback,
     });
-    const primaryUrl = await effects.getPrimaryUrl({
-        hostId,
-        packageId,
-        callback,
-    });
     const interfaceFilled = {
         ...serviceInterfaceValue,
-        primaryUrl: primaryUrl,
         host,
         addressInfo: host
             ? (0, exports.filledAddress)(host, serviceInterfaceValue.addressInfo)
             : null,
-        get primaryHostname() {
-            if (primaryUrl == null)
-                return null;
-            return (0, exports.getHostname)(primaryUrl);
-        },
     };
     return interfaceFilled;
 };

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.js

@@ -17,23 +17,10 @@ const makeManyInterfaceFilled = async ({ effects, packageId, callback, }) => {
         if (!host) {
             throw new Error(`host ${hostId} not found!`);
         }
-        const primaryUrl = await effects
-            .getPrimaryUrl({
-            hostId,
-            packageId,
-            callback,
-        })
-            .catch(() => null);
         return {
             ...serviceInterfaceValue,
-            primaryUrl: primaryUrl,
             host,
             addressInfo: (0, getServiceInterface_1.filledAddress)(host, serviceInterfaceValue.addressInfo),
-            get primaryHostname() {
-                if (primaryUrl == null)
-                    return null;
-                return (0, getServiceInterface_1.getHostname)(primaryUrl);
-            },
         };
     }));
     return serviceInterfacesFilled;

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

@@ -1 +1 @@
-{"version":3,"file":"getServiceInterfaces.js","sourceRoot":"","sources":["../../../../base/lib/util/getServiceInterfaces.ts"],"names":[],"mappings":";;;AACA,+DAI8B;AAE9B,MAAM,uBAAuB,GAAG,KAAK,EAAE,EACrC,OAAO,EACP,SAAS,EACT,QAAQ,GAKT,EAAE,EAAE;IACH,MAAM,sBAAsB,GAAG,MAAM,OAAO,CAAC,qBAAqB,CAAC;QACjE,SAAS;QACT,QAAQ;KACT,CAAC,CAAA;IAEF,MAAM,uBAAuB,GAA6B,MAAM,OAAO,CAAC,GAAG,CACzE,MAAM,CAAC,MAAM,CAAC,sBAAsB,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,qBAAqB,EAAE,EAAE;QACxE,MAAM,MAAM,GAAG,qBAAqB,CAAC,WAAW,CAAC,MAAM,CAAA;QACvD,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,WAAW,CAAC;YACrC,SAAS;YACT,MAAM;YACN,QAAQ;SACT,CAAC,CAAA;QACF,IAAI,CAAC,IAAI,EAAE;YACT,MAAM,IAAI,KAAK,CAAC,QAAQ,MAAM,aAAa,CAAC,CAAA;SAC7C;QACD,MAAM,UAAU,GAAG,MAAM,OAAO;aAC7B,aAAa,CAAC;YACb,MAAM;YACN,SAAS;YACT,QAAQ;SACT,CAAC;aACD,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAA;QACpB,OAAO;YACL,GAAG,qBAAqB;YACxB,UAAU,EAAE,UAAU;YACtB,IAAI;YACJ,WAAW,EAAE,IAAA,mCAAa,EAAC,IAAI,EAAE,qBAAqB,CAAC,WAAW,CAAC;YACnE,IAAI,eAAe;gBACjB,IAAI,UAAU,IAAI,IAAI;oBAAE,OAAO,IAAI,CAAA;gBACnC,OAAO,IAAA,iCAAW,EAAC,UAAU,CAAC,CAAA;YAChC,CAAC;SACF,CAAA;IACH,CAAC,CAAC,CACH,CAAA;IACD,OAAO,uBAAuB,CAAA;AAChC,CAAC,CAAA;AAED,MAAa,oBAAoB;IAC/B,YACW,OAAgB,EAChB,IAA4B;QAD5B,YAAO,GAAP,OAAO,CAAS;QAChB,SAAI,GAAJ,IAAI,CAAwB;IACpC,CAAC;IAEJ;;OAEG;IACH,KAAK,CAAC,KAAK;QACT,MAAM,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC,IAAI,CAAA;QAC/B,MAAM,QAAQ,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,CAAA;QAChD,MAAM,eAAe,GACnB,MAAM,uBAAuB,CAAC;YAC5B,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,SAAS;YACT,QAAQ;SACT,CAAC,CAAA;QAEJ,OAAO,eAAe,CAAA;IACxB,CAAC;IACD;;OAEG;IACH,KAAK,CAAC,IAAI;QACR,MAAM,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC,IAAI,CAAA;QAC/B,MAAM,eAAe,GACnB,MAAM,uBAAuB,CAAC;YAC5B,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,SAAS;SACV,CAAC,CAAA;QAEJ,OAAO,eAAe,CAAA;IACxB,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,CAAC,KAAK;QACV,MAAM,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC,IAAI,CAAA;QAC/B,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,uBAAuB,CAAC;gBAClC,OAAO,EAAE,IAAI,CAAC,OAAO;gBACrB,SAAS;gBACT,QAAQ;aACT,CAAC,CAAA;YACF,MAAM,WAAW,CAAA;SAClB;IACH,CAAC;CACF;AArDD,oDAqDC;AACD,SAAgB,oBAAoB,CAClC,OAAgB,EAChB,IAA4B;IAE5B,OAAO,IAAI,oBAAoB,CAAC,OAAO,EAAE,IAAI,CAAC,CAAA;AAChD,CAAC;AALD,oDAKC"}
+{"version":3,"file":"getServiceInterfaces.js","sourceRoot":"","sources":["../../../../base/lib/util/getServiceInterfaces.ts"],"names":[],"mappings":";;;AACA,+DAI8B;AAE9B,MAAM,uBAAuB,GAAG,KAAK,EAAE,EACrC,OAAO,EACP,SAAS,EACT,QAAQ,GAKT,EAAE,EAAE;IACH,MAAM,sBAAsB,GAAG,MAAM,OAAO,CAAC,qBAAqB,CAAC;QACjE,SAAS;QACT,QAAQ;KACT,CAAC,CAAA;IAEF,MAAM,uBAAuB,GAA6B,MAAM,OAAO,CAAC,GAAG,CACzE,MAAM,CAAC,MAAM,CAAC,sBAAsB,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,qBAAqB,EAAE,EAAE;QACxE,MAAM,MAAM,GAAG,qBAAqB,CAAC,WAAW,CAAC,MAAM,CAAA;QACvD,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,WAAW,CAAC;YACrC,SAAS;YACT,MAAM;YACN,QAAQ;SACT,CAAC,CAAA;QACF,IAAI,CAAC,IAAI,EAAE;YACT,MAAM,IAAI,KAAK,CAAC,QAAQ,MAAM,aAAa,CAAC,CAAA;SAC7C;QACD,OAAO;YACL,GAAG,qBAAqB;YACxB,IAAI;YACJ,WAAW,EAAE,IAAA,mCAAa,EAAC,IAAI,EAAE,qBAAqB,CAAC,WAAW,CAAC;SACpE,CAAA;IACH,CAAC,CAAC,CACH,CAAA;IACD,OAAO,uBAAuB,CAAA;AAChC,CAAC,CAAA;AAED,MAAa,oBAAoB;IAC/B,YACW,OAAgB,EAChB,IAA4B;QAD5B,YAAO,GAAP,OAAO,CAAS;QAChB,SAAI,GAAJ,IAAI,CAAwB;IACpC,CAAC;IAEJ;;OAEG;IACH,KAAK,CAAC,KAAK;QACT,MAAM,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC,IAAI,CAAA;QAC/B,MAAM,QAAQ,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,CAAA;QAChD,MAAM,eAAe,GACnB,MAAM,uBAAuB,CAAC;YAC5B,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,SAAS;YACT,QAAQ;SACT,CAAC,CAAA;QAEJ,OAAO,eAAe,CAAA;IACxB,CAAC;IACD;;OAEG;IACH,KAAK,CAAC,IAAI;QACR,MAAM,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC,IAAI,CAAA;QAC/B,MAAM,eAAe,GACnB,MAAM,uBAAuB,CAAC;YAC5B,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,SAAS;SACV,CAAC,CAAA;QAEJ,OAAO,eAAe,CAAA;IACxB,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,CAAC,KAAK;QACV,MAAM,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC,IAAI,CAAA;QAC/B,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,uBAAuB,CAAC;gBAClC,OAAO,EAAE,IAAI,CAAC,OAAO;gBACrB,SAAS;gBACT,QAAQ;aACT,CAAC,CAAA;YACF,MAAM,WAAW,CAAA;SAClB;IACH,CAAC;CACF;AArDD,oDAqDC;AACD,SAAgB,oBAAoB,CAClC,OAAgB,EAChB,IAA4B;IAE5B,OAAO,IAAI,oBAAoB,CAAC,OAAO,EAAE,IAAI,CAAC,CAAA;AAChD,CAAC;AALD,oDAKC"}

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

@@ -8,5 +8,7 @@ export declare const url: Pattern;
 export declare const localUrl: Pattern;
 export declare const torUrl: Pattern;
 export declare const ascii: Pattern;
+export declare const domain: Pattern;
 export declare const email: Pattern;
+export declare const emailWithName: Pattern;
 export declare const base64: Pattern;

package/base/lib/util/patterns.js

@@ -23,50 +23,58 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.base64 = exports.email = exports.ascii = exports.torUrl = exports.localUrl = exports.url = exports.torHostname = exports.localHostname = exports.hostname = exports.ipv4 = exports.ipv6 = void 0;
+exports.base64 = exports.emailWithName = exports.email = exports.domain = exports.ascii = exports.torUrl = exports.localUrl = exports.url = exports.torHostname = exports.localHostname = exports.hostname = exports.ipv4 = exports.ipv6 = void 0;
 const regexes = __importStar(require("./regexes"));
 exports.ipv6 = {
-    regex: regexes.ipv6.toString(),
+    regex: regexes.ipv6.matches(),
     description: "Must be a valid IPv6 address",
 };
 exports.ipv4 = {
-    regex: regexes.ipv4.toString(),
+    regex: regexes.ipv4.matches(),
     description: "Must be a valid IPv4 address",
 };
 exports.hostname = {
-    regex: regexes.hostname.toString(),
+    regex: regexes.hostname.matches(),
     description: "Must be a valid hostname",
 };
 exports.localHostname = {
-    regex: regexes.localHostname.toString(),
+    regex: regexes.localHostname.matches(),
     description: 'Must be a valid ".local" hostname',
 };
 exports.torHostname = {
-    regex: regexes.torHostname.toString(),
+    regex: regexes.torHostname.matches(),
     description: 'Must be a valid Tor (".onion") hostname',
 };
 exports.url = {
-    regex: regexes.url.toString(),
+    regex: regexes.url.matches(),
     description: "Must be a valid URL",
 };
 exports.localUrl = {
-    regex: regexes.localUrl.toString(),
+    regex: regexes.localUrl.matches(),
     description: 'Must be a valid ".local" URL',
 };
 exports.torUrl = {
-    regex: regexes.torUrl.toString(),
+    regex: regexes.torUrl.matches(),
     description: 'Must be a valid Tor (".onion") URL',
 };
 exports.ascii = {
-    regex: regexes.ascii.toString(),
+    regex: regexes.ascii.matches(),
     description: "May only contain ASCII characters. See https://www.w3schools.com/charsets/ref_html_ascii.asp",
 };
+exports.domain = {
+    regex: regexes.domain.matches(),
+    description: "Must be a valid Fully Qualified Domain Name",
+};
 exports.email = {
-    regex: regexes.email.toString(),
+    regex: regexes.email.matches(),
     description: "Must be a valid email address",
 };
+exports.emailWithName = {
+    regex: regexes.emailWithName.matches(),
+    description: "Must be a valid email address, optionally with a name",
+};
 exports.base64 = {
-    regex: regexes.base64.toString(),
+    regex: regexes.base64.matches(),
     description: "May only contain base64 characters. See https://base64.guru/learn/base64-characters",
 };
 //# sourceMappingURL=patterns.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"patterns.js","sourceRoot":"","sources":["../../../../base/lib/util/patterns.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AACA,mDAAoC;AAEvB,QAAA,IAAI,GAAY;IAC3B,KAAK,EAAE,OAAO,CAAC,IAAI,CAAC,QAAQ,EAAE;IAC9B,WAAW,EAAE,8BAA8B;CAC5C,CAAA;AAEY,QAAA,IAAI,GAAY;IAC3B,KAAK,EAAE,OAAO,CAAC,IAAI,CAAC,QAAQ,EAAE;IAC9B,WAAW,EAAE,8BAA8B;CAC5C,CAAA;AAEY,QAAA,QAAQ,GAAY;IAC/B,KAAK,EAAE,OAAO,CAAC,QAAQ,CAAC,QAAQ,EAAE;IAClC,WAAW,EAAE,0BAA0B;CACxC,CAAA;AAEY,QAAA,aAAa,GAAY;IACpC,KAAK,EAAE,OAAO,CAAC,aAAa,CAAC,QAAQ,EAAE;IACvC,WAAW,EAAE,mCAAmC;CACjD,CAAA;AAEY,QAAA,WAAW,GAAY;IAClC,KAAK,EAAE,OAAO,CAAC,WAAW,CAAC,QAAQ,EAAE;IACrC,WAAW,EAAE,yCAAyC;CACvD,CAAA;AAEY,QAAA,GAAG,GAAY;IAC1B,KAAK,EAAE,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE;IAC7B,WAAW,EAAE,qBAAqB;CACnC,CAAA;AAEY,QAAA,QAAQ,GAAY;IAC/B,KAAK,EAAE,OAAO,CAAC,QAAQ,CAAC,QAAQ,EAAE;IAClC,WAAW,EAAE,8BAA8B;CAC5C,CAAA;AAEY,QAAA,MAAM,GAAY;IAC7B,KAAK,EAAE,OAAO,CAAC,MAAM,CAAC,QAAQ,EAAE;IAChC,WAAW,EAAE,oCAAoC;CAClD,CAAA;AAEY,QAAA,KAAK,GAAY;IAC5B,KAAK,EAAE,OAAO,CAAC,KAAK,CAAC,QAAQ,EAAE;IAC/B,WAAW,EACT,8FAA8F;CACjG,CAAA;AAEY,QAAA,KAAK,GAAY;IAC5B,KAAK,EAAE,OAAO,CAAC,KAAK,CAAC,QAAQ,EAAE;IAC/B,WAAW,EAAE,+BAA+B;CAC7C,CAAA;AAEY,QAAA,MAAM,GAAY;IAC7B,KAAK,EAAE,OAAO,CAAC,MAAM,CAAC,QAAQ,EAAE;IAChC,WAAW,EACT,qFAAqF;CACxF,CAAA"}
+{"version":3,"file":"patterns.js","sourceRoot":"","sources":["../../../../base/lib/util/patterns.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AACA,mDAAoC;AAEvB,QAAA,IAAI,GAAY;IAC3B,KAAK,EAAE,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE;IAC7B,WAAW,EAAE,8BAA8B;CAC5C,CAAA;AAEY,QAAA,IAAI,GAAY;IAC3B,KAAK,EAAE,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE;IAC7B,WAAW,EAAE,8BAA8B;CAC5C,CAAA;AAEY,QAAA,QAAQ,GAAY;IAC/B,KAAK,EAAE,OAAO,CAAC,QAAQ,CAAC,OAAO,EAAE;IACjC,WAAW,EAAE,0BAA0B;CACxC,CAAA;AAEY,QAAA,aAAa,GAAY;IACpC,KAAK,EAAE,OAAO,CAAC,aAAa,CAAC,OAAO,EAAE;IACtC,WAAW,EAAE,mCAAmC;CACjD,CAAA;AAEY,QAAA,WAAW,GAAY;IAClC,KAAK,EAAE,OAAO,CAAC,WAAW,CAAC,OAAO,EAAE;IACpC,WAAW,EAAE,yCAAyC;CACvD,CAAA;AAEY,QAAA,GAAG,GAAY;IAC1B,KAAK,EAAE,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE;IAC5B,WAAW,EAAE,qBAAqB;CACnC,CAAA;AAEY,QAAA,QAAQ,GAAY;IAC/B,KAAK,EAAE,OAAO,CAAC,QAAQ,CAAC,OAAO,EAAE;IACjC,WAAW,EAAE,8BAA8B;CAC5C,CAAA;AAEY,QAAA,MAAM,GAAY;IAC7B,KAAK,EAAE,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE;IAC/B,WAAW,EAAE,oCAAoC;CAClD,CAAA;AAEY,QAAA,KAAK,GAAY;IAC5B,KAAK,EAAE,OAAO,CAAC,KAAK,CAAC,OAAO,EAAE;IAC9B,WAAW,EACT,8FAA8F;CACjG,CAAA;AAEY,QAAA,MAAM,GAAY;IAC7B,KAAK,EAAE,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE;IAC/B,WAAW,EAAE,6CAA6C;CAC3D,CAAA;AAEY,QAAA,KAAK,GAAY;IAC5B,KAAK,EAAE,OAAO,CAAC,KAAK,CAAC,OAAO,EAAE;IAC9B,WAAW,EAAE,+BAA+B;CAC7C,CAAA;AAEY,QAAA,aAAa,GAAY;IACpC,KAAK,EAAE,OAAO,CAAC,aAAa,CAAC,OAAO,EAAE;IACtC,WAAW,EAAE,uDAAuD;CACrE,CAAA;AAEY,QAAA,MAAM,GAAY;IAC7B,KAAK,EAAE,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE;IAC/B,WAAW,EACT,qFAAqF;CACxF,CAAA"}

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

@@ -1,11 +1,20 @@
-export declare const ipv6: RegExp;
-export declare const ipv4: RegExp;
-export declare const hostname: RegExp;
-export declare const localHostname: RegExp;
-export declare const torHostname: RegExp;
-export declare const url: RegExp;
-export declare const localUrl: RegExp;
-export declare const torUrl: RegExp;
-export declare const ascii: RegExp;
-export declare const email: RegExp;
-export declare const base64: RegExp;
+export declare class ComposableRegex {
+    readonly regex: RegExp;
+    constructor(regex: RegExp | string);
+    asExpr(): string;
+    matches(): string;
+    contains(): string;
+}
+export declare const ipv6: ComposableRegex;
+export declare const ipv4: ComposableRegex;
+export declare const hostname: ComposableRegex;
+export declare const localHostname: ComposableRegex;
+export declare const torHostname: ComposableRegex;
+export declare const url: ComposableRegex;
+export declare const localUrl: ComposableRegex;
+export declare const torUrl: ComposableRegex;
+export declare const ascii: ComposableRegex;
+export declare const domain: ComposableRegex;
+export declare const email: ComposableRegex;
+export declare const emailWithName: ComposableRegex;
+export declare const base64: ComposableRegex;

package/base/lib/util/regexes.js

@@ -1,21 +1,43 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.base64 = exports.email = exports.ascii = exports.torUrl = exports.localUrl = exports.url = exports.torHostname = exports.localHostname = exports.hostname = exports.ipv4 = exports.ipv6 = void 0;
+exports.base64 = exports.emailWithName = exports.email = exports.domain = exports.ascii = exports.torUrl = exports.localUrl = exports.url = exports.torHostname = exports.localHostname = exports.hostname = exports.ipv4 = exports.ipv6 = exports.ComposableRegex = void 0;
+class ComposableRegex {
+    constructor(regex) {
+        if (regex instanceof RegExp) {
+            this.regex = regex;
+        }
+        else {
+            this.regex = new RegExp(regex);
+        }
+    }
+    asExpr() {
+        return `(${this.regex.source})`;
+    }
+    matches() {
+        return `^${this.regex.source}$`;
+    }
+    contains() {
+        return this.regex.source;
+    }
+}
+exports.ComposableRegex = ComposableRegex;
 // https://ihateregex.io/expr/ipv6/
-exports.ipv6 = /(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))/;
+exports.ipv6 = new ComposableRegex(/(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))/);
 // https://ihateregex.io/expr/ipv4/
-exports.ipv4 = /(\b25[0-5]|\b2[0-4][0-9]|\b[01]?[0-9][0-9]?)(\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)){3}/;
-exports.hostname = /^(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]*[a-zA-Z0-9])\.)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9\-]*[A-Za-z0-9])$/;
-exports.localHostname = /[-a-zA-Z0-9@:%._\+~#=]{1,256}\.local/;
-exports.torHostname = /[-a-zA-Z0-9@:%._\+~#=]{1,256}\.onion/;
+exports.ipv4 = new ComposableRegex(/(\b25[0-5]|\b2[0-4][0-9]|\b[01]?[0-9][0-9]?)(\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)){3}/);
+exports.hostname = new ComposableRegex(/(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]*[a-zA-Z0-9])\.)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9\-]*[A-Za-z0-9])/);
+exports.localHostname = new ComposableRegex(/[-a-zA-Z0-9@:%._\+~#=]{1,256}\.local/);
+exports.torHostname = new ComposableRegex(/[-a-zA-Z0-9@:%._\+~#=]{1,256}\.onion/);
 // https://ihateregex.io/expr/url/
-exports.url = /https?:\/\/(www\.)?[-a-zA-Z0-9@:%._\+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b([-a-zA-Z0-9()!@:%_\+.~#?&\/\/=]*)/;
-exports.localUrl = /https?:\/\/(www\.)?[-a-zA-Z0-9@:%._\+~#=]{1,256}\.local\b([-a-zA-Z0-9()!@:%_\+.~#?&\/\/=]*)/;
-exports.torUrl = /https?:\/\/(www\.)?[-a-zA-Z0-9@:%._\+~#=]{1,256}\.onion\b([-a-zA-Z0-9()!@:%_\+.~#?&\/\/=]*)/;
+exports.url = new ComposableRegex(/https?:\/\/(www\.)?[-a-zA-Z0-9@:%._\+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b([-a-zA-Z0-9()!@:%_\+.~#?&\/\/=]*)/);
+exports.localUrl = new ComposableRegex(/https?:\/\/(www\.)?[-a-zA-Z0-9@:%._\+~#=]{1,256}\.local\b([-a-zA-Z0-9()!@:%_\+.~#?&\/\/=]*)/);
+exports.torUrl = new ComposableRegex(/https?:\/\/(www\.)?[-a-zA-Z0-9@:%._\+~#=]{1,256}\.onion\b([-a-zA-Z0-9()!@:%_\+.~#?&\/\/=]*)/);
 // https://ihateregex.io/expr/ascii/
-exports.ascii = /^[ -~]*$/;
-//https://ihateregex.io/expr/email/
-exports.email = /[^@ \t\r\n]+@[^@ \t\r\n]+\.[^@ \t\r\n]+/;
+exports.ascii = new ComposableRegex(/[ -~]*/);
+exports.domain = new ComposableRegex(/[A-Za-z0-9.-]+\.[A-Za-z]{2,}/);
+// https://www.regular-expressions.info/email.html
+exports.email = new ComposableRegex(`[A-Za-z0-9._%+-]+@${exports.domain.asExpr()}`);
+exports.emailWithName = new ComposableRegex(`${exports.email.asExpr()}|([^<]*<${exports.email.asExpr()}>)`);
 //https://rgxdb.com/r/1NUN74O6
-exports.base64 = /^(?:[a-zA-Z0-9+\/]{4})*(?:|(?:[a-zA-Z0-9+\/]{3}=)|(?:[a-zA-Z0-9+\/]{2}==)|(?:[a-zA-Z0-9+\/]{1}===))$/;
+exports.base64 = new ComposableRegex(/(?:[a-zA-Z0-9+\/]{4})*(?:|(?:[a-zA-Z0-9+\/]{3}=)|(?:[a-zA-Z0-9+\/]{2}==)|(?:[a-zA-Z0-9+\/]{1}===))/);
 //# sourceMappingURL=regexes.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"regexes.js","sourceRoot":"","sources":["../../../../base/lib/util/regexes.ts"],"names":[],"mappings":";;;AAAA,mCAAmC;AACtB,QAAA,IAAI,GACf,qpBAAqpB,CAAA;AAEvpB,mCAAmC;AACtB,QAAA,IAAI,GACf,2FAA2F,CAAA;AAEhF,QAAA,QAAQ,GACnB,6GAA6G,CAAA;AAElG,QAAA,aAAa,GAAG,sCAAsC,CAAA;AAEtD,QAAA,WAAW,GAAG,sCAAsC,CAAA;AAEjE,kCAAkC;AACrB,QAAA,GAAG,GACd,0GAA0G,CAAA;AAE/F,QAAA,QAAQ,GACnB,6FAA6F,CAAA;AAElF,QAAA,MAAM,GACjB,6FAA6F,CAAA;AAE/F,oCAAoC;AACvB,QAAA,KAAK,GAAG,UAAU,CAAA;AAE/B,mCAAmC;AACtB,QAAA,KAAK,GAAG,yCAAyC,CAAA;AAE9D,8BAA8B;AACjB,QAAA,MAAM,GACjB,sGAAsG,CAAA"}
+{"version":3,"file":"regexes.js","sourceRoot":"","sources":["../../../../base/lib/util/regexes.ts"],"names":[],"mappings":";;;AAAA,MAAa,eAAe;IAE1B,YAAY,KAAsB;QAChC,IAAI,KAAK,YAAY,MAAM,EAAE;YAC3B,IAAI,CAAC,KAAK,GAAG,KAAK,CAAA;SACnB;aAAM;YACL,IAAI,CAAC,KAAK,GAAG,IAAI,MAAM,CAAC,KAAK,CAAC,CAAA;SAC/B;IACH,CAAC;IACD,MAAM;QACJ,OAAO,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,CAAA;IACjC,CAAC;IACD,OAAO;QACL,OAAO,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,CAAA;IACjC,CAAC;IACD,QAAQ;QACN,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,CAAA;IAC1B,CAAC;CACF;AAlBD,0CAkBC;AAED,mCAAmC;AACtB,QAAA,IAAI,GAAG,IAAI,eAAe,CACrC,qpBAAqpB,CACtpB,CAAA;AAED,mCAAmC;AACtB,QAAA,IAAI,GAAG,IAAI,eAAe,CACrC,2FAA2F,CAC5F,CAAA;AAEY,QAAA,QAAQ,GAAG,IAAI,eAAe,CACzC,2GAA2G,CAC5G,CAAA;AAEY,QAAA,aAAa,GAAG,IAAI,eAAe,CAC9C,sCAAsC,CACvC,CAAA;AAEY,QAAA,WAAW,GAAG,IAAI,eAAe,CAC5C,sCAAsC,CACvC,CAAA;AAED,kCAAkC;AACrB,QAAA,GAAG,GAAG,IAAI,eAAe,CACpC,0GAA0G,CAC3G,CAAA;AAEY,QAAA,QAAQ,GAAG,IAAI,eAAe,CACzC,6FAA6F,CAC9F,CAAA;AAEY,QAAA,MAAM,GAAG,IAAI,eAAe,CACvC,6FAA6F,CAC9F,CAAA;AAED,oCAAoC;AACvB,QAAA,KAAK,GAAG,IAAI,eAAe,CAAC,QAAQ,CAAC,CAAA;AAErC,QAAA,MAAM,GAAG,IAAI,eAAe,CAAC,8BAA8B,CAAC,CAAA;AAEzE,kDAAkD;AACrC,QAAA,KAAK,GAAG,IAAI,eAAe,CAAC,qBAAqB,cAAM,CAAC,MAAM,EAAE,EAAE,CAAC,CAAA;AAEnE,QAAA,aAAa,GAAG,IAAI,eAAe,CAC9C,GAAG,aAAK,CAAC,MAAM,EAAE,WAAW,aAAK,CAAC,MAAM,EAAE,IAAI,CAC/C,CAAA;AAED,8BAA8B;AACjB,QAAA,MAAM,GAAG,IAAI,eAAe,CACvC,oGAAoG,CACrG,CAAA"}

package/package/lib/StartSdk.d.ts

@@ -67,12 +67,12 @@ export declare class StartSdk<Manifest extends T.SDKManifest, Store> {
             getOwn: <E_5 extends Effects, StoreValue_1 = unknown>(effects: E_5, path: PathBuilder<Store, StoreValue_1>) => import("./store/getStore").GetStore<Store, StoreValue_1>;
             setOwn: <E_6 extends Effects, Path extends import("../../base/lib/util/PathBuilder").PathBuilderStored<Store, unknown>>(effects: E_6, path: Path, value: Path extends PathBuilder<Store, infer Value_1> ? Value_1 : never) => Promise<null>;
         };
-        host: {
-            multi: (effects: Effects, id: string) => MultiHost;
+        MultiHost: {
+            of: (effects: Effects, id: string) => MultiHost;
         };
         nullIfEmpty: typeof nullIfEmpty;
         runCommand: <A extends string>(effects: Effects, image: {
-            id: keyof Manifest["images"] & T.ImageId;
+            imageId: keyof Manifest["images"] & T.ImageId;
             sharedRun?: boolean;
         }, command: T.CommandType, options: CommandOptions & {
             mounts?: {
@@ -229,7 +229,6 @@ export declare class StartSdk<Manifest extends T.SDKManifest, Store> {
             id: 'ui',
             description: 'The primary web app for this service.',
             type: 'ui',
-            hasPrimary: false,
             masked: false,
             schemeOverride: null,
             username: null,
@@ -245,8 +244,6 @@ export declare class StartSdk<Manifest extends T.SDKManifest, Store> {
             id: string;
             /** The human readable description. */
             description: string;
-            /** No effect until StartOS v0.4.0. If true, forces the user to select one URL (i.e. .onion, .local, or IP address) as the primary URL. This is needed by some services to function properly. */
-            hasPrimary: boolean;
             /** Affects how the interface appears to the user. One of: 'ui', 'api', 'p2p'. If 'ui', the user will see a "Launch UI" button */
             type: ServiceInterfaceType;
             /** (optional) prepends the provided username to all URLs. */
@@ -418,7 +415,7 @@ export declare class StartSdk<Manifest extends T.SDKManifest, Store> {
             inputSpecSpec,
             async ({ effects, input }) => {
               // ** UI multi-host **
-              const uiMulti = sdk.host.multi(effects, 'ui-multi')
+              const uiMulti = sdk.MultiHost.of(effects, 'ui-multi')
               const uiMultiOrigin = await uiMulti.bindPort(80, {
                 protocol: 'http',
               })
@@ -428,7 +425,6 @@ export declare class StartSdk<Manifest extends T.SDKManifest, Store> {
                 id: 'primary-ui',
                 description: 'The primary web app for this service.',
                 type: 'ui',
-                hasPrimary: false,
                 masked: false,
                 schemeOverride: null,
                 username: null,
@@ -441,7 +437,6 @@ export declare class StartSdk<Manifest extends T.SDKManifest, Store> {
                 id: 'admin-ui',
                 description: 'The admin web app for this service.',
                 type: 'ui',
-                hasPrimary: false,
                 masked: false,
                 schemeOverride: null,
                 username: null,
@@ -452,7 +447,7 @@ export declare class StartSdk<Manifest extends T.SDKManifest, Store> {
               const uiReceipt = await uiMultiOrigin.export([primaryUi, adminUi])
          
               // ** API multi-host **
-              const apiMulti = sdk.host.multi(effects, 'api-multi')
+              const apiMulti = sdk.MultiHost.of(effects, 'api-multi')
               const apiMultiOrigin = await apiMulti.bindPort(5959, {
                 protocol: 'http',
               })
@@ -462,7 +457,6 @@ export declare class StartSdk<Manifest extends T.SDKManifest, Store> {
                 id: 'api',
                 description: 'The advanced API for this service.',
                 type: 'api',
-                hasPrimary: false,
                 masked: false,
                 schemeOverride: null,
                 username: null,
@@ -537,6 +531,12 @@ export declare class StartSdk<Manifest extends T.SDKManifest, Store> {
         Daemons: {
             of(effects: Effects, started: (onTerm: () => PromiseLike<void>) => PromiseLike<null>, healthReceipts: HealthReceipt[]): Daemons<Manifest, never>;
         };
+        SubContainer: {
+            of(effects: Effects, image: {
+                imageId: T.ImageId & keyof Manifest["images"];
+                sharedRun?: boolean;
+            }, name: string): Promise<SubContainer>;
+        };
         List: {
             /**
              * @description Create a list of text inputs.
@@ -1077,7 +1077,6 @@ export declare class StartSdk<Manifest extends T.SDKManifest, Store> {
                  * @example default: 'radio1'
                  */
                 default: keyof Variants_1 & string;
-                required: boolean;
                 /**
                  * @description A mapping of unique radio options to their human readable display format.
                  * @example
@@ -1224,7 +1223,7 @@ export declare class StartSdk<Manifest extends T.SDKManifest, Store> {
     };
 }
 export declare function runCommand<Manifest extends T.SDKManifest>(effects: Effects, image: {
-    id: keyof Manifest["images"] & T.ImageId;
+    imageId: keyof Manifest["images"] & T.ImageId;
     sharedRun?: boolean;
 }, command: string | [string, ...string[]], options: CommandOptions & {
     mounts?: {

package/package/lib/StartSdk.js

@@ -132,12 +132,8 @@ class StartSdk {
                     path: (0, PathBuilder_1.extractJsonPath)(path),
                 }),
             },
-            host: {
-                // static: (effects: Effects, id: string) =>
-                //   new StaticHost({ id, effects }),
-                // single: (effects: Effects, id: string) =>
-                //   new SingleHost({ id, effects }),
-                multi: (effects, id) => new Host_1.MultiHost({ id, effects }),
+            MultiHost: {
+                of: (effects, id) => new Host_1.MultiHost({ id, effects }),
             },
             nullIfEmpty: util_2.nullIfEmpty,
             runCommand: async (effects, image, command, options, name) => {
@@ -266,7 +262,6 @@ class StartSdk {
                 id: 'ui',
                 description: 'The primary web app for this service.',
                 type: 'ui',
-                hasPrimary: false,
                 masked: false,
                 schemeOverride: null,
                 username: null,
@@ -406,7 +401,7 @@ class StartSdk {
                 inputSpecSpec,
                 async ({ effects, input }) => {
                   // ** UI multi-host **
-                  const uiMulti = sdk.host.multi(effects, 'ui-multi')
+                  const uiMulti = sdk.MultiHost.of(effects, 'ui-multi')
                   const uiMultiOrigin = await uiMulti.bindPort(80, {
                     protocol: 'http',
                   })
@@ -416,7 +411,6 @@ class StartSdk {
                     id: 'primary-ui',
                     description: 'The primary web app for this service.',
                     type: 'ui',
-                    hasPrimary: false,
                     masked: false,
                     schemeOverride: null,
                     username: null,
@@ -429,7 +423,6 @@ class StartSdk {
                     id: 'admin-ui',
                     description: 'The admin web app for this service.',
                     type: 'ui',
-                    hasPrimary: false,
                     masked: false,
                     schemeOverride: null,
                     username: null,
@@ -440,7 +433,7 @@ class StartSdk {
                   const uiReceipt = await uiMultiOrigin.export([primaryUi, adminUi])
              
                   // ** API multi-host **
-                  const apiMulti = sdk.host.multi(effects, 'api-multi')
+                  const apiMulti = sdk.MultiHost.of(effects, 'api-multi')
                   const apiMultiOrigin = await apiMulti.bindPort(5959, {
                     protocol: 'http',
                   })
@@ -450,7 +443,6 @@ class StartSdk {
                     id: 'api',
                     description: 'The advanced API for this service.',
                     type: 'api',
-                    hasPrimary: false,
                     masked: false,
                     schemeOverride: null,
                     username: null,
@@ -523,6 +515,11 @@ class StartSdk {
                     return Daemons_1.Daemons.of({ effects, started, healthReceipts });
                 },
             },
+            SubContainer: {
+                of(effects, image, name) {
+                    return SubContainer_1.SubContainer.of(effects, image, name);
+                },
+            },
             List: {
                 /**
                  * @description Create a list of text inputs.

package/package/lib/StartSdk.js.map

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

package/package/lib/health/checkFns/checkPortListening.d.ts

@@ -1,6 +1,6 @@
 import { Effects } from "../../../../base/lib/types";
 import { HealthCheckResult } from "./HealthCheckResult";
-export declare function containsAddress(x: string, port: number): boolean;
+export declare function containsAddress(x: string, port: number, address?: bigint): boolean;
 /**
  * This is used to check if a port is listening on the system.
  * Used during the health check fn or the check main fn.

package/package/lib/health/checkFns/checkPortListening.js

@@ -28,16 +28,15 @@ const util_1 = require("../../util");
 const node_util_1 = require("node:util");
 const CP = __importStar(require("node:child_process"));
 const cpExec = (0, node_util_1.promisify)(CP.exec);
-function containsAddress(x, port) {
+function containsAddress(x, port, address) {
     const readPorts = x
         .split("\n")
         .filter(Boolean)
         .splice(1)
-        .map((x) => { var _a, _b; return (_b = (_a = x.split(" ").filter(Boolean)[1]) === null || _a === void 0 ? void 0 : _a.split(":")) === null || _b === void 0 ? void 0 : _b[1]; })
-        .filter(Boolean)
-        .map((x) => Number.parseInt(x, 16))
-        .filter(Number.isFinite);
-    return readPorts.indexOf(port) >= 0;
+        .map((x) => { var _a; return (_a = x.split(" ").filter(Boolean)[1]) === null || _a === void 0 ? void 0 : _a.split(":"); })
+        .filter((x) => (x === null || x === void 0 ? void 0 : x.length) > 1)
+        .map(([addr, p]) => [BigInt(`0x${addr}`), Number.parseInt(p, 16)]);
+    return !!readPorts.find(([addr, p]) => (address === undefined || address === addr) && port === p);
 }
 exports.containsAddress = containsAddress;
 /**
@@ -48,7 +47,9 @@ async function checkPortListening(effects, port, options) {
     return Promise.race([
         Promise.resolve().then(async () => {
             const hasAddress = containsAddress(await cpExec(`cat /proc/net/tcp`, {}).then(util_1.stringFromStdErrOut), port) ||
-                containsAddress(await cpExec("cat /proc/net/udp", {}).then(util_1.stringFromStdErrOut), port);
+                containsAddress(await cpExec(`cat /proc/net/tcp6`, {}).then(util_1.stringFromStdErrOut), port, BigInt(0)) ||
+                containsAddress(await cpExec("cat /proc/net/udp", {}).then(util_1.stringFromStdErrOut), port) ||
+                containsAddress(await cpExec("cat /proc/net/udp6", {}).then(util_1.stringFromStdErrOut), port, BigInt(0));
             if (hasAddress) {
                 return { result: "success", message: options.successMessage };
             }