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

package/cjs/lib/StartSdk.d.ts

@@ -24,7 +24,7 @@ import { DependenciesReceipt, Read, Save } from "./config/setupConfig";
 import { InterfacesReceipt, SetInterfaces } from "./interfaces/setupInterfaces";
 import { successFailure } from "./trigger/successFailure";
 import { HealthReceipt } from "./health/HealthReceipt";
-import { MultiHost, Scheme, SingleHost, StaticHost } from "./interfaces/Host";
+import { MultiHost, Scheme } from "./interfaces/Host";
 import { ServiceInterfaceBuilder } from "./interfaces/ServiceInterfaceBuilder";
 import { GetSystemSmtp } from "./util/GetSystemSmtp";
 import nullIfEmpty from "./util/nullIfEmpty";
@@ -83,13 +83,11 @@ export declare class StartSdk<Manifest extends SDKManifest, Store> {
             setOwn: <E_6 extends Effects, Path extends import("./store/PathBuilder").PathBuilderStored<Store, unknown>>(effects: E_6, path: Path, value: Path extends PathBuilder<Store, infer Value_1> ? Value_1 : never) => Promise<void>;
         };
         host: {
-            static: (effects: Effects, id: string) => StaticHost;
-            single: (effects: Effects, id: string) => SingleHost;
             multi: (effects: Effects, id: string) => MultiHost;
         };
         nullIfEmpty: typeof nullIfEmpty;
         runCommand: <A extends string>(effects: Effects, image: {
-            id: Manifest["images"][number];
+            id: keyof Manifest["images"] & T.ImageId;
             sharedRun?: boolean;
         }, command: [string, ...string[]] | ValidIfNoStupidEscape<A>, options: CommandOptions & {
             mounts?: {
@@ -209,7 +207,7 @@ export declare class StartSdk<Manifest extends SDKManifest, Store> {
         setupMigrations: <Migrations_1 extends Migration<Manifest, Store, any>[]>(...migrations: EnsureUniqueId<Migrations_1>) => Migrations<Manifest, Store>;
         setupProperties: (fn: (options: {
             effects: Effects;
-        }) => Promise<T.SdkPropertiesReturn>) => T.ExpectedExports.Properties;
+        }) => Promise<T.SdkPropertiesReturn>) => T.ExpectedExports.properties;
         setupUninstall: (fn: UninstallFn<Manifest, Store>) => Uninstall<Manifest, Store>;
         trigger: {
             defaultTrigger: import("./trigger").Trigger;
@@ -446,7 +444,7 @@ export declare class StartSdk<Manifest extends SDKManifest, Store> {
     };
 }
 export declare function runCommand<Manifest extends SDKManifest>(effects: Effects, image: {
-    id: Manifest["images"][number];
+    id: keyof Manifest["images"] & T.ImageId;
     sharedRun?: boolean;
 }, command: string | [string, ...string[]], options: CommandOptions & {
     mounts?: {

package/cjs/lib/StartSdk.js

@@ -69,7 +69,7 @@ const mod_1 = require("./emverLite/mod");
 const PathBuilder_1 = require("./store/PathBuilder");
 const dependencies_1 = require("./dependencies/dependencies");
 exports.SIGTERM = "SIGTERM";
-exports.SIGKILL = "SIGTERM";
+exports.SIGKILL = "SIGKILL";
 exports.NO_TIMEOUT = -1;
 function removeConstType() {
     return (t) => t;
@@ -112,8 +112,10 @@ class StartSdk {
                 }),
             },
             host: {
-                static: (effects, id) => new Host_1.StaticHost({ id, effects }),
-                single: (effects, id) => new Host_1.SingleHost({ id, effects }),
+                // 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 }),
             },
             nullIfEmpty: nullIfEmpty_1.default,

package/cjs/lib/StartSdk.js.map

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

package/cjs/lib/health/HealthCheck.d.ts

@@ -3,11 +3,12 @@ import { CheckResult } from "./checkFns/CheckResult";
 import { HealthReceipt } from "./HealthReceipt";
 import { Trigger } from "../trigger";
 import { Overlay } from "../util/Overlay";
+import { T } from "..";
 export type HealthCheckParams<Manifest extends SDKManifest> = {
     effects: Effects;
     name: string;
     image: {
-        id: Manifest["images"][number];
+        id: keyof Manifest["images"] & T.ImageId;
         sharedRun?: boolean;
     };
     trigger?: Trigger;

package/cjs/lib/health/HealthCheck.js.map

@@ -1 +1 @@
-{"version":3,"file":"HealthCheck.js","sourceRoot":"","sources":["../../../../lib/health/HealthCheck.ts"],"names":[],"mappings":";;;AAMA,8DAA0D;AAC1D,uCAAmC;AACnC,6CAAyC;AACzC,2CAA4C;AAc5C,SAAgB,WAAW,CACzB,CAA8B;IAE9B,IAAI,OAAO,CAAC,KAAK,IAAI,EAAE;;QACrB,MAAM,OAAO,GAAG,MAAM,iBAAO,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,KAAK,CAAC,CAAA;QACpD,IAAI;YACF,IAAI,YAAY,GAAiB;gBAC/B,UAAU,EAAE,KAAK;aAClB,CAAA;YACD,MAAM,eAAe,GAAG,GAAG,EAAE,CAAC,YAAY,CAAA;YAC1C,MAAM,OAAO,GAAG,CAAC,MAAA,CAAC,CAAC,OAAO,mCAAI,+BAAc,CAAC,CAAC,eAAe,CAAC,CAAA;YAC9D,MAAM,mBAAmB,GAAG,IAAA,WAAI,EAAC,GAAG,EAAE,CACpC,OAAO,CAAC,OAAO,CACb,gBAAgB,IAAI,CAAC,IAAI,CAAC,CAAC,cAAc;gBACvC,CAAC,CAAC,CAAC,CAAC,cAAc,EAAE;gBACpB,CAAC,CAAC,SAAS,CACd,CACF,CAAA;YACD,KACE,IAAI,GAAG,GAAG,MAAM,OAAO,CAAC,IAAI,EAAE,EAC9B,CAAC,GAAG,CAAC,IAAI,EACT,GAAG,GAAG,MAAM,OAAO,CAAC,IAAI,EAAE,EAC1B;gBACA,IAAI;oBACF,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,CAAA;oBAC/C,MAAM,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC;wBACxB,IAAI,EAAE,CAAC,CAAC,IAAI;wBACZ,EAAE,EAAE,CAAC,CAAC,IAAI;wBACV,MAAM,EAAE,MAAM;wBACd,OAAO,EAAE,OAAO,IAAI,EAAE;qBACvB,CAAC,CAAA;oBACF,YAAY,CAAC,UAAU,GAAG,IAAI,CAAA;oBAC9B,YAAY,CAAC,UAAU,GAAG,SAAS,CAAA;oBACnC,MAAM,mBAAmB,EAAE,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;wBACxC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;oBACpB,CAAC,CAAC,CAAA;iBACH;gBAAC,OAAO,CAAC,EAAE;oBACV,MAAM,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC;wBACxB,IAAI,EAAE,CAAC,CAAC,IAAI;wBACZ,EAAE,EAAE,CAAC,CAAC,IAAI;wBACV,MAAM,EAAE,SAAS;wBACjB,OAAO,EAAE,SAAS,CAAC,CAAC,CAAC,IAAI,EAAE;qBAC5B,CAAC,CAAA;oBACF,YAAY,CAAC,UAAU,GAAG,SAAS,CAAA;iBACpC;aACF;SACF;gBAAS;YACR,MAAM,OAAO,CAAC,OAAO,EAAE,CAAA;SACxB;IACH,CAAC,CAAC,CAAA;IACF,OAAO,EAAmB,CAAA;AAC5B,CAAC;AAnDD,kCAmDC;AACD,SAAS,SAAS,CAAC,CAAU;IAC3B,IAAI,IAAA,mBAAM,EAAC,EAAE,OAAO,EAAE,oBAAO,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;QAAE,OAAO,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,CAAA;IAClE,MAAM,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,CAAA;IACvB,IAAI,KAAK,CAAC,MAAM,IAAI,IAAI;QAAE,OAAO,IAAI,CAAA;IACrC,OAAO,KAAK,CAAA;AACd,CAAC"}
+{"version":3,"file":"HealthCheck.js","sourceRoot":"","sources":["../../../../lib/health/HealthCheck.ts"],"names":[],"mappings":";;;AAMA,8DAA0D;AAC1D,uCAAmC;AACnC,6CAAyC;AACzC,2CAA4C;AAe5C,SAAgB,WAAW,CACzB,CAA8B;IAE9B,IAAI,OAAO,CAAC,KAAK,IAAI,EAAE;;QACrB,MAAM,OAAO,GAAG,MAAM,iBAAO,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,KAAK,CAAC,CAAA;QACpD,IAAI;YACF,IAAI,YAAY,GAAiB;gBAC/B,UAAU,EAAE,KAAK;aAClB,CAAA;YACD,MAAM,eAAe,GAAG,GAAG,EAAE,CAAC,YAAY,CAAA;YAC1C,MAAM,OAAO,GAAG,CAAC,MAAA,CAAC,CAAC,OAAO,mCAAI,+BAAc,CAAC,CAAC,eAAe,CAAC,CAAA;YAC9D,MAAM,mBAAmB,GAAG,IAAA,WAAI,EAAC,GAAG,EAAE,CACpC,OAAO,CAAC,OAAO,CACb,gBAAgB,IAAI,CAAC,IAAI,CAAC,CAAC,cAAc;gBACvC,CAAC,CAAC,CAAC,CAAC,cAAc,EAAE;gBACpB,CAAC,CAAC,SAAS,CACd,CACF,CAAA;YACD,KACE,IAAI,GAAG,GAAG,MAAM,OAAO,CAAC,IAAI,EAAE,EAC9B,CAAC,GAAG,CAAC,IAAI,EACT,GAAG,GAAG,MAAM,OAAO,CAAC,IAAI,EAAE,EAC1B;gBACA,IAAI;oBACF,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,CAAA;oBAC/C,MAAM,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC;wBACxB,IAAI,EAAE,CAAC,CAAC,IAAI;wBACZ,EAAE,EAAE,CAAC,CAAC,IAAI;wBACV,MAAM,EAAE,MAAM;wBACd,OAAO,EAAE,OAAO,IAAI,EAAE;qBACvB,CAAC,CAAA;oBACF,YAAY,CAAC,UAAU,GAAG,IAAI,CAAA;oBAC9B,YAAY,CAAC,UAAU,GAAG,SAAS,CAAA;oBACnC,MAAM,mBAAmB,EAAE,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;wBACxC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;oBACpB,CAAC,CAAC,CAAA;iBACH;gBAAC,OAAO,CAAC,EAAE;oBACV,MAAM,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC;wBACxB,IAAI,EAAE,CAAC,CAAC,IAAI;wBACZ,EAAE,EAAE,CAAC,CAAC,IAAI;wBACV,MAAM,EAAE,SAAS;wBACjB,OAAO,EAAE,SAAS,CAAC,CAAC,CAAC,IAAI,EAAE;qBAC5B,CAAC,CAAA;oBACF,YAAY,CAAC,UAAU,GAAG,SAAS,CAAA;iBACpC;aACF;SACF;gBAAS;YACR,MAAM,OAAO,CAAC,OAAO,EAAE,CAAA;SACxB;IACH,CAAC,CAAC,CAAA;IACF,OAAO,EAAmB,CAAA;AAC5B,CAAC;AAnDD,kCAmDC;AACD,SAAS,SAAS,CAAC,CAAU;IAC3B,IAAI,IAAA,mBAAM,EAAC,EAAE,OAAO,EAAE,oBAAO,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;QAAE,OAAO,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,CAAA;IAClE,MAAM,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,CAAA;IACvB,IAAI,KAAK,CAAC,MAAM,IAAI,IAAI;QAAE,OAAO,IAAI,CAAA;IACrC,OAAO,KAAK,CAAA;AACd,CAAC"}

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

@@ -1,11 +1,11 @@
 import { Effects } from "../types";
 import { Origin } from "./Origin";
-import { AddSslOptions } from ".././osBindings";
+import { AddSslOptions, BindParams } from ".././osBindings";
 import { Security } from ".././osBindings";
 import { BindOptions } from ".././osBindings";
 import { AlpnInfo } from ".././osBindings";
 export { AddSslOptions, Security, BindOptions };
-declare const knownProtocols: {
+export declare const knownProtocols: {
     readonly http: {
         readonly secure: null;
         readonly defaultPort: 80;
@@ -72,16 +72,14 @@ type NotProtocolsWithSslVariants = Exclude<keyof KnownProtocols, ProtocolsWithSs
 type BindOptionsByKnownProtocol = {
     protocol: ProtocolsWithSslVariants;
     preferredExternalPort?: number;
-    scheme?: Scheme;
     addSsl?: Partial<AddSslOptions>;
 } | {
     protocol: NotProtocolsWithSslVariants;
     preferredExternalPort?: number;
-    scheme?: Scheme;
     addSsl?: AddSslOptions;
 };
-type BindOptionsByProtocol = BindOptionsByKnownProtocol | BindOptions;
-export type HostKind = "static" | "single" | "multi";
+export type BindOptionsByProtocol = BindOptionsByKnownProtocol | BindOptions;
+export type HostKind = BindParams["kind"];
 export declare class Host {
     readonly options: {
         effects: Effects;
@@ -96,19 +94,7 @@ export declare class Host {
     bindPort(internalPort: number, options: BindOptionsByProtocol): Promise<Origin<this>>;
     private bindPortForUnknown;
     private bindPortForKnown;
-    private getAddSsl;
-}
-export declare class StaticHost extends Host {
-    constructor(options: {
-        effects: Effects;
-        id: string;
-    });
-}
-export declare class SingleHost extends Host {
-    constructor(options: {
-        effects: Effects;
-        id: string;
-    });
+    private getSslProto;
 }
 export declare class MultiHost extends Host {
     constructor(options: {

package/cjs/lib/interfaces/Host.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MultiHost = exports.SingleHost = exports.StaticHost = exports.Host = void 0;
+exports.MultiHost = exports.Host = exports.knownProtocols = void 0;
 const ts_matches_1 = require("ts-matches");
 const Origin_1 = require("./Origin");
-const knownProtocols = {
+exports.knownProtocols = {
     http: {
         secure: null,
         defaultPort: 80,
@@ -61,46 +61,45 @@ 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_1.Origin(this, options);
+        };
+        await this.options.effects.bind(binderOptions);
+        return new Origin_1.Origin(this, internalPort, null, null);
     }
     async bindPortForKnown(options, internalPort) {
-        const scheme = options.scheme === undefined ? options.protocol : options.scheme;
-        const protoInfo = knownProtocols[options.protocol];
+        const protoInfo = exports.knownProtocols[options.protocol];
         const preferredExternalPort = options.preferredExternalPort ||
-            knownProtocols[options.protocol].defaultPort;
-        const addSsl = this.getAddSsl(options, protoInfo);
+            exports.knownProtocols[options.protocol].defaultPort;
+        const sslProto = this.getSslProto(options, protoInfo);
+        const addSsl = sslProto && "alpn" in protoInfo
+            ? {
+                // addXForwardedHeaders: null,
+                preferredExternalPort: exports.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_1.Origin(this, newOptions);
+        return new Origin_1.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;
     }
 }
@@ -108,18 +107,16 @@ exports.Host = Host;
 function inObject(key, obj) {
     return key in obj;
 }
-class StaticHost extends Host {
-    constructor(options) {
-        super({ ...options, kind: "static" });
-    }
-}
-exports.StaticHost = StaticHost;
-class SingleHost extends Host {
-    constructor(options) {
-        super({ ...options, kind: "single" });
-    }
-}
-exports.SingleHost = SingleHost;
+// 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" });

package/cjs/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/cjs/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/cjs/lib/interfaces/Origin.js

@@ -2,9 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Origin = void 0;
 class Origin {
-    constructor(host, options) {
+    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)
@@ -13,18 +15,9 @@ 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/cjs/lib/interfaces/Origin.js.map

@@ -1 +1 @@
-{"version":3,"file":"Origin.js","sourceRoot":"","sources":["../../../../lib/interfaces/Origin.ts"],"names":[],"mappings":";;;AAKA,MAAa,MAAM;IACjB,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;AApFD,wBAoFC"}
+{"version":3,"file":"Origin.js","sourceRoot":"","sources":["../../../../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,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;AA7ED,wBA6EC"}

package/cjs/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/cjs/lib/mainFn/CommandController.js

@@ -45,28 +45,24 @@ class CommandController {
             return await this.runningAnswer;
         }
         finally {
-            await (0, Daemons_1.cpExecFile)("pkill", ["-9", "-s", String(this.pid)]).catch((_) => { });
+            if (this.pid !== undefined) {
+                await (0, Daemons_1.cpExecFile)("pkill", ["-9", "-s", String(this.pid)]).catch((_) => { });
+            }
             await this.overlay.destroy().catch((_) => { });
         }
     }
     async term({ signal = StartSdk_1.SIGTERM, timeout = StartSdk_1.NO_TIMEOUT } = {}) {
+        if (this.pid === undefined)
+            return;
         try {
             await (0, Daemons_1.cpExecFile)("pkill", [
                 `-${signal.replace("SIG", "")}`,
                 "-s",
                 String(this.pid),
             ]);
-            if (timeout > StartSdk_1.NO_TIMEOUT) {
-                const didTimeout = await Promise.race([
-                    new Promise((resolve) => setTimeout(resolve, timeout)).then(() => true),
-                    this.runningAnswer.then(() => false),
-                ]);
-                if (didTimeout) {
-                    await (0, Daemons_1.cpExecFile)("pkill", [`-9`, "-s", String(this.pid)]).catch((_) => { });
-                }
-            }
-            else {
-                await this.runningAnswer;
+            const didTimeout = await waitSession(this.pid, timeout);
+            if (didTimeout) {
+                await (0, Daemons_1.cpExecFile)("pkill", [`-9`, "-s", String(this.pid)]).catch((_) => { });
             }
         }
         finally {
@@ -75,4 +71,42 @@ class CommandController {
     }
 }
 exports.CommandController = CommandController;
+function waitSession(sid, timeout = StartSdk_1.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);
+        }
+        (0, Daemons_1.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/cjs/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":"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"}

package/cjs/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/cjs/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/cjs/lib/mainFn/Daemons.js

@@ -23,7 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Daemons = exports.runCommand = exports.cpExecFile = exports.CommandController = exports.Daemon = void 0;
+exports.Daemons = exports.runCommand = exports.cpExecFile = exports.cpExec = exports.CommandController = exports.Daemon = void 0;
 const node_util_1 = require("node:util");
 const CP = __importStar(require("node:child_process"));
 var Daemon_1 = require("./Daemon");
@@ -33,7 +33,7 @@ Object.defineProperty(exports, "CommandController", { enumerable: true, get: fun
 const HealthDaemon_1 = require("./HealthDaemon");
 const Daemon_2 = require("./Daemon");
 const CommandController_2 = require("./CommandController");
-const cpExec = (0, node_util_1.promisify)(CP.exec);
+exports.cpExec = (0, node_util_1.promisify)(CP.exec);
 exports.cpExecFile = (0, node_util_1.promisify)(CP.execFile);
 const runCommand = () => CommandController_2.CommandController.of();
 exports.runCommand = runCommand;
@@ -91,7 +91,10 @@ class Daemons {
     // prettier-ignore
     id, options) {
         const daemonIndex = this.daemons.length;
-        const daemon = Daemon_2.Daemon.of()(this.effects, options.image, options.command, options);
+        const daemon = Daemon_2.Daemon.of()(this.effects, options.image, options.command, {
+            ...options,
+            mounts: options.mounts.build(),
+        });
         const healthDaemon = new HealthDaemon_1.HealthDaemon(daemon, daemonIndex, options.requires
             .map((x) => this.ids.indexOf(id))
             .filter((x) => x >= 0)

package/cjs/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":"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"}