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

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/{SetPublicParams.js → BindingSetPublicParams.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=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/{HostKind.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=HostKind.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/GetSystemSmtp.d.ts

@@ -1,17 +1,22 @@
 import { Effects } from "../Effects";
+import * as T from "../types";
 export declare class GetSystemSmtp {
     readonly effects: Effects;
     constructor(effects: Effects);
     /**
-     * Returns the system SMTP credentials. Restarts the service if the credentials change
+     * Returns the system SMTP credentials. Reruns the context from which it has been called if the underlying value changes
      */
-    const(): Promise<import("../types").SmtpValue | null>;
+    const(): Promise<T.SmtpValue | null>;
     /**
      * Returns the system SMTP credentials. Does nothing if the credentials change
      */
-    once(): Promise<import("../types").SmtpValue | null>;
+    once(): Promise<T.SmtpValue | null>;
+    /**
+     * Watches the system SMTP credentials. Returns an async iterator that yields whenever the value changes
+     */
+    watch(): AsyncGenerator<T.SmtpValue | null, void, unknown>;
     /**
      * Watches the system SMTP credentials. Takes a custom callback function to run whenever the credentials change
      */
-    watch(): AsyncGenerator<import("../types").SmtpValue | null, void, unknown>;
+    onChange(callback: (value: T.SmtpValue | null, error?: Error) => void | Promise<void>): void;
 }

package/base/lib/util/GetSystemSmtp.js

@@ -6,7 +6,7 @@ class GetSystemSmtp {
         this.effects = effects;
     }
     /**
-     * Returns the system SMTP credentials. Restarts the service if the credentials change
+     * Returns the system SMTP credentials. Reruns the context from which it has been called if the underlying value changes
      */
     const() {
         return this.effects.getSystemSmtp({
@@ -20,7 +20,7 @@ class GetSystemSmtp {
         return this.effects.getSystemSmtp({});
     }
     /**
-     * Watches the system SMTP credentials. Takes a custom callback function to run whenever the credentials change
+     * Watches the system SMTP credentials. Returns an async iterator that yields whenever the value changes
      */
     async *watch() {
         while (true) {
@@ -34,6 +34,24 @@ class GetSystemSmtp {
             await waitForNext;
         }
     }
+    /**
+     * Watches the system SMTP credentials. Takes a custom callback function to run whenever the credentials change
+     */
+    onChange(callback) {
+        ;
+        (async () => {
+            for await (const value of this.watch()) {
+                try {
+                    await callback(value);
+                }
+                catch (e) {
+                    console.error("callback function threw an error @ GetSystemSmtp.onChange", e);
+                }
+            }
+        })()
+            .catch((e) => callback(null, e))
+            .catch((e) => console.error("callback function threw an error @ GetSystemSmtp.onChange", e));
+    }
 }
 exports.GetSystemSmtp = GetSystemSmtp;
 //# sourceMappingURL=GetSystemSmtp.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"GetSystemSmtp.js","sourceRoot":"","sources":["../../../../base/lib/util/GetSystemSmtp.ts"],"names":[],"mappings":";;;AAEA,MAAa,aAAa;IACxB,YAAqB,OAAgB;QAAhB,YAAO,GAAP,OAAO,CAAS;IAAG,CAAC;IAEzC;;OAEG;IACH,KAAK;QACH,OAAO,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC;YAChC,QAAQ,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;SAC1C,CAAC,CAAA;IACJ,CAAC;IACD;;OAEG;IACH,IAAI;QACF,OAAO,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,CAAC,CAAA;IACvC,CAAC;IACD;;OAEG;IACH,KAAK,CAAC,CAAC,KAAK;QACV,OAAO,IAAI,EAAE;YACX,IAAI,QAAoB,CAAA;YACxB,MAAM,WAAW,GAAG,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,EAAE;gBAChD,QAAQ,GAAG,OAAO,CAAA;YACpB,CAAC,CAAC,CAAA;YACF,MAAM,MAAM,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC;gBACrC,QAAQ,EAAE,GAAG,EAAE,CAAC,QAAQ,EAAE;aAC3B,CAAC,CAAA;YACF,MAAM,WAAW,CAAA;SAClB;IACH,CAAC;CACF;AAhCD,sCAgCC"}
+{"version":3,"file":"GetSystemSmtp.js","sourceRoot":"","sources":["../../../../base/lib/util/GetSystemSmtp.ts"],"names":[],"mappings":";;;AAGA,MAAa,aAAa;IACxB,YAAqB,OAAgB;QAAhB,YAAO,GAAP,OAAO,CAAS;IAAG,CAAC;IAEzC;;OAEG;IACH,KAAK;QACH,OAAO,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC;YAChC,QAAQ,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;SAC1C,CAAC,CAAA;IACJ,CAAC;IACD;;OAEG;IACH,IAAI;QACF,OAAO,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,CAAC,CAAA;IACvC,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,CAAC,KAAK;QACV,OAAO,IAAI,EAAE;YACX,IAAI,QAAoB,CAAA;YACxB,MAAM,WAAW,GAAG,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,EAAE;gBAChD,QAAQ,GAAG,OAAO,CAAA;YACpB,CAAC,CAAC,CAAA;YACF,MAAM,MAAM,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC;gBACrC,QAAQ,EAAE,GAAG,EAAE,CAAC,QAAQ,EAAE;aAC3B,CAAC,CAAA;YACF,MAAM,WAAW,CAAA;SAClB;IACH,CAAC;IAED;;OAEG;IACH,QAAQ,CACN,QAGyB;QAEzB,CAAC;QAAA,CAAC,KAAK,IAAI,EAAE;YACX,IAAI,KAAK,EAAE,MAAM,KAAK,IAAI,IAAI,CAAC,KAAK,EAAE,EAAE;gBACtC,IAAI;oBACF,MAAM,QAAQ,CAAC,KAAK,CAAC,CAAA;iBACtB;gBAAC,OAAO,CAAC,EAAE;oBACV,OAAO,CAAC,KAAK,CACX,2DAA2D,EAC3D,CAAC,CACF,CAAA;iBACF;aACF;QACH,CAAC,CAAC,EAAE;aACD,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;aAC/B,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CACX,OAAO,CAAC,KAAK,CACX,2DAA2D,EAC3D,CAAC,CACF,CACF,CAAA;IACL,CAAC;CACF;AA/DD,sCA+DC"}

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

@@ -49,17 +49,21 @@ export declare class GetServiceInterface {
         packageId?: string;
     });
     /**
-     * Returns the value of Store at the provided path. Restart the service if the value changes
+     * Returns the requested service interface. Reruns the context from which it has been called if the underlying value changes
      */
     const(): Promise<ServiceInterfaceFilled | null>;
     /**
-     * Returns the value of ServiceInterfacesFilled at the provided path. Does nothing if the value changes
+     * Returns the requested service interface. Does nothing if the value changes
      */
     once(): Promise<ServiceInterfaceFilled | null>;
     /**
-     * Watches the value of ServiceInterfacesFilled at the provided path. Takes a custom callback function to run whenever the value changes
+     * Watches the requested service interface. Returns an async iterator that yields whenever the value changes
      */
     watch(): AsyncGenerator<ServiceInterfaceFilled | null, void, unknown>;
+    /**
+     * Watches the requested service interface. Takes a custom callback function to run whenever the value changes
+     */
+    onChange(callback: (value: ServiceInterfaceFilled | null, error?: Error) => void | Promise<void>): void;
 }
 export declare function getServiceInterface(effects: Effects, opts: {
     id: string;

package/base/lib/util/getServiceInterface.js

@@ -131,7 +131,7 @@ class GetServiceInterface {
         this.opts = opts;
     }
     /**
-     * Returns the value of Store at the provided path. Restart the service if the value changes
+     * Returns the requested service interface. Reruns the context from which it has been called if the underlying value changes
      */
     async const() {
         const { id, packageId } = this.opts;
@@ -145,7 +145,7 @@ class GetServiceInterface {
         return interfaceFilled;
     }
     /**
-     * Returns the value of ServiceInterfacesFilled at the provided path. Does nothing if the value changes
+     * Returns the requested service interface. Does nothing if the value changes
      */
     async once() {
         const { id, packageId } = this.opts;
@@ -157,7 +157,7 @@ class GetServiceInterface {
         return interfaceFilled;
     }
     /**
-     * Watches the value of ServiceInterfacesFilled at the provided path. Takes a custom callback function to run whenever the value changes
+     * Watches the requested service interface. Returns an async iterator that yields whenever the value changes
      */
     async *watch() {
         const { id, packageId } = this.opts;
@@ -175,6 +175,24 @@ class GetServiceInterface {
             await waitForNext;
         }
     }
+    /**
+     * Watches the requested service interface. Takes a custom callback function to run whenever the value changes
+     */
+    onChange(callback) {
+        ;
+        (async () => {
+            for await (const value of this.watch()) {
+                try {
+                    await callback(value);
+                }
+                catch (e) {
+                    console.error("callback function threw an error @ GetServiceInterface.onChange", e);
+                }
+            }
+        })()
+            .catch((e) => callback(null, e))
+            .catch((e) => console.error("callback function threw an error @ GetServiceInterface.onChange", e));
+    }
 }
 exports.GetServiceInterface = GetServiceInterface;
 function getServiceInterface(effects, opts) {

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

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

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

@@ -9,17 +9,21 @@ export declare class GetServiceInterfaces {
         packageId?: string;
     });
     /**
-     * Returns the value of Store at the provided path. Restart the service if the value changes
+     * Returns the service interfaces for the package. Reruns the context from which it has been called if the underlying value changes
      */
     const(): Promise<ServiceInterfaceFilled[]>;
     /**
-     * Returns the value of ServiceInterfacesFilled at the provided path. Does nothing if the value changes
+     * Returns the service interfaces for the package. Does nothing if the value changes
      */
     once(): Promise<ServiceInterfaceFilled[]>;
     /**
-     * Watches the value of ServiceInterfacesFilled at the provided path. Takes a custom callback function to run whenever the value changes
+     * Watches the service interfaces for the package. Returns an async iterator that yields whenever the value changes
      */
     watch(): AsyncGenerator<ServiceInterfaceFilled[], void, unknown>;
+    /**
+     * Watches the service interfaces for the package. Takes a custom callback function to run whenever the value changes
+     */
+    onChange(callback: (value: ServiceInterfaceFilled[] | null, error?: Error) => void | Promise<void>): void;
 }
 export declare function getServiceInterfaces(effects: Effects, opts: {
     packageId?: string;

package/base/lib/util/getServiceInterfaces.js

@@ -31,7 +31,7 @@ class GetServiceInterfaces {
         this.opts = opts;
     }
     /**
-     * Returns the value of Store at the provided path. Restart the service if the value changes
+     * Returns the service interfaces for the package. Reruns the context from which it has been called if the underlying value changes
      */
     async const() {
         const { packageId } = this.opts;
@@ -44,7 +44,7 @@ class GetServiceInterfaces {
         return interfaceFilled;
     }
     /**
-     * Returns the value of ServiceInterfacesFilled at the provided path. Does nothing if the value changes
+     * Returns the service interfaces for the package. Does nothing if the value changes
      */
     async once() {
         const { packageId } = this.opts;
@@ -55,7 +55,7 @@ class GetServiceInterfaces {
         return interfaceFilled;
     }
     /**
-     * Watches the value of ServiceInterfacesFilled at the provided path. Takes a custom callback function to run whenever the value changes
+     * Watches the service interfaces for the package. Returns an async iterator that yields whenever the value changes
      */
     async *watch() {
         const { packageId } = this.opts;
@@ -72,6 +72,24 @@ class GetServiceInterfaces {
             await waitForNext;
         }
     }
+    /**
+     * Watches the service interfaces for the package. Takes a custom callback function to run whenever the value changes
+     */
+    onChange(callback) {
+        ;
+        (async () => {
+            for await (const value of this.watch()) {
+                try {
+                    await callback(value);
+                }
+                catch (e) {
+                    console.error("callback function threw an error @ GetServiceInterfaces.onChange", e);
+                }
+            }
+        })()
+            .catch((e) => callback(null, e))
+            .catch((e) => console.error("callback function threw an error @ GetServiceInterfaces.onChange", e));
+    }
 }
 exports.GetServiceInterfaces = GetServiceInterfaces;
 function getServiceInterfaces(effects, opts) {