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

package/mjs/lib/interfaces/Host.js

@@ -1,6 +1,6 @@
 import { object, string } from "ts-matches";
 import { Origin } from "./Origin";
-const knownProtocols = {
+export const knownProtocols = {
     http: {
         secure: null,
         defaultPort: 80,
@@ -59,62 +59,61 @@ export class Host {
         }
     }
     async bindPortForUnknown(internalPort, options) {
-        await this.options.effects.bind({
+        const binderOptions = {
             kind: this.options.kind,
             id: this.options.id,
-            internalPort: internalPort,
+            internalPort,
             ...options,
-        });
-        return new Origin(this, options);
+        };
+        await this.options.effects.bind(binderOptions);
+        return new Origin(this, internalPort, null, null);
     }
     async bindPortForKnown(options, internalPort) {
-        const scheme = options.scheme === undefined ? options.protocol : options.scheme;
         const protoInfo = knownProtocols[options.protocol];
         const preferredExternalPort = options.preferredExternalPort ||
             knownProtocols[options.protocol].defaultPort;
-        const addSsl = this.getAddSsl(options, protoInfo);
+        const sslProto = this.getSslProto(options, protoInfo);
+        const addSsl = sslProto && "alpn" in protoInfo
+            ? {
+                // addXForwardedHeaders: null,
+                preferredExternalPort: knownProtocols[sslProto].defaultPort,
+                scheme: sslProto,
+                alpn: protoInfo.alpn,
+                ...("addSsl" in options ? options.addSsl : null),
+            }
+            : null;
         const secure = !protoInfo.secure ? null : { ssl: false };
-        const newOptions = {
-            scheme,
-            preferredExternalPort,
-            addSsl,
-            secure,
-        };
         await this.options.effects.bind({
             kind: this.options.kind,
             id: this.options.id,
             internalPort,
-            ...newOptions,
+            preferredExternalPort,
+            addSsl,
+            secure,
         });
-        return new Origin(this, newOptions);
+        return new Origin(this, internalPort, options.protocol, sslProto);
     }
-    getAddSsl(options, protoInfo) {
+    getSslProto(options, protoInfo) {
         if (inObject("noAddSsl", options) && options.noAddSsl)
             return null;
         if ("withSsl" in protoInfo && protoInfo.withSsl)
-            return {
-                // addXForwardedHeaders: null,
-                preferredExternalPort: knownProtocols[protoInfo.withSsl].defaultPort,
-                scheme: protoInfo.withSsl,
-                alpn: protoInfo.alpn,
-                ...("addSsl" in options ? options.addSsl : null),
-            };
+            return protoInfo.withSsl;
         return null;
     }
 }
 function inObject(key, obj) {
     return key in obj;
 }
-export class StaticHost extends Host {
-    constructor(options) {
-        super({ ...options, kind: "static" });
-    }
-}
-export class SingleHost extends Host {
-    constructor(options) {
-        super({ ...options, kind: "single" });
-    }
-}
+// 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" })
+//   }
+// }
 export class MultiHost extends Host {
     constructor(options) {
         super({ ...options, kind: "multi" });

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

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

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

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

package/mjs/lib/interfaces/Origin.js

@@ -1,9 +1,13 @@
 export class Origin {
     host;
-    options;
-    constructor(host, options) {
+    internalPort;
+    scheme;
+    sslScheme;
+    constructor(host, internalPort, scheme, sslScheme) {
         this.host = host;
-        this.options = options;
+        this.internalPort = internalPort;
+        this.scheme = scheme;
+        this.sslScheme = sslScheme;
     }
     build({ username, path, search, schemeOverride }) {
         const qpEntries = Object.entries(search)
@@ -12,18 +16,9 @@ export class Origin {
         const qp = qpEntries.length ? `?${qpEntries}` : "";
         return {
             hostId: this.host.options.id,
-            bindOptions: {
-                ...this.options,
-                scheme: schemeOverride ? schemeOverride.noSsl : this.options.scheme,
-                addSsl: this.options.addSsl
-                    ? {
-                        ...this.options.addSsl,
-                        scheme: schemeOverride
-                            ? schemeOverride.ssl
-                            : this.options.addSsl.scheme,
-                    }
-                    : null,
-            },
+            internalPort: this.internalPort,
+            scheme: schemeOverride ? schemeOverride.noSsl : this.scheme,
+            sslScheme: schemeOverride ? schemeOverride.ssl : this.sslScheme,
             suffix: `${path}${qp}`,
             username,
         };

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

@@ -1 +1 @@
-{"version":3,"file":"Origin.js","sourceRoot":"","sources":["../../../../lib/interfaces/Origin.ts"],"names":[],"mappings":"AAKA,MAAM,OAAO,MAAM;IAEN;IACA;IAFX,YACW,IAAO,EACP,OAAoB;QADpB,SAAI,GAAJ,IAAI,CAAG;QACP,YAAO,GAAP,OAAO,CAAa;IAC5B,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,WAAW,EAAE;gBACX,GAAG,IAAI,CAAC,OAAO;gBACf,MAAM,EAAE,cAAc,CAAC,CAAC,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM;gBACnE,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM;oBACzB,CAAC,CAAC;wBACE,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM;wBACtB,MAAM,EAAE,cAAc;4BACpB,CAAC,CAAC,cAAc,CAAC,GAAG;4BACpB,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM;qBAC/B;oBACH,CAAC,CAAC,IAAI;aACT;YACD,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,UAAU,EACV,QAAQ,EACR,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,UAAU;gBACV,QAAQ;gBACR,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"}
+{"version":3,"file":"Origin.js","sourceRoot":"","sources":["../../../../lib/interfaces/Origin.ts"],"names":[],"mappings":"AAKA,MAAM,OAAO,MAAM;IAEN;IACA;IACA;IACA;IAJX,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,UAAU,EACV,QAAQ,EACR,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,UAAU;gBACV,QAAQ;gBACR,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"}

package/mjs/lib/mainFn/CommandController.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="node" />
 /// <reference types="node" />
 import { SDKManifest } from "../manifest/ManifestTypes";
-import { Effects, ValidIfNoStupidEscape } from "../types";
+import { Effects, ImageId, ValidIfNoStupidEscape } from "../types";
 import { MountOptions, Overlay } from "../util/Overlay";
 export declare class CommandController {
     readonly runningAnswer: Promise<unknown>;
@@ -9,7 +9,7 @@ export declare class CommandController {
     readonly pid: number | undefined;
     private constructor();
     static of<Manifest extends SDKManifest>(): <A extends string>(effects: Effects, imageId: {
-        id: Manifest["images"][number];
+        id: keyof Manifest["images"] & ImageId;
         sharedRun?: boolean;
     }, command: [string, ...string[]] | ValidIfNoStupidEscape<A>, options: {
         mounts?: {

package/mjs/lib/mainFn/CommandController.js

@@ -46,28 +46,24 @@ export class CommandController {
             return await this.runningAnswer;
         }
         finally {
-            await cpExecFile("pkill", ["-9", "-s", String(this.pid)]).catch((_) => { });
+            if (this.pid !== undefined) {
+                await cpExecFile("pkill", ["-9", "-s", String(this.pid)]).catch((_) => { });
+            }
             await this.overlay.destroy().catch((_) => { });
         }
     }
     async term({ signal = SIGTERM, timeout = NO_TIMEOUT } = {}) {
+        if (this.pid === undefined)
+            return;
         try {
             await cpExecFile("pkill", [
                 `-${signal.replace("SIG", "")}`,
                 "-s",
                 String(this.pid),
             ]);
-            if (timeout > NO_TIMEOUT) {
-                const didTimeout = await Promise.race([
-                    new Promise((resolve) => setTimeout(resolve, timeout)).then(() => true),
-                    this.runningAnswer.then(() => false),
-                ]);
-                if (didTimeout) {
-                    await cpExecFile("pkill", [`-9`, "-s", String(this.pid)]).catch((_) => { });
-                }
-            }
-            else {
-                await this.runningAnswer;
+            const didTimeout = await waitSession(this.pid, timeout);
+            if (didTimeout) {
+                await cpExecFile("pkill", [`-9`, "-s", String(this.pid)]).catch((_) => { });
             }
         }
         finally {
@@ -75,4 +71,42 @@ export class CommandController {
         }
     }
 }
+function waitSession(sid, timeout = NO_TIMEOUT, interval = 100) {
+    let nextInterval = interval * 2;
+    if (timeout >= 0 && timeout < nextInterval) {
+        nextInterval = timeout;
+    }
+    let nextTimeout = timeout;
+    if (timeout > 0) {
+        if (timeout >= interval) {
+            nextTimeout -= interval;
+        }
+        else {
+            nextTimeout = 0;
+        }
+    }
+    return new Promise((resolve, reject) => {
+        let next = null;
+        if (timeout !== 0) {
+            next = setTimeout(() => {
+                waitSession(sid, nextTimeout, nextInterval).then(resolve, reject);
+            }, interval);
+        }
+        cpExecFile("ps", [`--sid=${sid}`, "-o", "--pid="]).then((_) => {
+            if (timeout === 0) {
+                resolve(true);
+            }
+        }, (e) => {
+            if (next) {
+                clearTimeout(next);
+            }
+            if (typeof e === "object" && e && "code" in e && e.code) {
+                resolve(false);
+            }
+            else {
+                reject(e);
+            }
+        });
+    });
+}
 //# sourceMappingURL=CommandController.js.map

package/mjs/lib/mainFn/CommandController.js.map

@@ -1 +1 @@
-{"version":3,"file":"CommandController.js","sourceRoot":"","sources":["../../../../lib/mainFn/CommandController.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"CommandController.js","sourceRoot":"","sources":["../../../../lib/mainFn/CommandController.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAW,OAAO,EAAE,MAAM,aAAa,CAAA;AAG1D,OAAO,EAAgB,OAAO,EAAE,MAAM,iBAAiB,CAAA;AACvD,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAA;AACnD,OAAO,EAAE,UAAU,EAAU,MAAM,WAAW,CAAA;AAE9C,MAAM,OAAO,iBAAiB;IAEjB;IACA;IACA;IAHX,YACW,aAA+B,EAC/B,OAAgB,EAChB,GAAuB;QAFvB,kBAAa,GAAb,aAAa,CAAkB;QAC/B,YAAO,GAAP,OAAO,CAAS;QAChB,QAAG,GAAH,GAAG,CAAoB;IAC/B,CAAC;IACJ,MAAM,CAAC,EAAE;QACP,OAAO,KAAK,EACV,OAAgB,EAChB,OAGC,EACD,OAAyD,EACzD,OAYC,EACD,EAAE;YACF,MAAM,QAAQ,GAAG,YAAY,CAAC,OAAO,CAAC,CAAA;YACtC,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,IAAI,CAAC,MAAM,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAA;YACvE,KAAK,IAAI,KAAK,IAAI,OAAO,CAAC,MAAM,IAAI,EAAE,EAAE;gBACtC,MAAM,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,IAAI,CAAC,CAAA;aAC/C;YACD,MAAM,YAAY,GAAG,MAAM,OAAO,CAAC,KAAK,CAAC,QAAQ,EAAE;gBACjD,GAAG,EAAE,OAAO,CAAC,GAAG;aACjB,CAAC,CAAA;YACF,MAAM,MAAM,GAAG,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;gBACnD,YAAY,CAAC,MAAM,CAAC,EAAE,CACpB,MAAM,EACN,OAAO,CAAC,QAAQ;oBACd,CAAC,CAAC,IAAS,EAAE,EAAE;wBACb,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAA;oBAC9B,CAAC,CAAC,CACL,CAAA;gBACD,YAAY,CAAC,MAAM,CAAC,EAAE,CACpB,MAAM,EACN,OAAO,CAAC,QAAQ;oBACd,CAAC,CAAC,IAAS,EAAE,EAAE;wBACb,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAA;oBAChC,CAAC,CAAC,CACL,CAAA;gBAED,YAAY,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAS,EAAE,EAAE;oBACpC,IAAI,IAAI,KAAK,CAAC,EAAE;wBACd,OAAO,OAAO,CAAC,IAAI,CAAC,CAAA;qBACrB;oBACD,OAAO,MAAM,CAAC,IAAI,KAAK,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,qBAAqB,IAAI,EAAE,CAAC,CAAC,CAAA;gBACrE,CAAC,CAAC,CAAA;YACJ,CAAC,CAAC,CAAA;YAEF,MAAM,GAAG,GAAG,YAAY,CAAC,GAAG,CAAA;YAE5B,OAAO,IAAI,iBAAiB,CAAC,MAAM,EAAE,OAAO,EAAE,GAAG,CAAC,CAAA;QACpD,CAAC,CAAA;IACH,CAAC;IACD,KAAK,CAAC,IAAI;QACR,IAAI;YACF,OAAO,MAAM,IAAI,CAAC,aAAa,CAAA;SAChC;gBAAS;YACR,IAAI,IAAI,CAAC,GAAG,KAAK,SAAS,EAAE;gBAC1B,MAAM,UAAU,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAC7D,CAAC,CAAC,EAAE,EAAE,GAAE,CAAC,CACV,CAAA;aACF;YACD,MAAM,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,GAAE,CAAC,CAAC,CAAA;SAC9C;IACH,CAAC;IACD,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,EAAE,OAAO,GAAG,UAAU,EAAE,GAAG,EAAE;QACxD,IAAI,IAAI,CAAC,GAAG,KAAK,SAAS;YAAE,OAAM;QAClC,IAAI;YACF,MAAM,UAAU,CAAC,OAAO,EAAE;gBACxB,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,EAAE;gBAC/B,IAAI;gBACJ,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC;aACjB,CAAC,CAAA;YAEF,MAAM,UAAU,GAAG,MAAM,WAAW,CAAC,IAAI,CAAC,GAAG,EAAE,OAAO,CAAC,CAAA;YACvD,IAAI,UAAU,EAAE;gBACd,MAAM,UAAU,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAC7D,CAAC,CAAC,EAAE,EAAE,GAAE,CAAC,CACV,CAAA;aACF;SACF;gBAAS;YACR,MAAM,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAA;SAC7B;IACH,CAAC;CACF;AAED,SAAS,WAAW,CAClB,GAAW,EACX,OAAO,GAAG,UAAU,EACpB,QAAQ,GAAG,GAAG;IAEd,IAAI,YAAY,GAAG,QAAQ,GAAG,CAAC,CAAA;IAC/B,IAAI,OAAO,IAAI,CAAC,IAAI,OAAO,GAAG,YAAY,EAAE;QAC1C,YAAY,GAAG,OAAO,CAAA;KACvB;IACD,IAAI,WAAW,GAAG,OAAO,CAAA;IACzB,IAAI,OAAO,GAAG,CAAC,EAAE;QACf,IAAI,OAAO,IAAI,QAAQ,EAAE;YACvB,WAAW,IAAI,QAAQ,CAAA;SACxB;aAAM;YACL,WAAW,GAAG,CAAC,CAAA;SAChB;KACF;IACD,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,IAAI,IAAI,GAA0B,IAAI,CAAA;QACtC,IAAI,OAAO,KAAK,CAAC,EAAE;YACjB,IAAI,GAAG,UAAU,CAAC,GAAG,EAAE;gBACrB,WAAW,CAAC,GAAG,EAAE,WAAW,EAAE,YAAY,CAAC,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAA;YACnE,CAAC,EAAE,QAAQ,CAAC,CAAA;SACb;QACD,UAAU,CAAC,IAAI,EAAE,CAAC,SAAS,GAAG,EAAE,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC,IAAI,CACrD,CAAC,CAAC,EAAE,EAAE;YACJ,IAAI,OAAO,KAAK,CAAC,EAAE;gBACjB,OAAO,CAAC,IAAI,CAAC,CAAA;aACd;QACH,CAAC,EACD,CAAC,CAAC,EAAE,EAAE;YACJ,IAAI,IAAI,EAAE;gBACR,YAAY,CAAC,IAAI,CAAC,CAAA;aACnB;YACD,IAAI,OAAO,CAAC,KAAK,QAAQ,IAAI,CAAC,IAAI,MAAM,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE;gBACvD,OAAO,CAAC,KAAK,CAAC,CAAA;aACf;iBAAM;gBACL,MAAM,CAAC,CAAC,CAAC,CAAA;aACV;QACH,CAAC,CACF,CAAA;IACH,CAAC,CAAC,CAAA;AACJ,CAAC"}

package/mjs/lib/mainFn/Daemon.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="node" />
 /// <reference types="node" />
 import { SDKManifest } from "../manifest/ManifestTypes";
-import { Effects, ValidIfNoStupidEscape } from "../types";
+import { Effects, ImageId, ValidIfNoStupidEscape } from "../types";
 import { MountOptions, Overlay } from "../util/Overlay";
 /**
  * This is a wrapper around CommandController that has a state of off, where the command shouldn't be running
@@ -13,7 +13,7 @@ export declare class Daemon {
     private shouldBeRunning;
     private constructor();
     static of<Manifest extends SDKManifest>(): <A extends string>(effects: Effects, imageId: {
-        id: Manifest["images"][number];
+        id: keyof Manifest["images"] & ImageId;
         sharedRun?: boolean;
     }, command: [string, ...string[]] | ValidIfNoStupidEscape<A>, options: {
         mounts?: {

package/mjs/lib/mainFn/Daemons.d.ts

@@ -5,7 +5,8 @@ import { HealthReceipt } from "../health/HealthReceipt";
 import { CheckResult } from "../health/checkFns";
 import { SDKManifest } from "../manifest/ManifestTypes";
 import { Trigger } from "../trigger";
-import { Effects, ValidIfNoStupidEscape } from "../types";
+import { Effects, ImageId, ValidIfNoStupidEscape } from "../types";
+import { Mounts } from "./Mounts";
 import { MountOptions, Overlay } from "../util/Overlay";
 import * as CP from "node:child_process";
 export { Daemon } from "./Daemon";
@@ -13,6 +14,7 @@ export { CommandController } from "./CommandController";
 import { HealthDaemon } from "./HealthDaemon";
 import { Daemon } from "./Daemon";
 import { CommandController } from "./CommandController";
+export declare const cpExec: typeof CP.exec.__promisify__;
 export declare const cpExecFile: typeof CP.execFile.__promisify__;
 export type Ready = {
     display: string | null;
@@ -22,20 +24,17 @@ export type Ready = {
 type DaemonsParams<Manifest extends SDKManifest, Ids extends string, Command extends string, Id extends string> = {
     command: ValidIfNoStupidEscape<Command> | [string, ...string[]];
     image: {
-        id: Manifest["images"][number];
+        id: keyof Manifest["images"] & ImageId;
         sharedRun?: boolean;
     };
-    mounts: {
-        path: string;
-        options: MountOptions;
-    }[];
+    mounts: Mounts<Manifest>;
     env?: Record<string, string>;
     ready: Ready;
     requires: Exclude<Ids, Id>[];
 };
 type ErrorDuplicateId<Id extends string> = `The id '${Id}' is already used`;
 export declare const runCommand: <Manifest extends SDKManifest>() => <A extends string>(effects: Effects, imageId: {
-    id: Manifest["images"][number];
+    id: keyof Manifest["images"] & string;
     sharedRun?: boolean | undefined;
 }, command: [string, ...string[]] | ValidIfNoStupidEscape<A>, options: {
     mounts?: {

package/mjs/lib/mainFn/Daemons.js

@@ -5,7 +5,7 @@ export { CommandController } from "./CommandController";
 import { HealthDaemon } from "./HealthDaemon";
 import { Daemon } from "./Daemon";
 import { CommandController } from "./CommandController";
-const cpExec = promisify(CP.exec);
+export const cpExec = promisify(CP.exec);
 export const cpExecFile = promisify(CP.execFile);
 export const runCommand = () => CommandController.of();
 /**
@@ -67,7 +67,10 @@ export class Daemons {
     // prettier-ignore
     id, options) {
         const daemonIndex = this.daemons.length;
-        const daemon = Daemon.of()(this.effects, options.image, options.command, options);
+        const daemon = Daemon.of()(this.effects, options.image, options.command, {
+            ...options,
+            mounts: options.mounts.build(),
+        });
         const healthDaemon = new HealthDaemon(daemon, daemonIndex, options.requires
             .map((x) => this.ids.indexOf(id))
             .filter((x) => x >= 0)

package/mjs/lib/mainFn/Daemons.js.map

@@ -1 +1 @@
-{"version":3,"file":"Daemons.js","sourceRoot":"","sources":["../../../../lib/mainFn/Daemons.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Daemons.js","sourceRoot":"","sources":["../../../../lib/mainFn/Daemons.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAA;AACrC,OAAO,KAAK,EAAE,MAAM,oBAAoB,CAAA;AAExC,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAA;AACjC,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AACvD,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAC7C,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAA;AACjC,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AAEvD,MAAM,CAAC,MAAM,MAAM,GAAG,SAAS,CAAC,EAAE,CAAC,IAAI,CAAC,CAAA;AACxC,MAAM,CAAC,MAAM,UAAU,GAAG,SAAS,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAA;AAuBhD,MAAM,CAAC,MAAM,UAAU,GAAG,GAAiC,EAAE,CAC3D,iBAAiB,CAAC,EAAE,EAAY,CAAA;AAElC;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,MAAM,OAAO,OAAO;IAEP;IACA;IACA;IACA;IACA;IALX,YACW,OAAgB,EAChB,OAA+D,EAC/D,OAA0B,EAC1B,GAAU,EACV,aAA6B;QAJ7B,YAAO,GAAP,OAAO,CAAS;QAChB,YAAO,GAAP,OAAO,CAAwD;QAC/D,YAAO,GAAP,OAAO,CAAmB;QAC1B,QAAG,GAAH,GAAG,CAAO;QACV,kBAAa,GAAb,aAAa,CAAgB;IACrC,CAAC;IACJ;;;;;;;;;OASG;IACH,MAAM,CAAC,EAAE,CAA+B,MAIvC;QACC,OAAO,IAAI,OAAO,CAChB,MAAM,CAAC,OAAO,EACd,MAAM,CAAC,OAAO,EACd,EAAE,EACF,EAAE,EACF,EAAE,CACH,CAAA;IACH,CAAC;IACD;;;;;OAKG;IACH,SAAS;IACP,kBAAkB;IAClB,EAII,EACJ,OAAkD;QAElD,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAA;QACvC,MAAM,MAAM,GAAG,MAAM,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,KAAK,EAAE,OAAO,CAAC,OAAO,EAAE;YACvE,GAAG,OAAO;YACV,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE;SAC/B,CAAC,CAAA;QACF,MAAM,YAAY,GAAG,IAAI,YAAY,CACnC,MAAM,EACN,WAAW,EACX,OAAO,CAAC,QAAQ;aACb,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,EAAS,CAAC,CAAC;aACvC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC;aACrB,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC,EACtC,EAAE,EACF,IAAI,CAAC,GAAG,EACR,OAAO,CAAC,KAAK,EACb,IAAI,CAAC,OAAO,CACb,CAAA;QACD,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;QAC3C,MAAM,GAAG,GAAG,CAAC,GAAG,IAAI,CAAC,GAAG,EAAE,EAAE,CAAiB,CAAA;QAC7C,MAAM,aAAa,GAAG,CAAC,GAAG,IAAI,CAAC,aAAa,EAAE,YAAY,CAAC,CAAA;QAC3D,OAAO,IAAI,OAAO,CAChB,IAAI,CAAC,OAAO,EACZ,IAAI,CAAC,OAAO,EACZ,OAAO,EACP,GAAG,EACH,aAAa,CACd,CAAA;IACH,CAAC;IAED,KAAK,CAAC,KAAK;QACT,IAAI,CAAC,gBAAgB,EAAE,CAAA;QACvB,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAC/B,CAAC,CAAC,UAAU,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,gBAAgB,EAAE,CAAC,CAC5C,CAAA;QACD,OAAO;YACL,IAAI,EAAE,KAAK,EAAE,OAAgD,EAAE,EAAE;gBAC/D,IAAI;oBACF,MAAM,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAA;iBAClE;wBAAS;oBACR,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,CAAA;iBAClD;YACH,CAAC;SACF,CAAA;IACH,CAAC;IAEO,gBAAgB;QACtB,IAAI,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,KAAK,SAAS,CAAC,EAAE;YAClE,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,CAAA;SAClD;aAAM;YACL,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC,CAAA;SACnD;IACH,CAAC;CACF"}

package/mjs/lib/manifest/ManifestTypes.d.ts

@@ -1,4 +1,5 @@
 import { ValidEmVer } from "../emverLite/mod";
+import { ImageConfig, ImageId } from "../types";
 export interface Container {
     /** This should be pointing to a docker container name */
     image: string;
@@ -24,8 +25,6 @@ export type SDKManifest = {
     readonly releaseNotes: string;
     /** The type of license for the project. Include the LICENSE in the root of the project directory. A license is required for a Start9 package.*/
     readonly license: string;
-    /** A list of normie (hosted, SaaS, custodial, etc) services this services intends to replace */
-    readonly replaces: Readonly<string[]>;
     /** The Start9 wrapper repository URL for the package. This repo contains the manifest file (this),
      * any scripts necessary for configuration, backups, actions, or health checks (more below). This key
      * must exist. But could be embedded into the source repository
@@ -47,7 +46,7 @@ export type SDKManifest = {
         readonly long: string;
     };
     /** Defines the os images needed to run the container processes */
-    readonly images: string[];
+    readonly images: Record<ImageId, ImageConfig>;
     /** This denotes readonly asset directories that should be available to mount to the container.
      * Assuming that there will be three files with names along the lines:
      * icon.* : the icon that will be this packages icon on the ui

package/mjs/lib/manifest/setupManifest.d.ts

@@ -1,9 +1,10 @@
+import { ImageConfig, ImageId, VolumeId } from "../osBindings";
 import { SDKManifest, ManifestVersion } from "./ManifestTypes";
-export declare function setupManifest<Id extends string, Version extends ManifestVersion, Dependencies extends Record<string, unknown>, VolumesTypes extends string, AssetTypes extends string, ImagesTypes extends string, Manifest extends SDKManifest & {
+export declare function setupManifest<Id extends string, Version extends ManifestVersion, Dependencies extends Record<string, unknown>, VolumesTypes extends VolumeId, AssetTypes extends VolumeId, ImagesTypes extends ImageId, Manifest extends SDKManifest & {
     dependencies: Dependencies;
     id: Id;
     version: Version;
     assets: AssetTypes[];
-    images: ImagesTypes[];
+    images: Record<ImagesTypes, ImageConfig>;
     volumes: VolumesTypes[];
 }>(manifest: Manifest): Manifest;

package/mjs/lib/manifest/setupManifest.js.map

@@ -1 +1 @@
-{"version":3,"file":"setupManifest.js","sourceRoot":"","sources":["../../../../lib/manifest/setupManifest.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,aAAa,CAe3B,QAAkB;IAClB,OAAO,QAAQ,CAAA;AACjB,CAAC"}
+{"version":3,"file":"setupManifest.js","sourceRoot":"","sources":["../../../../lib/manifest/setupManifest.ts"],"names":[],"mappings":"AAGA,MAAM,UAAU,aAAa,CAe3B,QAAkB;IAClB,OAAO,QAAQ,CAAA;AACjB,CAAC"}

package/mjs/lib/osBindings/AcceptSigners.d.ts

@@ -1,6 +1,6 @@
-import type { SignerKey } from "./SignerKey";
+import type { AnyVerifyingKey } from "./AnyVerifyingKey";
 export type AcceptSigners = {
-    signer: SignerKey;
+    signer: AnyVerifyingKey;
 } | {
     any: Array<AcceptSigners>;
 } | {

package/mjs/lib/osBindings/AddAdminParams.d.ts

@@ -1,3 +1,4 @@
+import type { Guid } from "./Guid";
 export type AddAdminParams = {
-    signer: string;
+    signer: Guid;
 };

package/mjs/lib/osBindings/AddAdminParams.js

@@ -1,3 +1,2 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 export {};
 //# sourceMappingURL=AddAdminParams.js.map

package/mjs/lib/osBindings/AddAdminParams.js.map

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

package/mjs/lib/osBindings/AddAssetParams.d.ts

@@ -1,10 +1,10 @@
-import type { Signature } from "./Signature";
-import type { SignerKey } from "./SignerKey";
+import type { AnySignature } from "./AnySignature";
+import type { Blake3Commitment } from "./Blake3Commitment";
+import type { Version } from "./Version";
 export type AddAssetParams = {
-    url: string;
-    signature: Signature;
-    version: string;
+    version: Version;
     platform: string;
-    upload: boolean;
-    __auth_signer: SignerKey;
+    url: string;
+    signature: AnySignature;
+    commitment: Blake3Commitment;
 };

package/mjs/lib/osBindings/AddPackageParams.d.ts

@@ -0,0 +1,7 @@
+import type { AnySignature } from "./AnySignature";
+import type { MerkleArchiveCommitment } from "./MerkleArchiveCommitment";
+export type AddPackageParams = {
+    url: string;
+    commitment: MerkleArchiveCommitment;
+    signature: AnySignature;
+};

package/mjs/lib/osBindings/AddPackageParams.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=AddPackageParams.js.map

package/mjs/lib/osBindings/AddPackageParams.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"AddPackageParams.js","sourceRoot":"","sources":["../../../../lib/osBindings/AddPackageParams.ts"],"names":[],"mappings":""}

package/mjs/lib/osBindings/AddSslOptions.d.ts

@@ -1,6 +1,5 @@
 import type { AlpnInfo } from "./AlpnInfo";
 export type AddSslOptions = {
-    scheme: string | null;
     preferredExternalPort: number;
-    alpn: AlpnInfo;
+    alpn: AlpnInfo | null;
 };

package/mjs/lib/osBindings/AddVersionParams.d.ts

@@ -1,5 +1,6 @@
+import type { Version } from "./Version";
 export type AddVersionParams = {
-    version: string;
+    version: Version;
     headline: string;
     releaseNotes: string;
     sourceVersion: string;

package/mjs/lib/osBindings/AddVersionParams.js

@@ -1,3 +1,2 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 export {};
 //# sourceMappingURL=AddVersionParams.js.map

package/mjs/lib/osBindings/AddVersionParams.js.map

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

package/mjs/lib/osBindings/AddressInfo.d.ts

@@ -1,8 +1,9 @@
-import type { BindOptions } from "./BindOptions";
 import type { HostId } from "./HostId";
 export type AddressInfo = {
     username: string | null;
     hostId: HostId;
-    bindOptions: BindOptions;
+    internalPort: number;
+    scheme: string | null;
+    sslScheme: string | null;
     suffix: string;
 };

package/mjs/lib/osBindings/AnySignature.d.ts

@@ -0,0 +1 @@
+export type AnySignature = string;

package/mjs/lib/osBindings/{ReverseProxyBind.js → AnySignature.js}

@@ -1,3 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 export {};
-//# sourceMappingURL=ReverseProxyBind.js.map
+//# sourceMappingURL=AnySignature.js.map

package/mjs/lib/osBindings/AnySignature.js.map

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

package/mjs/lib/osBindings/AnySigningKey.d.ts

@@ -0,0 +1 @@
+export type AnySigningKey = string;

package/mjs/lib/osBindings/{ReverseProxyHttp.js → AnySigningKey.js}

@@ -1,3 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 export {};
-//# sourceMappingURL=ReverseProxyHttp.js.map
+//# sourceMappingURL=AnySigningKey.js.map

package/mjs/lib/osBindings/AnySigningKey.js.map

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

package/mjs/lib/osBindings/AnyVerifyingKey.d.ts

@@ -0,0 +1 @@
+export type AnyVerifyingKey = string;

package/mjs/lib/osBindings/{ExportedIpHostname.js → AnyVerifyingKey.js}

@@ -1,3 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 export {};
-//# sourceMappingURL=ExportedIpHostname.js.map
+//# sourceMappingURL=AnyVerifyingKey.js.map

package/mjs/lib/osBindings/AnyVerifyingKey.js.map

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

package/mjs/lib/osBindings/BindInfo.d.ts

@@ -1,5 +1,6 @@
 import type { BindOptions } from "./BindOptions";
+import type { LanInfo } from "./LanInfo";
 export type BindInfo = {
     options: BindOptions;
-    assignedLanPort: number | null;
+    lan: LanInfo;
 };

package/mjs/lib/osBindings/BindOptions.d.ts

@@ -1,7 +1,6 @@
 import type { AddSslOptions } from "./AddSslOptions";
 import type { Security } from "./Security";
 export type BindOptions = {
-    scheme: string | null;
     preferredExternalPort: number;
     addSsl: AddSslOptions | null;
     secure: Security | null;

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

@@ -6,7 +6,6 @@ export type BindParams = {
     kind: HostKind;
     id: HostId;
     internalPort: number;
-    scheme: string | null;
     preferredExternalPort: number;
     addSsl: AddSslOptions | null;
     secure: Security | null;