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/base/lib/Effects.ts

@@ -131,6 +131,8 @@ export type Effects = {
   }): Promise<Host | null>
   /** Returns the IP address of the container */
   getContainerIp(): Promise<string>
+  /** Returns the IP address of StartOS */
+  getOsIp(): Promise<string>
   // interface
   /** Creates an interface bound to a specific host and port to show to the user */
   exportServiceInterface(options: ExportServiceInterfaceParams): Promise<null>

sdk/base/lib/osBindings/ImageMetadata.ts

@@ -1,3 +1,8 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type ImageMetadata = { workdir: string; user: string }
+export type ImageMetadata = {
+  workdir: string
+  user: string
+  entrypoint: Array<string> | null
+  cmd: Array<string> | null
+}

sdk/base/lib/test/startosTypeValidation.test.ts

@@ -79,6 +79,7 @@ describe("startosTypeValidation ", () => {
       },
       getSystemSmtp: {} as WithCallback<GetSystemSmtpParams>,
       getContainerIp: undefined,
+      getOsIp: undefined,
       getServicePortForward: {} as GetServicePortForwardParams,
       clearServiceInterfaces: {} as ClearServiceInterfacesParams,
       exportServiceInterface: {} as ExportServiceInterfaceParams,

sdk/base/lib/types.ts

@@ -127,7 +127,11 @@ export type SmtpValue = {
   password: string | null | undefined
 }
 
-export type CommandType = string | [string, ...string[]]
+export class UseEntrypoint {
+  constructor(readonly overridCmd?: string[]) {}
+}
+
+export type CommandType = string | [string, ...string[]] | UseEntrypoint
 
 export type DaemonReturned = {
   wait(): Promise<unknown>

sdk/base/lib/util/getServiceInterface.ts

@@ -17,6 +17,7 @@ export const getHostname = (url: string): Hostname | null => {
 
 export type Filled = {
   hostnames: HostnameInfo[]
+  publicHostnames: HostnameInfo[]
   onionHostnames: HostnameInfo[]
   localHostnames: HostnameInfo[]
   ipHostnames: HostnameInfo[]
@@ -25,6 +26,7 @@ export type Filled = {
   nonIpHostnames: HostnameInfo[]
 
   urls: UrlString[]
+  publicUrls: UrlString[]
   onionUrls: UrlString[]
   localUrls: UrlString[]
   ipUrls: UrlString[]
@@ -105,6 +107,9 @@ export const filledAddress = (
   return {
     ...addressInfo,
     hostnames,
+    get publicHostnames() {
+      return hostnames.filter((h) => h.kind === "onion" || h.public)
+    },
     get onionHostnames() {
       return hostnames.filter((h) => h.kind === "onion")
     },
@@ -141,6 +146,9 @@ export const filledAddress = (
     get urls() {
       return this.hostnames.flatMap(toUrl)
     },
+    get publicUrls() {
+      return this.publicHostnames.flatMap(toUrl)
+    },
     get onionUrls() {
       return this.onionHostnames.flatMap(toUrl)
     },

sdk/base/package-lock.json

@@ -28,7 +28,7 @@
         "ts-node": "^10.9.1",
         "ts-pegjs": "^4.2.1",
         "tsx": "^4.7.1",
-        "typescript": "^5.0.4"
+        "typescript": "^5.7.3"
       }
     },
     "node_modules/@ampproject/remapping": {
@@ -4417,16 +4417,17 @@
       }
     },
     "node_modules/typescript": {
-      "version": "5.0.4",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.0.4.tgz",
-      "integrity": "sha512-cW9T5W9xY37cc+jfEnaUvX91foxtHkza3Nw3wkoF4sSlKn0MONdkdEndig/qPBWXNkmplh3NzayQzCiHM4/hqw==",
+      "version": "5.7.3",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.7.3.tgz",
+      "integrity": "sha512-84MVSjMEHP+FQRPy3pX9sTVV/INIex71s9TL2Gm5FG/WG1SqXeKyZ0k7/blY/4FdOzI12CBy1vGc4og/eus0fw==",
       "dev": true,
+      "license": "Apache-2.0",
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
       },
       "engines": {
-        "node": ">=12.20"
+        "node": ">=14.17"
       }
     },
     "node_modules/update-browserslist-db": {

sdk/base/package.json

@@ -47,6 +47,6 @@
     "ts-node": "^10.9.1",
     "ts-pegjs": "^4.2.1",
     "tsx": "^4.7.1",
-    "typescript": "^5.0.4"
+    "typescript": "^5.7.3"
   }
 }

sdk/base/tsconfig.json

@@ -12,7 +12,7 @@
     "skipLibCheck": true,
     "module": "commonjs",
     "outDir": "../baseDist",
-    "target": "es2018"
+    "target": "es2021"
   },
   "include": ["lib/**/*"],
   "exclude": ["lib/**/*.spec.ts", "lib/**/*.gen.ts", "list", "node_modules"]