misc improvements (#2836)

* misc improvements

* kill proc before destroying subcontainer fs

* version bump

* beta.11

* use bind mount explicitly

* Update sdk/base/lib/Effects.ts

Co-authored-by: Dominion5254 <musashidisciple@proton.me>

---------

Co-authored-by: Dominion5254 <musashidisciple@proton.me>

sdk/package/lib/mainFn/CommandController.ts

@@ -9,6 +9,7 @@ import {
 } from "../util/SubContainer"
 import { splitCommand } from "../util"
 import * as cp from "child_process"
+import * as fs from "node:fs/promises"
 
 export class CommandController {
   private constructor(
@@ -45,7 +46,17 @@ export class CommandController {
         onStderr?: (chunk: Buffer | string | any) => void
       },
     ) => {
-      const commands = splitCommand(command)
+      let commands: string[]
+      if (command instanceof T.UseEntrypoint) {
+        const imageMeta: T.ImageMetadata = 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 = splitCommand(command)
       const subc =
         subcontainer instanceof SubContainer
           ? subcontainer
@@ -55,10 +66,15 @@ export class CommandController {
                 subcontainer,
                 options?.subcontainerName || commands.join(" "),
               )
-              for (let mount of options.mounts || []) {
-                await subc.mount(mount.options, mount.path)
+              try {
+                for (let mount of options.mounts || []) {
+                  await subc.mount(mount.options, mount.path)
+                }
+                return subc
+              } catch (e) {
+                await subc.destroy()
+                throw e
               }
-              return subc
             })()
 
       try {

sdk/package/lib/mainFn/Daemons.ts

@@ -38,6 +38,12 @@ export type Ready = {
   fn: (
     spawnable: ExecSpawnable,
   ) => Promise<HealthCheckResult> | HealthCheckResult
+  /**
+   * A duration in milliseconds to treat a failing health check as "starting"
+   *
+   * defaults to 5000
+   */
+  gracePeriod?: number
   trigger?: Trigger
 }
 

sdk/package/lib/mainFn/HealthDaemon.ts

@@ -25,6 +25,7 @@ export class HealthDaemon {
   private _health: HealthCheckResult = { result: "starting", message: null }
   private healthWatchers: Array<() => unknown> = []
   private running = false
+  private started?: number
   private resolveReady: (() => void) | undefined
   private readyPromise: Promise<void>
   constructor(
@@ -75,6 +76,7 @@ export class HealthDaemon {
 
     if (newStatus) {
       ;(await this.daemon).start()
+      this.started = performance.now()
       this.setupHealthCheck()
     } else {
       ;(await this.daemon).stop()
@@ -146,14 +148,21 @@ export class HealthDaemon {
     this._health = health
     this.healthWatchers.forEach((watcher) => watcher())
     const display = this.ready.display
-    const result = health.result
     if (!display) {
       return
     }
+    let result = health.result
+    if (
+      result === "failure" &&
+      this.started &&
+      performance.now() - this.started <= (this.ready.gracePeriod ?? 5000)
+    )
+      result = "starting"
     await this.effects.setHealth({
       ...health,
       id: this.id,
       name: display,
+      result,
     } as SetHealth)
   }