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

package/package/lib/backup/Backups.js

@@ -35,17 +35,22 @@ var __importStar = (this && this.__importStar) || (function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Backups = exports.DEFAULT_OPTIONS = void 0;
 const child_process = __importStar(require("child_process"));
+const fs = __importStar(require("fs/promises"));
 const util_1 = require("../util");
 exports.DEFAULT_OPTIONS = {
     delete: true,
     exclude: [],
 };
 class Backups {
-    constructor(options = exports.DEFAULT_OPTIONS, restoreOptions = {}, backupOptions = {}, backupSet = []) {
+    constructor(options = exports.DEFAULT_OPTIONS, restoreOptions = {}, backupOptions = {}, backupSet = [], preBackup = async (effects) => { }, postBackup = async (effects) => { }, preRestore = async (effects) => { }, postRestore = async (effects) => { }) {
         this.options = options;
         this.restoreOptions = restoreOptions;
         this.backupOptions = backupOptions;
         this.backupSet = backupSet;
+        this.preBackup = preBackup;
+        this.postBackup = postBackup;
+        this.preRestore = preRestore;
+        this.postRestore = postRestore;
     }
     static withVolumes(...volumeNames) {
         return Backups.withSyncs(...volumeNames.map((srcVolume) => ({
@@ -80,7 +85,23 @@ class Backups {
         };
         return this;
     }
-    addVolume(volume, options) {
+    setPreBackup(fn) {
+        this.preBackup = fn;
+        return this;
+    }
+    setPostBackup(fn) {
+        this.postBackup = fn;
+        return this;
+    }
+    setPreRestore(fn) {
+        this.preRestore = fn;
+        return this;
+    }
+    setPostRestore(fn) {
+        this.postRestore = fn;
+        return this;
+    }
+    mountVolume(volume, options) {
         return this.addSync({
             dataPath: `/media/startos/volumes/${volume}/`,
             backupPath: `/media/startos/backup/${volume}/`,
@@ -94,7 +115,8 @@ class Backups {
         });
         return this;
     }
-    async createBackup() {
+    async createBackup(effects) {
+        await this.preBackup(effects);
         for (const item of this.backupSet) {
             const rsyncResults = await runRsync({
                 srcPath: item.dataPath,
@@ -108,9 +130,16 @@ class Backups {
             });
             await rsyncResults.wait();
         }
+        const dataVersion = await effects.getDataVersion();
+        if (dataVersion)
+            await fs.writeFile("/media/startos/backup/dataVersion.txt", dataVersion, {
+                encoding: "utf-8",
+            });
+        await this.postBackup(effects);
         return;
     }
-    async restoreBackup() {
+    async restoreBackup(effects) {
+        this.preRestore(effects);
         for (const item of this.backupSet) {
             const rsyncResults = await runRsync({
                 srcPath: item.backupPath,
@@ -124,6 +153,14 @@ class Backups {
             });
             await rsyncResults.wait();
         }
+        const dataVersion = await fs
+            .readFile("/media/startos/backup/dataVersion.txt", {
+            encoding: "utf-8",
+        })
+            .catch((_) => null);
+        if (dataVersion)
+            await effects.setDataVersion({ version: dataVersion });
+        this.postRestore(effects);
         return;
     }
 }

package/package/lib/backup/Backups.js.map

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

package/package/lib/backup/setupBackups.js

@@ -13,12 +13,12 @@ function setupBackups(options) {
     const answer = {
         get createBackup() {
             return (async (options) => {
-                return (await backupsFactory(options)).createBackup();
+                return (await backupsFactory(options)).createBackup(options.effects);
             });
         },
         get restoreBackup() {
             return (async (options) => {
-                return (await backupsFactory(options)).restoreBackup();
+                return (await backupsFactory(options)).restoreBackup(options.effects);
             });
         },
     };

package/package/lib/backup/setupBackups.js.map

@@ -1 +1 @@
-{"version":3,"file":"setupBackups.js","sourceRoot":"","sources":["../../../../package/lib/backup/setupBackups.ts"],"names":[],"mappings":";;AAaA,oCAyBC;AAtCD,uCAAmC;AAanC,SAAgB,YAAY,CAC1B,OAA8B;IAE9B,IAAI,cAAkE,CAAA;IACtE,IAAI,OAAO,YAAY,QAAQ,EAAE,CAAC;QAChC,cAAc,GAAG,OAAO,CAAA;IAC1B,CAAC;SAAM,CAAC;QACN,cAAc,GAAG,KAAK,IAAI,EAAE,CAAC,iBAAO,CAAC,WAAW,CAAC,GAAG,OAAO,CAAC,CAAA;IAC9D,CAAC;IACD,MAAM,MAAM,GAGR;QACF,IAAI,YAAY;YACd,OAAO,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE;gBACxB,OAAO,CAAC,MAAM,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC,YAAY,EAAE,CAAA;YACvD,CAAC,CAAmC,CAAA;QACtC,CAAC;QACD,IAAI,aAAa;YACf,OAAO,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE;gBACxB,OAAO,CAAC,MAAM,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC,aAAa,EAAE,CAAA;YACxD,CAAC,CAAoC,CAAA;QACvC,CAAC;KACF,CAAA;IACD,OAAO,MAAM,CAAA;AACf,CAAC"}
+{"version":3,"file":"setupBackups.js","sourceRoot":"","sources":["../../../../package/lib/backup/setupBackups.ts"],"names":[],"mappings":";;AAaA,oCAyBC;AAtCD,uCAAmC;AAanC,SAAgB,YAAY,CAC1B,OAA8B;IAE9B,IAAI,cAAkE,CAAA;IACtE,IAAI,OAAO,YAAY,QAAQ,EAAE,CAAC;QAChC,cAAc,GAAG,OAAO,CAAA;IAC1B,CAAC;SAAM,CAAC;QACN,cAAc,GAAG,KAAK,IAAI,EAAE,CAAC,iBAAO,CAAC,WAAW,CAAC,GAAG,OAAO,CAAC,CAAA;IAC9D,CAAC;IACD,MAAM,MAAM,GAGR;QACF,IAAI,YAAY;YACd,OAAO,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE;gBACxB,OAAO,CAAC,MAAM,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC,YAAY,CAAC,OAAO,CAAC,OAAO,CAAC,CAAA;YACtE,CAAC,CAAmC,CAAA;QACtC,CAAC;QACD,IAAI,aAAa;YACf,OAAO,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE;gBACxB,OAAO,CAAC,MAAM,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC,aAAa,CAAC,OAAO,CAAC,OAAO,CAAC,CAAA;YACvE,CAAC,CAAoC,CAAA;QACvC,CAAC;KACF,CAAA;IACD,OAAO,MAAM,CAAA;AACf,CAAC"}

package/package/lib/health/HealthCheck.js

@@ -18,7 +18,7 @@ class HealthCheck extends util_1.Drop {
         this.currentValue = {};
         this.promise = Promise.resolve().then(async () => {
             const getCurrentValue = () => this.currentValue;
-            const gracePeriod = o.gracePeriod ?? 5000;
+            const gracePeriod = o.gracePeriod ?? 10_000;
             const trigger = (o.trigger ?? defaultTrigger_1.defaultTrigger)(getCurrentValue);
             const triggerFirstSuccess = (0, util_1.once)(() => Promise.resolve("onFirstSuccess" in o && o.onFirstSuccess
                 ? o.onFirstSuccess()

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

@@ -1 +1 @@
-{"version":3,"file":"HealthCheck.js","sourceRoot":"","sources":["../../../../package/lib/health/HealthCheck.ts"],"names":[],"mappings":";;;AAIA,8DAA0D;AAC1D,kCAA6C;AAC7C,2CAA4C;AAW5C,MAAa,WAAY,SAAQ,WAAI;IAWnC,YAAoB,OAAgB,EAAE,CAAoB;QACxD,KAAK,EAAE,CAAA;QAXD,YAAO,GAAkB,IAAI,CAAA;QAC7B,eAAU,GAAG,CAAC,OAAsB,EAAE,EAAE;YAC9C,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;QACxB,CAAC,CAAA;QACO,WAAM,GAAG,KAAK,CAAA;QACd,SAAI,GAAG,GAAG,EAAE;YAClB,IAAI,CAAC,MAAM,GAAG,IAAI,CAAA;QACpB,CAAC,CAAA;QACO,iBAAY,GAAiB,EAAE,CAAA;QAIrC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC,KAAK,IAAI,EAAE;YAC/C,MAAM,eAAe,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,YAAY,CAAA;YAC/C,MAAM,WAAW,GAAG,CAAC,CAAC,WAAW,IAAI,IAAI,CAAA;YACzC,MAAM,OAAO,GAAG,CAAC,CAAC,CAAC,OAAO,IAAI,+BAAc,CAAC,CAAC,eAAe,CAAC,CAAA;YAC9D,MAAM,mBAAmB,GAAG,IAAA,WAAI,EAAC,GAAG,EAAE,CACpC,OAAO,CAAC,OAAO,CACb,gBAAgB,IAAI,CAAC,IAAI,CAAC,CAAC,cAAc;gBACvC,CAAC,CAAC,CAAC,CAAC,cAAc,EAAE;gBACpB,CAAC,CAAC,SAAS,CACd,CACF,CAAA;YACD,MAAM,YAAY,GAAG,GAAG,EAAE,CACxB;gBACE,IAAI,CAAC,OAAO;gBACZ,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,EAAE;oBAC5B,IAAI,CAAC,UAAU,GAAG,CAAC,OAAsB,EAAE,EAAE;wBAC3C,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;wBACtB,OAAO,EAAE,CAAA;oBACX,CAAC,CAAA;oBACD,IAAI,CAAC,IAAI,GAAG,GAAG,EAAE;wBACf,IAAI,CAAC,MAAM,GAAG,IAAI,CAAA;wBAClB,OAAO,EAAE,CAAA;oBACX,CAAC,CAAA;gBACH,CAAC,CAAC;aACM,CAAA;YACZ,IAAI,SAAS,GAAG,KAAK,CAAA;YACrB,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;gBACpB,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,GAAG,YAAY,EAAE,CAAA;gBACzC,IAAI,IAAI,GAEyD;oBAC/D,OAAO;iBACR,CAAA;gBACD,IAAI,OAAO,EAAE,CAAC;oBACZ,IAAI,GAAG,CAAC,GAAG,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC,CAAA;oBAChC,IAAI,SAAS,EAAE,CAAC;wBACd,IAAI,CAAC;4BACH,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC,CAAC,EAAE,EAAE,CAAA;4BACtC,IACE,MAAM,KAAK,SAAS;gCACpB,WAAW,CAAC,GAAG,EAAE,GAAG,OAAO,IAAI,WAAW;gCAE1C,MAAM,GAAG,UAAU,CAAA;4BACrB,MAAM,OAAO,CAAC,SAAS,CAAC;gCACtB,IAAI,EAAE,CAAC,CAAC,IAAI;gCACZ,EAAE,EAAE,CAAC,CAAC,EAAE;gCACR,MAAM;gCACN,OAAO,EAAE,OAAO,IAAI,EAAE;6BACvB,CAAC,CAAA;4BACF,IAAI,CAAC,YAAY,CAAC,UAAU,GAAG,MAAM,CAAA;4BACrC,MAAM,mBAAmB,EAAE,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;gCACxC,OAAO,CAAC,KAAK,CAAC,IAAA,cAAO,EAAC,GAAG,CAAC,CAAC,CAAA;4BAC7B,CAAC,CAAC,CAAA;wBACJ,CAAC;wBAAC,OAAO,CAAC,EAAE,CAAC;4BACX,MAAM,OAAO,CAAC,SAAS,CAAC;gCACtB,IAAI,EAAE,CAAC,CAAC,IAAI;gCACZ,EAAE,EAAE,CAAC,CAAC,EAAE;gCACR,MAAM,EACJ,WAAW,CAAC,GAAG,EAAE,GAAG,OAAO,IAAI,WAAW;oCACxC,CAAC,CAAC,UAAU;oCACZ,CAAC,CAAC,SAAS;gCACf,OAAO,EAAE,SAAS,CAAC,CAAC,CAAC,IAAI,EAAE;6BAC5B,CAAC,CAAA;4BACF,IAAI,CAAC,YAAY,CAAC,UAAU,GAAG,SAAS,CAAA;wBAC1C,CAAC;oBACH,CAAC;gBACH,CAAC;;oBAAM,SAAS,GAAG,KAAK,CAAA;gBACxB,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;gBACtC,IAAI,KAAK,EAAE,CAAC;oBACV,IAAI,KAAK,CAAC,IAAI;wBAAE,MAAK;oBACrB,SAAS,GAAG,IAAI,CAAA;gBAClB,CAAC;YACH,CAAC;QACH,CAAC,CAAC,CAAA;IACJ,CAAC;IACD,MAAM,CAAC,EAAE,CAAC,OAAgB,EAAE,OAA0B;QACpD,OAAO,IAAI,WAAW,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;IAC1C,CAAC;IACD,KAAK;QACH,IAAI,IAAI,CAAC,OAAO;YAAE,OAAM;QACxB,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,GAAG,EAAE,CAAC,CAAA;IACpC,CAAC;IACD,IAAI;QACF,IAAI,CAAC,IAAI,CAAC,OAAO;YAAE,OAAM;QACzB,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAA;IACvB,CAAC;IACD,MAAM;QACJ,IAAI,CAAC,IAAI,EAAE,CAAA;IACb,CAAC;CACF;AAtGD,kCAsGC;AAED,SAAS,SAAS,CAAC,CAAU;IAC3B,IAAI,IAAA,mBAAM,EAAC,EAAE,OAAO,EAAE,oBAAO,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;QAAE,OAAO,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,CAAA;IAClE,MAAM,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,CAAA;IACvB,IAAI,KAAK,CAAC,MAAM,IAAI,IAAI;QAAE,OAAO,IAAI,CAAA;IACrC,OAAO,KAAK,CAAA;AACd,CAAC"}
+{"version":3,"file":"HealthCheck.js","sourceRoot":"","sources":["../../../../package/lib/health/HealthCheck.ts"],"names":[],"mappings":"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"}

package/package/lib/health/checkFns/runHealthScript.d.ts

@@ -1,5 +1,6 @@
 import { HealthCheckResult } from "./HealthCheckResult";
 import { SubContainer } from "../../util/SubContainer";
+import { SDKManifest } from "../../types";
 /**
  * Running a health script, is used when we want to have a simple
  * script in bash or something like that. It should return something that is useful
@@ -7,7 +8,7 @@ import { SubContainer } from "../../util/SubContainer";
  * @param param0
  * @returns
  */
-export declare const runHealthScript: (runCommand: string[], subcontainer: SubContainer, { timeout, errorMessage, message, }?: {
+export declare const runHealthScript: <Manifest extends SDKManifest>(runCommand: string[], subcontainer: SubContainer<Manifest>, { timeout, errorMessage, message, }?: {
     timeout?: number | undefined;
     errorMessage?: string | undefined;
     message?: ((res: string) => string) | undefined;

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

@@ -11,7 +11,7 @@ const index_1 = require("./index");
  */
 const runHealthScript = async (runCommand, subcontainer, { timeout = 30000, errorMessage = `Error while running command: ${runCommand}`, message = (res) => `Have ran script ${runCommand} and the result: ${res}`, } = {}) => {
     const res = await Promise.race([
-        subcontainer.exec(runCommand),
+        subcontainer.execFail(runCommand),
         (0, index_1.timeoutPromise)(timeout),
     ]).catch((e) => {
         console.warn(errorMessage);

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;AAGxC;;;;;;GAMG;AACI,MAAM,eAAe,GAAG,KAAK,EAClC,UAAoB,EACpB,YAA0B,EAC1B,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/index.d.ts

@@ -6,8 +6,6 @@ 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";

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.inits = exports.healthFns = exports.health = exports.daemons = exports.backup = exports.actions = 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; } });
@@ -60,10 +60,6 @@ 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"));

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,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;AAEnB,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

@@ -1,13 +1,12 @@
 import { Actions } from "../../../base/lib/actions/setupActions";
 import { UpdateServiceInterfaces } from "../../../base/lib/interfaces/setupInterfaces";
-import { ExposedStorePaths } from "../../../base/lib/types";
 import * as T from "../../../base/lib/types";
 import { VersionGraph } from "../version/VersionGraph";
 import { PostInstall, PreInstall } from "./setupInstall";
 import { Uninstall } from "./setupUninstall";
-export declare function setupInit<Manifest extends T.SDKManifest, Store>(versions: VersionGraph<string>, preInstall: PreInstall<Manifest, Store>, postInstall: PostInstall<Manifest, Store>, uninstall: Uninstall<Manifest, Store>, setServiceInterfaces: UpdateServiceInterfaces<any>, setDependencies: (options: {
+export declare function setupInit<Manifest extends T.SDKManifest>(versions: VersionGraph<string>, preInstall: PreInstall<Manifest>, postInstall: PostInstall<Manifest>, uninstall: Uninstall<Manifest>, setServiceInterfaces: UpdateServiceInterfaces<any>, setDependencies: (options: {
     effects: T.Effects;
-}) => Promise<null | void | undefined>, actions: Actions<Store, any>, initStore: Store, exposedStore: ExposedStorePaths): {
+}) => Promise<null | void | undefined>, actions: Actions<any>): {
     packageInit: T.ExpectedExports.packageInit;
     packageUninit: T.ExpectedExports.packageUninit;
     containerInit: T.ExpectedExports.containerInit;

package/package/lib/inits/setupInit.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.setupInit = setupInit;
 const exver_1 = require("../../../base/lib/exver");
-function setupInit(versions, preInstall, postInstall, uninstall, setServiceInterfaces, setDependencies, actions, initStore, exposedStore) {
+function setupInit(versions, preInstall, postInstall, uninstall, setServiceInterfaces, setDependencies, actions) {
     return {
         packageInit: async (opts) => {
             const prev = await opts.effects.getDataVersion();
@@ -38,17 +38,12 @@ function setupInit(versions, preInstall, postInstall, uninstall, setServiceInter
         containerInit: async (opts) => {
             const prev = await opts.effects.getDataVersion();
             if (!prev) {
-                await opts.effects.store.set({
-                    path: "",
-                    value: initStore,
-                });
                 await preInstall.preInstall(opts);
             }
             await setServiceInterfaces({
                 ...opts,
             });
             await actions.update({ effects: opts.effects });
-            await opts.effects.exposeForDependents({ paths: exposedStore });
             await setDependencies({ effects: opts.effects });
         },
     };

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

@@ -1 +1 @@
-{"version":3,"file":"setupInit.js","sourceRoot":"","sources":["../../../../package/lib/inits/setupInit.ts"],"names":[],"mappings":";;AAUA,8BAgEC;AAzED,mDAAyD;AASzD,SAAgB,SAAS,CACvB,QAA8B,EAC9B,UAAuC,EACvC,WAAyC,EACzC,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,WAAW,CAAC,WAAW,CAAC,IAAI,CAAC,CAAA;gBACnC,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,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC,CAAA;YACnC,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"}
+{"version":3,"file":"setupInit.js","sourceRoot":"","sources":["../../../../package/lib/inits/setupInit.ts"],"names":[],"mappings":";;AAQA,8BAyDC;AAhED,mDAAyD;AAOzD,SAAgB,SAAS,CACvB,QAA8B,EAC9B,UAAgC,EAChC,WAAkC,EAClC,SAA8B,EAC9B,oBAAkD,EAClD,eAEsC,EACtC,OAAqB;IAMrB,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,WAAW,CAAC,WAAW,CAAC,IAAI,CAAC,CAAA;gBACnC,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,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC,CAAA;YACnC,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,eAAe,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC,CAAA;QAClD,CAAC;KACF,CAAA;AACH,CAAC"}

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

@@ -1,20 +1,20 @@
 import * as T from "../../../base/lib/types";
-export type InstallFn<Manifest extends T.SDKManifest, Store> = (opts: {
+export type InstallFn<Manifest extends T.SDKManifest> = (opts: {
     effects: T.Effects;
 }) => Promise<null | void | undefined>;
-export declare class Install<Manifest extends T.SDKManifest, Store> {
-    readonly fn: InstallFn<Manifest, Store>;
-    protected constructor(fn: InstallFn<Manifest, Store>);
+export declare class Install<Manifest extends T.SDKManifest> {
+    readonly fn: InstallFn<Manifest>;
+    protected constructor(fn: InstallFn<Manifest>);
 }
-export declare class PreInstall<Manifest extends T.SDKManifest, Store> extends Install<Manifest, Store> {
+export declare class PreInstall<Manifest extends T.SDKManifest> extends Install<Manifest> {
     private constructor();
-    static of<Manifest extends T.SDKManifest, Store>(fn: InstallFn<Manifest, Store>): PreInstall<Manifest, Store>;
+    static of<Manifest extends T.SDKManifest>(fn: InstallFn<Manifest>): PreInstall<Manifest>;
     preInstall({ effects }: Parameters<T.ExpectedExports.packageInit>[0]): Promise<void>;
 }
-export declare function setupPreInstall<Manifest extends T.SDKManifest, Store>(fn: InstallFn<Manifest, Store>): PreInstall<Manifest, Store>;
-export declare class PostInstall<Manifest extends T.SDKManifest, Store> extends Install<Manifest, Store> {
+export declare function setupPreInstall<Manifest extends T.SDKManifest>(fn: InstallFn<Manifest>): PreInstall<Manifest>;
+export declare class PostInstall<Manifest extends T.SDKManifest> extends Install<Manifest> {
     private constructor();
-    static of<Manifest extends T.SDKManifest, Store>(fn: InstallFn<Manifest, Store>): PostInstall<Manifest, Store>;
+    static of<Manifest extends T.SDKManifest>(fn: InstallFn<Manifest>): PostInstall<Manifest>;
     postInstall({ effects }: Parameters<T.ExpectedExports.packageInit>[0]): Promise<void>;
 }
-export declare function setupPostInstall<Manifest extends T.SDKManifest, Store>(fn: InstallFn<Manifest, Store>): PostInstall<Manifest, Store>;
+export declare function setupPostInstall<Manifest extends T.SDKManifest>(fn: InstallFn<Manifest>): PostInstall<Manifest>;

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

@@ -1 +1 @@
-{"version":3,"file":"setupInstall.js","sourceRoot":"","sources":["../../../../package/lib/inits/setupInstall.ts"],"names":[],"mappings":";;;AA6BA,0CAIC;AAsBD,4CAIC;AAtDD,MAAa,OAAO;IAClB,YAA+B,EAA8B;QAA9B,OAAE,GAAF,EAAE,CAA4B;IAAG,CAAC;CAClE;AAFD,0BAEC;AAED,MAAa,UAAkD,SAAQ,OAGtE;IACC,YAAoB,EAA8B;QAChD,KAAK,CAAC,EAAE,CAAC,CAAA;IACX,CAAC;IACD,MAAM,CAAC,EAAE,CACP,EAA8B;QAE9B,OAAO,IAAI,UAAU,CAAC,EAAE,CAAC,CAAA;IAC3B,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,EAAE,OAAO,EAAgD;QACxE,MAAM,IAAI,CAAC,EAAE,CAAC;YACZ,OAAO;SACR,CAAC,CAAA;IACJ,CAAC;CACF;AAlBD,gCAkBC;AAED,SAAgB,eAAe,CAC7B,EAA8B;IAE9B,OAAO,UAAU,CAAC,EAAE,CAAC,EAAE,CAAC,CAAA;AAC1B,CAAC;AAED,MAAa,WAAmD,SAAQ,OAGvE;IACC,YAAoB,EAA8B;QAChD,KAAK,CAAC,EAAE,CAAC,CAAA;IACX,CAAC;IACD,MAAM,CAAC,EAAE,CACP,EAA8B;QAE9B,OAAO,IAAI,WAAW,CAAC,EAAE,CAAC,CAAA;IAC5B,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,EAAE,OAAO,EAAgD;QACzE,MAAM,IAAI,CAAC,EAAE,CAAC;YACZ,OAAO;SACR,CAAC,CAAA;IACJ,CAAC;CACF;AAlBD,kCAkBC;AAED,SAAgB,gBAAgB,CAC9B,EAA8B;IAE9B,OAAO,WAAW,CAAC,EAAE,CAAC,EAAE,CAAC,CAAA;AAC3B,CAAC"}
+{"version":3,"file":"setupInstall.js","sourceRoot":"","sources":["../../../../package/lib/inits/setupInstall.ts"],"names":[],"mappings":";;;AA0BA,0CAIC;AAmBD,4CAIC;AAhDD,MAAa,OAAO;IAClB,YAA+B,EAAuB;QAAvB,OAAE,GAAF,EAAE,CAAqB;IAAG,CAAC;CAC3D;AAFD,0BAEC;AAED,MAAa,UAEX,SAAQ,OAAiB;IACzB,YAAoB,EAAuB;QACzC,KAAK,CAAC,EAAE,CAAC,CAAA;IACX,CAAC;IACD,MAAM,CAAC,EAAE,CAAiC,EAAuB;QAC/D,OAAO,IAAI,UAAU,CAAC,EAAE,CAAC,CAAA;IAC3B,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,EAAE,OAAO,EAAgD;QACxE,MAAM,IAAI,CAAC,EAAE,CAAC;YACZ,OAAO;SACR,CAAC,CAAA;IACJ,CAAC;CACF;AAfD,gCAeC;AAED,SAAgB,eAAe,CAC7B,EAAuB;IAEvB,OAAO,UAAU,CAAC,EAAE,CAAC,EAAE,CAAC,CAAA;AAC1B,CAAC;AAED,MAAa,WAEX,SAAQ,OAAiB;IACzB,YAAoB,EAAuB;QACzC,KAAK,CAAC,EAAE,CAAC,CAAA;IACX,CAAC;IACD,MAAM,CAAC,EAAE,CAAiC,EAAuB;QAC/D,OAAO,IAAI,WAAW,CAAC,EAAE,CAAC,CAAA;IAC5B,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,EAAE,OAAO,EAAgD;QACzE,MAAM,IAAI,CAAC,EAAE,CAAC;YACZ,OAAO;SACR,CAAC,CAAA;IACJ,CAAC;CACF;AAfD,kCAeC;AAED,SAAgB,gBAAgB,CAC9B,EAAuB;IAEvB,OAAO,WAAW,CAAC,EAAE,CAAC,EAAE,CAAC,CAAA;AAC3B,CAAC"}

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

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

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

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

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

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

package/package/lib/mainFn/CommandController.js

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

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

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

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

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