mirror of
https://github.com/Start9Labs/start-os.git
synced 2026-03-26 10:21:52 +00:00
* wip(fix): Dependencies * wip: context * wip(fix) Sorta auth * wip: warnings * wip(fix): registry/admin * wip(fix) marketplace * wip(fix) Some more converted and fixed with the linter and config * wip: Working on the static server * wip(fix)static server * wip: Remove some asynnc * wip: Something about the request and regular rpc * wip: gut install Co-authored-by: J H <Blu-J@users.noreply.github.com> * wip: Convert the static server into the new system * wip delete file * test * wip(fix) vhost does not need the with safe defaults * wip: Adding in the wifi * wip: Fix the developer and the verify * wip: new install flow Co-authored-by: J H <Blu-J@users.noreply.github.com> * fix middleware * wip * wip: Fix the auth * wip * continue service refactor * feature: Service get_config * feat: Action * wip: Fighting the great fight against the borrow checker * wip: Remove an error in a file that I just need to deel with later * chore: Add in some more lifetime stuff to the services * wip: Install fix on lifetime * cleanup * wip: Deal with the borrow later * more cleanup * resolve borrowchecker errors * wip(feat): add in the handler for the socket, for now * wip(feat): Update the service_effect_handler::action * chore: Add in the changes to make sure the from_service goes to context * chore: Change the * refactor service map * fix references to service map * fill out restore * wip: Before I work on the store stuff * fix backup module * handle some warnings * feat: add in the ui components on the rust side * feature: Update the procedures * chore: Update the js side of the main and a few of the others * chore: Update the rpc listener to match the persistant container * wip: Working on updating some things to have a better name * wip(feat): Try and get the rpc to return the correct shape? * lxc wip * wip(feat): Try and get the rpc to return the correct shape? * build for container runtime wip * remove container-init * fix build * fix error * chore: Update to work I suppose * lxc wip * remove docker module and feature * download alpine squashfs automatically * overlays effect Co-authored-by: Jade <Blu-J@users.noreply.github.com> * chore: Add the overlay effect * feat: Add the mounter in the main * chore: Convert to use the mounts, still need to work with the sandbox * install fixes * fix ssl * fixes from testing * implement tmpfile for upload * wip * misc fixes * cleanup * cleanup * better progress reporting * progress for sideload * return real guid * add devmode script * fix lxc rootfs path * fix percentage bar * fix progress bar styling * fix build for unstable * tweaks * label progress * tweaks * update progress more often * make symlink in rpc_client * make socket dir * fix parent path * add start-cli to container * add echo and gitInfo commands * wip: Add the init + errors * chore: Add in the exit effect for the system * chore: Change the type to null for failure to parse * move sigterm timeout to stopping status * update order * chore: Update the return type * remove dbg * change the map error * chore: Update the thing to capture id * chore add some life changes * chore: Update the loging * chore: Update the package to run module * us From for RpcError * chore: Update to use import instead * chore: update * chore: Use require for the backup * fix a default * update the type that is wrong * chore: Update the type of the manifest * chore: Update to make null * only symlink if not exists * get rid of double result * better debug info for ErrorCollection * chore: Update effects * chore: fix * mount assets and volumes * add exec instead of spawn * fix mounting in image * fix overlay mounts Co-authored-by: Jade <Blu-J@users.noreply.github.com> * misc fixes * feat: Fix two * fix: systemForEmbassy main * chore: Fix small part of main loop * chore: Modify the bundle * merge * fixMain loop" * move tsc to makefile * chore: Update the return types of the health check * fix client * chore: Convert the todo to use tsmatches * add in the fixes for the seen and create the hack to allow demo * chore: Update to include the systemForStartOs * chore UPdate to the latest types from the expected outout * fixes * fix typo * Don't emit if failure on tsc * wip Co-authored-by: Jade <Blu-J@users.noreply.github.com> * add s9pk api * add inspection * add inspect manifest * newline after display serializable * fix squashfs in image name * edit manifest Co-authored-by: Jade <Blu-J@users.noreply.github.com> * wait for response on repl * ignore sig for now * ignore sig for now * re-enable sig verification * fix * wip * env and chroot * add profiling logs * set uid & gid in squashfs to 100000 * set uid of sqfs to 100000 * fix mksquashfs args * add env to compat * fix * re-add docker feature flag * fix docker output format being stupid * here be dragons * chore: Add in the cross compiling for something * fix npm link * extract logs from container on exit * chore: Update for testing * add log capture to drop trait * chore: add in the modifications that I make * chore: Update small things for no updates * chore: Update the types of something * chore: Make main not complain * idmapped mounts * idmapped volumes * re-enable kiosk * chore: Add in some logging for the new system * bring in start-sdk * remove avahi * chore: Update the deps * switch to musl * chore: Update the version of prettier * chore: Organize' * chore: Update some of the headers back to the standard of fetch * fix musl build * fix idmapped mounts * fix cross build * use cross compiler for correct arch * feat: Add in the faked ssl stuff for the effects * @dr_bonez Did a solution here * chore: Something that DrBonez * chore: up * wip: We have a working server!!! * wip * uninstall * wip * tes * misc fixes * fix cli * replace interface with host * chore: Fix the types in some ts files * chore: quick update for the system for embassy to update the types * replace br-start9 with lxcbr0 * split patchdb into public/private * chore: Add changes for config set * Feat: Adding some debugging for the errors * wip: Working on getting the set config to work * chore: Update and fix the small issue with the deserialization * lightning, masked, schemeOverride, invert host-iface relationship * feat: Add in the changes for just the sdk * feat: Add in the changes for the new effects I suppose for now --------- Co-authored-by: J H <2364004+Blu-J@users.noreply.github.com> Co-authored-by: J H <Blu-J@users.noreply.github.com> Co-authored-by: J H <dragondef@gmail.com> Co-authored-by: Matt Hill <mattnine@protonmail.com>
285 lines
7.7 KiB
TypeScript
285 lines
7.7 KiB
TypeScript
import {
|
|
AddressInfo,
|
|
Effects,
|
|
HostInfo,
|
|
Hostname,
|
|
HostnameInfo,
|
|
ServiceInterface,
|
|
} from "../types"
|
|
import * as regexes from "./regexes"
|
|
import { ServiceInterfaceType } from "./utils"
|
|
|
|
export type UrlString = string
|
|
export type HostId = string
|
|
|
|
const getHostnameRegex = /^(\w+:\/\/)?([^\/\:]+)(:\d{1,3})?(\/)?/
|
|
export const getHostname = (url: string): Hostname | null => {
|
|
const founds = url.match(getHostnameRegex)?.[2]
|
|
if (!founds) return null
|
|
const parts = founds.split("@")
|
|
const last = parts[parts.length - 1] as Hostname | null
|
|
return last
|
|
}
|
|
|
|
export type Filled = {
|
|
hostnames: Hostname[]
|
|
onionHostnames: Hostname[]
|
|
localHostnames: Hostname[]
|
|
ipHostnames: Hostname[]
|
|
ipv4Hostnames: Hostname[]
|
|
ipv6Hostnames: Hostname[]
|
|
nonIpHostnames: Hostname[]
|
|
|
|
urls: UrlString[]
|
|
onionUrls: UrlString[]
|
|
localUrls: UrlString[]
|
|
ipUrls: UrlString[]
|
|
ipv4Urls: UrlString[]
|
|
ipv6Urls: UrlString[]
|
|
nonIpUrls: UrlString[]
|
|
}
|
|
export type FilledAddressInfo = AddressInfo & Filled
|
|
export type ServiceInterfaceFilled = {
|
|
id: string
|
|
/** The title of this field to be displayed */
|
|
name: string
|
|
/** Human readable description, used as tooltip usually */
|
|
description: string
|
|
/** Whether or not the interface has a primary URL */
|
|
hasPrimary: boolean
|
|
/** Whether or not the interface disabled */
|
|
disabled: boolean
|
|
/** Whether or not to mask the URIs for this interface. Useful if the URIs contain sensitive information, such as a password, macaroon, or API key */
|
|
masked: boolean
|
|
/** Information about the host for this binding */
|
|
hostInfo: HostInfo
|
|
/** URI information */
|
|
addressInfo: FilledAddressInfo
|
|
/** Indicates if we are a ui/p2p/api for the kind of interface that this is representing */
|
|
type: ServiceInterfaceType
|
|
/** The primary hostname for the service, as chosen by the user */
|
|
primaryHostname: Hostname | null
|
|
/** The primary URL for the service, as chosen by the user */
|
|
primaryUrl: UrlString | null
|
|
}
|
|
const either =
|
|
<A>(...args: ((a: A) => boolean)[]) =>
|
|
(a: A) =>
|
|
args.some((x) => x(a))
|
|
const negate =
|
|
<A>(fn: (a: A) => boolean) =>
|
|
(a: A) =>
|
|
!fn(a)
|
|
const unique = <A>(values: A[]) => Array.from(new Set(values))
|
|
function stringifyHostname(info: HostnameInfo): Hostname {
|
|
let base: string
|
|
if ("kind" in info.hostname && info.hostname.kind === "domain") {
|
|
base = info.hostname.subdomain
|
|
? `${info.hostname.subdomain}.${info.hostname.domain}`
|
|
: info.hostname.domain
|
|
} else {
|
|
base = info.hostname.value
|
|
}
|
|
if (info.hostname.port && info.hostname.sslPort) {
|
|
return `${base}:${info.hostname.port}` as Hostname
|
|
} else if (info.hostname.sslPort) {
|
|
return `${base}:${info.hostname.sslPort}` as Hostname
|
|
} else if (info.hostname.port) {
|
|
return `${base}:${info.hostname.port}` as Hostname
|
|
}
|
|
return base as Hostname
|
|
}
|
|
const addressHostToUrl = (
|
|
{ bindOptions, username, suffix }: AddressInfo,
|
|
host: Hostname,
|
|
): UrlString => {
|
|
const scheme = host.endsWith(".onion")
|
|
? bindOptions.scheme
|
|
: bindOptions.addSsl
|
|
? bindOptions.addSsl.scheme
|
|
: bindOptions.scheme // TODO: encode whether hostname transport is "secure"?
|
|
return `${scheme ? `${scheme}//` : ""}${
|
|
username ? `${username}@` : ""
|
|
}${host}${suffix}`
|
|
}
|
|
export const filledAddress = (
|
|
hostInfo: HostInfo,
|
|
addressInfo: AddressInfo,
|
|
): FilledAddressInfo => {
|
|
const toUrl = addressHostToUrl.bind(null, addressInfo)
|
|
const hostnameInfo =
|
|
hostInfo.kind == "multi"
|
|
? hostInfo.hostnames
|
|
: hostInfo.hostname
|
|
? [hostInfo.hostname]
|
|
: []
|
|
return {
|
|
...addressInfo,
|
|
hostnames: hostnameInfo.flatMap((h) => stringifyHostname(h)),
|
|
get onionHostnames() {
|
|
return hostnameInfo
|
|
.filter((h) => h.kind === "onion")
|
|
.map((h) => stringifyHostname(h))
|
|
},
|
|
get localHostnames() {
|
|
return hostnameInfo
|
|
.filter((h) => h.kind === "ip" && h.hostname.kind === "local")
|
|
.map((h) => stringifyHostname(h))
|
|
},
|
|
get ipHostnames() {
|
|
return hostnameInfo
|
|
.filter(
|
|
(h) =>
|
|
h.kind === "ip" &&
|
|
(h.hostname.kind === "ipv4" || h.hostname.kind === "ipv6"),
|
|
)
|
|
.map((h) => stringifyHostname(h))
|
|
},
|
|
get ipv4Hostnames() {
|
|
return hostnameInfo
|
|
.filter((h) => h.kind === "ip" && h.hostname.kind === "ipv4")
|
|
.map((h) => stringifyHostname(h))
|
|
},
|
|
get ipv6Hostnames() {
|
|
return hostnameInfo
|
|
.filter((h) => h.kind === "ip" && h.hostname.kind === "ipv6")
|
|
.map((h) => stringifyHostname(h))
|
|
},
|
|
get nonIpHostnames() {
|
|
return hostnameInfo
|
|
.filter(
|
|
(h) =>
|
|
h.kind === "ip" &&
|
|
h.hostname.kind !== "ipv4" &&
|
|
h.hostname.kind !== "ipv6",
|
|
)
|
|
.map((h) => stringifyHostname(h))
|
|
},
|
|
get urls() {
|
|
return this.hostnames.map(toUrl)
|
|
},
|
|
get onionUrls() {
|
|
return this.onionHostnames.map(toUrl)
|
|
},
|
|
get localUrls() {
|
|
return this.localHostnames.map(toUrl)
|
|
},
|
|
get ipUrls() {
|
|
return this.ipHostnames.map(toUrl)
|
|
},
|
|
get ipv4Urls() {
|
|
return this.ipv4Hostnames.map(toUrl)
|
|
},
|
|
get ipv6Urls() {
|
|
return this.ipv6Hostnames.map(toUrl)
|
|
},
|
|
get nonIpUrls() {
|
|
return this.nonIpHostnames.map(toUrl)
|
|
},
|
|
}
|
|
}
|
|
|
|
const makeInterfaceFilled = async ({
|
|
effects,
|
|
id,
|
|
packageId,
|
|
callback,
|
|
}: {
|
|
effects: Effects
|
|
id: string
|
|
packageId: string | undefined
|
|
callback: () => void
|
|
}) => {
|
|
const serviceInterfaceValue = await effects.getServiceInterface({
|
|
serviceInterfaceId: id,
|
|
packageId,
|
|
callback,
|
|
})
|
|
const hostInfo = await effects.getHostInfo({
|
|
packageId,
|
|
serviceInterfaceId: serviceInterfaceValue.id,
|
|
callback,
|
|
})
|
|
const primaryUrl = await effects.getPrimaryUrl({
|
|
serviceInterfaceId: id,
|
|
packageId,
|
|
callback,
|
|
})
|
|
|
|
const interfaceFilled: ServiceInterfaceFilled = {
|
|
...serviceInterfaceValue,
|
|
primaryUrl: primaryUrl,
|
|
hostInfo,
|
|
addressInfo: filledAddress(hostInfo, serviceInterfaceValue.addressInfo),
|
|
get primaryHostname() {
|
|
if (primaryUrl == null) return null
|
|
return getHostname(primaryUrl)
|
|
},
|
|
}
|
|
return interfaceFilled
|
|
}
|
|
|
|
export class GetServiceInterface {
|
|
constructor(
|
|
readonly effects: Effects,
|
|
readonly opts: { id: string; packageId?: string },
|
|
) {}
|
|
|
|
/**
|
|
* Returns the value of Store at the provided path. Restart the service if the value changes
|
|
*/
|
|
async const() {
|
|
const { id, packageId } = this.opts
|
|
const callback = this.effects.restart
|
|
const interfaceFilled: ServiceInterfaceFilled = await makeInterfaceFilled({
|
|
effects: this.effects,
|
|
id,
|
|
packageId,
|
|
callback,
|
|
})
|
|
|
|
return interfaceFilled
|
|
}
|
|
/**
|
|
* Returns the value of ServiceInterfacesFilled at the provided path. Does nothing if the value changes
|
|
*/
|
|
async once() {
|
|
const { id, packageId } = this.opts
|
|
const callback = () => {}
|
|
const interfaceFilled: ServiceInterfaceFilled = await makeInterfaceFilled({
|
|
effects: this.effects,
|
|
id,
|
|
packageId,
|
|
callback,
|
|
})
|
|
|
|
return interfaceFilled
|
|
}
|
|
|
|
/**
|
|
* Watches the value of ServiceInterfacesFilled at the provided path. Takes a custom callback function to run whenever the value changes
|
|
*/
|
|
async *watch() {
|
|
const { id, packageId } = this.opts
|
|
while (true) {
|
|
let callback: () => void = () => {}
|
|
const waitForNext = new Promise<void>((resolve) => {
|
|
callback = resolve
|
|
})
|
|
yield await makeInterfaceFilled({
|
|
effects: this.effects,
|
|
id,
|
|
packageId,
|
|
callback,
|
|
})
|
|
await waitForNext
|
|
}
|
|
}
|
|
}
|
|
export function getServiceInterface(
|
|
effects: Effects,
|
|
opts: { id: string; packageId?: string },
|
|
) {
|
|
return new GetServiceInterface(effects, opts)
|
|
}
|