Merge branch 'integration/new-container-runtime' of github.com:Start9Labs/start-os into integration/new-container-runtime

sdk/lib/util/Overlay.ts

@@ -64,7 +64,7 @@ export class Overlay {
   async destroy() {
     const imageId = this.imageId
     const guid = this.guid
-    await this.effects.destroyOverlayedImage({ imageId, guid })
+    await this.effects.destroyOverlayedImage({ guid })
   }
 
   async exec(

sdk/lib/util/getServiceInterface.ts

@@ -1,3 +1,4 @@
+import { ServiceInterfaceType } from "../StartSdk"
 import {
   AddressInfo,
   Effects,
@@ -5,7 +6,6 @@ import {
   Hostname,
   HostnameInfo,
 } from "../types"
-import { ServiceInterfaceType } from "./utils"
 
 export type UrlString = string
 export type HostId = string

sdk/lib/util/index.ts

@@ -7,7 +7,6 @@ import "./deepEqual"
 import "./deepMerge"
 import "./Overlay"
 import "./once"
-import * as utils from "./utils"
 import { SDKManifest } from "../manifest/ManifestTypes"
 
 // prettier-ignore
@@ -23,11 +22,6 @@ export const isKnownError = (e: unknown): e is T.KnownError =>
 
 declare const affine: unique symbol
 
-export const createUtils = utils.createUtils
-export const createMainUtils = <Manifest extends SDKManifest, Store>(
-  effects: T.Effects,
-) => createUtils<Manifest, Store, {}>(effects)
-
 type NeverPossible = { [affine]: string }
 export type NoAny<A> = NeverPossible extends A
   ? keyof NeverPossible extends keyof A

sdk/lib/util/utils.ts

@@ -1,300 +0,0 @@
-import nullIfEmpty from "./nullIfEmpty"
-import {
-  CheckResult,
-  checkPortListening,
-  checkWebUrl,
-} from "../health/checkFns"
-import {
-  DaemonReturned,
-  Effects,
-  EnsureStorePath,
-  ExtractStore,
-  ServiceInterfaceId,
-  PackageId,
-  ValidIfNoStupidEscape,
-} from "../types"
-import { GetSystemSmtp } from "./GetSystemSmtp"
-import { GetStore, getStore } from "../store/getStore"
-import { MultiHost, Scheme, SingleHost, StaticHost } from "../interfaces/Host"
-import { ServiceInterfaceBuilder } from "../interfaces/ServiceInterfaceBuilder"
-import { GetServiceInterface, getServiceInterface } from "./getServiceInterface"
-import {
-  GetServiceInterfaces,
-  getServiceInterfaces,
-} from "./getServiceInterfaces"
-import * as CP from "node:child_process"
-import { promisify } from "node:util"
-import { splitCommand } from "./splitCommand"
-import { SDKManifest } from "../manifest/ManifestTypes"
-import { MountOptions, Overlay, CommandOptions } from "./Overlay"
-export type Signals = NodeJS.Signals
-
-export const SIGTERM: Signals = "SIGTERM"
-export const SIGKILL: Signals = "SIGTERM"
-export const NO_TIMEOUT = -1
-
-const childProcess = {
-  exec: promisify(CP.exec),
-  execFile: promisify(CP.execFile),
-}
-const cp = childProcess
-
-export type ServiceInterfaceType = "ui" | "p2p" | "api"
-
-export type Utils<
-  Manifest extends SDKManifest,
-  Store,
-  WrapperOverWrite = { const: never },
-> = {
-  checkPortListening(
-    port: number,
-    options: {
-      errorMessage: string
-      successMessage: string
-      timeoutMessage?: string
-      timeout?: number
-    },
-  ): Promise<CheckResult>
-  checkWebUrl(
-    url: string,
-    options?: {
-      timeout?: number
-      successMessage?: string
-      errorMessage?: string
-    },
-  ): Promise<CheckResult>
-  childProcess: typeof childProcess
-  createInterface: (options: {
-    name: string
-    id: string
-    description: string
-    hasPrimary: boolean
-    disabled: boolean
-    type: ServiceInterfaceType
-    username: null | string
-    path: string
-    search: Record<string, string>
-    schemeOverride: { ssl: Scheme; noSsl: Scheme } | null
-    masked: boolean
-  }) => ServiceInterfaceBuilder
-  getSystemSmtp: () => GetSystemSmtp & WrapperOverWrite
-  host: {
-    static: (id: string) => StaticHost
-    single: (id: string) => SingleHost
-    multi: (id: string) => MultiHost
-  }
-  serviceInterface: {
-    getOwn: (id: ServiceInterfaceId) => GetServiceInterface & WrapperOverWrite
-    get: (opts: {
-      id: ServiceInterfaceId
-      packageId: PackageId
-    }) => GetServiceInterface & WrapperOverWrite
-    getAllOwn: () => GetServiceInterfaces & WrapperOverWrite
-    getAll: (opts: {
-      packageId: PackageId
-    }) => GetServiceInterfaces & WrapperOverWrite
-  }
-  nullIfEmpty: typeof nullIfEmpty
-  runCommand: <A extends string>(
-    imageId: Manifest["images"][number],
-    command: ValidIfNoStupidEscape<A> | [string, ...string[]],
-    options: CommandOptions & {
-      mounts?: { path: string; options: MountOptions }[]
-    },
-  ) => Promise<{ stdout: string | Buffer; stderr: string | Buffer }>
-  runDaemon: <A extends string>(
-    imageId: Manifest["images"][number],
-    command: ValidIfNoStupidEscape<A> | [string, ...string[]],
-    options: CommandOptions & {
-      mounts?: { path: string; options: MountOptions }[]
-      overlay?: Overlay
-    },
-  ) => Promise<DaemonReturned>
-  store: {
-    get: <Path extends string>(
-      packageId: string,
-      path: EnsureStorePath<Store, Path>,
-    ) => GetStore<Store, Path> & WrapperOverWrite
-    getOwn: <Path extends string>(
-      path: EnsureStorePath<Store, Path>,
-    ) => GetStore<Store, Path> & WrapperOverWrite
-    setOwn: <Path extends string | never>(
-      path: EnsureStorePath<Store, Path>,
-      value: ExtractStore<Store, Path>,
-    ) => Promise<void>
-  }
-}
-export const createUtils = <
-  Manifest extends SDKManifest,
-  Store = never,
-  WrapperOverWrite = { const: never },
->(
-  effects: Effects,
-): Utils<Manifest, Store, WrapperOverWrite> => {
-  return {
-    createInterface: (options: {
-      name: string
-      id: string
-      description: string
-      hasPrimary: boolean
-      disabled: boolean
-      type: ServiceInterfaceType
-      username: null | string
-      path: string
-      search: Record<string, string>
-      schemeOverride: { ssl: Scheme; noSsl: Scheme } | null
-      masked: boolean
-    }) => new ServiceInterfaceBuilder({ ...options, effects }),
-    childProcess,
-    getSystemSmtp: () =>
-      new GetSystemSmtp(effects) as GetSystemSmtp & WrapperOverWrite,
-
-    host: {
-      static: (id: string) => new StaticHost({ id, effects }),
-      single: (id: string) => new SingleHost({ id, effects }),
-      multi: (id: string) => new MultiHost({ id, effects }),
-    },
-    nullIfEmpty,
-
-    serviceInterface: {
-      getOwn: (id: ServiceInterfaceId) =>
-        getServiceInterface(effects, {
-          id,
-          packageId: null,
-        }) as GetServiceInterface & WrapperOverWrite,
-      get: (opts: { id: ServiceInterfaceId; packageId: PackageId }) =>
-        getServiceInterface(effects, opts) as GetServiceInterface &
-          WrapperOverWrite,
-      getAllOwn: () =>
-        getServiceInterfaces(effects, {
-          packageId: null,
-        }) as GetServiceInterfaces & WrapperOverWrite,
-      getAll: (opts: { packageId: PackageId }) =>
-        getServiceInterfaces(effects, opts) as GetServiceInterfaces &
-          WrapperOverWrite,
-    },
-    store: {
-      get: <Path extends string = never>(
-        packageId: string,
-        path: EnsureStorePath<Store, Path>,
-      ) =>
-        getStore<Store, Path>(effects, path as any, {
-          packageId,
-        }) as any,
-      getOwn: <Path extends string>(path: EnsureStorePath<Store, Path>) =>
-        getStore<Store, Path>(effects, path as any) as any,
-      setOwn: <Path extends string | never>(
-        path: EnsureStorePath<Store, Path>,
-        value: ExtractStore<Store, Path>,
-      ) => effects.store.set<Store, Path>({ value, path: path as any }),
-    },
-
-    runCommand: async <A extends string>(
-      imageId: Manifest["images"][number],
-      command: ValidIfNoStupidEscape<A> | [string, ...string[]],
-      options: CommandOptions & {
-        mounts?: { path: string; options: MountOptions }[]
-      },
-    ): Promise<{ stdout: string | Buffer; stderr: string | Buffer }> => {
-      const commands = splitCommand(command)
-      const overlay = await Overlay.of(effects, imageId)
-      try {
-        for (let mount of options.mounts || []) {
-          await overlay.mount(mount.options, mount.path)
-        }
-        return await overlay.exec(commands)
-      } finally {
-        await overlay.destroy()
-      }
-    },
-    runDaemon: async <A extends string>(
-      imageId: Manifest["images"][number],
-      command: ValidIfNoStupidEscape<A> | [string, ...string[]],
-      options: CommandOptions & {
-        mounts?: { path: string; options: MountOptions }[]
-        overlay?: Overlay
-      },
-    ): Promise<DaemonReturned> => {
-      const commands = splitCommand(command)
-      const overlay = options.overlay || (await Overlay.of(effects, imageId))
-      for (let mount of options.mounts || []) {
-        await overlay.mount(mount.options, mount.path)
-      }
-      const childProcess = await overlay.spawn(commands, {
-        env: options.env,
-      })
-      const answer = new Promise<null>((resolve, reject) => {
-        childProcess.stdout.on("data", (data: any) => {
-          console.log(data.toString())
-        })
-        childProcess.stderr.on("data", (data: any) => {
-          console.error(data.toString())
-        })
-
-        childProcess.on("exit", (code: any) => {
-          if (code === 0) {
-            return resolve(null)
-          }
-          return reject(new Error(`${commands[0]} exited with code ${code}`))
-        })
-      })
-
-      const pid = childProcess.pid
-      return {
-        async wait() {
-          const pids = pid ? await psTree(pid, overlay) : []
-          try {
-            return await answer
-          } finally {
-            for (const process of pids) {
-              cp.execFile("kill", [`-9`, String(process)]).catch((_) => {})
-            }
-          }
-        },
-        async term({ signal = SIGTERM, timeout = NO_TIMEOUT } = {}) {
-          const pids = pid ? await psTree(pid, overlay) : []
-          try {
-            childProcess.kill(signal)
-
-            if (timeout > NO_TIMEOUT) {
-              const didTimeout = await Promise.race([
-                new Promise((resolve) => setTimeout(resolve, timeout)).then(
-                  () => true,
-                ),
-                answer.then(() => false),
-              ])
-              if (didTimeout) {
-                childProcess.kill(SIGKILL)
-              }
-            } else {
-              await answer
-            }
-          } finally {
-            await overlay.destroy()
-          }
-
-          try {
-            for (const process of pids) {
-              await cp.execFile("kill", [`-${signal}`, String(process)])
-            }
-          } finally {
-            for (const process of pids) {
-              cp.execFile("kill", [`-9`, String(process)]).catch((_) => {})
-            }
-          }
-        },
-      }
-    },
-    checkPortListening: checkPortListening.bind(null, effects),
-    checkWebUrl: checkWebUrl.bind(null, effects),
-  }
-}
-function noop(): void {}
-
-async function psTree(pid: number, overlay: Overlay): Promise<number[]> {
-  const { stdout } = await childProcess.exec(`pstree -p ${pid}`)
-  const regex: RegExp = /\((\d+)\)/g
-  return [...stdout.toString().matchAll(regex)].map(([_all, pid]) =>
-    parseInt(pid),
-  )
-}