@start9labs/start-sdk 0.4.0-beta.1 → 0.4.0-beta.11

package/package/lib/StartSdk.d.ts

@@ -19,7 +19,7 @@ import { MultiHost, Scheme } from "../../base/lib/interfaces/Host";
 import { ServiceInterfaceBuilder } from "../../base/lib/interfaces/ServiceInterfaceBuilder";
 import { GetSystemSmtp } from "./util";
 import { nullIfEmpty } from "./util";
-import { CommandOptions, MountOptions, SubContainer } from "./util/SubContainer";
+import { CommandOptions, SubContainer } from "./util/SubContainer";
 import { Mounts } from "./mainFn/Mounts";
 import * as T from "../../base/lib/types";
 import { ExposedStorePaths } from "./store/setupExposeStore";
@@ -78,15 +78,6 @@ export declare class StartSdk<Manifest extends T.SDKManifest, Store> {
         };
         nullIfEmpty: typeof nullIfEmpty;
         useEntrypoint: (overrideCmd?: string[]) => T.UseEntrypoint;
-        runCommand: <A extends string>(effects: Effects, image: {
-            imageId: keyof Manifest["images"] & T.ImageId;
-            sharedRun?: boolean;
-        }, command: T.CommandType, options: CommandOptions & {
-            mounts: Mounts<Manifest>;
-        }, name?: string) => Promise<{
-            stdout: string | Buffer;
-            stderr: string | Buffer;
-        }>;
         /**
          * @description Use this class to create an Action. By convention, each Action should receive its own file.
          *
@@ -277,7 +268,7 @@ export declare class StartSdk<Manifest extends T.SDKManifest, Store> {
                 successMessage?: string | undefined;
                 errorMessage?: string | undefined;
             }) => Promise<import("./health/checkFns").HealthCheckResult>;
-            runHealthScript: (runCommand: string[], subcontainer: SubContainer, { timeout, errorMessage, message, }?: {
+            runHealthScript: <Manifest_1 extends T.SDKManifest>(runCommand: string[], subcontainer: SubContainer<Manifest_1>, { timeout, errorMessage, message, }?: {
                 timeout?: number | undefined;
                 errorMessage?: string | undefined;
                 message?: ((res: string) => string) | undefined;
@@ -505,7 +496,7 @@ export declare class StartSdk<Manifest extends T.SDKManifest, Store> {
             }) => import("./trigger").Trigger;
         };
         Mounts: {
-            of(): Mounts<Manifest>;
+            of(): Mounts<Manifest, never>;
         };
         Backups: {
             volumes: (...volumeNames: Array<Manifest["volumes"][number] & string>) => Backups<Manifest>;
@@ -546,17 +537,28 @@ export declare class StartSdk<Manifest extends T.SDKManifest, Store> {
             of(effects: Effects, started: (onTerm: () => PromiseLike<void>) => PromiseLike<null>, healthChecks: HealthCheck[]): Daemons<Manifest, never>;
         };
         SubContainer: {
+            /**
+             * @description Create a new SubContainer
+             * @param effects
+             * @param image - what container image to use
+             * @param mounts - what to mount to the subcontainer
+             * @param name - a name to use to refer to the subcontainer for debugging purposes
+             */
             of(effects: Effects, image: {
                 imageId: T.ImageId & keyof Manifest["images"];
                 sharedRun?: boolean;
-            }, name: string): Promise<SubContainer>;
-            with<T>(effects: T.Effects, image: {
+            }, mounts: Mounts<Manifest> | null, name: string): Promise<SubContainer<T.SDKManifest, Effects>>;
+            /**
+             * @description Run a function with a temporary SubContainer
+             * @param effects
+             * @param image - what container image to use
+             * @param mounts - what to mount to the subcontainer
+             * @param name - a name to use to refer to the ephemeral subcontainer for debugging purposes
+             */
+            withTemp<T>(effects: T.Effects, image: {
                 imageId: T.ImageId & keyof Manifest["images"];
                 sharedRun?: boolean;
-            }, mounts: {
-                options: MountOptions;
-                mountpoint: string;
-            }[], name: string, fn: (subContainer: SubContainer) => Promise<T>): Promise<T>;
+            }, mounts: Mounts<Manifest> | null, name: string, fn: (subContainer: SubContainer<Manifest>) => Promise<T>): Promise<T>;
         };
         List: {
             /**
@@ -1031,7 +1033,7 @@ export declare function runCommand<Manifest extends T.SDKManifest>(effects: Effe
     imageId: keyof Manifest["images"] & T.ImageId;
     sharedRun?: boolean;
 }, command: T.CommandType, options: CommandOptions & {
-    mounts: Mounts<Manifest>;
+    mounts: Mounts<Manifest> | null;
 }, name?: string): Promise<{
     stdout: string | Buffer;
     stderr: string | Buffer;

package/package/lib/StartSdk.js

@@ -137,10 +137,15 @@ class StartSdk {
             },
             getContainerIp: (effects, options = {}) => {
                 async function* watch() {
-                    while (true) {
+                    const resolveCell = { resolve: () => { } };
+                    effects.onLeaveContext(() => {
+                        resolveCell.resolve();
+                    });
+                    while (effects.isInContext) {
                         let callback = () => { };
                         const waitForNext = new Promise((resolve) => {
                             callback = resolve;
+                            resolveCell.resolve = resolve;
                         });
                         yield await effects.getContainerIp({ ...options, callback });
                         await waitForNext;
@@ -186,13 +191,6 @@ class StartSdk {
             },
             nullIfEmpty: util_2.nullIfEmpty,
             useEntrypoint: (overrideCmd) => new T.UseEntrypoint(overrideCmd),
-            runCommand: async (effects, image, command, options, 
-            /**
-             * A name to use to refer to the ephemeral subcontainer for debugging purposes
-             */
-            name) => {
-                return runCommand(effects, image, command, options, name);
-            },
             /**
              * @description Use this class to create an Action. By convention, each Action should receive its own file.
              *
@@ -578,11 +576,25 @@ class StartSdk {
                 },
             },
             SubContainer: {
-                of(effects, image, name) {
-                    return SubContainer_1.SubContainer.of(effects, image, name);
+                /**
+                 * @description Create a new SubContainer
+                 * @param effects
+                 * @param image - what container image to use
+                 * @param mounts - what to mount to the subcontainer
+                 * @param name - a name to use to refer to the subcontainer for debugging purposes
+                 */
+                of(effects, image, mounts, name) {
+                    return SubContainer_1.SubContainer.of(effects, image, mounts, name);
                 },
-                with(effects, image, mounts, name, fn) {
-                    return SubContainer_1.SubContainer.with(effects, image, mounts, name, fn);
+                /**
+                 * @description Run a function with a temporary SubContainer
+                 * @param effects
+                 * @param image - what container image to use
+                 * @param mounts - what to mount to the subcontainer
+                 * @param name - a name to use to refer to the ephemeral subcontainer for debugging purposes
+                 */
+                withTemp(effects, image, mounts, name, fn) {
+                    return SubContainer_1.SubContainer.withTemp(effects, image, mounts, name, fn);
                 },
             },
             List: {
@@ -920,11 +932,11 @@ async function runCommand(effects, image, command, options, name) {
             .catch(() => "{}")
             .then(JSON.parse);
         commands = imageMeta.entrypoint ?? [];
-        commands.concat(...(command.overridCmd ?? imageMeta.cmd ?? []));
+        commands = commands.concat(...(command.overridCmd ?? imageMeta.cmd ?? []));
     }
     else
         commands = (0, util_4.splitCommand)(command);
-    return SubContainer_1.SubContainer.with(effects, image, options.mounts.build(), name ||
+    return SubContainer_1.SubContainer.withTemp(effects, image, options.mounts, name ||
         commands
             .map((c) => {
             if (c.includes(" ")) {

package/package/lib/StartSdk.js.map

@@ -1 +1 @@
-{"version":3,"file":"StartSdk.js","sourceRoot":"","sources":["../../../package/lib/StartSdk.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"StartSdk.js","sourceRoot":"","sources":["../../../package/lib/StartSdk.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAuoCA,gCA2CC;AAlrCD,sEAAkE;AAClE,8EAIuD;AAUvD,4EAAwE;AACxE,sEAAqE;AAQrE,uEAAwD;AACxD,8CAAsD;AACtD,wFAA+E;AAC/E,8CAA6D;AAC7D,sDAAkD;AAClD,6EAAyE;AACzE,gDAAgE;AAChE,oEAAgE;AAChE,uDAK6B;AAC7B,wDAAwE;AACxE,2DAAoE;AACpE,qCAAoC;AACpC,6DAAyD;AACzD,uCAAiE;AACjE,+EAGkD;AAClD,6DAAyD;AACzD,yDAAkE;AAClE,+FAA2F;AAC3F,iCAAsC;AACtC,iCAAoC;AACpC,iCAAkE;AAClE,+CAA2C;AAC3C,sDAK4B;AAC5B,iCAAqC;AACrC,4CAAwC;AACxC,qFAAiF;AACjF,wDAAyC;AACzC,gDAAsD;AAEtD,iEAIwC;AACxC,2EAGiD;AACjD,iCAA0C;AAK1C,gEAAiD;AACjD,iDAA6C;AAC7C,qDAAsC;AAEzB,QAAA,SAAS,GAAG,IAAA,uBAAe,EAAC,eAAe,CAAC,CAAA;AASzD,MAAa,QAAQ;IACnB,YAA6B,QAAkB;QAAlB,aAAQ,GAAR,QAAQ,CAAU;IAAG,CAAC;IACnD,MAAM,CAAC,EAAE;QACP,OAAO,IAAI,QAAQ,CAAe,IAAa,CAAC,CAAA;IAClD,CAAC;IACD,YAAY,CAAyC,QAAkB;QACrE,OAAO,IAAI,QAAQ,CAAkB,QAAQ,CAAC,CAAA;IAChD,CAAC;IACD,SAAS;QACP,OAAO,IAAI,QAAQ,CAAkB,IAAI,CAAC,QAAQ,CAAC,CAAA;IACrD,CAAC;IAED,KAAK,CAAC,OAAiE;QAyBrE,MAAM,qBAAqB,GAA0B;YACnD,OAAO,EAAE,CAAC,OAAO,EAAE,GAAG,IAAI,EAAE,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC;YACvD,eAAe,EAAE,CAAC,OAAO,EAAE,GAAG,IAAI,EAAE,EAAE,CAAC,OAAO,CAAC,eAAe,CAAC,GAAG,IAAI,CAAC;YACvE,iBAAiB,EAAE,CAAC,OAAO,EAAE,GAAG,IAAI,EAAE,EAAE,CACtC,OAAO,CAAC,iBAAiB,CAAC,GAAG,IAAI,CAAC;YACpC,KAAK,EAAE,CAAC,OAAO,EAAE,GAAG,IAAI,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC;YACnD,oBAAoB,EAAE,CAAC,OAAO,EAAE,GAAG,IAAI,EAAE,EAAE,CACzC,OAAO,CAAC,oBAAoB,CAAC,GAAG,IAAI,CAAC;YACvC,mBAAmB,EAAE,CAAC,OAAO,EAAE,GAAG,IAAI,EAAE,EAAE,CACxC,OAAO,CAAC,mBAAmB,CAAC,GAAG,IAAI,CAAC;YACtC,qBAAqB,EAAE,CAAC,OAAO,EAAE,GAAG,IAAI,EAAE,EAAE,CAC1C,OAAO,CAAC,qBAAqB,CAAC,GAAG,IAAI,CAAC;YACxC,aAAa,EAAE,CAAC,OAAO,EAAE,GAAG,IAAI,EAAE,EAAE,CAAC,OAAO,CAAC,aAAa,CAAC,GAAG,IAAI,CAAC;YACnE,OAAO,EAAE,CAAC,OAAO,EAAE,GAAG,IAAI,EAAE,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC;YACvD,SAAS,EAAE,CAAC,OAAO,EAAE,GAAG,IAAI,EAAE,EAAE,CAAC,OAAO,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC;YAC3D,cAAc,EAAE,CAAC,OAAO,EAAE,GAAG,IAAI,EAAE,EAAE,CAAC,OAAO,CAAC,cAAc,CAAC,GAAG,IAAI,CAAC;YACrE,cAAc,EAAE,CAAC,OAAO,EAAE,GAAG,IAAI,EAAE,EAAE,CAAC,OAAO,CAAC,cAAc,CAAC,GAAG,IAAI,CAAC;YACrE,QAAQ,EAAE,CAAC,OAAO,EAAE,GAAG,IAAI,EAAE,EAAE,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC;YACzD,eAAe,EAAE,CAAC,OAAO,EAAE,GAAG,IAAI,EAAE,EAAE,CAAC,OAAO,CAAC,eAAe,CAAC,GAAG,IAAI,CAAC;YACvE,SAAS,EAAE,CAAC,OAAO,EAAE,GAAG,IAAI,EAAE,EAAE,CAAC,OAAO,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC;SAC5D,CAAA;QAED,OAAO;YACL,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,GAAG,qBAAqB;YACxB,MAAM,EAAE;gBACN,GAAG,EAAE,OAAO,CAAC,SAAS;gBACtB,OAAO,EAAE,CACP,OAAkB,EAClB,SAAsB,EACtB,MAAS,EACT,QAA0B,EAC1B,OAAyC,EACzC,EAAE,CACF,OAAO,CAAC,aAAa,CAAC;oBACpB,OAAO;oBACP,SAAS;oBACT,MAAM;oBACN,QAAQ;oBACR,OAAO,EAAE,OAAO;iBACjB,CAAC;gBACJ,UAAU,EAAE,CACV,OAAkB,EAClB,MAAS,EACT,QAA0B,EAC1B,OAAyC,EACzC,EAAE,CACF,OAAO,CAAC,aAAa,CAAC;oBACpB,OAAO;oBACP,SAAS,EAAE,IAAI,CAAC,QAAQ,CAAC,EAAE;oBAC3B,MAAM;oBACN,QAAQ;oBACR,OAAO,EAAE,OAAO;iBACjB,CAAC;gBACJ,YAAY,EAAE,CAAC,OAAkB,EAAE,GAAG,SAAmB,EAAE,EAAE,CAC3D,OAAO,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;aACpD;YACD,iBAAiB,EAAE,gCAM0B;YAC7C,gBAAgB,EAAE;gBAChB,MAAM,EAAE,CAAoB,OAAU,EAAE,EAAsB,EAAE,EAAE,CAChE,IAAA,0BAAmB,EAAC,OAAO,EAAE;oBAC3B,EAAE;iBACH,CAAC;gBACJ,GAAG,EAAE,CACH,OAAU,EACV,IAAsD,EACtD,EAAE,CAAC,IAAA,0BAAmB,EAAC,OAAO,EAAE,IAAI,CAAC;gBACvC,SAAS,EAAE,CAAoB,OAAU,EAAE,EAAE,CAC3C,IAAA,2BAAoB,EAAC,OAAO,EAAE,EAAE,CAAC;gBACnC,MAAM,EAAE,CACN,OAAU,EACV,IAA8B,EAC9B,EAAE,CAAC,IAAA,2BAAoB,EAAC,OAAO,EAAE,IAAI,CAAC;aACzC;YACD,cAAc,EAAE,CACd,OAAkB,EAClB,UAGI,EAAE,EACN,EAAE;gBACF,KAAK,SAAS,CAAC,CAAC,KAAK;oBACnB,MAAM,WAAW,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,GAAE,CAAC,EAAE,CAAA;oBACzC,OAAO,CAAC,cAAc,CAAC,GAAG,EAAE;wBAC1B,WAAW,CAAC,OAAO,EAAE,CAAA;oBACvB,CAAC,CAAC,CAAA;oBACF,OAAO,OAAO,CAAC,WAAW,EAAE,CAAC;wBAC3B,IAAI,QAAQ,GAAe,GAAG,EAAE,GAAE,CAAC,CAAA;wBACnC,MAAM,WAAW,GAAG,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,EAAE;4BAChD,QAAQ,GAAG,OAAO,CAAA;4BAClB,WAAW,CAAC,OAAO,GAAG,OAAO,CAAA;wBAC/B,CAAC,CAAC,CAAA;wBACF,MAAM,MAAM,OAAO,CAAC,cAAc,CAAC,EAAE,GAAG,OAAO,EAAE,QAAQ,EAAE,CAAC,CAAA;wBAC5D,MAAM,WAAW,CAAA;oBACnB,CAAC;gBACH,CAAC;gBACD,OAAO;oBACL,KAAK,EAAE,GAAG,EAAE,CACV,OAAO,CAAC,cAAc,CAAC;wBACrB,GAAG,OAAO;wBACV,QAAQ,EACN,OAAO,CAAC,UAAU;4BAClB,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,UAAU,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC;qBACrD,CAAC;oBACJ,IAAI,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,cAAc,CAAC,OAAO,CAAC;oBAC3C,KAAK;oBACL,QAAQ,EAAE,CACR,QAGyB,EACzB,EAAE;wBACF,CAAC;wBAAA,CAAC,KAAK,IAAI,EAAE;4BACX,IAAI,KAAK,EAAE,MAAM,KAAK,IAAI,KAAK,EAAE,EAAE,CAAC;gCAClC,IAAI,CAAC;oCACH,MAAM,QAAQ,CAAC,KAAK,CAAC,CAAA;gCACvB,CAAC;gCAAC,OAAO,CAAC,EAAE,CAAC;oCACX,OAAO,CAAC,KAAK,CACX,4DAA4D,EAC5D,CAAC,CACF,CAAA;gCACH,CAAC;4BACH,CAAC;wBACH,CAAC,CAAC,EAAE;6BACD,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;6BAC/B,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CACX,OAAO,CAAC,KAAK,CACX,4DAA4D,EAC5D,CAAC,CACF,CACF,CAAA;oBACL,CAAC;iBACF,CAAA;YACH,CAAC;YACD,KAAK,EAAE;gBACL,GAAG,EAAE,CACH,OAAU,EACV,SAAiB,EACjB,IAAoC,EACpC,EAAE,CACF,IAAA,mBAAQ,EAAoB,OAAO,EAAE,IAAI,EAAE;oBACzC,SAAS;iBACV,CAAC;gBACJ,MAAM,EAAE,CACN,OAAU,EACV,IAAoC,EACpC,EAAE,CAAC,IAAA,mBAAQ,EAAoB,OAAO,EAAE,IAAI,CAAC;gBAC/C,MAAM,EAAE,CACN,OAAU,EACV,IAAU,EACV,KAAmE,EACnE,EAAE,CACF,OAAO,CAAC,KAAK,CAAC,GAAG,CAAQ;oBACvB,KAAK;oBACL,IAAI,EAAE,IAAA,6BAAe,EAAC,IAAI,CAAC;iBAC5B,CAAC;aACL;YAED,SAAS,EAAE;gBACT,EAAE,EAAE,CAAC,OAAgB,EAAE,EAAU,EAAE,EAAE,CAAC,IAAI,gBAAS,CAAC,EAAE,EAAE,EAAE,OAAO,EAAE,CAAC;aACrE;YACD,WAAW,EAAX,kBAAW;YACX,aAAa,EAAE,CAAC,WAAsB,EAAE,EAAE,CACxC,IAAI,CAAC,CAAC,aAAa,CAAC,WAAW,CAAC;YAClC;;;eAGG;YACH,MAAM,EAAE;gBACN;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;kBAwDE;gBACF,SAAS,EAAE,CAOT,EAAM,EACN,QAAqD,EACrD,SAAwB,EACxB,QAAiC,EACjC,GAAuB,EACvB,EAAE,CAAC,qBAAM,CAAC,SAAS,CAAC,EAAE,EAAE,QAAQ,EAAE,SAAS,EAAE,QAAQ,EAAE,GAAG,CAAC;gBAC7D;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;kBA2CE;gBACF,YAAY,EAAE,CACZ,EAAM,EACN,QAAqD,EACrD,GAAY,EACZ,EAAE,CAAC,qBAAM,CAAC,YAAY,CAAC,EAAE,EAAE,QAAQ,EAAE,GAAG,CAAC;aAC5C;YACD,kBAAkB,EAAE,EAAE,aAAa,EAAb,kCAAa,EAAE;YACrC;;;;;;;;;;;;;;;;;;;;eAoBG;YACH,eAAe,EAAE,CACf,OAAgB,EAChB,OAsBC,EACD,EAAE,CAAC,IAAI,iDAAuB,CAAC,EAAE,GAAG,OAAO,EAAE,OAAO,EAAE,CAAC;YACzD,aAAa,EAAE,CAAoB,OAAU,EAAE,EAAE,CAC/C,IAAI,oBAAa,CAAC,OAAO,CAAC;YAC5B,gBAAgB,EAAE,CAChB,OAAU,EACV,SAAmB,EACnB,SAAuB,EACvB,EAAE,CAAC,IAAI,wBAAiB,CAAC,OAAO,EAAE,SAAS,EAAE,SAAS,CAAC;YACzD,WAAW,EAAX,yBAAW;YACX,WAAW,EAAE;gBACX,kBAAkB,EAAlB,uCAAkB;gBAClB,WAAW,EAAX,sBAAW;gBACX,eAAe,EAAf,0BAAe;aAChB;YACD,QAAQ;YACR;;;;;;;;;;;;;eAaG;YACH,OAAO,EAAE,CAAA,sBAAkB,CAAA;YAC3B;;;;;;;;;;;;;;;;;;;;;;;;eAwBG;YACH,YAAY,EAAE,CAAC,OAAqC,EAAE,EAAE,CACtD,IAAA,2BAAY,EAAW,OAAO,CAAC;YACjC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;eAsCG;YACH,iBAAiB,EAAE,CAAA,qCAA2B,CAAA;YAC9C,SAAS,EAAE,CAAA,qBAA0B,CAAA;YACrC;;;;;;;;;;eAUG;YACH,eAAe,EAAE,CAAC,EAA8B,EAAE,EAAE,CAAC,yBAAU,CAAC,EAAE,CAAC,EAAE,CAAC;YACtE;;;;;;;;;;;;;;;;;eAiBG;YACH,gBAAgB,EAAE,CAAC,EAA8B,EAAE,EAAE,CAAC,0BAAW,CAAC,EAAE,CAAC,EAAE,CAAC;YACxE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;eAwEG;YACH,eAAe,EAAE,wCAAsB;YACvC,SAAS,EAAE,CACT,EAGqC,EACrC,EAAE,CAAC,IAAA,kBAAS,EAAkB,EAAE,CAAC;YACnC;;eAEG;YACH,cAAc,EAAE,CAAC,EAAgC,EAAE,EAAE,CACnD,IAAA,+BAAc,EAAkB,EAAE,CAAC;YACrC,OAAO,EAAE;gBACP,cAAc,EAAd,+BAAc;gBACd,eAAe,EAAf,yBAAe;gBACf,oBAAoB,EAApB,8BAAoB;gBACpB,cAAc,EAAd,+BAAc;aACf;YACD,MAAM,EAAE;gBACN,EAAE;oBACA,OAAO,eAAM,CAAC,EAAE,EAAY,CAAA;gBAC9B,CAAC;aACF;YACD,OAAO,EAAE;gBACP,OAAO,EAAE,CACP,GAAG,WAAwD,EAC3D,EAAE,CAAC,iBAAO,CAAC,WAAW,CAAW,GAAG,WAAW,CAAC;gBAClD,OAAO,EAAE,CACP,GAAG,OAA2D,EAC9D,EAAE,CAAC,iBAAO,CAAC,SAAS,CAAW,GAAG,OAAO,CAAC;gBAC5C,WAAW,EAAE,CAAC,OAA8B,EAAE,EAAE,CAC9C,iBAAO,CAAC,WAAW,CAAW,OAAO,CAAC;aACzC;YACD,SAAS,EAAE;gBACT;;;;;;;;;;;;;;;;;;;;;;;;;;mBA0BG;gBACH,EAAE,EAAE,CAGF,IAAU,EACV,EAAE,CAAC,qBAAS,CAAC,EAAE,CAAc,IAAI,CAAC;aACrC;YACD,OAAO,EAAE;gBACP,EAAE,CACA,OAAgB,EAChB,OAA+D,EAC/D,YAA2B;oBAE3B,OAAO,iBAAO,CAAC,EAAE,CAAW,EAAE,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,CAAC,CAAA;gBACjE,CAAC;aACF;YACD,YAAY,EAAE;gBACZ;;;;;;mBAMG;gBACH,EAAE,CACA,OAAgB,EAChB,KAGC,EACD,MAA+B,EAC/B,IAAY;oBAEZ,OAAO,2BAAY,CAAC,EAAE,CAAC,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;gBACtD,CAAC;gBACD;;;;;;mBAMG;gBACH,QAAQ,CACN,OAAkB,EAClB,KAGC,EACD,MAA+B,EAC/B,IAAY,EACZ,EAAwD;oBAExD,OAAO,2BAAY,CAAC,QAAQ,CAAC,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,CAAC,CAAA;gBAChE,CAAC;aACF;YACD,IAAI,EAAE;gBACJ;;;;mBAIG;gBACH,IAAI,EAAE,WAAI,CAAC,IAAI;gBACf;;;;mBAIG;gBACH,GAAG,EAAE,CACH,CAA8C,EAC9C,KAAkD,EAClD,EAAE,CAAC,WAAI,CAAC,GAAG,CAAc,CAAC,EAAE,KAAK,CAAC;gBACpC;;;;mBAIG;gBACH,WAAW,EAAE,CAAA,WAAI,CAAC,WAAkB,CAAA;aACrC;YACD,SAAS,EAAE,IAAA,yBAAW,GAAS;YAC/B,KAAK,EAAE;gBACL;;;;;;;;;;;;;;;mBAeG;gBACH,MAAM,EAAE,aAAK,CAAC,MAAM;gBACpB;;;;;;;;;;;;;;;;;;;;;;;mBAuBG;gBACH,IAAI,EAAE,aAAK,CAAC,IAAI;gBAChB;;;;;;;;;;;;;;;;;;;mBAmBG;gBACH,QAAQ,EAAE,aAAK,CAAC,QAAQ;gBACxB;;;;;;;;;;;;;;;;;;;;;;mBAsBG;gBACH,MAAM,EAAE,aAAK,CAAC,MAAM;gBACpB;;;;;;;;;;;;;;;;mBAgBG;gBACH,KAAK,EAAE,aAAK,CAAC,KAAK;gBAClB;;;;;;;;;;;;;;;;;;;mBAmBG;gBACH,QAAQ,EAAE,aAAK,CAAC,QAAQ;gBACxB;;;;;;;;;;;;;;;;;;;;mBAoBG;gBACH,MAAM,EAAE,aAAK,CAAC,MAAM;gBACpB;;;;;;;;;;;;;;;;;;;;;;mBAsBG;gBACH,WAAW,EAAE,aAAK,CAAC,WAAW;gBAC9B;;;;;;;;;;;;;;;;mBAgBG;gBACH,MAAM,EAAE,aAAK,CAAC,MAAM;gBACpB;;;;;;;;;;;;;;;;;;;;;;;;;;;;mBA4BG;gBACH,KAAK,EAAE,aAAK,CAAC,KAAK;gBAClB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;mBA8DG;gBACH,IAAI,EAAE,aAAK,CAAC,IAAI;gBAChB,MAAM,EAAE,aAAK,CAAC,MAAM;gBACpB,aAAa,EAAE,CAAA,aAAK,CAAC,aAAoB,CAAA;gBACzC,WAAW,EAAE,CAAA,aAAK,CAAC,WAAkB,CAAA;gBACrC,eAAe,EAAE,CAAA,aAAK,CAAC,eAAsB,CAAA;gBAC7C,aAAa,EAAE,CAAA,aAAK,CAAC,aAAoB,CAAA;gBACzC,YAAY,EAAE,CAAA,aAAK,CAAC,YAAmB,CAAA;gBACvC,eAAe,EAAE,CAAA,aAAK,CAAC,eAAsB,CAAA;gBAC7C,aAAa,EAAE,CAAA,aAAK,CAAC,aAAoB,CAAA;gBACzC,kBAAkB,EAAE,CAAA,aAAK,CAAC,kBAAyB,CAAA;gBACnD,aAAa,EAAE,CAQb,aAEI,EACJ,CAAkE,EAClE,SAEI,EACJ,EAAE,CACF,aAAK,CAAC,aAAa,CACjB,aAAa,EACb,CAAC,EACD,SAAS,CACV;gBAEH,YAAY,EAAE,CAQZ,IAAoE,EACpE,SAEI,EACJ,EAAE,CAAC,aAAK,CAAC,YAAY,CAAuB,IAAI,EAAE,SAAS,CAAC;aAC/D;YACD,QAAQ,EAAE;gBACR,EAAE,EAAE,CAQF,CAAgB,EAChB,EAAE,CAAC,mBAAQ,CAAC,EAAE,CAAuB,CAAC,CAAC;aAC1C;SACF,CAAA;IACH,CAAC;CACF;AAxiCD,4BAwiCC;AAEM,KAAK,UAAU,UAAU,CAC9B,OAAgB,EAChB,KAA6E,EAC7E,OAAsB,EACtB,OAEC,EACD,IAAa;IAEb,IAAI,QAAkB,CAAA;IACtB,IAAI,OAAO,YAAY,CAAC,CAAC,aAAa,EAAE,CAAC;QACvC,MAAM,SAAS,GAAoB,MAAM,EAAE;aACxC,QAAQ,CAAC,yBAAyB,KAAK,CAAC,OAAO,OAAO,EAAE;YACvD,QAAQ,EAAE,MAAM;SACjB,CAAC;aACD,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC;aACjB,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;QACnB,QAAQ,GAAG,SAAS,CAAC,UAAU,IAAI,EAAE,CAAA;QACrC,QAAQ,GAAG,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,UAAU,IAAI,SAAS,CAAC,GAAG,IAAI,EAAE,CAAC,CAAC,CAAA;IAC5E,CAAC;;QAAM,QAAQ,GAAG,IAAA,mBAAY,EAAC,OAAO,CAAC,CAAA;IACvC,OAAO,2BAAY,CAAC,QAAQ,CAC1B,OAAO,EACP,KAAK,EACL,OAAO,CAAC,MAAM,EACd,IAAI;QACF,QAAQ;aACL,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;YACT,IAAI,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;gBACpB,OAAO,IAAI,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,GAAG,CAAA;YACrC,CAAC;iBAAM,CAAC;gBACN,OAAO,CAAC,CAAA;YACV,CAAC;QACH,CAAC,CAAC;aACD,IAAI,CAAC,GAAG,CAAC,EACd,KAAK,EAAE,YAAY,EAAE,EAAE;QACrB,MAAM,GAAG,GAAG,MAAM,YAAY,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;QAC7C,IAAI,GAAG,CAAC,QAAQ,IAAI,GAAG,CAAC,UAAU,EAAE,CAAC;YACnC,MAAM,IAAI,wBAAS,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,CAAA;QACvC,CAAC;aAAM,CAAC;YACN,OAAO,GAAG,CAAA;QACZ,CAAC;IACH,CAAC,CACF,CAAA;AACH,CAAC"}

package/package/lib/backup/Backups.d.ts

@@ -1,4 +1,5 @@
 import * as T from "../../../base/lib/types";
+import { Affine } from "../util";
 export declare const DEFAULT_OPTIONS: T.SyncOptions;
 export type BackupSync<Volumes extends string> = {
     dataPath: `/media/startos/volumes/${Volumes}/${string}`;
@@ -7,11 +8,16 @@ export type BackupSync<Volumes extends string> = {
     backupOptions?: Partial<T.SyncOptions>;
     restoreOptions?: Partial<T.SyncOptions>;
 };
+export type BackupEffects = T.Effects & Affine<"Backups">;
 export declare class Backups<M extends T.SDKManifest> {
     private options;
     private restoreOptions;
     private backupOptions;
     private backupSet;
+    private preBackup;
+    private postBackup;
+    private preRestore;
+    private postRestore;
     private constructor();
     static withVolumes<M extends T.SDKManifest = never>(...volumeNames: Array<M["volumes"][number]>): Backups<M>;
     static withSyncs<M extends T.SDKManifest = never>(...syncs: BackupSync<M["volumes"][number]>[]): Backups<M>;
@@ -19,12 +25,16 @@ export declare class Backups<M extends T.SDKManifest> {
     setOptions(options?: Partial<T.SyncOptions>): this;
     setBackupOptions(options?: Partial<T.SyncOptions>): this;
     setRestoreOptions(options?: Partial<T.SyncOptions>): this;
+    setPreBackup(fn: (effects: BackupEffects) => Promise<void>): this;
+    setPostBackup(fn: (effects: BackupEffects) => Promise<void>): this;
+    setPreRestore(fn: (effects: BackupEffects) => Promise<void>): this;
+    setPostRestore(fn: (effects: BackupEffects) => Promise<void>): this;
     addVolume(volume: M["volumes"][number], options?: Partial<{
         options: T.SyncOptions;
         backupOptions: T.SyncOptions;
         restoreOptions: T.SyncOptions;
     }>): this;
     addSync(sync: BackupSync<M["volumes"][0]>): this;
-    createBackup(): Promise<void>;
-    restoreBackup(): Promise<void>;
+    createBackup(effects: T.Effects): Promise<void>;
+    restoreBackup(effects: T.Effects): Promise<void>;
 }

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,6 +85,22 @@ class Backups {
         };
         return this;
     }
+    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;
+    }
     addVolume(volume, options) {
         return this.addSync({
             dataPath: `/media/startos/volumes/${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,27 @@ class Backups {
             });
             await rsyncResults.wait();
         }
+        await fs.writeFile("/media/startos/backup/store.json", JSON.stringify(await effects.store.get({ path: "" })), { encoding: "utf-8" });
+        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);
+        const store = await fs
+            .readFile("/media/startos/backup/store.json", {
+            encoding: "utf-8",
+        })
+            .catch((_) => null);
+        if (store)
+            await effects.store.set({
+                path: "",
+                value: JSON.parse(store),
+            });
         for (const item of this.backupSet) {
             const rsyncResults = await runRsync({
                 srcPath: item.backupPath,
@@ -124,6 +164,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/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/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;