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

package/package/lib/mainFn/HealthDaemon.js

@@ -1,9 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.HealthDaemon = void 0;
+exports.HealthDaemon = exports.EXIT_SUCCESS = void 0;
 const defaultTrigger_1 = require("../trigger/defaultTrigger");
-const _1 = require(".");
-const asError_1 = require("../../../base/lib/util/asError");
 const oncePromise = () => {
     let resolve;
     const promise = new Promise((res) => {
@@ -11,6 +9,7 @@ const oncePromise = () => {
     });
     return { resolve: resolve, promise };
 };
+exports.EXIT_SUCCESS = 'EXIT_SUCCESS';
 /**
  * Wanted a structure that deals with controlling daemons by their health status
  * States:
@@ -19,20 +18,21 @@ const oncePromise = () => {
  *
  */
 class HealthDaemon {
-    constructor(daemon, daemonIndex, dependencies, id, ids, ready, effects, sigtermTimeout = _1.DEFAULT_SIGTERM_TIMEOUT) {
+    constructor(daemon, dependencies, id, ready, effects) {
         this.daemon = daemon;
-        this.daemonIndex = daemonIndex;
         this.dependencies = dependencies;
         this.id = id;
-        this.ids = ids;
         this.ready = ready;
         this.effects = effects;
-        this.sigtermTimeout = sigtermTimeout;
-        this._health = { result: "starting", message: null };
+        this._health = { result: 'waiting', message: null };
         this.healthWatchers = [];
         this.running = false;
+        this.resolvedReady = false;
         this.healthCheckCleanup = null;
-        this.readyPromise = new Promise((resolve) => (this.resolveReady = resolve));
+        this.readyPromise = new Promise((resolve) => (this.resolveReady = () => {
+            resolve();
+            this.resolvedReady = true;
+        }));
         this.dependencies.forEach((d) => d.addWatcher(() => this.updateStatus()));
     }
     /** Run after we want to do cleanup */
@@ -40,10 +40,9 @@ class HealthDaemon {
         this.healthWatchers = [];
         this.running = false;
         this.healthCheckCleanup?.();
-        await this.daemon.then((d) => d.term({
-            timeout: this.sigtermTimeout,
+        await this.daemon?.term({
             ...termOptions,
-        }));
+        });
     }
     /** Want to add another notifier that the health might have changed */
     addWatcher(watcher) {
@@ -57,55 +56,69 @@ class HealthDaemon {
             return;
         this.running = newStatus;
         if (newStatus) {
-            ;
-            (await this.daemon).start();
-            this.started = performance.now();
+            console.debug(`Launching ${this.id}...`);
             this.setupHealthCheck();
+            this.daemon?.start();
+            this.started = performance.now();
         }
         else {
-            ;
-            (await this.daemon).stop();
-            this.turnOffHealthCheck();
-            this.setHealth({ result: "starting", message: null });
+            console.debug(`Stopping ${this.id}...`);
+            this.daemon?.term();
+            await this.turnOffHealthCheck();
         }
     }
-    turnOffHealthCheck() {
-        this.healthCheckCleanup?.();
+    async turnOffHealthCheck() {
+        await this.healthCheckCleanup?.();
+        this.resolvedReady = false;
+        this.readyPromise = new Promise((resolve) => (this.resolveReady = () => {
+            resolve();
+            this.resolvedReady = true;
+        }));
     }
     async setupHealthCheck() {
+        this.daemon?.onExit((success) => {
+            if (success && this.ready === 'EXIT_SUCCESS') {
+                this.setHealth({ result: 'success', message: null });
+            }
+            else if (!success) {
+                this.setHealth({
+                    result: 'failure',
+                    message: `${this.id} daemon crashed`,
+                });
+            }
+            else if (!this.daemon?.isOneshot()) {
+                this.setHealth({
+                    result: 'failure',
+                    message: `${this.id} daemon exited`,
+                });
+            }
+        });
+        if (this.ready === 'EXIT_SUCCESS')
+            return;
         if (this.healthCheckCleanup)
             return;
         const trigger = (this.ready.trigger ?? defaultTrigger_1.defaultTrigger)(() => ({
             lastResult: this._health.result,
         }));
         const { promise: status, resolve: setStatus } = oncePromise();
+        const { promise: exited, resolve: setExited } = oncePromise();
         new Promise(async () => {
+            if (this.ready === 'EXIT_SUCCESS')
+                return;
             for (let res = await Promise.race([status, trigger.next()]); !res.done; res = await Promise.race([status, trigger.next()])) {
-                const handle = (await this.daemon).subContainerHandle;
-                if (handle) {
-                    const response = await Promise.resolve(this.ready.fn(handle)).catch((err) => {
-                        console.error((0, asError_1.asError)(err));
-                        return {
-                            result: "failure",
-                            message: "message" in err ? err.message : String(err),
-                        };
-                    });
-                    if (this.resolveReady &&
-                        (response.result === "success" || response.result === "disabled")) {
-                        this.resolveReady();
-                    }
-                    await this.setHealth(response);
-                }
-                else {
-                    await this.setHealth({
-                        result: "failure",
-                        message: "Daemon not running",
-                    });
-                }
+                const response = await Promise.resolve(this.ready.fn()).catch((err) => {
+                    return {
+                        result: 'failure',
+                        message: 'message' in err ? err.message : String(err),
+                    };
+                });
+                await this.setHealth(response);
             }
+            setExited(null);
         }).catch((err) => console.error(`Daemon ${this.id} failed: ${err}`));
-        this.healthCheckCleanup = () => {
+        this.healthCheckCleanup = async () => {
             setStatus({ done: true });
+            await exited;
             this.healthCheckCleanup = null;
             return null;
         };
@@ -113,18 +126,31 @@ class HealthDaemon {
     onReady() {
         return this.readyPromise;
     }
+    get isReady() {
+        return this.resolvedReady;
+    }
     async setHealth(health) {
+        const changed = this._health.result !== health.result;
         this._health = health;
-        this.healthWatchers.forEach((watcher) => watcher());
+        if (this.resolveReady && health.result === 'success') {
+            this.resolveReady();
+        }
+        if (changed)
+            this.healthWatchers.forEach((watcher) => watcher());
+        if (this.ready === 'EXIT_SUCCESS')
+            return;
         const display = this.ready.display;
         if (!display) {
             return;
         }
         let result = health.result;
-        if (result === "failure" &&
+        if (result === 'failure' &&
             this.started &&
-            performance.now() - this.started <= (this.ready.gracePeriod ?? 5000))
-            result = "starting";
+            performance.now() - this.started <= (this.ready.gracePeriod ?? 10_000))
+            result = 'starting';
+        if (result === 'failure') {
+            console.error(`Health Check ${this.id} failed:`, health.message);
+        }
         await this.effects.setHealth({
             ...health,
             id: this.id,
@@ -133,8 +159,23 @@ class HealthDaemon {
         });
     }
     async updateStatus() {
-        const healths = this.dependencies.map((d) => d.running && d._health);
-        this.changeRunning(healths.every((x) => x && x.result === "success"));
+        const healths = this.dependencies.map((d) => ({
+            health: d.running && d._health,
+            id: d.id,
+            display: typeof d.ready === 'object' ? d.ready.display : null,
+        }));
+        const waitingOn = healths.filter((h) => !h.health || h.health.result !== 'success');
+        if (waitingOn.length)
+            console.debug(`daemon ${this.id} waiting on ${waitingOn.map((w) => w.id)}`);
+        if (waitingOn.length) {
+            const waitingOnNames = waitingOn.flatMap((w) => w.display ? [w.display] : []);
+            const message = waitingOnNames.length ? waitingOnNames.join(', ') : null;
+            await this.setHealth({ result: 'waiting', message });
+        }
+        else {
+            await this.setHealth({ result: 'starting', message: null });
+        }
+        await this.changeRunning(!waitingOn.length);
     }
 }
 exports.HealthDaemon = HealthDaemon;

package/package/lib/mainFn/HealthDaemon.js.map

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

package/package/lib/mainFn/Mounts.d.ts

@@ -1,59 +1,46 @@
-import * as T from "../../../base/lib/types";
-import { MountOptions } from "../util/SubContainer";
+import * as T from '../../../base/lib/types';
+import { MountOptions } from '../util/SubContainer';
 type MountArray = {
     mountpoint: string;
     options: MountOptions;
 }[];
-export declare class Mounts<Manifest extends T.SDKManifest, Backups extends {
+type SharedOptions = {
+    /** The path within the resource to mount. Use `null` to mount the entire resource */
     subpath: string | null;
+    /** Where to mount the resource. e.g. /data */
     mountpoint: string;
-} = never> {
-    readonly volumes: {
-        id: Manifest["volumes"][number];
-        subpath: string | null;
-        mountpoint: string;
-        readonly: boolean;
-    }[];
-    readonly assets: {
-        subpath: string | null;
-        mountpoint: string;
-    }[];
-    readonly dependencies: {
-        dependencyId: string;
-        volumeId: string;
-        subpath: string | null;
-        mountpoint: string;
-        readonly: boolean;
-    }[];
+    /**
+     * Whether to mount this as a file or directory
+     *
+     * defaults to "directory"
+     * */
+    type?: 'file' | 'directory' | 'infer';
+};
+type VolumeOpts<Manifest extends T.SDKManifest> = {
+    /** The ID of the volume to mount. Must be one of the volume IDs defined in the manifest */
+    volumeId: Manifest['volumes'][number];
+    /** Whether or not the resource should be readonly for this subcontainer */
+    readonly: boolean;
+} & SharedOptions;
+type DependencyOpts<Manifest extends T.SDKManifest> = {
+    /** The ID of the dependency */
+    dependencyId: Manifest['id'];
+    /** The ID of the volume to mount. Must be one of the volume IDs defined in the manifest of the dependency */
+    volumeId: Manifest['volumes'][number];
+    /** Whether or not the resource should be readonly for this subcontainer */
+    readonly: boolean;
+} & SharedOptions;
+export declare class Mounts<Manifest extends T.SDKManifest, Backups extends SharedOptions = never> {
+    readonly volumes: VolumeOpts<Manifest>[];
+    readonly assets: SharedOptions[];
+    readonly dependencies: DependencyOpts<T.SDKManifest>[];
     readonly backups: Backups[];
     private constructor();
     static of<Manifest extends T.SDKManifest>(): Mounts<Manifest, never>;
-    addVolume(
-    /** The ID of the volume to mount. Must be one of the volume IDs defined in the manifest */
-    id: Manifest["volumes"][number], 
-    /** The path within the volume to mount. Use `null` to mount the entire volume */
-    subpath: string | null, 
-    /** Where to mount the volume. e.g. /data */
-    mountpoint: string, 
-    /** Whether or not the volume should be readonly for this daemon */
-    readonly: boolean): Mounts<Manifest, Backups>;
-    addAssets(
-    /** The path within the asset directory to mount. Use `null` to mount the entire volume */
-    subpath: string | null, 
-    /** Where to mount the asset. e.g. /asset */
-    mountpoint: string): Mounts<Manifest, Backups>;
-    addDependency<DependencyManifest extends T.SDKManifest>(
-    /** The ID of the dependency service */
-    dependencyId: keyof Manifest["dependencies"] & string, 
-    /** The ID of the volume belonging to the dependency service to mount */
-    volumeId: DependencyManifest["volumes"][number], 
-    /** The path within the dependency's volume to mount. Use `null` to mount the entire volume */
-    subpath: string | null, 
-    /** Where to mount the dependency's volume. e.g. /service-id */
-    mountpoint: string, 
-    /** Whether or not the volume should be readonly for this daemon */
-    readonly: boolean): Mounts<Manifest, Backups>;
-    addBackups(subpath: string | null, mountpoint: string): Mounts<Manifest, {
+    mountVolume(options: VolumeOpts<Manifest>): Mounts<Manifest, Backups>;
+    mountAssets(options: SharedOptions): Mounts<Manifest, Backups>;
+    mountDependency<DependencyManifest extends T.SDKManifest>(options: DependencyOpts<DependencyManifest>): Mounts<Manifest, Backups>;
+    mountBackups(options: SharedOptions): Mounts<Manifest, {
         subpath: string | null;
         mountpoint: string;
     }>;

package/package/lib/mainFn/Mounts.js

@@ -11,62 +11,17 @@ class Mounts {
     static of() {
         return new Mounts([], [], [], []);
     }
-    addVolume(
-    /** The ID of the volume to mount. Must be one of the volume IDs defined in the manifest */
-    id, 
-    /** The path within the volume to mount. Use `null` to mount the entire volume */
-    subpath, 
-    /** Where to mount the volume. e.g. /data */
-    mountpoint, 
-    /** Whether or not the volume should be readonly for this daemon */
-    readonly) {
-        return new Mounts([
-            ...this.volumes,
-            {
-                id,
-                subpath,
-                mountpoint,
-                readonly,
-            },
-        ], [...this.assets], [...this.dependencies], [...this.backups]);
+    mountVolume(options) {
+        return new Mounts([...this.volumes, options], [...this.assets], [...this.dependencies], [...this.backups]);
     }
-    addAssets(
-    /** The path within the asset directory to mount. Use `null` to mount the entire volume */
-    subpath, 
-    /** Where to mount the asset. e.g. /asset */
-    mountpoint) {
-        return new Mounts([...this.volumes], [
-            ...this.assets,
-            {
-                subpath,
-                mountpoint,
-            },
-        ], [...this.dependencies], [...this.backups]);
+    mountAssets(options) {
+        return new Mounts([...this.volumes], [...this.assets, options], [...this.dependencies], [...this.backups]);
     }
-    addDependency(
-    /** The ID of the dependency service */
-    dependencyId, 
-    /** The ID of the volume belonging to the dependency service to mount */
-    volumeId, 
-    /** The path within the dependency's volume to mount. Use `null` to mount the entire volume */
-    subpath, 
-    /** Where to mount the dependency's volume. e.g. /service-id */
-    mountpoint, 
-    /** Whether or not the volume should be readonly for this daemon */
-    readonly) {
-        return new Mounts([...this.volumes], [...this.assets], [
-            ...this.dependencies,
-            {
-                dependencyId,
-                volumeId,
-                subpath,
-                mountpoint,
-                readonly,
-            },
-        ], [...this.backups]);
+    mountDependency(options) {
+        return new Mounts([...this.volumes], [...this.assets], [...this.dependencies, options], [...this.backups]);
     }
-    addBackups(subpath, mountpoint) {
-        return new Mounts([...this.volumes], [...this.assets], [...this.dependencies], [...this.backups, { subpath, mountpoint }]);
+    mountBackups(options) {
+        return new Mounts([...this.volumes], [...this.assets], [...this.dependencies], [...this.backups, options]);
     }
     build() {
         const mountpoints = new Set();
@@ -83,33 +38,39 @@ class Mounts {
             .concat(this.volumes.map((v) => ({
             mountpoint: v.mountpoint,
             options: {
-                type: "volume",
-                id: v.id,
+                type: 'volume',
+                volumeId: v.volumeId,
                 subpath: v.subpath,
                 readonly: v.readonly,
+                filetype: v.type ?? 'directory',
+                idmap: [],
             },
         })))
             .concat(this.assets.map((a) => ({
             mountpoint: a.mountpoint,
             options: {
-                type: "assets",
+                type: 'assets',
                 subpath: a.subpath,
+                filetype: a.type ?? 'directory',
+                idmap: [],
             },
         })))
             .concat(this.dependencies.map((d) => ({
             mountpoint: d.mountpoint,
             options: {
-                type: "pointer",
+                type: 'pointer',
                 packageId: d.dependencyId,
                 volumeId: d.volumeId,
                 subpath: d.subpath,
                 readonly: d.readonly,
+                filetype: d.type ?? 'directory',
+                idmap: [],
             },
         })));
     }
 }
 exports.Mounts = Mounts;
-const a = Mounts.of().addBackups(null, "");
+const a = Mounts.of().mountBackups({ subpath: null, mountpoint: '' });
 // @ts-expect-error
 const m = a;
 //# sourceMappingURL=Mounts.js.map

package/package/lib/mainFn/Mounts.js.map

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

package/package/lib/mainFn/Oneshot.d.ts

@@ -0,0 +1,12 @@
+import * as T from '../../../base/lib/types';
+import { SubContainer } from '../util/SubContainer';
+import { Daemon } from './Daemon';
+import { DaemonCommandType } from './Daemons';
+/**
+ * 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
+ * unlike Daemon, does not restart on success
+ */
+export declare class Oneshot<Manifest extends T.SDKManifest, C extends SubContainer<Manifest> | null = SubContainer<Manifest> | null> extends Daemon<Manifest, C> {
+    static of<Manifest extends T.SDKManifest>(): <C extends SubContainer<Manifest> | null>(effects: T.Effects, subcontainer: C, exec: DaemonCommandType<Manifest, C>) => Oneshot<Manifest, C>;
+}

package/package/lib/mainFn/Oneshot.js

@@ -0,0 +1,23 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Oneshot = void 0;
+const CommandController_1 = require("./CommandController");
+const Daemon_1 = require("./Daemon");
+/**
+ * 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
+ * unlike Daemon, does not restart on success
+ */
+class Oneshot extends Daemon_1.Daemon {
+    static of() {
+        return (effects, subcontainer, exec) => {
+            let subc = subcontainer;
+            if (subcontainer && subcontainer.isOwned())
+                subc = subcontainer.rc();
+            const startCommand = () => CommandController_1.CommandController.of()(effects, (subc?.rc() ?? null), exec);
+            return new Oneshot(subcontainer, startCommand, true);
+        };
+    }
+}
+exports.Oneshot = Oneshot;
+//# sourceMappingURL=Oneshot.js.map

package/package/lib/mainFn/Oneshot.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Oneshot.js","sourceRoot":"","sources":["../../../../package/lib/mainFn/Oneshot.ts"],"names":[],"mappings":";;;AAEA,2DAAuD;AACvD,qCAAiC;AAGjC;;;;GAIG;AAEH,MAAa,OAGX,SAAQ,eAAmB;IAC3B,MAAM,CAAC,EAAE;QACP,OAAO,CACL,OAAkB,EAClB,YAAe,EACf,IAAoC,EACpC,EAAE;YACF,IAAI,IAAI,GAAkC,YAAY,CAAA;YACtD,IAAI,YAAY,IAAI,YAAY,CAAC,OAAO,EAAE;gBAAE,IAAI,GAAG,YAAY,CAAC,EAAE,EAAE,CAAA;YACpE,MAAM,YAAY,GAAG,GAAG,EAAE,CACxB,qCAAiB,CAAC,EAAE,EAAe,CACjC,OAAO,EACP,CAAC,IAAI,EAAE,EAAE,EAAE,IAAI,IAAI,CAAM,EACzB,IAAI,CACL,CAAA;YACH,OAAO,IAAI,OAAO,CAAc,YAAY,EAAE,YAAY,EAAE,IAAI,CAAC,CAAA;QACnE,CAAC,CAAA;IACH,CAAC;CACF;AArBD,0BAqBC"}

package/package/lib/mainFn/index.d.ts

@@ -1,8 +1,8 @@
-import * as T from "../../../base/lib/types";
-import { Daemons } from "./Daemons";
-import "../../../base/lib/interfaces/ServiceInterfaceBuilder";
-import "../../../base/lib/interfaces/Origin";
-export declare const DEFAULT_SIGTERM_TIMEOUT = 30000;
+import * as T from '../../../base/lib/types';
+import { Daemons } from './Daemons';
+import '../../../base/lib/interfaces/ServiceInterfaceBuilder';
+import '../../../base/lib/interfaces/Origin';
+export declare const DEFAULT_SIGTERM_TIMEOUT = 60000;
 /**
  * Used to ensure that the main function is running with the valid proofs.
  * We first do the folowing order of things
@@ -13,7 +13,6 @@ export declare const DEFAULT_SIGTERM_TIMEOUT = 30000;
  * @param fn
  * @returns
  */
-export declare const setupMain: <Manifest extends T.SDKManifest, Store>(fn: (o: {
+export declare const setupMain: <Manifest extends T.SDKManifest>(fn: (o: {
     effects: T.Effects;
-    started(onTerm: () => PromiseLike<void>): PromiseLike<null>;
 }) => Promise<Daemons<Manifest, any>>) => T.ExpectedExports.main;

package/package/lib/mainFn/index.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.setupMain = exports.DEFAULT_SIGTERM_TIMEOUT = void 0;
 require("../../../base/lib/interfaces/ServiceInterfaceBuilder");
 require("../../../base/lib/interfaces/Origin");
-exports.DEFAULT_SIGTERM_TIMEOUT = 30_000;
+exports.DEFAULT_SIGTERM_TIMEOUT = 60_000;
 /**
  * Used to ensure that the main function is running with the valid proofs.
  * We first do the folowing order of things

package/package/lib/mainFn/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../package/lib/mainFn/index.ts"],"names":[],"mappings":";;;AAEA,gEAA6D;AAC7D,+CAA4C;AAE/B,QAAA,uBAAuB,GAAG,MAAM,CAAA;AAC7C;;;;;;;;;GASG;AACI,MAAM,SAAS,GAAG,CACvB,EAGqC,EACb,EAAE;IAC1B,OAAO,KAAK,EAAE,OAAO,EAAE,EAAE;QACvB,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,OAAO,CAAC,CAAA;QAChC,OAAO,MAAM,CAAA;IACf,CAAC,CAAA;AACH,CAAC,CAAA;AAVY,QAAA,SAAS,aAUrB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../package/lib/mainFn/index.ts"],"names":[],"mappings":";;;AAEA,gEAA6D;AAC7D,+CAA4C;AAE/B,QAAA,uBAAuB,GAAG,MAAM,CAAA;AAC7C;;;;;;;;;GASG;AACI,MAAM,SAAS,GAAG,CACvB,EAAkE,EAC1C,EAAE;IAC1B,OAAO,KAAK,EAAE,OAAO,EAAE,EAAE;QACvB,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,OAAO,CAAC,CAAA;QAChC,OAAO,MAAM,CAAA;IACf,CAAC,CAAA;AACH,CAAC,CAAA;AAPY,QAAA,SAAS,aAOrB"}

package/package/lib/manifest/setupManifest.d.ts

@@ -1,7 +1,7 @@
-import * as T from "../../../base/lib/types";
-import { ImageId, VolumeId } from "../../../base/lib/types";
-import { SDKManifest, SDKImageInputSpec } from "../../../base/lib/types/ManifestTypes";
-import { VersionGraph } from "../version/VersionGraph";
+import * as T from '../../../base/lib/types';
+import { ImageId, VolumeId } from '../../../base/lib/types';
+import { SDKManifest, SDKImageInputSpec } from '../../../base/lib/types/ManifestTypes';
+import { VersionGraph } from '../version/VersionGraph';
 /**
  * @description Use this function to define critical information about your package
  *

package/package/lib/manifest/setupManifest.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.setupManifest = setupManifest;
 exports.buildManifest = buildManifest;
 const StartSdk_1 = require("../StartSdk");
+const package_json_1 = require("../../package.json");
 /**
  * @description Use this function to define critical information about your package
  *
@@ -13,17 +14,20 @@ function setupManifest(manifest) {
 }
 function buildManifest(versions, manifest) {
     const images = Object.entries(manifest.images).reduce((images, [k, v]) => {
-        v.arch = v.arch || ["aarch64", "x86_64"];
+        v.arch = v.arch ?? ['aarch64', 'x86_64', 'riscv64'];
         if (v.emulateMissingAs === undefined)
-            v.emulateMissingAs = v.arch.includes("aarch64")
-                ? "aarch64"
-                : v.arch[0] || null;
+            v.emulateMissingAs = v.arch.includes('x86_64')
+                ? 'x86_64'
+                : (v.arch[0] ?? null);
+        v.nvidiaContainer = !!v.nvidiaContainer;
         images[k] = v;
         return images;
     }, {});
     return {
         ...manifest,
+        gitHash: null,
         osVersion: manifest.osVersion ?? StartSdk_1.OSVersion,
+        sdkVersion: package_json_1.version,
         version: versions.current.options.version,
         releaseNotes: versions.current.options.releaseNotes,
         satisfies: versions.current.options.satisfies || [],
@@ -41,18 +45,18 @@ function buildManifest(versions, manifest) {
         hardwareRequirements: {
             device: manifest.hardwareRequirements?.device || [],
             ram: manifest.hardwareRequirements?.ram || null,
-            arch: manifest.hardwareRequirements?.arch === undefined
-                ? Object.values(images).reduce((arch, inputSpec) => {
-                    if (inputSpec.emulateMissingAs) {
-                        return arch;
-                    }
-                    if (arch === null) {
-                        return inputSpec.arch;
-                    }
-                    return arch.filter((a) => inputSpec.arch.includes(a));
-                }, null)
-                : manifest.hardwareRequirements?.arch,
+            arch: Object.values(images).reduce((arch, inputSpec) => {
+                if (inputSpec.emulateMissingAs) {
+                    return arch;
+                }
+                if (arch === null) {
+                    return inputSpec.arch;
+                }
+                return arch.filter((a) => inputSpec.arch.includes(a));
+            }, null),
         },
+        hardwareAcceleration: manifest.hardwareAcceleration ?? false,
+        plugins: manifest.plugins ?? [],
     };
 }
 //# sourceMappingURL=setupManifest.js.map