Feature/fe new registry (#2647)

* bugfixes

* update fe types

* implement new registry types in marketplace and ui

* fix marketplace types to have default params

* add alt implementation toggle

* merge cleanup

* more cleanup and notes

* fix build

* cleanup sync with next/minor

* add exver JS parser

* parse ValidExVer to string

* update types to interface

* add VersionRange and comparative functions

* Parse ExtendedVersion from string

* add conjunction, disjunction, and inversion logic

* consider flavor in satisfiedBy fn

* consider prerelease for ordering

* add compare fn for sorting

* rename fns for consistency

* refactoring

* update compare fn to return null if flavors don't match

* begin simplifying dependencies

* under construction

* wip

* add dependency metadata to CurrentDependencyInfo

* ditch inheritance for recursive VersionRange constructor. Recursive 'satisfiedBy' fn wip

* preprocess manifest

* misc fixes

* use sdk version as osVersion in manifest

* chore: Change the type to just validate and not generate all solutions.

* add publishedAt

* fix pegjs exports

* integrate exver into sdk

* misc fixes

* complete satisfiedBy fn

* refactor - use greaterThanOrEqual and lessThanOrEqual fns

* fix tests

* update dependency details

* update types

* remove interim types

* rename alt implementation to flavor

* cleanup os update

* format exver.ts

* add s9pk parsing endpoints

* fix build

* update to exver

* exver and bug fixes

* update static endpoints + cleanup

* cleanup

* update static proxy verification

* make mocks more robust; fix dep icon fallback; cleanup

* refactor alert versions and update fixtures

* registry bugfixes

* misc fixes

* cleanup unused

* convert patchdb ui seed to camelCase

* update otherVersions type

* change otherVersions: null to 'none'

* refactor and complete feature

* improve static endpoints

* fix install params

* mask systemd-networkd-wait-online

* fix static file fetching

* include non-matching versions in otherVersions

* convert release notes to modal and clean up displayExver

* alert for no other versions

* Fix ack-instructions casing

* fix indeterminate loader on service install

---------

Co-authored-by: Aiden McClelland <me@drbonez.dev>
Co-authored-by: Shadowy Super Coder <musashidisciple@proton.me>
Co-authored-by: Aiden McClelland <3732071+dr-bonez@users.noreply.github.com>
Co-authored-by: J H <dragondef@gmail.com>
Co-authored-by: Matt Hill <mattnine@protonmail.com>

sdk/lib/mainFn/CommandController.ts

@@ -1,7 +1,7 @@
 import { DEFAULT_SIGTERM_TIMEOUT } from "."
 import { NO_TIMEOUT, SIGKILL, SIGTERM } from "../StartSdk"
-import { SDKManifest } from "../manifest/ManifestTypes"
-import { Effects, ImageId, ValidIfNoStupidEscape } from "../types"
+
+import * as T from "../types"
 import { MountOptions, Overlay } from "../util/Overlay"
 import { splitCommand } from "../util/splitCommand"
 import { cpExecFile, cpExec } from "./Daemons"
@@ -13,14 +13,14 @@ export class CommandController {
     readonly pid: number | undefined,
     readonly sigtermTimeout: number = DEFAULT_SIGTERM_TIMEOUT,
   ) {}
-  static of<Manifest extends SDKManifest>() {
+  static of<Manifest extends T.Manifest>() {
     return async <A extends string>(
-      effects: Effects,
+      effects: T.Effects,
       imageId: {
-        id: keyof Manifest["images"] & ImageId
+        id: keyof Manifest["images"] & T.ImageId
         sharedRun?: boolean
       },
-      command: ValidIfNoStupidEscape<A> | [string, ...string[]],
+      command: T.CommandType,
       options: {
         // Defaults to the DEFAULT_SIGTERM_TIMEOUT = 30_000ms
         sigtermTimeout?: number

sdk/lib/mainFn/Daemon.ts

@@ -1,5 +1,4 @@
-import { SDKManifest } from "../manifest/ManifestTypes"
-import { Effects, ImageId, ValidIfNoStupidEscape } from "../types"
+import * as T from "../types"
 import { MountOptions, Overlay } from "../util/Overlay"
 import { CommandController } from "./CommandController"
 
@@ -14,14 +13,14 @@ export class Daemon {
   private commandController: CommandController | null = null
   private shouldBeRunning = false
   private constructor(private startCommand: () => Promise<CommandController>) {}
-  static of<Manifest extends SDKManifest>() {
+  static of<Manifest extends T.Manifest>() {
     return async <A extends string>(
-      effects: Effects,
+      effects: T.Effects,
       imageId: {
-        id: keyof Manifest["images"] & ImageId
+        id: keyof Manifest["images"] & T.ImageId
         sharedRun?: boolean
       },
-      command: ValidIfNoStupidEscape<A> | [string, ...string[]],
+      command: T.CommandType,
       options: {
         mounts?: { path: string; options: MountOptions }[]
         overlay?: Overlay

sdk/lib/mainFn/Daemons.ts

@@ -1,16 +1,11 @@
 import { NO_TIMEOUT, SIGKILL, SIGTERM, Signals } from "../StartSdk"
 import { HealthReceipt } from "../health/HealthReceipt"
 import { CheckResult } from "../health/checkFns"
-import { SDKManifest } from "../manifest/ManifestTypes"
+
 import { Trigger } from "../trigger"
 import { TriggerInput } from "../trigger/TriggerInput"
 import { defaultTrigger } from "../trigger/defaultTrigger"
-import {
-  DaemonReturned,
-  Effects,
-  ImageId,
-  ValidIfNoStupidEscape,
-} from "../types"
+import * as T from "../types"
 import { Mounts } from "./Mounts"
 import { CommandOptions, MountOptions, Overlay } from "../util/Overlay"
 import { splitCommand } from "../util/splitCommand"
@@ -33,13 +28,13 @@ export type Ready = {
 }
 
 type DaemonsParams<
-  Manifest extends SDKManifest,
+  Manifest extends T.Manifest,
   Ids extends string,
   Command extends string,
   Id extends string,
 > = {
-  command: ValidIfNoStupidEscape<Command> | [string, ...string[]]
-  image: { id: keyof Manifest["images"] & ImageId; sharedRun?: boolean }
+  command: T.CommandType
+  image: { id: keyof Manifest["images"] & T.ImageId; sharedRun?: boolean }
   mounts: Mounts<Manifest>
   env?: Record<string, string>
   ready: Ready
@@ -49,7 +44,7 @@ type DaemonsParams<
 
 type ErrorDuplicateId<Id extends string> = `The id '${Id}' is already used`
 
-export const runCommand = <Manifest extends SDKManifest>() =>
+export const runCommand = <Manifest extends T.Manifest>() =>
   CommandController.of<Manifest>()
 
 /**
@@ -75,9 +70,9 @@ Daemons.of({
 })
 ```
  */
-export class Daemons<Manifest extends SDKManifest, Ids extends string> {
+export class Daemons<Manifest extends T.Manifest, Ids extends string> {
   private constructor(
-    readonly effects: Effects,
+    readonly effects: T.Effects,
     readonly started: (onTerm: () => PromiseLike<void>) => PromiseLike<void>,
     readonly daemons: Promise<Daemon>[],
     readonly ids: Ids[],
@@ -93,8 +88,8 @@ export class Daemons<Manifest extends SDKManifest, Ids extends string> {
    * @param config
    * @returns
    */
-  static of<Manifest extends SDKManifest>(config: {
-    effects: Effects
+  static of<Manifest extends T.Manifest>(config: {
+    effects: T.Effects
     started: (onTerm: () => PromiseLike<void>) => PromiseLike<void>
     healthReceipts: HealthReceipt[]
   }) {

sdk/lib/mainFn/Mounts.ts

@@ -1,10 +1,9 @@
-import { SDKManifest } from "../manifest/ManifestTypes"
-import { Effects } from "../types"
+import * as T from "../types"
 import { MountOptions } from "../util/Overlay"
 
 type MountArray = { path: string; options: MountOptions }[]
 
-export class Mounts<Manifest extends SDKManifest> {
+export class Mounts<Manifest extends T.Manifest> {
   private constructor(
     readonly volumes: {
       id: Manifest["volumes"][number]
@@ -26,7 +25,7 @@ export class Mounts<Manifest extends SDKManifest> {
     }[],
   ) {}
 
-  static of<Manifest extends SDKManifest>() {
+  static of<Manifest extends T.Manifest>() {
     return new Mounts<Manifest>([], [], [])
   }
 
@@ -58,7 +57,7 @@ export class Mounts<Manifest extends SDKManifest> {
     return this
   }
 
-  addDependency<DependencyManifest extends SDKManifest>(
+  addDependency<DependencyManifest extends T.Manifest>(
     dependencyId: keyof Manifest["dependencies"] & string,
     volumeId: DependencyManifest["volumes"][number],
     subpath: string | null,

sdk/lib/mainFn/index.ts

@@ -1,10 +1,10 @@
-import { ExpectedExports } from "../types"
+import * as T from "../types"
 import { Daemons } from "./Daemons"
 import "../interfaces/ServiceInterfaceBuilder"
 import "../interfaces/Origin"
 
 import "./Daemons"
-import { SDKManifest } from "../manifest/ManifestTypes"
+
 import { MainEffects } from "../StartSdk"
 
 export const DEFAULT_SIGTERM_TIMEOUT = 30_000
@@ -18,12 +18,12 @@ export const DEFAULT_SIGTERM_TIMEOUT = 30_000
  * @param fn
  * @returns
  */
-export const setupMain = <Manifest extends SDKManifest, Store>(
+export const setupMain = <Manifest extends T.Manifest, Store>(
   fn: (o: {
     effects: MainEffects
     started(onTerm: () => PromiseLike<void>): PromiseLike<void>
   }) => Promise<Daemons<Manifest, any>>,
-): ExpectedExports.main => {
+): T.ExpectedExports.main => {
   return async (options) => {
     const result = await fn(options)
     return result