@start9labs/start-sdk 0.4.0-beta.2 → 0.4.0-beta.21

package/package/lib/inits/setupUninit.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.setupUninit = setupUninit;
+function setupUninit(...uninits) {
+    return async (opts) => {
+        for (const uninit of uninits) {
+            if ("uninit" in uninit)
+                await uninit.uninit(opts.effects, opts.target);
+            else
+                await uninit(opts.effects, opts.target);
+        }
+    };
+}
+//# sourceMappingURL=setupUninit.js.map

package/package/lib/inits/setupUninit.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"setupUninit.js","sourceRoot":"","sources":["../../../../package/lib/inits/setupUninit.ts"],"names":[],"mappings":";;AAeA,kCASC;AATD,SAAgB,WAAW,CACzB,GAAG,OAAoC;IAEvC,OAAO,KAAK,EAAE,IAAI,EAAE,EAAE;QACpB,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;YAC7B,IAAI,QAAQ,IAAI,MAAM;gBAAE,MAAM,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,CAAA;;gBACjE,MAAM,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,CAAA;QAC9C,CAAC;IACH,CAAC,CAAA;AACH,CAAC"}

package/package/lib/inits/setupUninstall.d.ts

@@ -1,11 +1,11 @@
 import * as T from "../../../base/lib/types";
-export type UninstallFn<Manifest extends T.SDKManifest, Store> = (opts: {
+export type UninstallFn<Manifest extends T.SDKManifest> = (opts: {
     effects: T.Effects;
 }) => Promise<null | void | undefined>;
-export declare class Uninstall<Manifest extends T.SDKManifest, Store> {
-    readonly fn: UninstallFn<Manifest, Store>;
+export declare class Uninstall<Manifest extends T.SDKManifest> {
+    readonly fn: UninstallFn<Manifest>;
     private constructor();
-    static of<Manifest extends T.SDKManifest, Store>(fn: UninstallFn<Manifest, Store>): Uninstall<Manifest, Store>;
+    static of<Manifest extends T.SDKManifest>(fn: UninstallFn<Manifest>): Uninstall<Manifest>;
     uninstall({ effects, nextVersion, }: Parameters<T.ExpectedExports.packageUninit>[0]): Promise<void>;
 }
-export declare function setupUninstall<Manifest extends T.SDKManifest, Store>(fn: UninstallFn<Manifest, Store>): Uninstall<Manifest, Store>;
+export declare function setupUninstall<Manifest extends T.SDKManifest>(fn: UninstallFn<Manifest>): Uninstall<Manifest>;

package/package/lib/inits/setupUninstall.js.map

@@ -1 +1 @@
-{"version":3,"file":"setupUninstall.js","sourceRoot":"","sources":["../../../../package/lib/inits/setupUninstall.ts"],"names":[],"mappings":";;;AAwBA,wCAIC;AAvBD,MAAa,SAAS;IACpB,YAA6B,EAAgC;QAAhC,OAAE,GAAF,EAAE,CAA8B;IAAG,CAAC;IACjE,MAAM,CAAC,EAAE,CACP,EAAgC;QAEhC,OAAO,IAAI,SAAS,CAAC,EAAE,CAAC,CAAA;IAC1B,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,EACd,OAAO,EACP,WAAW,GACoC;QAC/C,IAAI,CAAC,WAAW;YACd,MAAM,IAAI,CAAC,EAAE,CAAC;gBACZ,OAAO;aACR,CAAC,CAAA;IACN,CAAC;CACF;AAjBD,8BAiBC;AAED,SAAgB,cAAc,CAC5B,EAAgC;IAEhC,OAAO,SAAS,CAAC,EAAE,CAAC,EAAE,CAAC,CAAA;AACzB,CAAC"}
+{"version":3,"file":"setupUninstall.js","sourceRoot":"","sources":["../../../../package/lib/inits/setupUninstall.ts"],"names":[],"mappings":";;;AAsBA,wCAIC;AArBD,MAAa,SAAS;IACpB,YAA6B,EAAyB;QAAzB,OAAE,GAAF,EAAE,CAAuB;IAAG,CAAC;IAC1D,MAAM,CAAC,EAAE,CAAiC,EAAyB;QACjE,OAAO,IAAI,SAAS,CAAC,EAAE,CAAC,CAAA;IAC1B,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,EACd,OAAO,EACP,WAAW,GACoC;QAC/C,IAAI,CAAC,WAAW;YACd,MAAM,IAAI,CAAC,EAAE,CAAC;gBACZ,OAAO;aACR,CAAC,CAAA;IACN,CAAC;CACF;AAfD,8BAeC;AAED,SAAgB,cAAc,CAC5B,EAAyB;IAEzB,OAAO,SAAS,CAAC,EAAE,CAAC,EAAE,CAAC,CAAA;AACzB,CAAC"}

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

@@ -1,23 +1,15 @@
 import * as T from "../../../base/lib/types";
-import { MountOptions, SubContainerHandle, SubContainer } from "../util/SubContainer";
+import { SubContainer } from "../util/SubContainer";
 import { Drop } from "../util";
-export declare class CommandController extends Drop {
+export declare class CommandController<Manifest extends T.SDKManifest> extends Drop {
     readonly runningAnswer: Promise<unknown>;
     private state;
     private readonly subcontainer;
     private process;
     readonly sigtermTimeout: number;
     private constructor();
-    static of<Manifest extends T.SDKManifest>(): <A extends string>(effects: T.Effects, subcontainer: {
-        imageId: keyof Manifest["images"] & T.ImageId;
-        sharedRun?: boolean;
-    } | SubContainer, command: T.CommandType, options: {
-        subcontainerName?: string;
+    static of<Manifest extends T.SDKManifest>(): (effects: T.Effects, subcontainer: SubContainer<Manifest>, command: T.CommandType, options: {
         sigtermTimeout?: number;
-        mounts?: {
-            mountpoint: string;
-            options: MountOptions;
-        }[];
         runAsInit?: boolean;
         env?: {
             [variable: string]: string;
@@ -26,8 +18,7 @@ export declare class CommandController extends Drop {
         user?: string | undefined;
         onStdout?: (chunk: Buffer | string | any) => void;
         onStderr?: (chunk: Buffer | string | any) => void;
-    }) => Promise<CommandController>;
-    get subContainerHandle(): SubContainerHandle;
+    }) => Promise<CommandController<Manifest>>;
     wait({ timeout }?: {
         timeout?: number | undefined;
     }): Promise<unknown>;

package/package/lib/mainFn/CommandController.js

@@ -37,7 +37,6 @@ exports.CommandController = void 0;
 const _1 = require(".");
 const types_1 = require("../../../base/lib/types");
 const T = __importStar(require("../../../base/lib/types"));
-const SubContainer_1 = require("../util/SubContainer");
 const util_1 = require("../util");
 const fs = __importStar(require("node:fs/promises"));
 class CommandController extends util_1.Drop {
@@ -51,43 +50,28 @@ class CommandController extends util_1.Drop {
     }
     static of() {
         return async (effects, subcontainer, command, options) => {
-            let commands;
-            if (command instanceof T.UseEntrypoint) {
-                const imageMeta = await fs
-                    .readFile(`/media/startos/images/${subcontainer.imageId}.json`, {
-                    encoding: "utf8",
-                })
-                    .catch(() => "{}")
-                    .then(JSON.parse);
-                commands = imageMeta.entrypoint ?? [];
-                commands.concat(...(command.overridCmd ?? imageMeta.cmd ?? []));
-            }
-            else
-                commands = (0, util_1.splitCommand)(command);
-            const subc = subcontainer instanceof SubContainer_1.SubContainer
-                ? subcontainer
-                : await (async () => {
-                    const subc = await SubContainer_1.SubContainer.of(effects, subcontainer, options?.subcontainerName || commands.join(" "));
-                    try {
-                        for (let mount of options.mounts || []) {
-                            await subc.mount(mount.options, mount.mountpoint);
-                        }
-                        return subc;
-                    }
-                    catch (e) {
-                        await subc.destroy();
-                        throw e;
-                    }
-                })();
             try {
+                let commands;
+                if (command instanceof T.UseEntrypoint) {
+                    const imageMeta = await fs
+                        .readFile(`/media/startos/images/${subcontainer.imageId}.json`, {
+                        encoding: "utf8",
+                    })
+                        .catch(() => "{}")
+                        .then(JSON.parse);
+                    commands = imageMeta.entrypoint ?? [];
+                    commands = commands.concat(...(command.overridCmd ?? imageMeta.cmd ?? []));
+                }
+                else
+                    commands = (0, util_1.splitCommand)(command);
                 let childProcess;
                 if (options.runAsInit) {
-                    childProcess = await subc.launch(commands, {
+                    childProcess = await subcontainer.launch(commands, {
                         env: options.env,
                     });
                 }
                 else {
-                    childProcess = await subc.spawn(commands, {
+                    childProcess = await subcontainer.spawn(commands, {
                         env: options.env,
                         stdio: options.onStdout || options.onStderr ? "pipe" : "inherit",
                     });
@@ -113,51 +97,46 @@ class CommandController extends util_1.Drop {
                         }
                     });
                 });
-                return new CommandController(answer, state, subc, childProcess, options.sigtermTimeout);
+                return new CommandController(answer, state, subcontainer, childProcess, options.sigtermTimeout);
             }
             catch (e) {
-                await subc.destroy();
+                await subcontainer.destroy();
                 throw e;
             }
         };
     }
-    get subContainerHandle() {
-        return new SubContainer_1.SubContainerHandle(this.subcontainer);
-    }
     async wait({ timeout = types_1.NO_TIMEOUT } = {}) {
-        const self = this.weak();
         if (timeout > 0)
             setTimeout(() => {
-                self.term();
+                this.term();
             }, timeout);
         try {
-            return await self.runningAnswer;
+            return await this.runningAnswer;
         }
         finally {
-            if (!self.state.exited) {
-                self.process.kill("SIGKILL");
+            if (!this.state.exited) {
+                this.process.kill("SIGKILL");
             }
-            await self.subcontainer.destroy().catch((_) => { });
+            await this.subcontainer.destroy();
         }
     }
     async term({ signal = types_1.SIGTERM, timeout = this.sigtermTimeout } = {}) {
-        const self = this.weak();
         try {
-            if (!self.state.exited) {
+            if (!this.state.exited) {
                 if (signal !== "SIGKILL") {
                     setTimeout(() => {
-                        if (!self.state.exited)
-                            self.process.kill("SIGKILL");
+                        if (!this.state.exited)
+                            this.process.kill("SIGKILL");
                     }, timeout);
                 }
-                if (!self.process.kill(signal)) {
+                if (!this.process.kill(signal)) {
                     console.error(`failed to send signal ${signal} to pid ${this.process.pid}`);
                 }
             }
-            await self.runningAnswer;
+            await this.runningAnswer;
         }
         finally {
-            await self.subcontainer.destroy();
+            await this.subcontainer.destroy();
         }
     }
     onDrop() {

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

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

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

@@ -1,25 +1,22 @@
 import * as T from "../../../base/lib/types";
-import { ExecSpawnable, MountOptions, SubContainer } from "../util/SubContainer";
+import { Drop } from "../util";
+import { SubContainer, SubContainerRc } from "../util/SubContainer";
 import { CommandController } from "./CommandController";
 /**
  * This is a wrapper around CommandController that has a state of off, where the command shouldn't be running
  * and the others state of running, where it will keep a living running command
  */
-export declare class Daemon {
+export declare class Daemon<Manifest extends T.SDKManifest> extends Drop {
+    private subcontainer;
     private startCommand;
+    readonly oneshot: boolean;
+    protected onExitSuccessFns: (() => void)[];
     private commandController;
     private shouldBeRunning;
-    constructor(startCommand: () => Promise<CommandController>);
-    get subContainerHandle(): undefined | ExecSpawnable;
-    static of<Manifest extends T.SDKManifest>(): <A extends string>(effects: T.Effects, subcontainer: {
-        imageId: keyof Manifest["images"] & T.ImageId;
-        sharedRun?: boolean;
-    } | SubContainer, command: T.CommandType, options: {
-        subcontainerName?: string;
-        mounts?: {
-            mountpoint: string;
-            options: MountOptions;
-        }[];
+    protected exitedSuccess: boolean;
+    protected constructor(subcontainer: SubContainer<Manifest>, startCommand: () => Promise<CommandController<Manifest>>, oneshot?: boolean, onExitSuccessFns?: (() => void)[]);
+    static of<Manifest extends T.SDKManifest>(): (effects: T.Effects, subcontainer: SubContainer<Manifest>, command: T.CommandType, options: {
+        runAsInit?: boolean;
         env?: {
             [variable: string]: string;
         } | undefined;
@@ -28,7 +25,7 @@ export declare class Daemon {
         onStdout?: (chunk: Buffer | string | any) => void;
         onStderr?: (chunk: Buffer | string | any) => void;
         sigtermTimeout?: number;
-    }) => Promise<Daemon>;
+    }) => Promise<Daemon<Manifest>>;
     start(): Promise<void>;
     term(termOptions?: {
         signal?: NodeJS.Signals | undefined;
@@ -38,4 +35,6 @@ export declare class Daemon {
         signal?: NodeJS.Signals | undefined;
         timeout?: number | undefined;
     }): Promise<void>;
+    subcontainerRc(): SubContainerRc<Manifest>;
+    onDrop(): void;
 }

package/package/lib/mainFn/Daemon.js

@@ -2,6 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Daemon = void 0;
 const asError_1 = require("../../../base/lib/util/asError");
+const util_1 = require("../util");
+const SubContainer_1 = require("../util/SubContainer");
 const CommandController_1 = require("./CommandController");
 const TIMEOUT_INCREMENT_MS = 1000;
 const MAX_TIMEOUT_MS = 30000;
@@ -9,19 +11,23 @@ const MAX_TIMEOUT_MS = 30000;
  * This is a wrapper around CommandController that has a state of off, where the command shouldn't be running
  * and the others state of running, where it will keep a living running command
  */
-class Daemon {
-    constructor(startCommand) {
+class Daemon extends util_1.Drop {
+    constructor(subcontainer, startCommand, oneshot = false, onExitSuccessFns = []) {
+        super();
+        this.subcontainer = subcontainer;
         this.startCommand = startCommand;
+        this.oneshot = oneshot;
+        this.onExitSuccessFns = onExitSuccessFns;
         this.commandController = null;
         this.shouldBeRunning = false;
-    }
-    get subContainerHandle() {
-        return this.commandController?.subContainerHandle;
+        this.exitedSuccess = false;
     }
     static of() {
         return async (effects, subcontainer, command, options) => {
-            const startCommand = () => CommandController_1.CommandController.of()(effects, subcontainer, command, options);
-            return new Daemon(startCommand);
+            if (subcontainer instanceof SubContainer_1.SubContainerOwned)
+                subcontainer = subcontainer.rc();
+            const startCommand = () => CommandController_1.CommandController.of()(effects, subcontainer.rc(), command, options);
+            return new Daemon(subcontainer, startCommand);
         };
     }
     async start() {
@@ -29,18 +35,37 @@ class Daemon {
             return;
         }
         this.shouldBeRunning = true;
+        this.exitedSuccess = false;
         let timeoutCounter = 0;
-        new Promise(async () => {
+        (async () => {
             while (this.shouldBeRunning) {
                 if (this.commandController)
-                    await this.commandController.term().catch((err) => console.error(err));
+                    await this.commandController
+                        .term({})
+                        .catch((err) => console.error(err));
                 this.commandController = await this.startCommand();
-                await this.commandController.wait().catch((err) => console.error(err));
+                if ((await this.commandController.wait().then((_) => true, (err) => {
+                    console.error(err);
+                    return false;
+                })) &&
+                    this.oneshot) {
+                    for (const fn of this.onExitSuccessFns) {
+                        try {
+                            fn();
+                        }
+                        catch (e) {
+                            console.error("EXIT_SUCCESS handler", e);
+                        }
+                    }
+                    this.onExitSuccessFns = [];
+                    this.exitedSuccess = true;
+                    break;
+                }
                 await new Promise((resolve) => setTimeout(resolve, timeoutCounter));
                 timeoutCounter += TIMEOUT_INCREMENT_MS;
-                timeoutCounter = Math.max(MAX_TIMEOUT_MS, timeoutCounter);
+                timeoutCounter = Math.min(MAX_TIMEOUT_MS, timeoutCounter);
             }
-        }).catch((err) => {
+        })().catch((err) => {
             console.error((0, asError_1.asError)(err));
         });
     }
@@ -53,6 +78,13 @@ class Daemon {
             ?.term({ ...termOptions })
             .catch((e) => console.error((0, asError_1.asError)(e)));
         this.commandController = null;
+        await this.subcontainer.destroy();
+    }
+    subcontainerRc() {
+        return this.subcontainer.rc();
+    }
+    onDrop() {
+        this.stop().catch((e) => console.error((0, asError_1.asError)(e)));
     }
 }
 exports.Daemon = Daemon;

package/package/lib/mainFn/Daemon.js.map

@@ -1 +1 @@
-{"version":3,"file":"Daemon.js","sourceRoot":"","sources":["../../../../package/lib/mainFn/Daemon.ts"],"names":[],"mappings":";;;AACA,4DAAwD;AAExD,2DAAuD;AAEvD,MAAM,oBAAoB,GAAG,IAAI,CAAA;AACjC,MAAM,cAAc,GAAG,KAAK,CAAA;AAC5B;;;GAGG;AAEH,MAAa,MAAM;IAGjB,YAAoB,YAA8C;QAA9C,iBAAY,GAAZ,YAAY,CAAkC;QAF1D,sBAAiB,GAA6B,IAAI,CAAA;QAClD,oBAAe,GAAG,KAAK,CAAA;IACsC,CAAC;IACtE,IAAI,kBAAkB;QACpB,OAAO,IAAI,CAAC,iBAAiB,EAAE,kBAAkB,CAAA;IACnD,CAAC;IACD,MAAM,CAAC,EAAE;QACP,OAAO,KAAK,EACV,OAAkB,EAClB,YAKgB,EAChB,OAAsB,EACtB,OAaC,EACD,EAAE;YACF,MAAM,YAAY,GAAG,GAAG,EAAE,CACxB,qCAAiB,CAAC,EAAE,EAAY,CAC9B,OAAO,EACP,YAAY,EACZ,OAAO,EACP,OAAO,CACR,CAAA;YACH,OAAO,IAAI,MAAM,CAAC,YAAY,CAAC,CAAA;QACjC,CAAC,CAAA;IACH,CAAC;IACD,KAAK,CAAC,KAAK;QACT,IAAI,IAAI,CAAC,iBAAiB,EAAE,CAAC;YAC3B,OAAM;QACR,CAAC;QACD,IAAI,CAAC,eAAe,GAAG,IAAI,CAAA;QAC3B,IAAI,cAAc,GAAG,CAAC,CAAA;QACtB,IAAI,OAAO,CAAC,KAAK,IAAI,EAAE;YACrB,OAAO,IAAI,CAAC,eAAe,EAAE,CAAC;gBAC5B,IAAI,IAAI,CAAC,iBAAiB;oBACxB,MAAM,IAAI,CAAC,iBAAiB,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAA;gBACxE,IAAI,CAAC,iBAAiB,GAAG,MAAM,IAAI,CAAC,YAAY,EAAE,CAAA;gBAClD,MAAM,IAAI,CAAC,iBAAiB,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAA;gBACtE,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC,CAAA;gBACnE,cAAc,IAAI,oBAAoB,CAAA;gBACtC,cAAc,GAAG,IAAI,CAAC,GAAG,CAAC,cAAc,EAAE,cAAc,CAAC,CAAA;YAC3D,CAAC;QACH,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;YACf,OAAO,CAAC,KAAK,CAAC,IAAA,iBAAO,EAAC,GAAG,CAAC,CAAC,CAAA;QAC7B,CAAC,CAAC,CAAA;IACJ,CAAC;IACD,KAAK,CAAC,IAAI,CAAC,WAGV;QACC,OAAO,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;IAC/B,CAAC;IACD,KAAK,CAAC,IAAI,CAAC,WAGV;QACC,IAAI,CAAC,eAAe,GAAG,KAAK,CAAA;QAC5B,MAAM,IAAI,CAAC,iBAAiB;YAC1B,EAAE,IAAI,CAAC,EAAE,GAAG,WAAW,EAAE,CAAC;aACzB,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,IAAA,iBAAO,EAAC,CAAC,CAAC,CAAC,CAAC,CAAA;QAC1C,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAA;IAC/B,CAAC;CACF;AA9ED,wBA8EC"}
+{"version":3,"file":"Daemon.js","sourceRoot":"","sources":["../../../../package/lib/mainFn/Daemon.ts"],"names":[],"mappings":"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"}

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

@@ -1,8 +1,7 @@
 import { HealthCheckResult } from "../health/checkFns";
 import { Trigger } from "../trigger";
 import * as T from "../../../base/lib/types";
-import { Mounts } from "./Mounts";
-import { ExecSpawnable, MountOptions, SubContainer } from "../util/SubContainer";
+import { SubContainer } from "../util/SubContainer";
 import * as CP from "node:child_process";
 export { Daemon } from "./Daemon";
 export { CommandController } from "./CommandController";
@@ -10,6 +9,7 @@ import { HealthDaemon } from "./HealthDaemon";
 import { Daemon } from "./Daemon";
 import { CommandController } from "./CommandController";
 import { HealthCheck } from "../health/HealthCheck";
+import { Manifest } from "../test/output.sdk";
 export declare const cpExec: typeof CP.exec.__promisify__;
 export declare const cpExecFile: typeof CP.execFile.__promisify__;
 export type Ready = {
@@ -29,7 +29,7 @@ export type Ready = {
         })
     * ```
     */
-    fn: (spawnable: ExecSpawnable) => Promise<HealthCheckResult> | HealthCheckResult;
+    fn: (subcontainer: SubContainer<Manifest>) => Promise<HealthCheckResult> | HealthCheckResult;
     /**
      * A duration in milliseconds to treat a failing health check as "starting"
      *
@@ -38,40 +38,33 @@ export type Ready = {
     gracePeriod?: number;
     trigger?: Trigger;
 };
-type DaemonsParams<Manifest extends T.SDKManifest, Ids extends string, Command extends string, Id extends string> = {
+type NewDaemonParams<Manifest extends T.SDKManifest> = {
     /** The command line command to start the daemon */
     command: T.CommandType;
     /** Information about the subcontainer in which the daemon runs */
-    subcontainer: {
-        /** The ID of the image. Must be one of the image IDs declared in the manifest */
-        imageId: keyof Manifest["images"] & T.ImageId;
-        /**
-         * Whether or not to share the `/run` directory with the parent container.
-         * This is useful if you are trying to connect to a service that exposes a unix domain socket or auth cookie via the `/run` directory
-         */
-        sharedRun?: boolean;
-    } | SubContainer;
-    /** For mounting the necessary volumes. Syntax: sdk.Mounts.of().addVolume() */
-    mounts: Mounts<Manifest>;
+    subcontainer: SubContainer<Manifest>;
+    runAsInit?: boolean;
     env?: Record<string, string>;
-    ready: Ready;
-    /** An array of IDs of prior daemons whose successful initializations are required before this daemon will initialize */
-    requires: Exclude<Ids, Id>[];
+    cwd?: string;
+    user?: string;
     sigtermTimeout?: number;
     onStdout?: (chunk: Buffer | string | any) => void;
     onStderr?: (chunk: Buffer | string | any) => void;
 };
+type AddDaemonParams<Manifest extends T.SDKManifest, Ids extends string, Id extends string> = (NewDaemonParams<Manifest> | {
+    daemon: Daemon<Manifest>;
+}) & {
+    ready: Ready;
+    /** An array of IDs of prior daemons whose successful initializations are required before this daemon will initialize */
+    requires: Exclude<Ids, Id>[];
+};
+type AddOneshotParams<Manifest extends T.SDKManifest, Ids extends string, Id extends string> = NewDaemonParams<Manifest> & {
+    /** An array of IDs of prior daemons whose successful initializations are required before this daemon will initialize */
+    requires: Exclude<Ids, Id>[];
+};
 type ErrorDuplicateId<Id extends string> = `The id '${Id}' is already used`;
-export declare const runCommand: <Manifest extends T.SDKManifest>() => <A extends string>(effects: T.Effects, subcontainer: SubContainer | {
-    imageId: keyof Manifest["images"] & string;
-    sharedRun?: boolean;
-}, command: T.CommandType, options: {
-    subcontainerName?: string;
+export declare const runCommand: <Manifest extends T.SDKManifest>() => (effects: T.Effects, subcontainer: SubContainer<Manifest, T.Effects>, command: T.CommandType, options: {
     sigtermTimeout?: number;
-    mounts?: {
-        mountpoint: string;
-        options: MountOptions;
-    }[] | undefined;
     runAsInit?: boolean;
     env?: {
         [variable: string]: string;
@@ -80,7 +73,7 @@ export declare const runCommand: <Manifest extends T.SDKManifest>() => <A extend
     user?: string | undefined;
     onStdout?: ((chunk: Buffer | string | any) => void) | undefined;
     onStderr?: ((chunk: Buffer | string | any) => void) | undefined;
-}) => Promise<CommandController>;
+}) => Promise<CommandController<Manifest>>;
 /**
  * A class for defining and controlling the service daemons
 ```ts
@@ -107,9 +100,9 @@ Daemons.of({
 export declare class Daemons<Manifest extends T.SDKManifest, Ids extends string> implements T.DaemonBuildable {
     readonly effects: T.Effects;
     readonly started: (onTerm: () => PromiseLike<void>) => PromiseLike<null>;
-    readonly daemons: Promise<Daemon>[];
+    readonly daemons: Promise<Daemon<Manifest>>[];
     readonly ids: Ids[];
-    readonly healthDaemons: HealthDaemon[];
+    readonly healthDaemons: HealthDaemon<Manifest>[];
     readonly healthChecks: HealthCheck[];
     private constructor();
     /**
@@ -130,10 +123,18 @@ export declare class Daemons<Manifest extends T.SDKManifest, Ids extends string>
     /**
      * Returns the complete list of daemons, including the one defined here
      * @param id
-     * @param newDaemon
-     * @returns
+     * @param options
+     * @returns a new Daemons object
+     */
+    addDaemon<Id extends string>(id: "" extends Id ? never : ErrorDuplicateId<Id> extends Id ? never : Id extends Ids ? ErrorDuplicateId<Id> : Id, options: AddDaemonParams<Manifest, Ids, Id>): Daemons<Manifest, Ids | Id>;
+    /**
+     * Returns the complete list of daemons, including a "oneshot" daemon one defined here
+     * a oneshot daemon is a command that executes once when started, and is considered "running" once it exits successfully
+     * @param id
+     * @param options
+     * @returns a new Daemons object
      */
-    addDaemon<Id extends string, Command extends string>(id: "" extends Id ? never : ErrorDuplicateId<Id> extends Id ? never : Id extends Ids ? ErrorDuplicateId<Id> : Id, options: DaemonsParams<Manifest, Ids, Command, Id>): Daemons<Manifest, Ids | Id>;
+    addOneshot<Id extends string>(id: "" extends Id ? never : ErrorDuplicateId<Id> extends Id ? never : Id extends Ids ? ErrorDuplicateId<Id> : Id, options: AddOneshotParams<Manifest, Ids, Id>): Daemons<Manifest, Ids | Id>;
     term(): Promise<void>;
     build(): Promise<this>;
 }

package/package/lib/mainFn/Daemons.js

@@ -43,6 +43,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 Oneshot_1 = require("./Oneshot");
 exports.cpExec = (0, node_util_1.promisify)(CP.exec);
 exports.cpExecFile = (0, node_util_1.promisify)(CP.execFile);
 const runCommand = () => CommandController_2.CommandController.of();
@@ -95,22 +96,41 @@ class Daemons {
     /**
      * Returns the complete list of daemons, including the one defined here
      * @param id
-     * @param newDaemon
-     * @returns
+     * @param options
+     * @returns a new Daemons object
      */
     addDaemon(
     // prettier-ignore
     id, options) {
-        const daemonIndex = this.daemons.length;
-        const daemon = Daemon_2.Daemon.of()(this.effects, options.subcontainer, options.command, {
+        const daemon = "daemon" in options
+            ? Promise.resolve(options.daemon)
+            : Daemon_2.Daemon.of()(this.effects, options.subcontainer, options.command, {
+                ...options,
+            });
+        const healthDaemon = new HealthDaemon_1.HealthDaemon(daemon, options.requires
+            .map((x) => this.ids.indexOf(x))
+            .filter((x) => x >= 0)
+            .map((id) => this.healthDaemons[id]), id, this.ids, options.ready, this.effects);
+        const daemons = this.daemons.concat(daemon);
+        const ids = [...this.ids, id];
+        const healthDaemons = [...this.healthDaemons, healthDaemon];
+        return new Daemons(this.effects, this.started, daemons, ids, healthDaemons, this.healthChecks);
+    }
+    /**
+     * Returns the complete list of daemons, including a "oneshot" daemon one defined here
+     * a oneshot daemon is a command that executes once when started, and is considered "running" once it exits successfully
+     * @param id
+     * @param options
+     * @returns a new Daemons object
+     */
+    addOneshot(id, options) {
+        const daemon = Oneshot_1.Oneshot.of()(this.effects, options.subcontainer, options.command, {
             ...options,
-            mounts: options.mounts.build(),
-            subcontainerName: id,
         });
-        const healthDaemon = new HealthDaemon_1.HealthDaemon(daemon, daemonIndex, options.requires
+        const healthDaemon = new HealthDaemon_1.HealthDaemon(daemon, options.requires
             .map((x) => this.ids.indexOf(x))
             .filter((x) => x >= 0)
-            .map((id) => this.healthDaemons[id]), id, this.ids, options.ready, this.effects, options.sigtermTimeout);
+            .map((id) => this.healthDaemons[id]), id, this.ids, "EXIT_SUCCESS", this.effects);
         const daemons = this.daemons.concat(daemon);
         const ids = [...this.ids, id];
         const healthDaemons = [...this.healthDaemons, healthDaemon];
@@ -119,7 +139,7 @@ class Daemons {
     async term() {
         try {
             this.healthChecks.forEach((health) => health.stop());
-            for (let result of await Promise.allSettled(this.healthDaemons.map((x) => x.term({ timeout: x.sigtermTimeout })))) {
+            for (let result of await Promise.allSettled(this.healthDaemons.map((x) => x.term()))) {
                 if (result.status === "rejected") {
                     console.error(result.reason);
                 }
@@ -131,7 +151,7 @@ class Daemons {
     }
     async build() {
         for (const daemon of this.healthDaemons) {
-            await daemon.updateStatus();
+            await daemon.init();
         }
         for (const health of this.healthChecks) {
             health.start();

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

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