fix s9pk build

container-runtime/src/Adapters/RpcListener.ts

@@ -42,6 +42,7 @@ export const matchRpcResult = anyOf(
     ),
   }),
 )
+
 export type RpcResult = typeof matchRpcResult._TYPE
 type SocketResponse = ({ jsonrpc: "2.0"; id: IdType } & RpcResult) | null
 

core/startos/src/util/logger.rs

@@ -1,3 +1,5 @@
+use std::io;
+
 use tracing::Subscriber;
 use tracing_subscriber::util::SubscriberInitExt;
 
@@ -21,7 +23,11 @@ impl EmbassyLogger {
         let filter_layer = filter_layer
             .add_directive("tokio=trace".parse().unwrap())
             .add_directive("runtime=trace".parse().unwrap());
-        let fmt_layer = fmt::layer().with_target(true);
+        let fmt_layer = fmt::layer()
+            .with_writer(io::stderr)
+            .with_line_number(true)
+            .with_file(true)
+            .with_target(true);
 
         let sub = tracing_subscriber::registry()
             .with(filter_layer)

sdk/Makefile

@@ -67,9 +67,8 @@ base/node_modules: base/package.json
 
 node_modules: package/node_modules base/node_modules
 
-publish: bundle package/package.json README.md LICENSE
-	cd dist
-	npm publish --access=public
+publish: bundle package/package.json package/README.md package/LICENSE
+	cd dist && npm publish --access=public
 
 link: bundle
 	cd dist && npm link

sdk/base/lib/dependencies/setupDependencies.ts

@@ -2,7 +2,7 @@ import * as T from "../types"
 import { once } from "../util"
 import { Dependency } from "./Dependency"
 
-type DependencyType<Manifest extends T.Manifest> = {
+type DependencyType<Manifest extends T.SDKManifest> = {
   [K in keyof {
     [K in keyof Manifest["dependencies"]]: Manifest["dependencies"][K]["optional"] extends false
       ? K
@@ -16,7 +16,7 @@ type DependencyType<Manifest extends T.Manifest> = {
   }]?: Dependency
 }
 
-export function setupDependencies<Manifest extends T.Manifest>(
+export function setupDependencies<Manifest extends T.SDKManifest>(
   fn: (options: { effects: T.Effects }) => Promise<DependencyType<Manifest>>,
 ): (options: { effects: T.Effects }) => Promise<null> {
   const cell = { updater: async (_: { effects: T.Effects }) => null }

sdk/package/lib/StartSdk.ts

@@ -86,12 +86,12 @@ type AnyNeverCond<T extends any[], Then, Else> =
     T extends [any, ...infer U] ? AnyNeverCond<U,Then, Else> :
     never
 
-export class StartSdk<Manifest extends T.Manifest, Store> {
+export class StartSdk<Manifest extends T.SDKManifest, Store> {
   private constructor(readonly manifest: Manifest) {}
   static of() {
     return new StartSdk<never, never>(null as never)
   }
-  withManifest<Manifest extends T.Manifest = never>(manifest: Manifest) {
+  withManifest<Manifest extends T.SDKManifest = never>(manifest: Manifest) {
     return new StartSdk<Manifest, Store>(manifest)
   }
   withStore<Store extends Record<string, any>>() {
@@ -1358,7 +1358,7 @@ export class StartSdk<Manifest extends T.Manifest, Store> {
   }
 }
 
-export async function runCommand<Manifest extends T.Manifest>(
+export async function runCommand<Manifest extends T.SDKManifest>(
   effects: Effects,
   image: { id: keyof Manifest["images"] & T.ImageId; sharedRun?: boolean },
   command: string | [string, ...string[]],

sdk/package/lib/backup/Backups.ts

@@ -35,15 +35,15 @@ export type BackupSync<Volumes extends string> = {
  * ).build()q
  * ```
  */
-export class Backups<M extends T.Manifest> {
+export class Backups<M extends T.SDKManifest> {
   private constructor(
     private options = DEFAULT_OPTIONS,
     private restoreOptions: Partial<T.SyncOptions> = {},
     private backupOptions: Partial<T.SyncOptions> = {},
     private backupSet = [] as BackupSync<M["volumes"][number]>[],
   ) {}
 
-  static withVolumes<M extends T.Manifest = never>(
+  static withVolumes<M extends T.SDKManifest = never>(
     ...volumeNames: Array<M["volumes"][number]>
   ): Backups<M> {
     return Backups.withSyncs(
@@ -54,13 +54,13 @@ export class Backups<M extends T.Manifest> {
     )
   }
 
-  static withSyncs<M extends T.Manifest = never>(
+  static withSyncs<M extends T.SDKManifest = never>(
     ...syncs: BackupSync<M["volumes"][number]>[]
   ) {
     return syncs.reduce((acc, x) => acc.addSync(x), new Backups<M>())
   }
 
-  static withOptions<M extends T.Manifest = never>(
+  static withOptions<M extends T.SDKManifest = never>(
     options?: Partial<T.SyncOptions>,
   ) {
     return new Backups<M>({ ...DEFAULT_OPTIONS, ...options })

sdk/package/lib/backup/setupBackups.ts

@@ -2,7 +2,7 @@ import { Backups } from "./Backups"
 import * as T from "../../../base/lib/types"
 import { _ } from "../util"
 
-export type SetupBackupsParams<M extends T.Manifest> =
+export type SetupBackupsParams<M extends T.SDKManifest> =
   | M["volumes"][number][]
   | ((_: { effects: T.Effects }) => Promise<Backups<M>>)
 
@@ -11,7 +11,7 @@ type SetupBackupsRes = {
   restoreBackup: T.ExpectedExports.restoreBackup
 }
 
-export function setupBackups<M extends T.Manifest>(
+export function setupBackups<M extends T.SDKManifest>(
   options: SetupBackupsParams<M>,
 ) {
   let backupsFactory: (_: { effects: T.Effects }) => Promise<Backups<M>>

sdk/package/lib/index.ts

@@ -28,7 +28,7 @@ export {
 export { Daemons } from "./mainFn/Daemons"
 export { SubContainer } from "./util/SubContainer"
 export { StartSdk } from "./StartSdk"
-export { setupManifest } from "./manifest/setupManifest"
+export { setupManifest, buildManifest } from "./manifest/setupManifest"
 export { FileHelper } from "./util/fileHelper"
 export { setupExposeStore } from "./store/setupExposeStore"
 export { pathBuilder } from "../../base/lib/util/PathBuilder"

sdk/package/lib/inits/setupInit.ts

@@ -7,8 +7,8 @@ import { VersionGraph } from "../version/VersionGraph"
 import { Install } from "./setupInstall"
 import { Uninstall } from "./setupUninstall"
 
-export function setupInit<Manifest extends T.Manifest, Store>(
-  versions: VersionGraph<Manifest["version"]>,
+export function setupInit<Manifest extends T.SDKManifest, Store>(
+  versions: VersionGraph<string>,
   install: Install<Manifest, Store>,
   uninstall: Uninstall<Manifest, Store>,
   setServiceInterfaces: UpdateServiceInterfaces<any>,

sdk/package/lib/inits/setupInstall.ts

@@ -1,11 +1,11 @@
 import * as T from "../../../base/lib/types"
 
-export type InstallFn<Manifest extends T.Manifest, Store> = (opts: {
+export type InstallFn<Manifest extends T.SDKManifest, Store> = (opts: {
   effects: T.Effects
 }) => Promise<null | void | undefined>
-export class Install<Manifest extends T.Manifest, Store> {
+export class Install<Manifest extends T.SDKManifest, Store> {
   private constructor(readonly fn: InstallFn<Manifest, Store>) {}
-  static of<Manifest extends T.Manifest, Store>(
+  static of<Manifest extends T.SDKManifest, Store>(
     fn: InstallFn<Manifest, Store>,
   ) {
     return new Install(fn)
@@ -18,7 +18,7 @@ export class Install<Manifest extends T.Manifest, Store> {
   }
 }
 
-export function setupInstall<Manifest extends T.Manifest, Store>(
+export function setupInstall<Manifest extends T.SDKManifest, Store>(
   fn: InstallFn<Manifest, Store>,
 ) {
   return Install.of(fn)

sdk/package/lib/inits/setupUninstall.ts

@@ -1,11 +1,11 @@
 import * as T from "../../../base/lib/types"
 
-export type UninstallFn<Manifest extends T.Manifest, Store> = (opts: {
+export type UninstallFn<Manifest extends T.SDKManifest, Store> = (opts: {
   effects: T.Effects
 }) => Promise<null | void | undefined>
-export class Uninstall<Manifest extends T.Manifest, Store> {
+export class Uninstall<Manifest extends T.SDKManifest, Store> {
   private constructor(readonly fn: UninstallFn<Manifest, Store>) {}
-  static of<Manifest extends T.Manifest, Store>(
+  static of<Manifest extends T.SDKManifest, Store>(
     fn: UninstallFn<Manifest, Store>,
   ) {
     return new Uninstall(fn)
@@ -22,7 +22,7 @@ export class Uninstall<Manifest extends T.Manifest, Store> {
   }
 }
 
-export function setupUninstall<Manifest extends T.Manifest, Store>(
+export function setupUninstall<Manifest extends T.SDKManifest, Store>(
   fn: UninstallFn<Manifest, Store>,
 ) {
   return Uninstall.of(fn)

sdk/package/lib/mainFn/CommandController.ts

@@ -20,7 +20,7 @@ export class CommandController {
     private process: cp.ChildProcessWithoutNullStreams,
     readonly sigtermTimeout: number = DEFAULT_SIGTERM_TIMEOUT,
   ) {}
-  static of<Manifest extends T.Manifest>() {
+  static of<Manifest extends T.SDKManifest>() {
     return async <A extends string>(
       effects: T.Effects,
       subcontainer:

sdk/package/lib/mainFn/Daemon.ts

@@ -17,7 +17,7 @@ export class Daemon {
   get subContainerHandle(): undefined | ExecSpawnable {
     return this.commandController?.subContainerHandle
   }
-  static of<Manifest extends T.Manifest>() {
+  static of<Manifest extends T.SDKManifest>() {
     return async <A extends string>(
       effects: T.Effects,
       subcontainer:

sdk/package/lib/mainFn/Daemons.ts

@@ -27,7 +27,7 @@ export type Ready = {
 }
 
 type DaemonsParams<
-  Manifest extends T.Manifest,
+  Manifest extends T.SDKManifest,
   Ids extends string,
   Command extends string,
   Id extends string,
@@ -43,7 +43,7 @@ type DaemonsParams<
 
 type ErrorDuplicateId<Id extends string> = `The id '${Id}' is already used`
 
-export const runCommand = <Manifest extends T.Manifest>() =>
+export const runCommand = <Manifest extends T.SDKManifest>() =>
   CommandController.of<Manifest>()
 
 /**
@@ -69,7 +69,7 @@ Daemons.of({
 })
 ```
  */
-export class Daemons<Manifest extends T.Manifest, Ids extends string>
+export class Daemons<Manifest extends T.SDKManifest, Ids extends string>
   implements T.DaemonBuildable
 {
   private constructor(
@@ -89,7 +89,7 @@ export class Daemons<Manifest extends T.Manifest, Ids extends string>
    * @param options
    * @returns
    */
-  static of<Manifest extends T.Manifest>(options: {
+  static of<Manifest extends T.SDKManifest>(options: {
     effects: T.Effects
     started: (onTerm: () => PromiseLike<void>) => PromiseLike<null>
     healthReceipts: HealthReceipt[]

sdk/package/lib/mainFn/Mounts.ts

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

sdk/package/lib/mainFn/index.ts

@@ -14,7 +14,7 @@ export const DEFAULT_SIGTERM_TIMEOUT = 30_000
  * @param fn
  * @returns
  */
-export const setupMain = <Manifest extends T.Manifest, Store>(
+export const setupMain = <Manifest extends T.SDKManifest, Store>(
   fn: (o: {
     effects: T.Effects
     started(onTerm: () => PromiseLike<void>): PromiseLike<null>

sdk/package/lib/manifest/setupManifest.ts

@@ -14,6 +14,23 @@ import { VersionGraph } from "../version/VersionGraph"
  * @param manifest Static properties of the package
  */
 export function setupManifest<
+  Id extends string,
+  Dependencies extends Record<string, unknown>,
+  VolumesTypes extends VolumeId,
+  AssetTypes extends VolumeId,
+  ImagesTypes extends ImageId,
+  Manifest extends {
+    dependencies: Dependencies
+    id: Id
+    assets: AssetTypes[]
+    images: Record<ImagesTypes, SDKImageInputSpec>
+    volumes: VolumesTypes[]
+  },
+>(manifest: SDKManifest & Manifest): SDKManifest & Manifest {
+  return manifest
+}
+
+export function buildManifest<
   Id extends string,
   Version extends string,
   Dependencies extends Record<string, unknown>,
@@ -27,7 +44,6 @@ export function setupManifest<
     images: Record<ImagesTypes, SDKImageInputSpec>
     volumes: VolumesTypes[]
   },
-  Satisfies extends string[] = [],
 >(
   versions: VersionGraph<Version>,
   manifest: SDKManifest & Manifest,