@start9labs/start-sdk 0.3.6-beta.0 → 0.3.6-beta.10

package/package/lib/inits/setupInstall.js.map

@@ -1 +1 @@
-{"version":3,"file":"setupInstall.js","sourceRoot":"","sources":["../../../../package/lib/inits/setupInstall.ts"],"names":[],"mappings":";;;AAKA,MAAa,OAAO;IAClB,YAA6B,EAA8B;QAA9B,OAAE,GAAF,EAAE,CAA4B;IAAG,CAAC;IAC/D,MAAM,CAAC,EAAE,CACP,EAA8B;QAE9B,OAAO,IAAI,OAAO,CAAC,EAAE,CAAC,CAAA;IACxB,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,EAAE,OAAO,EAAgD;QACrE,MAAM,IAAI,CAAC,EAAE,CAAC;YACZ,OAAO;SACR,CAAC,CAAA;IACJ,CAAC;CACF;AAbD,0BAaC;AAED,SAAgB,YAAY,CAC1B,EAA8B;IAE9B,OAAO,OAAO,CAAC,EAAE,CAAC,EAAE,CAAC,CAAA;AACvB,CAAC;AAJD,oCAIC"}
+{"version":3,"file":"setupInstall.js","sourceRoot":"","sources":["../../../../package/lib/inits/setupInstall.ts"],"names":[],"mappings":";;;AAoBA,oCAIC;AAnBD,MAAa,OAAO;IAClB,YAA6B,EAA8B;QAA9B,OAAE,GAAF,EAAE,CAA4B;IAAG,CAAC;IAC/D,MAAM,CAAC,EAAE,CACP,EAA8B;QAE9B,OAAO,IAAI,OAAO,CAAC,EAAE,CAAC,CAAA;IACxB,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,EAAE,OAAO,EAAgD;QACrE,MAAM,IAAI,CAAC,EAAE,CAAC;YACZ,OAAO;SACR,CAAC,CAAA;IACJ,CAAC;CACF;AAbD,0BAaC;AAED,SAAgB,YAAY,CAC1B,EAA8B;IAE9B,OAAO,OAAO,CAAC,EAAE,CAAC,EAAE,CAAC,CAAA;AACvB,CAAC"}

package/package/lib/inits/setupUninstall.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.setupUninstall = exports.Uninstall = void 0;
+exports.Uninstall = void 0;
+exports.setupUninstall = setupUninstall;
 class Uninstall {
     constructor(fn) {
         this.fn = fn;
@@ -19,5 +20,4 @@ exports.Uninstall = Uninstall;
 function setupUninstall(fn) {
     return Uninstall.of(fn);
 }
-exports.setupUninstall = setupUninstall;
 //# sourceMappingURL=setupUninstall.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"setupUninstall.js","sourceRoot":"","sources":["../../../../package/lib/inits/setupUninstall.ts"],"names":[],"mappings":";;;AAKA,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;AAJD,wCAIC"}
+{"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"}

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

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

package/package/lib/mainFn/CommandController.js

@@ -1,10 +1,45 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 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 {
     constructor(runningAnswer, state, subcontainer, process, sigtermTimeout = _1.DEFAULT_SIGTERM_TIMEOUT) {
         this.runningAnswer = runningAnswer;
@@ -15,58 +50,80 @@ class CommandController {
     }
     static of() {
         return async (effects, subcontainer, command, options) => {
-            var _a, _b;
-            const commands = (0, util_1.splitCommand)(command);
+            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 === null || options === void 0 ? void 0 : options.subcontainerName) || commands.join(" "));
-                    for (let mount of options.mounts || []) {
-                        await subc.mount(mount.options, mount.path);
+                    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.path);
+                        }
+                        return subc;
+                    }
+                    catch (e) {
+                        await subc.destroy();
+                        throw e;
                     }
-                    return subc;
                 })();
-            let childProcess;
-            if (options.runAsInit) {
-                childProcess = await subc.launch(commands, {
-                    env: options.env,
+            try {
+                let childProcess;
+                if (options.runAsInit) {
+                    childProcess = await subc.launch(commands, {
+                        env: options.env,
+                    });
+                }
+                else {
+                    childProcess = await subc.spawn(commands, {
+                        env: options.env,
+                        stdio: options.onStdout || options.onStderr ? "pipe" : "inherit",
+                    });
+                }
+                if (options.onStdout)
+                    childProcess.stdout?.on("data", options.onStdout);
+                if (options.onStderr)
+                    childProcess.stderr?.on("data", options.onStderr);
+                const state = { exited: false };
+                const answer = new Promise((resolve, reject) => {
+                    childProcess.on("exit", (code) => {
+                        state.exited = true;
+                        if (code === 0 ||
+                            code === 143 ||
+                            (code === null && childProcess.signalCode == "SIGTERM")) {
+                            return resolve(null);
+                        }
+                        if (code) {
+                            return reject(new Error(`${commands[0]} exited with code ${code}`));
+                        }
+                        else {
+                            return reject(new Error(`${commands[0]} exited with signal ${childProcess.signalCode}`));
+                        }
+                    });
                 });
+                return new CommandController(answer, state, subc, childProcess, options.sigtermTimeout);
             }
-            else {
-                childProcess = await subc.spawn(commands, {
-                    env: options.env,
-                    stdio: options.onStdout || options.onStderr ? "pipe" : "inherit",
-                });
+            catch (e) {
+                await subc.destroy();
+                throw e;
             }
-            if (options.onStdout)
-                (_a = childProcess.stdout) === null || _a === void 0 ? void 0 : _a.on("data", options.onStdout);
-            if (options.onStderr)
-                (_b = childProcess.stderr) === null || _b === void 0 ? void 0 : _b.on("data", options.onStderr);
-            const state = { exited: false };
-            const answer = new Promise((resolve, reject) => {
-                childProcess.on("exit", (code) => {
-                    state.exited = true;
-                    if (code === 0 ||
-                        code === 143 ||
-                        (code === null && childProcess.signalCode == "SIGTERM")) {
-                        return resolve(null);
-                    }
-                    if (code) {
-                        return reject(new Error(`${commands[0]} exited with code ${code}`));
-                    }
-                    else {
-                        return reject(new Error(`${commands[0]} exited with signal ${childProcess.signalCode}`));
-                    }
-                });
-            });
-            return new CommandController(answer, state, subc, childProcess, options.sigtermTimeout);
         };
     }
     get subContainerHandle() {
         return new SubContainer_1.SubContainerHandle(this.subcontainer);
     }
     async wait({ timeout = types_1.NO_TIMEOUT } = {}) {
-        var _a, _b;
         if (timeout > 0)
             setTimeout(() => {
                 this.term();
@@ -78,11 +135,10 @@ class CommandController {
             if (!this.state.exited) {
                 this.process.kill("SIGKILL");
             }
-            await ((_b = (_a = this.subcontainer).destroy) === null || _b === void 0 ? void 0 : _b.call(_a).catch((_) => { }));
+            await this.subcontainer.destroy().catch((_) => { });
         }
     }
     async term({ signal = types_1.SIGTERM, timeout = this.sigtermTimeout } = {}) {
-        var _a, _b;
         try {
             if (!this.state.exited) {
                 if (signal !== "SIGKILL") {
@@ -98,7 +154,7 @@ class CommandController {
             await this.runningAnswer;
         }
         finally {
-            await ((_b = (_a = this.subcontainer).destroy) === null || _b === void 0 ? void 0 : _b.call(_a));
+            await this.subcontainer.destroy();
         }
     }
 }

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,5 +1,3 @@
-/// <reference types="node" />
-/// <reference types="node" />
 import * as T from "../../../base/lib/types";
 import { ExecSpawnable, MountOptions, SubContainer } from "../util/SubContainer";
 import { CommandController } from "./CommandController";
@@ -14,22 +12,22 @@ export declare class Daemon {
     constructor(startCommand: () => Promise<CommandController>);
     get subContainerHandle(): undefined | ExecSpawnable;
     static of<Manifest extends T.SDKManifest>(): <A extends string>(effects: T.Effects, subcontainer: {
-        id: keyof Manifest["images"] & T.ImageId;
+        imageId: keyof Manifest["images"] & T.ImageId;
         sharedRun?: boolean;
     } | SubContainer, command: T.CommandType, options: {
-        subcontainerName?: string | undefined;
+        subcontainerName?: string;
         mounts?: {
             path: string;
             options: MountOptions;
-        }[] | undefined;
+        }[];
         env?: {
             [variable: string]: string;
         } | undefined;
         cwd?: string | undefined;
         user?: string | undefined;
-        onStdout?: ((chunk: Buffer | string | any) => void) | undefined;
-        onStderr?: ((chunk: Buffer | string | any) => void) | undefined;
-        sigtermTimeout?: number | undefined;
+        onStdout?: (chunk: Buffer | string | any) => void;
+        onStderr?: (chunk: Buffer | string | any) => void;
+        sigtermTimeout?: number;
     }) => Promise<Daemon>;
     start(): Promise<void>;
     term(termOptions?: {

package/package/lib/mainFn/Daemon.js

@@ -16,8 +16,7 @@ class Daemon {
         this.shouldBeRunning = false;
     }
     get subContainerHandle() {
-        var _a;
-        return (_a = this.commandController) === null || _a === void 0 ? void 0 : _a.subContainerHandle;
+        return this.commandController?.subContainerHandle;
     }
     static of() {
         return async (effects, subcontainer, command, options) => {
@@ -33,6 +32,8 @@ class Daemon {
         let timeoutCounter = 0;
         new Promise(async () => {
             while (this.shouldBeRunning) {
+                if (this.commandController)
+                    await this.commandController.term().catch((err) => console.error(err));
                 this.commandController = await this.startCommand();
                 await this.commandController.wait().catch((err) => console.error(err));
                 await new Promise((resolve) => setTimeout(resolve, timeoutCounter));
@@ -47,9 +48,10 @@ class Daemon {
         return this.stop(termOptions);
     }
     async stop(termOptions) {
-        var _a;
         this.shouldBeRunning = false;
-        await ((_a = this.commandController) === null || _a === void 0 ? void 0 : _a.term({ ...termOptions }).catch((e) => console.error((0, asError_1.asError)(e))));
+        await this.commandController
+            ?.term({ ...termOptions })
+            .catch((e) => console.error((0, asError_1.asError)(e)));
         this.commandController = null;
     }
 }

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,MAAA,IAAI,CAAC,iBAAiB,0CAAE,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;YAC1B,OAAM;SACP;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;gBAC3B,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;aAC1D;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,CAAA,MAAA,IAAI,CAAC,iBAAiB,0CACxB,IAAI,CAAC,EAAE,GAAG,WAAW,EAAE,EACxB,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,IAAA,iBAAO,EAAC,CAAC,CAAC,CAAC,CAAC,CAAA,CAAA;QAC1C,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAA;IAC/B,CAAC;CACF;AA5ED,wBA4EC"}
+{"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"}

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

@@ -1,11 +1,9 @@
-/// <reference types="node" />
-/// <reference types="node" />
-import { HealthReceipt, Signals } from "../../../base/lib/types";
+import { HealthReceipt } from "../../../base/lib/types";
 import { HealthCheckResult } from "../health/checkFns";
 import { Trigger } from "../trigger";
 import * as T from "../../../base/lib/types";
 import { Mounts } from "./Mounts";
-import { ExecSpawnable, MountOptions } from "../util/SubContainer";
+import { ExecSpawnable, MountOptions, SubContainer } from "../util/SubContainer";
 import * as CP from "node:child_process";
 export { Daemon } from "./Daemon";
 export { CommandController } from "./CommandController";
@@ -32,21 +30,27 @@ export type Ready = {
     * ```
     */
     fn: (spawnable: ExecSpawnable) => Promise<HealthCheckResult> | HealthCheckResult;
+    /**
+     * A duration in milliseconds to treat a failing health check as "starting"
+     *
+     * defaults to 5000
+     */
+    gracePeriod?: number;
     trigger?: Trigger;
 };
 type DaemonsParams<Manifest extends T.SDKManifest, Ids extends string, Command extends string, Id extends string> = {
     /** The command line command to start the daemon */
     command: T.CommandType;
-    /** Information about the image in which the daemon runs */
-    image: {
+    /** 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 */
-        id: keyof Manifest["images"] & T.ImageId;
+        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>;
     env?: Record<string, string>;
@@ -58,24 +62,24 @@ type DaemonsParams<Manifest extends T.SDKManifest, Ids extends string, Command e
     onStderr?: (chunk: Buffer | string | any) => void;
 };
 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: import("../util/SubContainer").SubContainer | {
-    id: keyof Manifest["images"] & string;
-    sharedRun?: boolean | undefined;
+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 | undefined;
-    sigtermTimeout?: number | undefined;
+    subcontainerName?: string;
+    sigtermTimeout?: number;
     mounts?: {
         path: string;
         options: MountOptions;
     }[] | undefined;
-    runAsInit?: boolean | undefined;
+    runAsInit?: boolean;
     env?: {
         [variable: string]: string;
     } | undefined;
     cwd?: string | undefined;
     user?: string | undefined;
-    onStdout?: ((chunk: any) => void) | undefined;
-    onStderr?: ((chunk: any) => void) | undefined;
+    onStdout?: ((chunk: Buffer | string | any) => void) | undefined;
+    onStderr?: ((chunk: Buffer | string | any) => void) | undefined;
 }) => Promise<CommandController>;
 /**
  * A class for defining and controlling the service daemons
@@ -130,10 +134,6 @@ export declare class Daemons<Manifest extends T.SDKManifest, Ids extends string>
      */
     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>;
     build(): Promise<{
-        term: (options?: {
-            signal?: Signals;
-            timeout?: number;
-        }) => Promise<void>;
+        term: () => Promise<void>;
     }>;
-    private updateMainHealth;
 }

package/package/lib/mainFn/Daemons.js

@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Daemons = exports.runCommand = exports.cpExecFile = exports.cpExec = exports.CommandController = exports.Daemon = void 0;
 const node_util_1 = require("node:util");
@@ -91,7 +101,7 @@ class Daemons {
     // prettier-ignore
     id, options) {
         const daemonIndex = this.daemons.length;
-        const daemon = Daemon_2.Daemon.of()(this.effects, options.image, options.command, {
+        const daemon = Daemon_2.Daemon.of()(this.effects, options.subcontainer, options.command, {
             ...options,
             mounts: options.mounts.build(),
             subcontainerName: id,
@@ -106,12 +116,14 @@ class Daemons {
         return new Daemons(this.effects, this.started, daemons, ids, healthDaemons);
     }
     async build() {
-        this.updateMainHealth();
-        this.healthDaemons.forEach((x) => x.addWatcher(() => this.updateMainHealth()));
         const built = {
-            term: async (options) => {
+            term: async () => {
                 try {
-                    await Promise.all(this.healthDaemons.map((x) => x.term(options)));
+                    for (let result of await Promise.allSettled(this.healthDaemons.map((x) => x.term({ timeout: x.sigtermTimeout })))) {
+                        if (result.status === "rejected") {
+                            console.error(result.reason);
+                        }
+                    }
                 }
                 finally {
                     this.effects.setMainStatus({ status: "stopped" });
@@ -121,9 +133,6 @@ class Daemons {
         this.started(() => built.term());
         return built;
     }
-    updateMainHealth() {
-        this.effects.setMainStatus({ status: "running" });
-    }
 }
 exports.Daemons = Daemons;
 //# sourceMappingURL=Daemons.js.map

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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"}

package/package/lib/mainFn/HealthDaemon.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { HealthCheckResult } from "../health/checkFns";
 import { Ready } from "./Daemons";
 import { Daemon } from "./Daemon";
@@ -22,6 +21,9 @@ export declare class HealthDaemon {
     private _health;
     private healthWatchers;
     private running;
+    private started?;
+    private resolveReady;
+    private readyPromise;
     constructor(daemon: Promise<Daemon>, daemonIndex: number, dependencies: HealthDaemon[], id: string, ids: string[], ready: Ready, effects: Effects, sigtermTimeout?: number);
     /** Run after we want to do cleanup */
     term(termOptions?: {
@@ -35,6 +37,7 @@ export declare class HealthDaemon {
     private healthCheckCleanup;
     private turnOffHealthCheck;
     private setupHealthCheck;
+    onReady(): Promise<void>;
     private setHealth;
     private updateStatus;
 }

package/package/lib/mainFn/HealthDaemon.js

@@ -32,15 +32,15 @@ class HealthDaemon {
         this.healthWatchers = [];
         this.running = false;
         this.healthCheckCleanup = null;
+        this.readyPromise = new Promise((resolve) => (this.resolveReady = resolve));
         this.updateStatus();
         this.dependencies.forEach((d) => d.addWatcher(() => this.updateStatus()));
     }
     /** Run after we want to do cleanup */
     async term(termOptions) {
-        var _a;
         this.healthWatchers = [];
         this.running = false;
-        (_a = this.healthCheckCleanup) === null || _a === void 0 ? void 0 : _a.call(this);
+        this.healthCheckCleanup?.();
         await this.daemon.then((d) => d.term({
             timeout: this.sigtermTimeout,
             ...termOptions,
@@ -60,6 +60,7 @@ class HealthDaemon {
         if (newStatus) {
             ;
             (await this.daemon).start();
+            this.started = performance.now();
             this.setupHealthCheck();
         }
         else {
@@ -70,14 +71,12 @@ class HealthDaemon {
         }
     }
     turnOffHealthCheck() {
-        var _a;
-        (_a = this.healthCheckCleanup) === null || _a === void 0 ? void 0 : _a.call(this);
+        this.healthCheckCleanup?.();
     }
     async setupHealthCheck() {
-        var _a;
         if (this.healthCheckCleanup)
             return;
-        const trigger = ((_a = this.ready.trigger) !== null && _a !== void 0 ? _a : defaultTrigger_1.defaultTrigger)(() => ({
+        const trigger = (this.ready.trigger ?? defaultTrigger_1.defaultTrigger)(() => ({
             lastResult: this._health.result,
         }));
         const { promise: status, resolve: setStatus } = oncePromise();
@@ -92,6 +91,10 @@ class HealthDaemon {
                             message: "message" in err ? err.message : String(err),
                         };
                     });
+                    if (this.resolveReady &&
+                        (response.result === "success" || response.result === "disabled")) {
+                        this.resolveReady();
+                    }
                     await this.setHealth(response);
                 }
                 else {
@@ -108,18 +111,26 @@ class HealthDaemon {
             return null;
         };
     }
+    onReady() {
+        return this.readyPromise;
+    }
     async setHealth(health) {
         this._health = health;
         this.healthWatchers.forEach((watcher) => watcher());
         const display = this.ready.display;
-        const result = health.result;
         if (!display) {
             return;
         }
+        let result = health.result;
+        if (result === "failure" &&
+            this.started &&
+            performance.now() - this.started <= (this.ready.gracePeriod ?? 5000))
+            result = "starting";
         await this.effects.setHealth({
             ...health,
             id: this.id,
             name: display,
+            result,
         });
     }
     async updateStatus() {