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

package/base/lib/actions/input/inputSpecConstants.js

@@ -26,9 +26,9 @@ exports.customSmtp = inputSpec_1.InputSpec.of({
         name: "From Address",
         required: true,
         default: null,
-        placeholder: "<name>test@example.com",
+        placeholder: "Example Name <test@example.com>",
         inputmode: "email",
-        patterns: [util_1.Patterns.email],
+        patterns: [util_1.Patterns.emailWithName],
     }),
     login: value_1.Value.text({
         name: "Login",

package/base/lib/actions/input/inputSpecConstants.js.map

@@ -1 +1 @@
-{"version":3,"file":"inputSpecConstants.js","sourceRoot":"","sources":["../../../../../base/lib/actions/input/inputSpecConstants.ts"],"names":[],"mappings":";;;AACA,qCAAoD;AACpD,mDAA4D;AAC5D,2CAAuC;AACvC,iDAA6C;AAE7C;;GAEG;AACU,QAAA,UAAU,GAAG,qBAAS,CAAC,EAAE,CAAgC;IACpE,MAAM,EAAE,aAAK,CAAC,IAAI,CAAC;QACjB,IAAI,EAAE,aAAa;QACnB,QAAQ,EAAE,IAAI;QACd,OAAO,EAAE,IAAI;KACd,CAAC;IACF,IAAI,EAAE,aAAK,CAAC,MAAM,CAAC;QACjB,IAAI,EAAE,MAAM;QACZ,QAAQ,EAAE,IAAI;QACd,OAAO,EAAE,GAAG;QACZ,GAAG,EAAE,CAAC;QACN,GAAG,EAAE,KAAK;QACV,OAAO,EAAE,IAAI;KACd,CAAC;IACF,IAAI,EAAE,aAAK,CAAC,IAAI,CAAC;QACf,IAAI,EAAE,cAAc;QACpB,QAAQ,EAAE,IAAI;QACd,OAAO,EAAE,IAAI;QACb,WAAW,EAAE,wBAAwB;QACrC,SAAS,EAAE,OAAO;QAClB,QAAQ,EAAE,CAAC,eAAQ,CAAC,KAAK,CAAC;KAC3B,CAAC;IACF,KAAK,EAAE,aAAK,CAAC,IAAI,CAAC;QAChB,IAAI,EAAE,OAAO;QACb,QAAQ,EAAE,IAAI;QACd,OAAO,EAAE,IAAI;KACd,CAAC;IACF,QAAQ,EAAE,aAAK,CAAC,IAAI,CAAC;QACnB,IAAI,EAAE,UAAU;QAChB,QAAQ,EAAE,KAAK;QACf,OAAO,EAAE,IAAI;QACb,MAAM,EAAE,IAAI;KACb,CAAC;CACH,CAAC,CAAA;AAEF;;GAEG;AACU,QAAA,aAAa,GAAG,aAAK,CAAC,aAAa,CAC9C,KAAK,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE;IACpB,MAAM,IAAI,GAAG,MAAM,IAAI,oBAAa,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,CAAA;IACpD,OAAO,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAA;AAC/B,CAAC,EACD;IACE,IAAI,EAAE,MAAM;IACZ,WAAW,EAAE,sDAAsD;IACnE,OAAO,EAAE,UAAU;CACpB,EACD,mBAAQ,CAAC,EAAE,CAAC;IACV,QAAQ,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,qBAAS,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE;IACtD,MAAM,EAAE;QACN,IAAI,EAAE,oBAAoB;QAC1B,IAAI,EAAE,qBAAS,CAAC,EAAE,CAAC;YACjB,UAAU,EAAE,aAAK,CAAC,IAAI,CAAC;gBACrB,IAAI,EAAE,qBAAqB;gBAC3B,WAAW,EACT,gGAAgG;gBAClG,QAAQ,EAAE,KAAK;gBACf,OAAO,EAAE,IAAI;gBACb,WAAW,EAAE,wBAAwB;gBACrC,SAAS,EAAE,OAAO;gBAClB,QAAQ,EAAE,CAAC,eAAQ,CAAC,KAAK,CAAC;aAC3B,CAAC;SACH,CAAC;KACH;IACD,MAAM,EAAE;QACN,IAAI,EAAE,oBAAoB;QAC1B,IAAI,EAAE,kBAAU;KACjB;CACF,CAAC,CACH,CAAA"}
+{"version":3,"file":"inputSpecConstants.js","sourceRoot":"","sources":["../../../../../base/lib/actions/input/inputSpecConstants.ts"],"names":[],"mappings":";;;AACA,qCAAoD;AACpD,mDAA4D;AAC5D,2CAAuC;AACvC,iDAA6C;AAE7C;;GAEG;AACU,QAAA,UAAU,GAAG,qBAAS,CAAC,EAAE,CAAgC;IACpE,MAAM,EAAE,aAAK,CAAC,IAAI,CAAC;QACjB,IAAI,EAAE,aAAa;QACnB,QAAQ,EAAE,IAAI;QACd,OAAO,EAAE,IAAI;KACd,CAAC;IACF,IAAI,EAAE,aAAK,CAAC,MAAM,CAAC;QACjB,IAAI,EAAE,MAAM;QACZ,QAAQ,EAAE,IAAI;QACd,OAAO,EAAE,GAAG;QACZ,GAAG,EAAE,CAAC;QACN,GAAG,EAAE,KAAK;QACV,OAAO,EAAE,IAAI;KACd,CAAC;IACF,IAAI,EAAE,aAAK,CAAC,IAAI,CAAC;QACf,IAAI,EAAE,cAAc;QACpB,QAAQ,EAAE,IAAI;QACd,OAAO,EAAE,IAAI;QACb,WAAW,EAAE,iCAAiC;QAC9C,SAAS,EAAE,OAAO;QAClB,QAAQ,EAAE,CAAC,eAAQ,CAAC,aAAa,CAAC;KACnC,CAAC;IACF,KAAK,EAAE,aAAK,CAAC,IAAI,CAAC;QAChB,IAAI,EAAE,OAAO;QACb,QAAQ,EAAE,IAAI;QACd,OAAO,EAAE,IAAI;KACd,CAAC;IACF,QAAQ,EAAE,aAAK,CAAC,IAAI,CAAC;QACnB,IAAI,EAAE,UAAU;QAChB,QAAQ,EAAE,KAAK;QACf,OAAO,EAAE,IAAI;QACb,MAAM,EAAE,IAAI;KACb,CAAC;CACH,CAAC,CAAA;AAEF;;GAEG;AACU,QAAA,aAAa,GAAG,aAAK,CAAC,aAAa,CAC9C,KAAK,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE;IACpB,MAAM,IAAI,GAAG,MAAM,IAAI,oBAAa,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,CAAA;IACpD,OAAO,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAA;AAC/B,CAAC,EACD;IACE,IAAI,EAAE,MAAM;IACZ,WAAW,EAAE,sDAAsD;IACnE,OAAO,EAAE,UAAU;CACpB,EACD,mBAAQ,CAAC,EAAE,CAAC;IACV,QAAQ,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,qBAAS,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE;IACtD,MAAM,EAAE;QACN,IAAI,EAAE,oBAAoB;QAC1B,IAAI,EAAE,qBAAS,CAAC,EAAE,CAAC;YACjB,UAAU,EAAE,aAAK,CAAC,IAAI,CAAC;gBACrB,IAAI,EAAE,qBAAqB;gBAC3B,WAAW,EACT,gGAAgG;gBAClG,QAAQ,EAAE,KAAK;gBACf,OAAO,EAAE,IAAI;gBACb,WAAW,EAAE,wBAAwB;gBACrC,SAAS,EAAE,OAAO;gBAClB,QAAQ,EAAE,CAAC,eAAQ,CAAC,KAAK,CAAC;aAC3B,CAAC;SACH,CAAC;KACH;IACD,MAAM,EAAE;QACN,IAAI,EAAE,oBAAoB;QAC1B,IAAI,EAAE,kBAAU;KACjB;CACF,CAAC,CACH,CAAA"}

package/base/lib/interfaces/Host.d.ts

@@ -1,6 +1,6 @@
 import { Effects } from "../Effects";
 import { Origin } from "./Origin";
-import { AddSslOptions, BindParams } from "../osBindings";
+import { AddSslOptions } from "../osBindings";
 import { Security } from "../osBindings";
 import { BindOptions } from "../osBindings";
 import { AlpnInfo } from "../osBindings";
@@ -78,17 +78,16 @@ type BindOptionsByKnownProtocol = {
     preferredExternalPort?: number;
     addSsl?: AddSslOptions;
 };
-export type BindOptionsByProtocol = BindOptionsByKnownProtocol | BindOptions;
-export type HostKind = BindParams["kind"];
-export declare class Host {
+export type BindOptionsByProtocol = BindOptionsByKnownProtocol | (BindOptions & {
+    protocol: null;
+});
+export declare class MultiHost {
     readonly options: {
         effects: Effects;
-        kind: HostKind;
         id: string;
     };
     constructor(options: {
         effects: Effects;
-        kind: HostKind;
         id: string;
     });
     /**
@@ -107,14 +106,8 @@ export declare class Host {
       })
      * ```
      */
-    bindPort(internalPort: number, options: BindOptionsByProtocol): Promise<Origin<this>>;
+    bindPort(internalPort: number, options: BindOptionsByProtocol): Promise<Origin>;
     private bindPortForUnknown;
     private bindPortForKnown;
     private getSslProto;
 }
-export declare class MultiHost extends Host {
-    constructor(options: {
-        effects: Effects;
-        id: string;
-    });
-}

package/base/lib/interfaces/Host.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MultiHost = exports.Host = exports.knownProtocols = void 0;
+exports.MultiHost = exports.knownProtocols = void 0;
 const ts_matches_1 = require("ts-matches");
 const Origin_1 = require("./Origin");
 exports.knownProtocols = {
@@ -48,7 +48,7 @@ exports.knownProtocols = {
 const hasStringProtocol = (0, ts_matches_1.object)({
     protocol: ts_matches_1.string,
 }).test;
-class Host {
+class MultiHost {
     constructor(options) {
         this.options = options;
     }
@@ -78,7 +78,6 @@ class Host {
     }
     async bindPortForUnknown(internalPort, options) {
         const binderOptions = {
-            kind: this.options.kind,
             id: this.options.id,
             internalPort,
             ...options,
@@ -102,7 +101,6 @@ class Host {
             : null;
         const secure = !protoInfo.secure ? null : { ssl: false };
         await this.options.effects.bind({
-            kind: this.options.kind,
             id: this.options.id,
             internalPort,
             preferredExternalPort,
@@ -119,24 +117,8 @@ class Host {
         return null;
     }
 }
-exports.Host = Host;
+exports.MultiHost = MultiHost;
 function inObject(key, obj) {
     return key in obj;
 }
-// export class StaticHost extends Host {
-//   constructor(options: { effects: Effects; id: string }) {
-//     super({ ...options, kind: "static" })
-//   }
-// }
-// export class SingleHost extends Host {
-//   constructor(options: { effects: Effects; id: string }) {
-//     super({ ...options, kind: "single" })
-//   }
-// }
-class MultiHost extends Host {
-    constructor(options) {
-        super({ ...options, kind: "multi" });
-    }
-}
-exports.MultiHost = MultiHost;
 //# sourceMappingURL=Host.js.map

package/base/lib/interfaces/Host.js.map

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

package/base/lib/interfaces/Origin.d.ts

@@ -1,13 +1,13 @@
 import { AddressInfo } from "../types";
 import { AddressReceipt } from "./AddressReceipt";
-import { Host, Scheme } from "./Host";
+import { MultiHost, Scheme } from "./Host";
 import { ServiceInterfaceBuilder } from "./ServiceInterfaceBuilder";
-export declare class Origin<T extends Host> {
-    readonly host: T;
+export declare class Origin {
+    readonly host: MultiHost;
     readonly internalPort: number;
     readonly scheme: string | null;
     readonly sslScheme: string | null;
-    constructor(host: T, internalPort: number, scheme: string | null, sslScheme: string | null);
+    constructor(host: MultiHost, internalPort: number, scheme: string | null, sslScheme: string | null);
     build({ username, path, search, schemeOverride }: BuildOptions): AddressInfo;
     /**
      * @description A function to register a group of origins (<PROTOCOL> :// <HOSTNAME> : <PORT>) with StartOS

package/base/lib/interfaces/Origin.js.map

@@ -1 +1 @@
-{"version":3,"file":"Origin.js","sourceRoot":"","sources":["../../../../base/lib/interfaces/Origin.ts"],"names":[],"mappings":";;;AAKA,MAAa,MAAM;IACjB,YACW,IAAO,EACP,YAAoB,EACpB,MAAqB,EACrB,SAAwB;QAHxB,SAAI,GAAJ,IAAI,CAAG;QACP,iBAAY,GAAZ,YAAY,CAAQ;QACpB,WAAM,GAAN,MAAM,CAAe;QACrB,cAAS,GAAT,SAAS,CAAe;IAChC,CAAC;IAEJ,KAAK,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,cAAc,EAAgB;QAC5D,MAAM,SAAS,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC;aACrC,GAAG,CACF,CAAC,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC,GAAG,kBAAkB,CAAC,GAAG,CAAC,IAAI,kBAAkB,CAAC,GAAG,CAAC,EAAE,CACxE;aACA,IAAI,CAAC,GAAG,CAAC,CAAA;QAEZ,MAAM,EAAE,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAA;QAElD,OAAO;YACL,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE;YAC5B,YAAY,EAAE,IAAI,CAAC,YAAY;YAC/B,MAAM,EAAE,cAAc,CAAC,CAAC,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM;YAC3D,SAAS,EAAE,cAAc,CAAC,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS;YAC/D,MAAM,EAAE,GAAG,IAAI,GAAG,EAAE,EAAE;YACtB,QAAQ;SACT,CAAA;IACH,CAAC;IAED;;;;;;;OAOG;IACH,KAAK,CAAC,MAAM,CACV,iBAA4C;QAE5C,MAAM,aAAa,GAAG,EAAE,CAAA;QACxB,KAAK,IAAI,gBAAgB,IAAI,iBAAiB,EAAE;YAC9C,MAAM,EACJ,IAAI,EACJ,WAAW,EACX,EAAE,EACF,IAAI,EACJ,QAAQ,EACR,IAAI,EACJ,MAAM,EACN,cAAc,EACd,MAAM,GACP,GAAG,gBAAgB,CAAC,OAAO,CAAA;YAE5B,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC;gBAC7B,QAAQ;gBACR,IAAI;gBACJ,MAAM;gBACN,cAAc;aACf,CAAC,CAAA;YAEF,MAAM,gBAAgB,CAAC,OAAO,CAAC,OAAO,CAAC,sBAAsB,CAAC;gBAC5D,EAAE;gBACF,IAAI;gBACJ,WAAW;gBACX,WAAW;gBACX,IAAI;gBACJ,MAAM;aACP,CAAC,CAAA;YAEF,aAAa,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;SAChC;QAED,OAAO,aAA+C,CAAA;IACxD,CAAC;CACF;AAzED,wBAyEC"}
+{"version":3,"file":"Origin.js","sourceRoot":"","sources":["../../../../base/lib/interfaces/Origin.ts"],"names":[],"mappings":";;;AAKA,MAAa,MAAM;IACjB,YACW,IAAe,EACf,YAAoB,EACpB,MAAqB,EACrB,SAAwB;QAHxB,SAAI,GAAJ,IAAI,CAAW;QACf,iBAAY,GAAZ,YAAY,CAAQ;QACpB,WAAM,GAAN,MAAM,CAAe;QACrB,cAAS,GAAT,SAAS,CAAe;IAChC,CAAC;IAEJ,KAAK,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,cAAc,EAAgB;QAC5D,MAAM,SAAS,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC;aACrC,GAAG,CACF,CAAC,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC,GAAG,kBAAkB,CAAC,GAAG,CAAC,IAAI,kBAAkB,CAAC,GAAG,CAAC,EAAE,CACxE;aACA,IAAI,CAAC,GAAG,CAAC,CAAA;QAEZ,MAAM,EAAE,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAA;QAElD,OAAO;YACL,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE;YAC5B,YAAY,EAAE,IAAI,CAAC,YAAY;YAC/B,MAAM,EAAE,cAAc,CAAC,CAAC,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM;YAC3D,SAAS,EAAE,cAAc,CAAC,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS;YAC/D,MAAM,EAAE,GAAG,IAAI,GAAG,EAAE,EAAE;YACtB,QAAQ;SACT,CAAA;IACH,CAAC;IAED;;;;;;;OAOG;IACH,KAAK,CAAC,MAAM,CACV,iBAA4C;QAE5C,MAAM,aAAa,GAAG,EAAE,CAAA;QACxB,KAAK,IAAI,gBAAgB,IAAI,iBAAiB,EAAE;YAC9C,MAAM,EACJ,IAAI,EACJ,WAAW,EACX,EAAE,EACF,IAAI,EACJ,QAAQ,EACR,IAAI,EACJ,MAAM,EACN,cAAc,EACd,MAAM,GACP,GAAG,gBAAgB,CAAC,OAAO,CAAA;YAE5B,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC;gBAC7B,QAAQ;gBACR,IAAI;gBACJ,MAAM;gBACN,cAAc;aACf,CAAC,CAAA;YAEF,MAAM,gBAAgB,CAAC,OAAO,CAAC,OAAO,CAAC,sBAAsB,CAAC;gBAC5D,EAAE;gBACF,IAAI;gBACJ,WAAW;gBACX,WAAW;gBACX,IAAI;gBACJ,MAAM;aACP,CAAC,CAAA;YAEF,aAAa,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;SAChC;QAED,OAAO,aAA+C,CAAA;IACxD,CAAC;CACF;AAzED,wBAyEC"}

package/base/lib/osBindings/BindParams.d.ts

@@ -1,9 +1,7 @@
 import type { AddSslOptions } from "./AddSslOptions";
 import type { HostId } from "./HostId";
-import type { HostKind } from "./HostKind";
 import type { Security } from "./Security";
 export type BindParams = {
-    kind: HostKind;
     id: HostId;
     internalPort: number;
     preferredExternalPort: number;

package/base/lib/osBindings/BindingSetPublicParams.d.ts

@@ -0,0 +1,4 @@
+export type BindingSetPublicParams = {
+    internalPort: number;
+    public: boolean | null;
+};

package/base/lib/osBindings/BindingSetPublicParams.js

@@ -0,0 +1,4 @@
+"use strict";
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=BindingSetPublicParams.js.map

package/base/lib/osBindings/BindingSetPublicParams.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"BindingSetPublicParams.js","sourceRoot":"","sources":["../../../../base/lib/osBindings/BindingSetPublicParams.ts"],"names":[],"mappings":";AAAA,4GAA4G"}

package/base/lib/osBindings/Host.d.ts

@@ -1,9 +1,7 @@
 import type { BindInfo } from "./BindInfo";
 import type { DomainConfig } from "./DomainConfig";
-import type { HostKind } from "./HostKind";
 import type { HostnameInfo } from "./HostnameInfo";
 export type Host = {
-    kind: HostKind;
     bindings: {
         [key: number]: BindInfo;
     };

package/base/lib/osBindings/HostAddress.d.ts

@@ -1,7 +1,10 @@
+import type { AcmeProvider } from "./AcmeProvider";
 export type HostAddress = {
     kind: "onion";
     address: string;
 } | {
     kind: "domain";
     address: string;
+    public: boolean;
+    acme: AcmeProvider | null;
 };

package/base/lib/osBindings/HostAddress.js

@@ -1,4 +1,3 @@
 "use strict";
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 Object.defineProperty(exports, "__esModule", { value: true });
 //# sourceMappingURL=HostAddress.js.map

package/base/lib/osBindings/HostAddress.js.map

@@ -1 +1 @@
-{"version":3,"file":"HostAddress.js","sourceRoot":"","sources":["../../../../base/lib/osBindings/HostAddress.ts"],"names":[],"mappings":";AAAA,4GAA4G"}
+{"version":3,"file":"HostAddress.js","sourceRoot":"","sources":["../../../../base/lib/osBindings/HostAddress.ts"],"names":[],"mappings":""}

package/base/lib/osBindings/{SetPublicParams.d.ts → NetworkInterfaceSetPublicParams.d.ts}

@@ -1,4 +1,4 @@
-export type SetPublicParams = {
+export type NetworkInterfaceSetPublicParams = {
     interface: string;
     public: boolean | null;
 };

package/base/lib/osBindings/NetworkInterfaceSetPublicParams.js

@@ -0,0 +1,4 @@
+"use strict";
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=NetworkInterfaceSetPublicParams.js.map

package/base/lib/osBindings/NetworkInterfaceSetPublicParams.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"NetworkInterfaceSetPublicParams.js","sourceRoot":"","sources":["../../../../base/lib/osBindings/NetworkInterfaceSetPublicParams.ts"],"names":[],"mappings":";AAAA,4GAA4G"}

package/base/lib/osBindings/ServerInfo.d.ts

@@ -1,6 +1,7 @@
 import type { AcmeProvider } from "./AcmeProvider";
 import type { AcmeSettings } from "./AcmeSettings";
 import type { Governor } from "./Governor";
+import type { Host } from "./Host";
 import type { LshwDevice } from "./LshwDevice";
 import type { NetworkInterfaceInfo } from "./NetworkInterfaceInfo";
 import type { ServerStatus } from "./ServerStatus";
@@ -11,16 +12,11 @@ export type ServerInfo = {
     platform: string;
     id: string;
     hostname: string;
+    host: Host;
     version: string;
     packageVersionCompat: string;
     postInitMigrationTodos: string[];
     lastBackup: string | null;
-    lanAddress: string;
-    onionAddress: string;
-    /**
-     * for backwards compatibility
-     */
-    torAddress: string;
     networkInterfaces: {
         [key: string]: NetworkInterfaceInfo;
     };

package/base/lib/osBindings/SetupResult.d.ts

@@ -1,5 +1,5 @@
 export type SetupResult = {
-    torAddress: string;
+    torAddresses: Array<string>;
     hostname: string;
     lanAddress: string;
     rootCa: string;

package/base/lib/osBindings/TestSmtpParams.d.ts

@@ -0,0 +1,8 @@
+export type TestSmtpParams = {
+    server: string;
+    port: number;
+    from: string;
+    to: string;
+    login: string;
+    password: string | null;
+};

package/base/lib/osBindings/{SetPublicParams.js → TestSmtpParams.js}

@@ -1,4 +1,4 @@
 "use strict";
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 Object.defineProperty(exports, "__esModule", { value: true });
-//# sourceMappingURL=SetPublicParams.js.map
+//# sourceMappingURL=TestSmtpParams.js.map

package/base/lib/osBindings/TestSmtpParams.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"TestSmtpParams.js","sourceRoot":"","sources":["../../../../base/lib/osBindings/TestSmtpParams.ts"],"names":[],"mappings":";AAAA,4GAA4G"}

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

@@ -38,6 +38,7 @@ export { BackupTargetFS } from "./BackupTargetFS";
 export { Base64 } from "./Base64";
 export { BindId } from "./BindId";
 export { BindInfo } from "./BindInfo";
+export { BindingSetPublicParams } from "./BindingSetPublicParams";
 export { BindOptions } from "./BindOptions";
 export { BindParams } from "./BindParams";
 export { Blake3Commitment } from "./Blake3Commitment";
@@ -97,8 +98,8 @@ export { Governor } from "./Governor";
 export { Guid } from "./Guid";
 export { HardwareRequirements } from "./HardwareRequirements";
 export { HealthCheckId } from "./HealthCheckId";
+export { HostAddress } from "./HostAddress";
 export { HostId } from "./HostId";
-export { HostKind } from "./HostKind";
 export { HostnameInfo } from "./HostnameInfo";
 export { Hosts } from "./Hosts";
 export { Host } from "./Host";
@@ -131,6 +132,7 @@ export { NamedHealthCheckResult } from "./NamedHealthCheckResult";
 export { NamedProgress } from "./NamedProgress";
 export { NetInfo } from "./NetInfo";
 export { NetworkInterfaceInfo } from "./NetworkInterfaceInfo";
+export { NetworkInterfaceSetPublicParams } from "./NetworkInterfaceSetPublicParams";
 export { NetworkInterfaceType } from "./NetworkInterfaceType";
 export { OnionHostname } from "./OnionHostname";
 export { OsIndex } from "./OsIndex";
@@ -176,7 +178,6 @@ export { SetIconParams } from "./SetIconParams";
 export { SetMainStatusStatus } from "./SetMainStatusStatus";
 export { SetMainStatus } from "./SetMainStatus";
 export { SetNameParams } from "./SetNameParams";
-export { SetPublicParams } from "./SetPublicParams";
 export { SetStoreParams } from "./SetStoreParams";
 export { SetupExecuteParams } from "./SetupExecuteParams";
 export { SetupProgress } from "./SetupProgress";
@@ -186,6 +187,7 @@ export { SignAssetParams } from "./SignAssetParams";
 export { SignerInfo } from "./SignerInfo";
 export { SmtpValue } from "./SmtpValue";
 export { StartStop } from "./StartStop";
+export { TestSmtpParams } from "./TestSmtpParams";
 export { UnsetPublicParams } from "./UnsetPublicParams";
 export { UpdatingState } from "./UpdatingState";
 export { VerifyCifsParams } from "./VerifyCifsParams";

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.source,
+    regex: regexes.ipv6.matches(),
     description: "Must be a valid IPv6 address",
 };
 exports.ipv4 = {
-    regex: regexes.ipv4.source,
+    regex: regexes.ipv4.matches(),
     description: "Must be a valid IPv4 address",
 };
 exports.hostname = {
-    regex: regexes.hostname.source,
+    regex: regexes.hostname.matches(),
     description: "Must be a valid hostname",
 };
 exports.localHostname = {
-    regex: regexes.localHostname.source,
+    regex: regexes.localHostname.matches(),
     description: 'Must be a valid ".local" hostname',
 };
 exports.torHostname = {
-    regex: regexes.torHostname.source,
+    regex: regexes.torHostname.matches(),
     description: 'Must be a valid Tor (".onion") hostname',
 };
 exports.url = {
-    regex: regexes.url.source,
+    regex: regexes.url.matches(),
     description: "Must be a valid URL",
 };
 exports.localUrl = {
-    regex: regexes.localUrl.source,
+    regex: regexes.localUrl.matches(),
     description: 'Must be a valid ".local" URL',
 };
 exports.torUrl = {
-    regex: regexes.torUrl.source,
+    regex: regexes.torUrl.matches(),
     description: 'Must be a valid Tor (".onion") URL',
 };
 exports.ascii = {
-    regex: regexes.ascii.source,
+    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.source,
+    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.source,
+    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,MAAM;IAC1B,WAAW,EAAE,8BAA8B;CAC5C,CAAA;AAEY,QAAA,IAAI,GAAY;IAC3B,KAAK,EAAE,OAAO,CAAC,IAAI,CAAC,MAAM;IAC1B,WAAW,EAAE,8BAA8B;CAC5C,CAAA;AAEY,QAAA,QAAQ,GAAY;IAC/B,KAAK,EAAE,OAAO,CAAC,QAAQ,CAAC,MAAM;IAC9B,WAAW,EAAE,0BAA0B;CACxC,CAAA;AAEY,QAAA,aAAa,GAAY;IACpC,KAAK,EAAE,OAAO,CAAC,aAAa,CAAC,MAAM;IACnC,WAAW,EAAE,mCAAmC;CACjD,CAAA;AAEY,QAAA,WAAW,GAAY;IAClC,KAAK,EAAE,OAAO,CAAC,WAAW,CAAC,MAAM;IACjC,WAAW,EAAE,yCAAyC;CACvD,CAAA;AAEY,QAAA,GAAG,GAAY;IAC1B,KAAK,EAAE,OAAO,CAAC,GAAG,CAAC,MAAM;IACzB,WAAW,EAAE,qBAAqB;CACnC,CAAA;AAEY,QAAA,QAAQ,GAAY;IAC/B,KAAK,EAAE,OAAO,CAAC,QAAQ,CAAC,MAAM;IAC9B,WAAW,EAAE,8BAA8B;CAC5C,CAAA;AAEY,QAAA,MAAM,GAAY;IAC7B,KAAK,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM;IAC5B,WAAW,EAAE,oCAAoC;CAClD,CAAA;AAEY,QAAA,KAAK,GAAY;IAC5B,KAAK,EAAE,OAAO,CAAC,KAAK,CAAC,MAAM;IAC3B,WAAW,EACT,8FAA8F;CACjG,CAAA;AAEY,QAAA,KAAK,GAAY;IAC5B,KAAK,EAAE,OAAO,CAAC,KAAK,CAAC,MAAM;IAC3B,WAAW,EAAE,+BAA+B;CAC7C,CAAA;AAEY,QAAA,MAAM,GAAY;IAC7B,KAAK,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM;IAC5B,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?: {
@@ -415,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',
               })
@@ -447,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',
               })
@@ -533,7 +533,7 @@ export declare class StartSdk<Manifest extends T.SDKManifest, Store> {
         };
         SubContainer: {
             of(effects: Effects, image: {
-                id: T.ImageId & keyof Manifest["images"];
+                imageId: T.ImageId & keyof Manifest["images"];
                 sharedRun?: boolean;
             }, name: string): Promise<SubContainer>;
         };
@@ -1223,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) => {
@@ -405,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',
                   })
@@ -437,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',
                   })