@start9labs/start-sdk 0.3.6-beta.2 → 0.3.6-beta.20

package/package/lib/health/checkFns/checkPortListening.js

@@ -15,31 +15,40 @@ 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.checkPortListening = exports.containsAddress = void 0;
+exports.containsAddress = containsAddress;
+exports.checkPortListening = checkPortListening;
 const util_1 = require("../../util");
 const node_util_1 = require("node:util");
 const CP = __importStar(require("node:child_process"));
 const cpExec = (0, node_util_1.promisify)(CP.exec);
-function containsAddress(x, port) {
+function containsAddress(x, port, address) {
     const readPorts = x
         .split("\n")
         .filter(Boolean)
         .splice(1)
-        .map((x) => { var _a, _b; return (_b = (_a = x.split(" ").filter(Boolean)[1]) === null || _a === void 0 ? void 0 : _a.split(":")) === null || _b === void 0 ? void 0 : _b[1]; })
-        .filter(Boolean)
-        .map((x) => Number.parseInt(x, 16))
-        .filter(Number.isFinite);
-    return readPorts.indexOf(port) >= 0;
+        .map((x) => x.split(" ").filter(Boolean)[1]?.split(":"))
+        .filter((x) => x?.length > 1)
+        .map(([addr, p]) => [BigInt(`0x${addr}`), Number.parseInt(p, 16)]);
+    return !!readPorts.find(([addr, p]) => (address === undefined || address === addr) && port === p);
 }
-exports.containsAddress = containsAddress;
 /**
  * This is used to check if a port is listening on the system.
  * Used during the health check fn or the check main fn.
@@ -48,7 +57,9 @@ async function checkPortListening(effects, port, options) {
     return Promise.race([
         Promise.resolve().then(async () => {
             const hasAddress = containsAddress(await cpExec(`cat /proc/net/tcp`, {}).then(util_1.stringFromStdErrOut), port) ||
-                containsAddress(await cpExec("cat /proc/net/udp", {}).then(util_1.stringFromStdErrOut), port);
+                containsAddress(await cpExec(`cat /proc/net/tcp6`, {}).then(util_1.stringFromStdErrOut), port, BigInt(0)) ||
+                containsAddress(await cpExec("cat /proc/net/udp", {}).then(util_1.stringFromStdErrOut), port) ||
+                containsAddress(await cpExec("cat /proc/net/udp6", {}).then(util_1.stringFromStdErrOut), port, BigInt(0));
             if (hasAddress) {
                 return { result: "success", message: options.successMessage };
             }
@@ -58,13 +69,11 @@ async function checkPortListening(effects, port, options) {
             };
         }),
         new Promise((resolve) => {
-            var _a;
             setTimeout(() => resolve({
                 result: "failure",
                 message: options.timeoutMessage || `Timeout trying to check port ${port}`,
-            }), (_a = options.timeout) !== null && _a !== void 0 ? _a : 1000);
+            }), options.timeout ?? 1_000);
         }),
     ]);
 }
-exports.checkPortListening = checkPortListening;
 //# sourceMappingURL=checkPortListening.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"checkPortListening.js","sourceRoot":"","sources":["../../../../../package/lib/health/checkFns/checkPortListening.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AACA,qCAAgD;AAEhD,yCAAqC;AACrC,uDAAwC;AAExC,MAAM,MAAM,GAAG,IAAA,qBAAS,EAAC,EAAE,CAAC,IAAI,CAAC,CAAA;AAEjC,SAAgB,eAAe,CAAC,CAAS,EAAE,IAAY;IACrD,MAAM,SAAS,GAAG,CAAC;SAChB,KAAK,CAAC,IAAI,CAAC;SACX,MAAM,CAAC,OAAO,CAAC;SACf,MAAM,CAAC,CAAC,CAAC;SACT,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,eAAC,OAAA,MAAA,MAAA,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,0CAAE,KAAK,CAAC,GAAG,CAAC,0CAAG,CAAC,CAAC,CAAA,EAAA,CAAC;SAC5D,MAAM,CAAC,OAAO,CAAC;SACf,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;SAClC,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAA;IAC1B,OAAO,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;AACrC,CAAC;AAVD,0CAUC;AAED;;;GAGG;AACI,KAAK,UAAU,kBAAkB,CACtC,OAAgB,EAChB,IAAY,EACZ,OAKC;IAED,OAAO,OAAO,CAAC,IAAI,CAAoB;QACrC,OAAO,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC,KAAK,IAAI,EAAE;YAChC,MAAM,UAAU,GACd,eAAe,CACb,MAAM,MAAM,CAAC,mBAAmB,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,0BAAmB,CAAC,EAC/D,IAAI,CACL;gBACD,eAAe,CACb,MAAM,MAAM,CAAC,mBAAmB,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,0BAAmB,CAAC,EAC/D,IAAI,CACL,CAAA;YACH,IAAI,UAAU,EAAE;gBACd,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,OAAO,CAAC,cAAc,EAAE,CAAA;aAC9D;YACD,OAAO;gBACL,MAAM,EAAE,SAAS;gBACjB,OAAO,EAAE,OAAO,CAAC,YAAY;aAC9B,CAAA;QACH,CAAC,CAAC;QACF,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;;YACtB,UAAU,CACR,GAAG,EAAE,CACH,OAAO,CAAC;gBACN,MAAM,EAAE,SAAS;gBACjB,OAAO,EACL,OAAO,CAAC,cAAc,IAAI,gCAAgC,IAAI,EAAE;aACnE,CAAC,EACJ,MAAA,OAAO,CAAC,OAAO,mCAAI,IAAK,CACzB,CAAA;QACH,CAAC,CAAC;KACH,CAAC,CAAA;AACJ,CAAC;AAzCD,gDAyCC"}
+{"version":3,"file":"checkPortListening.js","sourceRoot":"","sources":["../../../../../package/lib/health/checkFns/checkPortListening.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAQA,0CAWC;AAMD,gDAmDC;AA3ED,qCAAgD;AAEhD,yCAAqC;AACrC,uDAAwC;AAExC,MAAM,MAAM,GAAG,IAAA,qBAAS,EAAC,EAAE,CAAC,IAAI,CAAC,CAAA;AAEjC,SAAgB,eAAe,CAAC,CAAS,EAAE,IAAY,EAAE,OAAgB;IACvE,MAAM,SAAS,GAAG,CAAC;SAChB,KAAK,CAAC,IAAI,CAAC;SACX,MAAM,CAAC,OAAO,CAAC;SACf,MAAM,CAAC,CAAC,CAAC;SACT,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;SACvD,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,MAAM,GAAG,CAAC,CAAC;SAC5B,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,KAAK,IAAI,EAAE,CAAC,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC,EAAE,EAAE,CAAC,CAAU,CAAC,CAAA;IAC7E,OAAO,CAAC,CAAC,SAAS,CAAC,IAAI,CACrB,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,OAAO,KAAK,SAAS,IAAI,OAAO,KAAK,IAAI,CAAC,IAAI,IAAI,KAAK,CAAC,CACzE,CAAA;AACH,CAAC;AAED;;;GAGG;AACI,KAAK,UAAU,kBAAkB,CACtC,OAAgB,EAChB,IAAY,EACZ,OAKC;IAED,OAAO,OAAO,CAAC,IAAI,CAAoB;QACrC,OAAO,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC,KAAK,IAAI,EAAE;YAChC,MAAM,UAAU,GACd,eAAe,CACb,MAAM,MAAM,CAAC,mBAAmB,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,0BAAmB,CAAC,EAC/D,IAAI,CACL;gBACD,eAAe,CACb,MAAM,MAAM,CAAC,oBAAoB,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,0BAAmB,CAAC,EAChE,IAAI,EACJ,MAAM,CAAC,CAAC,CAAC,CACV;gBACD,eAAe,CACb,MAAM,MAAM,CAAC,mBAAmB,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,0BAAmB,CAAC,EAC/D,IAAI,CACL;gBACD,eAAe,CACb,MAAM,MAAM,CAAC,oBAAoB,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,0BAAmB,CAAC,EAChE,IAAI,EACJ,MAAM,CAAC,CAAC,CAAC,CACV,CAAA;YACH,IAAI,UAAU,EAAE,CAAC;gBACf,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,OAAO,CAAC,cAAc,EAAE,CAAA;YAC/D,CAAC;YACD,OAAO;gBACL,MAAM,EAAE,SAAS;gBACjB,OAAO,EAAE,OAAO,CAAC,YAAY;aAC9B,CAAA;QACH,CAAC,CAAC;QACF,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YACtB,UAAU,CACR,GAAG,EAAE,CACH,OAAO,CAAC;gBACN,MAAM,EAAE,SAAS;gBACjB,OAAO,EACL,OAAO,CAAC,cAAc,IAAI,gCAAgC,IAAI,EAAE;aACnE,CAAC,EACJ,OAAO,CAAC,OAAO,IAAI,KAAK,CACzB,CAAA;QACH,CAAC,CAAC;KACH,CAAC,CAAA;AACJ,CAAC"}

package/package/lib/health/checkFns/index.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.runHealthScript = exports.timeoutPromise = exports.checkWebUrl = exports.checkPortListening = void 0;
+exports.runHealthScript = exports.checkWebUrl = exports.checkPortListening = void 0;
+exports.timeoutPromise = timeoutPromise;
 const runHealthScript_1 = require("./runHealthScript");
 Object.defineProperty(exports, "runHealthScript", { enumerable: true, get: function () { return runHealthScript_1.runHealthScript; } });
 var checkPortListening_1 = require("./checkPortListening");
@@ -10,5 +11,4 @@ Object.defineProperty(exports, "checkWebUrl", { enumerable: true, get: function
 function timeoutPromise(ms, { message = "Timed out" } = {}) {
     return new Promise((resolve, reject) => setTimeout(() => reject(new Error(message)), ms));
 }
-exports.timeoutPromise = timeoutPromise;
 //# sourceMappingURL=index.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../package/lib/health/checkFns/index.ts"],"names":[],"mappings":";;;AAAA,uDAAmD;AAU1C,gGAVA,iCAAe,OAUA;AATxB,2DAAyD;AAAhD,wHAAA,kBAAkB,OAAA;AAE3B,6CAA2C;AAAlC,0GAAA,WAAW,OAAA;AAEpB,SAAgB,cAAc,CAAC,EAAU,EAAE,EAAE,OAAO,GAAG,WAAW,EAAE,GAAG,EAAE;IACvE,OAAO,IAAI,OAAO,CAAQ,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,CAC5C,UAAU,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,CAAC,CACjD,CAAA;AACH,CAAC;AAJD,wCAIC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../package/lib/health/checkFns/index.ts"],"names":[],"mappings":";;;AAKA,wCAIC;AATD,uDAAmD;AAU1C,gGAVA,iCAAe,OAUA;AATxB,2DAAyD;AAAhD,wHAAA,kBAAkB,OAAA;AAE3B,6CAA2C;AAAlC,0GAAA,WAAW,OAAA;AAEpB,SAAgB,cAAc,CAAC,EAAU,EAAE,EAAE,OAAO,GAAG,WAAW,EAAE,GAAG,EAAE;IACvE,OAAO,IAAI,OAAO,CAAQ,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,CAC5C,UAAU,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,CAAC,CACjD,CAAA;AACH,CAAC"}

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

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

package/package/lib/health/index.js

@@ -1,4 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.HealthCheck = void 0;
 require("./checkFns");
+var HealthCheck_1 = require("./HealthCheck");
+Object.defineProperty(exports, "HealthCheck", { enumerable: true, get: function () { return HealthCheck_1.HealthCheck; } });
 //# sourceMappingURL=index.js.map

package/package/lib/health/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../package/lib/health/index.ts"],"names":[],"mappings":";;AAAA,sBAAmB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../package/lib/health/index.ts"],"names":[],"mappings":";;;AAAA,sBAAmB;AAEnB,6CAA2C;AAAlC,0GAAA,WAAW,OAAA"}

package/package/lib/index.d.ts

@@ -1,5 +1,6 @@
-import { S9pk, Version, VersionRange, ExtendedVersion, inputSpec, ISB, IST, types, T, matches, utils } from "../../base/lib";
-export { S9pk, Version, VersionRange, ExtendedVersion, inputSpec, ISB, IST, types, T, matches, utils, };
+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";

package/package/lib/index.js

@@ -15,18 +15,28 @@ 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;
+    };
+})();
 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.utils = exports.matches = exports.T = 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.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;
 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; } });
@@ -36,9 +46,9 @@ 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, "T", { enumerable: true, get: function () { return lib_1.T; } });
 Object.defineProperty(exports, "matches", { enumerable: true, get: function () { return lib_1.matches; } });
 Object.defineProperty(exports, "utils", { enumerable: true, get: function () { return lib_1.utils; } });
+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");

package/package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../package/lib/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,wCAYuB;AAGrB,qFAdA,UAAI,OAcA;AACJ,wFAdA,aAAO,OAcA;AACP,6FAdA,kBAAY,OAcA;AACZ,gGAdA,qBAAe,OAcA;AACf,0FAdA,eAAS,OAcA;AACT,oFAdA,SAAG,OAcA;AACH,oFAdA,SAAG,OAcA;AACH,sFAdA,WAAK,OAcA;AACL,kFAdA,OAAC,OAcA;AACD,wFAdA,aAAO,OAcA;AACP,sFAdA,WAAK,OAcA;AAEP,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,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"}

package/package/lib/inits/setupInit.d.ts

@@ -7,7 +7,7 @@ import { Install } from "./setupInstall";
 import { Uninstall } from "./setupUninstall";
 export declare function setupInit<Manifest extends T.SDKManifest, Store>(versions: VersionGraph<string>, install: Install<Manifest, Store>, uninstall: Uninstall<Manifest, Store>, setServiceInterfaces: UpdateServiceInterfaces<any>, setDependencies: (options: {
     effects: T.Effects;
-}) => Promise<null | void | undefined>, actions: Actions<Store, any>, exposedStore: ExposedStorePaths): {
+}) => Promise<null | void | undefined>, actions: Actions<Store, any>, initStore: Store, exposedStore: ExposedStorePaths): {
     packageInit: T.ExpectedExports.packageInit;
     packageUninit: T.ExpectedExports.packageUninit;
     containerInit: T.ExpectedExports.containerInit;

package/package/lib/inits/setupInit.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.setupInit = void 0;
+exports.setupInit = setupInit;
 const exver_1 = require("../../../base/lib/exver");
-function setupInit(versions, install, uninstall, setServiceInterfaces, setDependencies, actions, exposedStore) {
+function setupInit(versions, install, uninstall, setServiceInterfaces, setDependencies, actions, initStore, exposedStore) {
     return {
         packageInit: async (opts) => {
             const prev = await opts.effects.getDataVersion();
@@ -36,6 +36,14 @@ function setupInit(versions, install, uninstall, setServiceInterfaces, setDepend
             }
         },
         containerInit: async (opts) => {
+            const prev = await opts.effects.getDataVersion();
+            if (!prev) {
+                await opts.effects.store.set({
+                    path: "",
+                    value: initStore,
+                });
+                await install.preInstall(opts);
+            }
             await setServiceInterfaces({
                 ...opts,
             });
@@ -45,5 +53,4 @@ function setupInit(versions, install, uninstall, setServiceInterfaces, setDepend
         },
     };
 }
-exports.setupInit = setupInit;
 //# sourceMappingURL=setupInit.js.map

package/package/lib/inits/setupInit.js.map

@@ -1 +1 @@
-{"version":3,"file":"setupInit.js","sourceRoot":"","sources":["../../../../package/lib/inits/setupInit.ts"],"names":[],"mappings":";;;AACA,mDAAyD;AAQzD,SAAgB,SAAS,CACvB,QAA8B,EAC9B,OAAiC,EACjC,SAAqC,EACrC,oBAAkD,EAClD,eAEsC,EACtC,OAA4B,EAC5B,YAA+B;IAM/B,OAAO;QACL,WAAW,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;YAC1B,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE,CAAA;YAChD,IAAI,IAAI,EAAE;gBACR,MAAM,QAAQ,CAAC,OAAO,CAAC;oBACrB,OAAO,EAAE,IAAI,CAAC,OAAO;oBACrB,IAAI,EAAE,uBAAe,CAAC,KAAK,CAAC,IAAI,CAAC;oBACjC,EAAE,EAAE,QAAQ,CAAC,cAAc,EAAE;iBAC9B,CAAC,CAAA;aACH;iBAAM;gBACL,MAAM,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;gBAC3B,MAAM,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC;oBAChC,OAAO,EAAE,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO;iBAC1C,CAAC,CAAA;aACH;QACH,CAAC;QACD,aAAa,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;YAC5B,IAAI,IAAI,CAAC,WAAW,EAAE;gBACpB,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE,CAAA;gBAChD,IAAI,IAAI,EAAE;oBACR,MAAM,QAAQ,CAAC,OAAO,CAAC;wBACrB,OAAO,EAAE,IAAI,CAAC,OAAO;wBACrB,IAAI,EAAE,uBAAe,CAAC,KAAK,CAAC,IAAI,CAAC;wBACjC,EAAE,EAAE,uBAAe,CAAC,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC;qBAC5C,CAAC,CAAA;iBACH;aACF;iBAAM;gBACL,MAAM,SAAS,CAAC,SAAS,CAAC,IAAI,CAAC,CAAA;aAChC;QACH,CAAC;QACD,aAAa,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;YAC5B,MAAM,oBAAoB,CAAC;gBACzB,GAAG,IAAI;aACR,CAAC,CAAA;YACF,MAAM,OAAO,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC,CAAA;YAC/C,MAAM,IAAI,CAAC,OAAO,CAAC,mBAAmB,CAAC,EAAE,KAAK,EAAE,YAAY,EAAE,CAAC,CAAA;YAC/D,MAAM,eAAe,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC,CAAA;QAClD,CAAC;KACF,CAAA;AACH,CAAC;AAtDD,8BAsDC"}
+{"version":3,"file":"setupInit.js","sourceRoot":"","sources":["../../../../package/lib/inits/setupInit.ts"],"names":[],"mappings":";;AAUA,8BA+DC;AAxED,mDAAyD;AASzD,SAAgB,SAAS,CACvB,QAA8B,EAC9B,OAAiC,EACjC,SAAqC,EACrC,oBAAkD,EAClD,eAEsC,EACtC,OAA4B,EAC5B,SAAgB,EAChB,YAA+B;IAM/B,OAAO;QACL,WAAW,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;YAC1B,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE,CAAA;YAChD,IAAI,IAAI,EAAE,CAAC;gBACT,MAAM,QAAQ,CAAC,OAAO,CAAC;oBACrB,OAAO,EAAE,IAAI,CAAC,OAAO;oBACrB,IAAI,EAAE,uBAAe,CAAC,KAAK,CAAC,IAAI,CAAC;oBACjC,EAAE,EAAE,QAAQ,CAAC,cAAc,EAAE;iBAC9B,CAAC,CAAA;YACJ,CAAC;iBAAM,CAAC;gBACN,MAAM,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;gBAC3B,MAAM,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC;oBAChC,OAAO,EAAE,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO;iBAC1C,CAAC,CAAA;YACJ,CAAC;QACH,CAAC;QACD,aAAa,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;YAC5B,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;gBACrB,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE,CAAA;gBAChD,IAAI,IAAI,EAAE,CAAC;oBACT,MAAM,QAAQ,CAAC,OAAO,CAAC;wBACrB,OAAO,EAAE,IAAI,CAAC,OAAO;wBACrB,IAAI,EAAE,uBAAe,CAAC,KAAK,CAAC,IAAI,CAAC;wBACjC,EAAE,EAAE,uBAAe,CAAC,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC;qBAC5C,CAAC,CAAA;gBACJ,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,MAAM,SAAS,CAAC,SAAS,CAAC,IAAI,CAAC,CAAA;YACjC,CAAC;QACH,CAAC;QACD,aAAa,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;YAC5B,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE,CAAA;YAChD,IAAI,CAAC,IAAI,EAAE,CAAC;gBACV,MAAM,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC;oBAC3B,IAAI,EAAE,EAAe;oBACrB,KAAK,EAAE,SAAS;iBACjB,CAAC,CAAA;gBACF,MAAM,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,CAAA;YAChC,CAAC;YACD,MAAM,oBAAoB,CAAC;gBACzB,GAAG,IAAI;aACR,CAAC,CAAA;YACF,MAAM,OAAO,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC,CAAA;YAC/C,MAAM,IAAI,CAAC,OAAO,CAAC,mBAAmB,CAAC,EAAE,KAAK,EAAE,YAAY,EAAE,CAAC,CAAA;YAC/D,MAAM,eAAe,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC,CAAA;QAClD,CAAC;KACF,CAAA;AACH,CAAC"}

package/package/lib/inits/setupInstall.d.ts

@@ -4,8 +4,10 @@ export type InstallFn<Manifest extends T.SDKManifest, Store> = (opts: {
 }) => Promise<null | void | undefined>;
 export declare class Install<Manifest extends T.SDKManifest, Store> {
     readonly fn: InstallFn<Manifest, Store>;
+    readonly preFn?: InstallFn<Manifest, Store> | undefined;
     private constructor();
-    static of<Manifest extends T.SDKManifest, Store>(fn: InstallFn<Manifest, Store>): Install<Manifest, Store>;
+    static of<Manifest extends T.SDKManifest, Store>(fn: InstallFn<Manifest, Store>, preFn?: InstallFn<Manifest, Store>): Install<Manifest, Store>;
     install({ effects }: Parameters<T.ExpectedExports.packageInit>[0]): Promise<void>;
+    preInstall({ effects }: Parameters<T.ExpectedExports.packageInit>[0]): Promise<void>;
 }
-export declare function setupInstall<Manifest extends T.SDKManifest, Store>(fn: InstallFn<Manifest, Store>): Install<Manifest, Store>;
+export declare function setupInstall<Manifest extends T.SDKManifest, Store>(fn: InstallFn<Manifest, Store>, preFn?: InstallFn<Manifest, Store>): Install<Manifest, Store>;

package/package/lib/inits/setupInstall.js

@@ -1,22 +1,29 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.setupInstall = exports.Install = void 0;
+exports.Install = void 0;
+exports.setupInstall = setupInstall;
 class Install {
-    constructor(fn) {
+    constructor(fn, preFn) {
         this.fn = fn;
+        this.preFn = preFn;
     }
-    static of(fn) {
-        return new Install(fn);
+    static of(fn, preFn) {
+        return new Install(fn, preFn);
     }
     async install({ effects }) {
         await this.fn({
             effects,
         });
     }
+    async preInstall({ effects }) {
+        this.preFn &&
+            (await this.preFn({
+                effects,
+            }));
+    }
 }
 exports.Install = Install;
-function setupInstall(fn) {
-    return Install.of(fn);
+function setupInstall(fn, preFn) {
+    return Install.of(fn, preFn);
 }
-exports.setupInstall = setupInstall;
 //# sourceMappingURL=setupInstall.js.map

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":";;;AA+BA,oCAKC;AA/BD,MAAa,OAAO;IAClB,YACW,EAA8B,EAC9B,KAAkC;QADlC,OAAE,GAAF,EAAE,CAA4B;QAC9B,UAAK,GAAL,KAAK,CAA6B;IAC1C,CAAC;IACJ,MAAM,CAAC,EAAE,CACP,EAA8B,EAC9B,KAAkC;QAElC,OAAO,IAAI,OAAO,CAAC,EAAE,EAAE,KAAK,CAAC,CAAA;IAC/B,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,EAAE,OAAO,EAAgD;QACrE,MAAM,IAAI,CAAC,EAAE,CAAC;YACZ,OAAO;SACR,CAAC,CAAA;IACJ,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,EAAE,OAAO,EAAgD;QACxE,IAAI,CAAC,KAAK;YACR,CAAC,MAAM,IAAI,CAAC,KAAK,CAAC;gBAChB,OAAO;aACR,CAAC,CAAC,CAAA;IACP,CAAC;CACF;AAxBD,0BAwBC;AAED,SAAgB,YAAY,CAC1B,EAA8B,EAC9B,KAAkC;IAElC,OAAO,OAAO,CAAC,EAAE,CAAC,EAAE,EAAE,KAAK,CAAC,CAAA;AAC9B,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,8 +1,7 @@
-/// <reference types="node" />
-/// <reference types="node" />
 import * as T from "../../../base/lib/types";
 import { MountOptions, SubContainerHandle, SubContainer } from "../util/SubContainer";
-export declare class CommandController {
+import { Drop } from "../util";
+export declare class CommandController extends Drop {
     readonly runningAnswer: Promise<unknown>;
     private state;
     private readonly subcontainer;
@@ -10,23 +9,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;
+            mountpoint: 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 }?: {
@@ -36,4 +35,5 @@ export declare class CommandController {
         signal?: NodeJS.Signals | undefined;
         timeout?: number | undefined;
     }): Promise<void>;
+    onDrop(): void;
 }

package/package/lib/mainFn/CommandController.js

@@ -1,12 +1,48 @@
 "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");
-class CommandController {
+const fs = __importStar(require("node:fs/promises"));
+class CommandController extends util_1.Drop {
     constructor(runningAnswer, state, subcontainer, process, sigtermTimeout = _1.DEFAULT_SIGTERM_TIMEOUT) {
+        super();
         this.runningAnswer = runningAnswer;
         this.state = state;
         this.subcontainer = subcontainer;
@@ -15,92 +51,118 @@ 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.mountpoint);
+                        }
+                        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;
+        const self = this.weak();
         if (timeout > 0)
             setTimeout(() => {
-                this.term();
+                self.term();
             }, timeout);
         try {
-            return await this.runningAnswer;
+            return await self.runningAnswer;
         }
         finally {
-            if (!this.state.exited) {
-                this.process.kill("SIGKILL");
+            if (!self.state.exited) {
+                self.process.kill("SIGKILL");
             }
-            await ((_b = (_a = this.subcontainer).destroy) === null || _b === void 0 ? void 0 : _b.call(_a).catch((_) => { }));
+            await self.subcontainer.destroy().catch((_) => { });
         }
     }
     async term({ signal = types_1.SIGTERM, timeout = this.sigtermTimeout } = {}) {
-        var _a, _b;
+        const self = this.weak();
         try {
-            if (!this.state.exited) {
+            if (!self.state.exited) {
                 if (signal !== "SIGKILL") {
                     setTimeout(() => {
-                        if (!this.state.exited)
-                            this.process.kill("SIGKILL");
+                        if (!self.state.exited)
+                            self.process.kill("SIGKILL");
                     }, timeout);
                 }
-                if (!this.process.kill(signal)) {
+                if (!self.process.kill(signal)) {
                     console.error(`failed to send signal ${signal} to pid ${this.process.pid}`);
                 }
             }
-            await this.runningAnswer;
+            await self.runningAnswer;
         }
         finally {
-            await ((_b = (_a = this.subcontainer).destroy) === null || _b === void 0 ? void 0 : _b.call(_a));
+            await self.subcontainer.destroy();
         }
     }
+    onDrop() {
+        this.term().catch(console.error);
+    }
 }
 exports.CommandController = CommandController;
 //# sourceMappingURL=CommandController.js.map