feat: add getOutboundGateway effect and simplify VersionGraph init/uninit

Add getOutboundGateway effect across core, container-runtime, and SDK
to let services query their effective outbound gateway with callback
support. Remove preInstall/uninstall hooks from VersionGraph as they
are no longer needed.
This commit is contained in:
Aiden McClelland
2026-02-20 13:26:45 -07:00
parent 8c1a452742
commit 80cb2d9ba5
12 changed files with 327 additions and 46 deletions

View File

@@ -135,6 +135,8 @@ export type Effects = {
}): Promise<string>
/** Returns the IP address of StartOS */
getOsIp(): Promise<string>
/** Returns the effective outbound gateway for this service */
getOutboundGateway(options: { callback?: () => void }): Promise<string>
// interface
/** Creates an interface bound to a specific host and port to show to the user */
exportServiceInterface(options: ExportServiceInterfaceParams): Promise<null>

View File

@@ -0,0 +1,4 @@
// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
import type { CallbackId } from './CallbackId'
export type GetOutboundGatewayParams = { callback?: CallbackId }

View File

@@ -110,6 +110,7 @@ export { GetContainerIpParams } from './GetContainerIpParams'
export { GetHostInfoParams } from './GetHostInfoParams'
export { GetOsAssetParams } from './GetOsAssetParams'
export { GetOsVersionParams } from './GetOsVersionParams'
export { GetOutboundGatewayParams } from './GetOutboundGatewayParams'
export { GetPackageParams } from './GetPackageParams'
export { GetPackageResponseFull } from './GetPackageResponseFull'
export { GetPackageResponse } from './GetPackageResponse'

View File

@@ -25,6 +25,7 @@ import { GetSslKeyParams } from '.././osBindings'
import { GetServiceInterfaceParams } from '.././osBindings'
import { SetDependenciesParams } from '.././osBindings'
import { GetSystemSmtpParams } from '.././osBindings'
import { GetOutboundGatewayParams } from '.././osBindings'
import { GetServicePortForwardParams } from '.././osBindings'
import { ExportServiceInterfaceParams } from '.././osBindings'
import { ListServiceInterfacesParams } from '.././osBindings'
@@ -83,6 +84,7 @@ describe('startosTypeValidation ', () => {
getServiceManifest: {} as WithCallback<GetServiceManifestParams>,
getSystemSmtp: {} as WithCallback<GetSystemSmtpParams>,
getContainerIp: {} as WithCallback<GetContainerIpParams>,
getOutboundGateway: {} as WithCallback<GetOutboundGatewayParams>,
getOsIp: undefined,
getServicePortForward: {} as GetServicePortForwardParams,
clearServiceInterfaces: {} as ClearServiceInterfacesParams,

View File

@@ -0,0 +1,105 @@
import { Effects } from '../Effects'
import { DropGenerator, DropPromise } from './Drop'
export class GetOutboundGateway {
constructor(readonly effects: Effects) {}
/**
* Returns the effective outbound gateway. Reruns the context from which it has been called if the underlying value changes
*/
const() {
return this.effects.getOutboundGateway({
callback:
this.effects.constRetry &&
(() => this.effects.constRetry && this.effects.constRetry()),
})
}
/**
* Returns the effective outbound gateway. Does nothing if the value changes
*/
once() {
return this.effects.getOutboundGateway({})
}
private async *watchGen(abort?: AbortSignal) {
const resolveCell = { resolve: () => {} }
this.effects.onLeaveContext(() => {
resolveCell.resolve()
})
abort?.addEventListener('abort', () => resolveCell.resolve())
while (this.effects.isInContext && !abort?.aborted) {
let callback: () => void = () => {}
const waitForNext = new Promise<void>((resolve) => {
callback = resolve
resolveCell.resolve = resolve
})
yield await this.effects.getOutboundGateway({
callback: () => callback(),
})
await waitForNext
}
return new Promise<never>((_, rej) => rej(new Error('aborted')))
}
/**
* Watches the effective outbound gateway. Returns an async iterator that yields whenever the value changes
*/
watch(abort?: AbortSignal): AsyncGenerator<string, never, unknown> {
const ctrl = new AbortController()
abort?.addEventListener('abort', () => ctrl.abort())
return DropGenerator.of(this.watchGen(ctrl.signal), () => ctrl.abort())
}
/**
* Watches the effective outbound gateway. Takes a custom callback function to run whenever the value changes
*/
onChange(
callback: (
value: string,
error?: Error,
) => { cancel: boolean } | Promise<{ cancel: boolean }>,
) {
;(async () => {
const ctrl = new AbortController()
for await (const value of this.watch(ctrl.signal)) {
try {
const res = await callback(value)
if (res.cancel) {
ctrl.abort()
break
}
} catch (e) {
console.error(
'callback function threw an error @ GetOutboundGateway.onChange',
e,
)
}
}
})()
.catch((e) => callback('', e))
.catch((e) =>
console.error(
'callback function threw an error @ GetOutboundGateway.onChange',
e,
),
)
}
/**
* Watches the effective outbound gateway. Returns when the predicate is true
*/
waitFor(pred: (value: string) => boolean): Promise<string> {
const ctrl = new AbortController()
return DropPromise.of(
Promise.resolve().then(async () => {
for await (const next of this.watchGen(ctrl.signal)) {
if (pred(next)) {
return next
}
}
return ''
}),
() => ctrl.abort(),
)
}
}

View File

@@ -14,6 +14,7 @@ export { once } from './once'
export { asError } from './asError'
export * as Patterns from './patterns'
export * from './typeHelpers'
export { GetOutboundGateway } from './GetOutboundGateway'
export { GetSystemSmtp } from './GetSystemSmtp'
export { Graph, Vertex } from './graph'
export { inMs } from './inMs'

View File

@@ -23,7 +23,7 @@ import { setupExportedUrls } from '../../base/lib/interfaces/setupExportedUrls'
import { successFailure } from './trigger/successFailure'
import { MultiHost, Scheme } from '../../base/lib/interfaces/Host'
import { ServiceInterfaceBuilder } from '../../base/lib/interfaces/ServiceInterfaceBuilder'
import { GetSystemSmtp } from './util'
import { GetOutboundGateway, GetSystemSmtp } from './util'
import { nullIfEmpty } from './util'
import { getServiceInterface, getServiceInterfaces } from './util'
import {
@@ -107,6 +107,7 @@ export class StartSdk<Manifest extends T.SDKManifest> {
type AlreadyExposed =
| 'getSslCertificate'
| 'getSystemSmtp'
| 'getOutboundGateway'
| 'getContainerIp'
| 'getDataVersion'
| 'setDataVersion'
@@ -445,6 +446,8 @@ export class StartSdk<Manifest extends T.SDKManifest> {
) => new ServiceInterfaceBuilder({ ...options, effects }),
getSystemSmtp: <E extends Effects>(effects: E) =>
new GetSystemSmtp(effects),
getOutboundGateway: <E extends Effects>(effects: E) =>
new GetOutboundGateway(effects),
getSslCertificate: <E extends Effects>(
effects: E,
hostnames: string[],

View File

@@ -64,8 +64,6 @@ export class VersionGraph<CurrentVersion extends string>
private constructor(
readonly current: VersionInfo<CurrentVersion>,
versions: Array<VersionInfo<any>>,
private readonly preInstall?: InitScriptOrFn<'install'>,
private readonly uninstall?: UninitScript | UninitFn,
) {
this.graph = once(() => {
const graph = new Graph<
@@ -167,24 +165,8 @@ export class VersionGraph<CurrentVersion extends string>
static of<
CurrentVersion extends string,
OtherVersions extends Array<VersionInfo<any>>,
>(options: {
current: VersionInfo<CurrentVersion>
other: OtherVersions
/**
* A script to run only on fresh install
*/
preInstall?: InitScriptOrFn<'install'>
/**
* A script to run only on uninstall
*/
uninstall?: UninitScriptOrFn
}) {
return new VersionGraph(
options.current,
options.other,
options.preInstall,
options.uninstall,
)
>(options: { current: VersionInfo<CurrentVersion>; other: OtherVersions }) {
return new VersionGraph(options.current, options.other)
}
async migrate({
effects,
@@ -270,7 +252,7 @@ export class VersionGraph<CurrentVersion extends string>
.normalize(),
)
async init(effects: T.Effects, kind: InitKind): Promise<void> {
async init(effects: T.Effects): Promise<void> {
const from = await getDataVersion(effects)
if (from) {
await this.migrate({
@@ -279,10 +261,6 @@ export class VersionGraph<CurrentVersion extends string>
to: this.currentVersion(),
})
} else {
kind = 'install' // implied by !dataVersion
if (this.preInstall)
if ('init' in this.preInstall) await this.preInstall.init(effects, kind)
else await this.preInstall(effects, kind)
await effects.setDataVersion({ version: this.current.options.version })
}
}
@@ -300,11 +278,6 @@ export class VersionGraph<CurrentVersion extends string>
to: target,
})
}
} else {
if (this.uninstall)
if ('uninit' in this.uninstall)
await this.uninstall.uninit(effects, target)
else await this.uninstall(effects, target)
}
await setDataVersion(effects, target)
}