@start9labs/start-sdk 0.4.0-beta.5 → 0.4.0-beta.51

package/package/lib/health/checkFns/runHealthScript.js.map

@@ -1 +1 @@
-{"version":3,"file":"runHealthScript.js","sourceRoot":"","sources":["../../../../../package/lib/health/checkFns/runHealthScript.ts"],"names":[],"mappings":";;;AACA,mCAAwC;AAIxC;;;;;;GAMG;AACI,MAAM,eAAe,GAAG,KAAK,EAClC,UAAoB,EACpB,YAAoC,EACpC,EACE,OAAO,GAAG,KAAK,EACf,YAAY,GAAG,gCAAgC,UAAU,EAAE,EAC3D,OAAO,GAAG,CAAC,GAAW,EAAE,EAAE,CACxB,mBAAmB,UAAU,oBAAoB,GAAG,EAAE,MACtD,EAAE,EACsB,EAAE;IAC9B,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC;QAC7B,YAAY,CAAC,IAAI,CAAC,UAAU,CAAC;QAC7B,IAAA,sBAAc,EAAC,OAAO,CAAC;KACxB,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE;QACb,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC,CAAA;QAC1B,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAA;QAC/B,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAA;QAC1B,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,YAAY,EAAuB,CAAA;IACzE,CAAC,CAAC,CAAA;IACF,OAAO;QACL,MAAM,EAAE,SAAS;QACjB,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;KACnB,CAAA;AACxB,CAAC,CAAA;AAvBY,QAAA,eAAe,mBAuB3B"}
+{"version":3,"file":"runHealthScript.js","sourceRoot":"","sources":["../../../../../package/lib/health/checkFns/runHealthScript.ts"],"names":[],"mappings":";;;AACA,mCAAwC;AAIxC;;;;;;GAMG;AACI,MAAM,eAAe,GAAG,KAAK,EAClC,UAAoB,EACpB,YAAoC,EACpC,EACE,OAAO,GAAG,KAAK,EACf,YAAY,GAAG,gCAAgC,UAAU,EAAE,EAC3D,OAAO,GAAG,CAAC,GAAW,EAAE,EAAE,CACxB,mBAAmB,UAAU,oBAAoB,GAAG,EAAE,MACtD,EAAE,EACsB,EAAE;IAC9B,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC;QAC7B,YAAY,CAAC,QAAQ,CAAC,UAAU,CAAC;QACjC,IAAA,sBAAc,EAAC,OAAO,CAAC;KACxB,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE;QACb,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC,CAAA;QAC1B,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAA;QAC/B,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAA;QAC1B,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,YAAY,EAAuB,CAAA;IACzE,CAAC,CAAC,CAAA;IACF,OAAO;QACL,MAAM,EAAE,SAAS;QACjB,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;KACnB,CAAA;AACxB,CAAC,CAAA;AAvBY,QAAA,eAAe,mBAuB3B"}

package/package/lib/health/index.d.ts

@@ -1,2 +1,2 @@
-import "./checkFns";
-export { HealthCheck } from "./HealthCheck";
+import './checkFns';
+export { HealthCheck } from './HealthCheck';

package/package/lib/i18n/index.d.ts

@@ -0,0 +1,24 @@
+/**
+ * Internationalization (i18n) utilities for StartOS packages.
+ *
+ * @example
+ * ```typescript
+ * // In package's i18n/index.ts:
+ * import { setupI18n } from '@start9labs/start-sdk'
+ * import defaultDict, { DEFAULT_LANG } from './dictionaries/default'
+ * import translations from './dictionaries/translations'
+ *
+ * export const i18n = setupI18n(defaultDict, translations, DEFAULT_LANG)
+ * ```
+ */
+type ParamValue = string | number | Date;
+/**
+ * Creates a typed i18n function for a package.
+ *
+ * @param defaultDict - The default language dictionary mapping strings to numeric indices
+ * @param translations - Translation dictionaries for each supported locale
+ * @param defaultLang - The default language code (e.g., 'en_US')
+ * @returns A typed i18n function that accepts dictionary keys and optional parameters
+ */
+export declare function setupI18n<Dict extends Record<string, number>, Translations extends Record<string, Record<number, string>>>(defaultDict: Dict, translations: Translations, defaultLang: string): (key: keyof Dict, params?: Record<string, ParamValue>) => string;
+export {};

package/package/lib/i18n/index.js

@@ -0,0 +1,59 @@
+"use strict";
+/**
+ * Internationalization (i18n) utilities for StartOS packages.
+ *
+ * @example
+ * ```typescript
+ * // In package's i18n/index.ts:
+ * import { setupI18n } from '@start9labs/start-sdk'
+ * import defaultDict, { DEFAULT_LANG } from './dictionaries/default'
+ * import translations from './dictionaries/translations'
+ *
+ * export const i18n = setupI18n(defaultDict, translations, DEFAULT_LANG)
+ * ```
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.setupI18n = setupI18n;
+/**
+ * Creates a typed i18n function for a package.
+ *
+ * @param defaultDict - The default language dictionary mapping strings to numeric indices
+ * @param translations - Translation dictionaries for each supported locale
+ * @param defaultLang - The default language code (e.g., 'en_US')
+ * @returns A typed i18n function that accepts dictionary keys and optional parameters
+ */
+function setupI18n(defaultDict, translations, defaultLang) {
+    const lang = process.env.LANG?.replace(/\.UTF-8$/, '') || defaultLang;
+    // Convert locale format from en_US to en-US for Intl APIs
+    const intlLocale = lang.replace('_', '-');
+    function getTranslation() {
+        if (lang === defaultLang)
+            return null;
+        const availableLangs = Object.keys(translations);
+        const match = availableLangs.find((l) => l === lang) ??
+            availableLangs.find((l) => String(l).startsWith(lang.split('_')[0] + '_'));
+        return match ? translations[match] : null;
+    }
+    const translation = getTranslation();
+    function formatValue(value) {
+        if (typeof value === 'number') {
+            return new Intl.NumberFormat(intlLocale).format(value);
+        }
+        if (value instanceof Date) {
+            return new Intl.DateTimeFormat(intlLocale).format(value);
+        }
+        return value;
+    }
+    return function i18n(key, params) {
+        let result = translation
+            ? translation[defaultDict[key]]
+            : key;
+        if (params) {
+            for (const [paramName, value] of Object.entries(params)) {
+                result = result.replace(`\${${paramName}}`, formatValue(value));
+            }
+        }
+        return result;
+    };
+}
+//# sourceMappingURL=index.js.map

package/package/lib/i18n/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../package/lib/i18n/index.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;GAYG;;AAYH,8BAiDC;AAzDD;;;;;;;GAOG;AACH,SAAgB,SAAS,CAGvB,WAAiB,EAAE,YAA0B,EAAE,WAAmB;IAClE,MAAM,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,IAAI,WAAW,CAAA;IAErE,0DAA0D;IAC1D,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;IAEzC,SAAS,cAAc;QACrB,IAAI,IAAI,KAAK,WAAW;YAAE,OAAO,IAAI,CAAA;QAErC,MAAM,cAAc,GAAG,MAAM,CAAC,IAAI,CAAC,YAAY,CAA2B,CAAA;QAE1E,MAAM,KAAK,GACT,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,IAAI,CAAC;YACtC,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,CAAA;QAE5E,OAAO,KAAK,CAAC,CAAC,CAAE,YAAY,CAAC,KAAK,CAA4B,CAAC,CAAC,CAAC,IAAI,CAAA;IACvE,CAAC;IAED,MAAM,WAAW,GAAG,cAAc,EAAE,CAAA;IAEpC,SAAS,WAAW,CAAC,KAAiB;QACpC,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;YAC9B,OAAO,IAAI,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;QACxD,CAAC;QACD,IAAI,KAAK,YAAY,IAAI,EAAE,CAAC;YAC1B,OAAO,IAAI,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;QAC1D,CAAC;QACD,OAAO,KAAK,CAAA;IACd,CAAC;IAED,OAAO,SAAS,IAAI,CAClB,GAAe,EACf,MAAmC;QAEnC,IAAI,MAAM,GAAG,WAAW;YACtB,CAAC,CAAC,WAAW,CAAC,WAAW,CAAC,GAAa,CAAC,CAAC;YACzC,CAAC,CAAE,GAAc,CAAA;QAEnB,IAAI,MAAM,EAAE,CAAC;YACX,KAAK,MAAM,CAAC,SAAS,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;gBACxD,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,SAAS,GAAG,EAAE,WAAW,CAAC,KAAK,CAAC,CAAC,CAAA;YACjE,CAAC;QACH,CAAC;QAED,OAAO,MAAM,CAAA;IACf,CAAC,CAAA;AACH,CAAC"}

package/package/lib/index.d.ts

@@ -1,23 +1,21 @@
-import { S9pk, Version, VersionRange, ExtendedVersion, inputSpec, ISB, IST, types, matches, utils } from "../../base/lib";
-export { S9pk, Version, VersionRange, ExtendedVersion, inputSpec, ISB, IST, types, matches, utils, };
-export * as T from "./types";
-export { Daemons } from "./mainFn/Daemons";
-export { SubContainer } from "./util/SubContainer";
-export { StartSdk } from "./StartSdk";
-export { setupManifest, buildManifest } from "./manifest/setupManifest";
-export { FileHelper } from "./util/fileHelper";
-export { setupExposeStore } from "./store/setupExposeStore";
-export { pathBuilder } from "../../base/lib/util/PathBuilder";
-export * as actions from "../../base/lib/actions";
-export * as backup from "./backup";
-export * as daemons from "./mainFn/Daemons";
-export * as health from "./health";
-export * as healthFns from "./health/checkFns";
-export * as inits from "./inits";
-export * as mainFn from "./mainFn";
-export * as toml from "@iarna/toml";
-export * as yaml from "yaml";
-export * as startSdk from "./StartSdk";
-export * as YAML from "yaml";
-export * as TOML from "@iarna/toml";
-export * from "./version";
+import { S9pk, Version, VersionRange, ExtendedVersion, inputSpec, ISB, IST, types, z, utils } from '../../base/lib';
+export { S9pk, Version, VersionRange, ExtendedVersion, inputSpec, ISB, IST, types, z, utils, };
+export { setupI18n } from './i18n';
+export * as T from './types';
+export { Daemons } from './mainFn/Daemons';
+export { SubContainer } from './util/SubContainer';
+export { StartSdk } from './StartSdk';
+export { setupManifest, buildManifest } from './manifest/setupManifest';
+export { FileHelper } from './util/fileHelper';
+export * as actions from '../../base/lib/actions';
+export * as backup from './backup';
+export * as daemons from './mainFn/Daemons';
+export * as health from './health';
+export * as healthFns from './health/checkFns';
+export * as mainFn from './mainFn';
+export * as toml from '@iarna/toml';
+export * as yaml from 'yaml';
+export * as startSdk from './StartSdk';
+export * as YAML from 'yaml';
+export * as TOML from '@iarna/toml';
+export * from './version';

package/package/lib/index.js

@@ -36,7 +36,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TOML = exports.YAML = exports.startSdk = exports.yaml = exports.toml = exports.mainFn = exports.inits = exports.healthFns = exports.health = exports.daemons = exports.backup = exports.actions = exports.pathBuilder = exports.setupExposeStore = exports.FileHelper = exports.buildManifest = exports.setupManifest = exports.StartSdk = exports.SubContainer = exports.Daemons = exports.T = exports.utils = exports.matches = exports.types = exports.IST = exports.ISB = exports.inputSpec = exports.ExtendedVersion = exports.VersionRange = exports.Version = exports.S9pk = void 0;
+exports.TOML = exports.YAML = exports.startSdk = exports.yaml = exports.toml = exports.mainFn = exports.healthFns = exports.health = exports.daemons = exports.backup = exports.actions = exports.FileHelper = exports.buildManifest = exports.setupManifest = exports.StartSdk = exports.Daemons = exports.T = exports.setupI18n = exports.utils = exports.z = exports.types = exports.IST = exports.ISB = exports.inputSpec = exports.ExtendedVersion = exports.VersionRange = exports.Version = exports.S9pk = void 0;
 const lib_1 = require("../../base/lib");
 Object.defineProperty(exports, "S9pk", { enumerable: true, get: function () { return lib_1.S9pk; } });
 Object.defineProperty(exports, "Version", { enumerable: true, get: function () { return lib_1.Version; } });
@@ -46,13 +46,13 @@ Object.defineProperty(exports, "inputSpec", { enumerable: true, get: function ()
 Object.defineProperty(exports, "ISB", { enumerable: true, get: function () { return lib_1.ISB; } });
 Object.defineProperty(exports, "IST", { enumerable: true, get: function () { return lib_1.IST; } });
 Object.defineProperty(exports, "types", { enumerable: true, get: function () { return lib_1.types; } });
-Object.defineProperty(exports, "matches", { enumerable: true, get: function () { return lib_1.matches; } });
+Object.defineProperty(exports, "z", { enumerable: true, get: function () { return lib_1.z; } });
 Object.defineProperty(exports, "utils", { enumerable: true, get: function () { return lib_1.utils; } });
+var i18n_1 = require("./i18n");
+Object.defineProperty(exports, "setupI18n", { enumerable: true, get: function () { return i18n_1.setupI18n; } });
 exports.T = __importStar(require("./types"));
 var Daemons_1 = require("./mainFn/Daemons");
 Object.defineProperty(exports, "Daemons", { enumerable: true, get: function () { return Daemons_1.Daemons; } });
-var SubContainer_1 = require("./util/SubContainer");
-Object.defineProperty(exports, "SubContainer", { enumerable: true, get: function () { return SubContainer_1.SubContainer; } });
 var StartSdk_1 = require("./StartSdk");
 Object.defineProperty(exports, "StartSdk", { enumerable: true, get: function () { return StartSdk_1.StartSdk; } });
 var setupManifest_1 = require("./manifest/setupManifest");
@@ -60,16 +60,11 @@ Object.defineProperty(exports, "setupManifest", { enumerable: true, get: functio
 Object.defineProperty(exports, "buildManifest", { enumerable: true, get: function () { return setupManifest_1.buildManifest; } });
 var fileHelper_1 = require("./util/fileHelper");
 Object.defineProperty(exports, "FileHelper", { enumerable: true, get: function () { return fileHelper_1.FileHelper; } });
-var setupExposeStore_1 = require("./store/setupExposeStore");
-Object.defineProperty(exports, "setupExposeStore", { enumerable: true, get: function () { return setupExposeStore_1.setupExposeStore; } });
-var PathBuilder_1 = require("../../base/lib/util/PathBuilder");
-Object.defineProperty(exports, "pathBuilder", { enumerable: true, get: function () { return PathBuilder_1.pathBuilder; } });
 exports.actions = __importStar(require("../../base/lib/actions"));
 exports.backup = __importStar(require("./backup"));
 exports.daemons = __importStar(require("./mainFn/Daemons"));
 exports.health = __importStar(require("./health"));
 exports.healthFns = __importStar(require("./health/checkFns"));
-exports.inits = __importStar(require("./inits"));
 exports.mainFn = __importStar(require("./mainFn"));
 exports.toml = __importStar(require("@iarna/toml"));
 exports.yaml = __importStar(require("yaml"));

package/package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../package/lib/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,wCAWuB;AAGrB,qFAbA,UAAI,OAaA;AACJ,wFAbA,aAAO,OAaA;AACP,6FAbA,kBAAY,OAaA;AACZ,gGAbA,qBAAe,OAaA;AACf,0FAbA,eAAS,OAaA;AACT,oFAbA,SAAG,OAaA;AACH,oFAbA,SAAG,OAaA;AACH,sFAbA,WAAK,OAaA;AACL,wFAbA,aAAO,OAaA;AACP,sFAbA,WAAK,OAaA;AAEP,6CAA4B;AAC5B,4CAA0C;AAAjC,kGAAA,OAAO,OAAA;AAChB,oDAAkD;AAAzC,4GAAA,YAAY,OAAA;AACrB,uCAAqC;AAA5B,oGAAA,QAAQ,OAAA;AACjB,0DAAuE;AAA9D,8GAAA,aAAa,OAAA;AAAE,8GAAA,aAAa,OAAA;AACrC,gDAA8C;AAArC,wGAAA,UAAU,OAAA;AACnB,6DAA2D;AAAlD,oHAAA,gBAAgB,OAAA;AACzB,+DAA6D;AAApD,0GAAA,WAAW,OAAA;AAEpB,kEAAiD;AACjD,mDAAkC;AAClC,4DAA2C;AAC3C,mDAAkC;AAClC,+DAA8C;AAC9C,iDAAgC;AAChC,mDAAkC;AAClC,oDAAmC;AACnC,6CAA4B;AAC5B,uDAAsC;AACtC,6CAA4B;AAC5B,oDAAmC;AACnC,4CAAyB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../package/lib/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,wCAWuB;AAGrB,qFAbA,UAAI,OAaA;AACJ,wFAbA,aAAO,OAaA;AACP,6FAbA,kBAAY,OAaA;AACZ,gGAbA,qBAAe,OAaA;AACf,0FAbA,eAAS,OAaA;AACT,oFAbA,SAAG,OAaA;AACH,oFAbA,SAAG,OAaA;AACH,sFAbA,WAAK,OAaA;AACL,kFAbA,OAAC,OAaA;AACD,sFAbA,WAAK,OAaA;AAEP,+BAAkC;AAAzB,iGAAA,SAAS,OAAA;AAClB,6CAA4B;AAC5B,4CAA0C;AAAjC,kGAAA,OAAO,OAAA;AAEhB,uCAAqC;AAA5B,oGAAA,QAAQ,OAAA;AACjB,0DAAuE;AAA9D,8GAAA,aAAa,OAAA;AAAE,8GAAA,aAAa,OAAA;AACrC,gDAA8C;AAArC,wGAAA,UAAU,OAAA;AAEnB,kEAAiD;AACjD,mDAAkC;AAClC,4DAA2C;AAC3C,mDAAkC;AAClC,+DAA8C;AAC9C,mDAAkC;AAClC,oDAAmC;AACnC,6CAA4B;AAC5B,uDAAsC;AACtC,6CAA4B;AAC5B,oDAAmC;AACnC,4CAAyB"}

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

@@ -1,28 +1,18 @@
-import * as T from "../../../base/lib/types";
-import { SubContainerHandle, SubContainer } from "../util/SubContainer";
-import { Drop } from "../util";
-export declare class CommandController<Manifest extends T.SDKManifest> extends Drop {
-    readonly runningAnswer: Promise<unknown>;
+import * as T from '../../../base/lib/types';
+import { SubContainer } from '../util/SubContainer';
+import { Drop } from '../util';
+import { DaemonCommandType } from './Daemons';
+export declare class CommandController<Manifest extends T.SDKManifest, C extends SubContainer<Manifest> | null> extends Drop {
+    readonly runningAnswer: Promise<null>;
     private state;
     private readonly subcontainer;
     private process;
     readonly sigtermTimeout: number;
     private constructor();
-    static of<Manifest extends T.SDKManifest>(): (effects: T.Effects, subcontainer: SubContainer<Manifest>, command: T.CommandType, options: {
-        sigtermTimeout?: number;
-        runAsInit?: boolean;
-        env?: {
-            [variable: string]: string;
-        } | undefined;
-        cwd?: string | undefined;
-        user?: string | undefined;
-        onStdout?: (chunk: Buffer | string | any) => void;
-        onStderr?: (chunk: Buffer | string | any) => void;
-    }) => Promise<CommandController<Manifest>>;
-    get subContainerHandle(): SubContainerHandle;
+    static of<Manifest extends T.SDKManifest, C extends SubContainer<Manifest> | null>(): (effects: T.Effects, subcontainer: C, exec: DaemonCommandType<Manifest, C>) => Promise<CommandController<Manifest, C>>;
     wait({ timeout }?: {
         timeout?: number | undefined;
-    }): Promise<unknown>;
+    }): Promise<void>;
     term({ signal, timeout }?: {
         signal?: NodeJS.Signals | undefined;
         timeout?: number | undefined;

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 {
@@ -50,44 +49,65 @@ class CommandController extends util_1.Drop {
         this.sigtermTimeout = sigtermTimeout;
     }
     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);
+        return async (effects, subcontainer, exec) => {
             try {
+                if ('fn' in exec) {
+                    const abort = new AbortController();
+                    const cell = {
+                        ctrl: new CommandController(exec.fn(subcontainer, abort.signal).then(async (command) => {
+                            if (subcontainer && command && !abort.signal.aborted) {
+                                const newCtrl = (await CommandController.of()(effects, subcontainer, command)).leak();
+                                Object.assign(cell.ctrl, newCtrl);
+                                return await cell.ctrl.runningAnswer;
+                            }
+                            else {
+                                cell.ctrl.state.exited = true;
+                            }
+                            return null;
+                        }), { exited: false }, subcontainer, abort, exec.sigtermTimeout),
+                    };
+                    return cell.ctrl;
+                }
+                let commands;
+                if (T.isUseEntrypoint(exec.command)) {
+                    const imageMeta = await fs
+                        .readFile(`/media/startos/images/${subcontainer.imageId}.json`, {
+                        encoding: 'utf8',
+                    })
+                        .catch(() => '{}')
+                        .then(JSON.parse);
+                    commands = imageMeta.entrypoint ?? [];
+                    commands = commands.concat(...(exec.command.overridCmd ?? imageMeta.cmd ?? []));
+                }
+                else
+                    commands = (0, util_1.splitCommand)(exec.command);
                 let childProcess;
-                if (options.runAsInit) {
+                if (exec.runAsInit) {
                     childProcess = await subcontainer.launch(commands, {
-                        env: options.env,
+                        env: exec.env,
+                        user: exec.user,
+                        cwd: exec.cwd,
                     });
                 }
                 else {
                     childProcess = await subcontainer.spawn(commands, {
-                        env: options.env,
-                        stdio: options.onStdout || options.onStderr ? "pipe" : "inherit",
+                        env: exec.env,
+                        user: exec.user,
+                        cwd: exec.cwd,
+                        stdio: exec.onStdout || exec.onStderr ? 'pipe' : 'inherit',
                     });
                 }
-                if (options.onStdout)
-                    childProcess.stdout?.on("data", options.onStdout);
-                if (options.onStderr)
-                    childProcess.stderr?.on("data", options.onStderr);
+                if (exec.onStdout)
+                    childProcess.stdout?.on('data', exec.onStdout);
+                if (exec.onStderr)
+                    childProcess.stderr?.on('data', exec.onStderr);
                 const state = { exited: false };
                 const answer = new Promise((resolve, reject) => {
-                    childProcess.on("exit", (code) => {
+                    childProcess.on('exit', (code) => {
                         state.exited = true;
                         if (code === 0 ||
                             code === 143 ||
-                            (code === null && childProcess.signalCode == "SIGTERM")) {
+                            (code === null && childProcess.signalCode == 'SIGTERM')) {
                             return resolve(null);
                         }
                         if (code) {
@@ -98,49 +118,65 @@ class CommandController extends util_1.Drop {
                         }
                     });
                 });
-                return new CommandController(answer, state, subcontainer, childProcess, options.sigtermTimeout);
+                return new CommandController(answer, state, subcontainer, childProcess, exec.sigtermTimeout);
             }
             catch (e) {
-                await subcontainer.destroy();
+                await subcontainer?.destroy();
                 throw e;
             }
         };
     }
-    get subContainerHandle() {
-        return new SubContainer_1.SubContainerHandle(this.subcontainer);
-    }
     async wait({ timeout = types_1.NO_TIMEOUT } = {}) {
         if (timeout > 0)
             setTimeout(() => {
                 this.term();
             }, timeout);
         try {
-            return await this.runningAnswer;
+            if (timeout > 0 && this.process instanceof AbortController)
+                await Promise.race([
+                    this.runningAnswer,
+                    new Promise((_, reject) => setTimeout(() => reject(new Error('Timed out waiting for js command to exit')), timeout * 2)),
+                ]);
+            else
+                await this.runningAnswer;
         }
         finally {
             if (!this.state.exited) {
-                this.process.kill("SIGKILL");
+                if (this.process instanceof AbortController)
+                    this.process.abort();
+                else
+                    this.process.kill('SIGKILL');
             }
-            await this.subcontainer.destroy().catch((_) => { });
+            await this.subcontainer?.destroy();
         }
     }
     async term({ signal = types_1.SIGTERM, timeout = this.sigtermTimeout } = {}) {
         try {
             if (!this.state.exited) {
-                if (signal !== "SIGKILL") {
+                if (this.process instanceof AbortController)
+                    return this.process.abort();
+                if (signal !== 'SIGKILL') {
                     setTimeout(() => {
-                        if (!this.state.exited)
-                            this.process.kill("SIGKILL");
+                        if (this.process instanceof AbortController)
+                            this.process.abort();
+                        else
+                            this.process.kill('SIGKILL');
                     }, timeout);
                 }
                 if (!this.process.kill(signal)) {
                     console.error(`failed to send signal ${signal} to pid ${this.process.pid}`);
                 }
             }
-            await this.runningAnswer;
+            if (this.process instanceof AbortController)
+                await Promise.race([
+                    this.runningAnswer,
+                    new Promise((_, reject) => setTimeout(() => reject(new Error('Timed out waiting for js command to exit')), timeout * 2)),
+                ]);
+            else
+                await this.runningAnswer;
         }
         finally {
-            await this.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,33 +1,33 @@
-import * as T from "../../../base/lib/types";
-import { ExecSpawnable, SubContainer } from "../util/SubContainer";
-import { CommandController } from "./CommandController";
+import * as T from '../../../base/lib/types';
+import { Drop } from '../util';
+import { SubContainer, SubContainerRc } from '../util/SubContainer';
+import { CommandController } from './CommandController';
+import { DaemonCommandType } from './Daemons';
+import { Oneshot } from './Oneshot';
 /**
  * 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<Manifest extends T.SDKManifest> {
+export declare class Daemon<Manifest extends T.SDKManifest, C extends SubContainer<Manifest> | null = SubContainer<Manifest> | null> extends Drop {
+    private subcontainer;
     private startCommand;
+    readonly oneshot: boolean;
     private commandController;
     private shouldBeRunning;
-    constructor(startCommand: () => Promise<CommandController<Manifest>>);
-    get subContainerHandle(): undefined | ExecSpawnable;
-    static of<Manifest extends T.SDKManifest>(): <A extends string>(effects: T.Effects, subcontainer: SubContainer<Manifest>, command: T.CommandType, options: {
-        env?: {
-            [variable: string]: string;
-        } | undefined;
-        cwd?: string | undefined;
-        user?: string | undefined;
-        onStdout?: (chunk: Buffer | string | any) => void;
-        onStderr?: (chunk: Buffer | string | any) => void;
-        sigtermTimeout?: number;
-    }) => Promise<Daemon<Manifest>>;
+    protected exitedSuccess: boolean;
+    private exiting;
+    private onExitFns;
+    protected constructor(subcontainer: C, startCommand: () => Promise<CommandController<Manifest, C>>, oneshot?: boolean);
+    isOneshot(): this is Oneshot<Manifest>;
+    static of<Manifest extends T.SDKManifest>(): <C extends SubContainer<Manifest> | null>(effects: T.Effects, subcontainer: C, exec: DaemonCommandType<Manifest, C>) => Daemon<Manifest, SubContainer<Manifest, T.Effects> | null>;
     start(): Promise<void>;
     term(termOptions?: {
         signal?: NodeJS.Signals | undefined;
         timeout?: number | undefined;
+        destroySubcontainer?: boolean;
     }): Promise<void>;
-    stop(termOptions?: {
-        signal?: NodeJS.Signals | undefined;
-        timeout?: number | undefined;
-    }): Promise<void>;
+    subcontainerRc(): SubContainerRc<Manifest> | null;
+    sharesSubcontainerWith(other: Daemon<Manifest, SubContainer<Manifest> | null>): boolean;
+    onExit(fn: (success: boolean) => void): void;
+    onDrop(): void;
 }

package/package/lib/mainFn/Daemon.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Daemon = void 0;
 const asError_1 = require("../../../base/lib/util/asError");
+const util_1 = require("../util");
 const CommandController_1 = require("./CommandController");
 const TIMEOUT_INCREMENT_MS = 1000;
 const MAX_TIMEOUT_MS = 30000;
@@ -9,19 +10,32 @@ 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) {
+        super();
+        this.subcontainer = subcontainer;
         this.startCommand = startCommand;
+        this.oneshot = oneshot;
         this.commandController = null;
         this.shouldBeRunning = false;
+        this.exitedSuccess = false;
+        this.exiting = null;
+        this.onExitFns = [];
     }
-    get subContainerHandle() {
-        return this.commandController?.subContainerHandle;
+    isOneshot() {
+        return this.oneshot;
     }
     static of() {
-        return async (effects, subcontainer, command, options) => {
-            const startCommand = () => CommandController_1.CommandController.of()(effects, subcontainer, command, options);
-            return new Daemon(startCommand);
+        return (effects, subcontainer, exec) => {
+            let subc = subcontainer;
+            if (subcontainer && subcontainer.isOwned())
+                subc = subcontainer.rc();
+            const startCommand = () => CommandController_1.CommandController.of()(effects, (subc?.rc() ?? null), exec);
+            const res = new Daemon(subc, startCommand);
+            effects.onLeaveContext(() => {
+                res.term({ destroySubcontainer: true }).catch((e) => console.error(e));
+            });
+            return res;
         };
     }
     async start() {
@@ -30,29 +44,74 @@ class Daemon {
         }
         this.shouldBeRunning = true;
         let timeoutCounter = 0;
-        new Promise(async () => {
+        (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 this.commandController
+                        .term({})
+                        .catch((err) => console.error(err));
+                try {
+                    this.commandController = await this.startCommand();
+                    if (!this.shouldBeRunning) {
+                        // handles race condition if stopped while starting
+                        await this.term();
+                        break;
+                    }
+                    const success = await this.commandController.wait().then((_) => true, (err) => {
+                        console.error(err);
+                        return false;
+                    });
+                    for (const fn of this.onExitFns) {
+                        try {
+                            fn(success);
+                        }
+                        catch (e) {
+                            console.error('EXIT handler', e);
+                        }
+                    }
+                    if (success && this.oneshot) {
+                        this.exitedSuccess = true;
+                        break;
+                    }
+                }
+                catch (e) {
+                    console.error(e);
+                }
                 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));
         });
     }
     async term(termOptions) {
-        return this.stop(termOptions);
-    }
-    async stop(termOptions) {
         this.shouldBeRunning = false;
-        await this.commandController
-            ?.term({ ...termOptions })
-            .catch((e) => console.error((0, asError_1.asError)(e)));
-        this.commandController = null;
+        this.exitedSuccess = false;
+        if (this.commandController) {
+            this.exiting = this.commandController.term({ ...termOptions });
+            this.commandController = null;
+            this.onExitFns = [];
+        }
+        if (this.exiting) {
+            await this.exiting.catch(console.error);
+            if (termOptions?.destroySubcontainer) {
+                await this.subcontainer?.destroy();
+            }
+            this.exiting = null;
+        }
+    }
+    subcontainerRc() {
+        return this.subcontainer?.rc() ?? null;
+    }
+    sharesSubcontainerWith(other) {
+        return this.subcontainer?.guid === other.subcontainer?.guid;
+    }
+    onExit(fn) {
+        this.onExitFns.push(fn);
+    }
+    onDrop() {
+        this.term().catch((e) => console.error((0, asError_1.asError)(e)));
     }
 }
 exports.Daemon = Daemon;