mirror of
https://github.com/Start9Labs/start-os.git
synced 2026-03-27 02:41:53 +00:00
* wip: static-server errors * wip: fix wifi * wip: Fix the service_effects * wip: Fix cors in the middleware * wip(chore): Auth clean up the lint. * wip(fix): Vhost * wip: continue manager refactor Co-authored-by: J H <Blu-J@users.noreply.github.com> * wip: service manager refactor * wip: Some fixes * wip(fix): Fix the lib.rs * wip * wip(fix): Logs * wip: bins * wip(innspect): Add in the inspect * wip: config * wip(fix): Diagnostic * 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 --------- Co-authored-by: J H <dragondef@gmail.com> Co-authored-by: J H <Blu-J@users.noreply.github.com> Co-authored-by: J H <2364004+Blu-J@users.noreply.github.com>
308 lines
8.2 KiB
TypeScript
308 lines
8.2 KiB
TypeScript
import * as matches from "ts-matches"
|
|
|
|
const starSub = /((\d+\.)*\d+)\.\*/
|
|
// prettier-ignore
|
|
export type ValidEmVer = `${number}${`.${number}` | ""}${`.${number}` | ""}${`-${string}` | ""}`;
|
|
// prettier-ignore
|
|
export type ValidEmVerRange = `${'>=' | '<='| '<' | '>' | ''}${'^' | '~' | ''}${number | '*'}${`.${number | '*'}` | ""}${`.${number | '*'}` | ""}${`-${string}` | ""}`;
|
|
|
|
function incrementLastNumber(list: number[]) {
|
|
const newList = [...list]
|
|
newList[newList.length - 1]++
|
|
return newList
|
|
}
|
|
/**
|
|
* Will take in a range, like `>1.2` or `<1.2.3.4` or `=1.2` or `1.*`
|
|
* and return a checker, that has the check function for checking that a version is in the valid
|
|
* @param range
|
|
* @returns
|
|
*/
|
|
export function rangeOf(range: string | Checker): Checker {
|
|
return Checker.parse(range)
|
|
}
|
|
|
|
/**
|
|
* Used to create a checker that will `and` all the ranges passed in
|
|
* @param ranges
|
|
* @returns
|
|
*/
|
|
export function rangeAnd(...ranges: (string | Checker)[]): Checker {
|
|
if (ranges.length === 0) {
|
|
throw new Error("No ranges given")
|
|
}
|
|
const [firstCheck, ...rest] = ranges
|
|
return Checker.parse(firstCheck).and(...rest)
|
|
}
|
|
|
|
/**
|
|
* Used to create a checker that will `or` all the ranges passed in
|
|
* @param ranges
|
|
* @returns
|
|
*/
|
|
export function rangeOr(...ranges: (string | Checker)[]): Checker {
|
|
if (ranges.length === 0) {
|
|
throw new Error("No ranges given")
|
|
}
|
|
const [firstCheck, ...rest] = ranges
|
|
return Checker.parse(firstCheck).or(...rest)
|
|
}
|
|
|
|
/**
|
|
* This will negate the checker, so given a checker that checks for >= 1.0.0, it will check for < 1.0.0
|
|
* @param range
|
|
* @returns
|
|
*/
|
|
export function notRange(range: string | Checker): Checker {
|
|
return rangeOf(range).not()
|
|
}
|
|
|
|
/**
|
|
* EmVer is a set of versioning of any pattern like 1 or 1.2 or 1.2.3 or 1.2.3.4 or ..
|
|
*/
|
|
export class EmVer {
|
|
/**
|
|
* Convert the range, should be 1.2.* or * into a emver
|
|
* Or an already made emver
|
|
* IsUnsafe
|
|
*/
|
|
static from(range: string | EmVer): EmVer {
|
|
if (range instanceof EmVer) {
|
|
return range
|
|
}
|
|
return EmVer.parse(range)
|
|
}
|
|
/**
|
|
* Convert the range, should be 1.2.* or * into a emver
|
|
* IsUnsafe
|
|
*/
|
|
static parse(rangeExtra: string): EmVer {
|
|
const [range, extra] = rangeExtra.split("-")
|
|
const values = range.split(".").map((x) => parseInt(x))
|
|
for (const value of values) {
|
|
if (isNaN(value)) {
|
|
throw new Error(`Couldn't parse range: ${range}`)
|
|
}
|
|
}
|
|
return new EmVer(values, extra)
|
|
}
|
|
private constructor(
|
|
public readonly values: number[],
|
|
readonly extra: string | null,
|
|
) {}
|
|
|
|
/**
|
|
* Used when we need a new emver that has the last number incremented, used in the 1.* like things
|
|
*/
|
|
public withLastIncremented() {
|
|
return new EmVer(incrementLastNumber(this.values), null)
|
|
}
|
|
|
|
public greaterThan(other: EmVer): boolean {
|
|
for (const i in this.values) {
|
|
if (other.values[i] == null) {
|
|
return true
|
|
}
|
|
if (this.values[i] > other.values[i]) {
|
|
return true
|
|
}
|
|
|
|
if (this.values[i] < other.values[i]) {
|
|
return false
|
|
}
|
|
}
|
|
return false
|
|
}
|
|
|
|
public equals(other: EmVer): boolean {
|
|
if (other.values.length !== this.values.length) {
|
|
return false
|
|
}
|
|
for (const i in this.values) {
|
|
if (this.values[i] !== other.values[i]) {
|
|
return false
|
|
}
|
|
}
|
|
return true
|
|
}
|
|
public greaterThanOrEqual(other: EmVer): boolean {
|
|
return this.greaterThan(other) || this.equals(other)
|
|
}
|
|
public lessThanOrEqual(other: EmVer): boolean {
|
|
return !this.greaterThan(other)
|
|
}
|
|
public lessThan(other: EmVer): boolean {
|
|
return !this.greaterThanOrEqual(other)
|
|
}
|
|
/**
|
|
* Return a enum string that describes (used for switching/iffs)
|
|
* to know comparison
|
|
* @param other
|
|
* @returns
|
|
*/
|
|
public compare(other: EmVer) {
|
|
if (this.equals(other)) {
|
|
return "equal" as const
|
|
} else if (this.greaterThan(other)) {
|
|
return "greater" as const
|
|
} else {
|
|
return "less" as const
|
|
}
|
|
}
|
|
/**
|
|
* Used when sorting emver's in a list using the sort method
|
|
* @param other
|
|
* @returns
|
|
*/
|
|
public compareForSort(other: EmVer) {
|
|
return matches
|
|
.matches(this.compare(other))
|
|
.when("equal", () => 0 as const)
|
|
.when("greater", () => 1 as const)
|
|
.when("less", () => -1 as const)
|
|
.unwrap()
|
|
}
|
|
|
|
toString() {
|
|
return `${this.values.join(".")}${this.extra ? `-${this.extra}` : ""}`
|
|
}
|
|
}
|
|
|
|
/**
|
|
* A checker is a function that takes a version and returns true if the version matches the checker.
|
|
* Used when we are doing range checking, like saying ">=1.0.0".check("1.2.3") will be true
|
|
*/
|
|
export class Checker {
|
|
/**
|
|
* Will take in a range, like `>1.2` or `<1.2.3.4` or `=1.2` or `1.*`
|
|
* and return a checker, that has the check function for checking that a version is in the valid
|
|
* @param range
|
|
* @returns
|
|
*/
|
|
static parse(range: string | Checker): Checker {
|
|
if (range instanceof Checker) {
|
|
return range
|
|
}
|
|
range = range.trim()
|
|
if (range.indexOf("||") !== -1) {
|
|
return rangeOr(...range.split("||").map((x) => Checker.parse(x)))
|
|
}
|
|
if (range.indexOf("&&") !== -1) {
|
|
return rangeAnd(...range.split("&&").map((x) => Checker.parse(x)))
|
|
}
|
|
if (range === "*") {
|
|
return new Checker((version) => {
|
|
EmVer.from(version)
|
|
return true
|
|
})
|
|
}
|
|
if (range.startsWith("!")) {
|
|
return Checker.parse(range.substring(1)).not()
|
|
}
|
|
const starSubMatches = starSub.exec(range)
|
|
if (starSubMatches != null) {
|
|
const emVarLower = EmVer.parse(starSubMatches[1])
|
|
const emVarUpper = emVarLower.withLastIncremented()
|
|
|
|
return new Checker((version) => {
|
|
const v = EmVer.from(version)
|
|
return (
|
|
(v.greaterThan(emVarLower) || v.equals(emVarLower)) &&
|
|
!v.greaterThan(emVarUpper) &&
|
|
!v.equals(emVarUpper)
|
|
)
|
|
})
|
|
}
|
|
|
|
switch (range.substring(0, 2)) {
|
|
case ">=": {
|
|
const emVar = EmVer.parse(range.substring(2))
|
|
return new Checker((version) => {
|
|
const v = EmVer.from(version)
|
|
return v.greaterThanOrEqual(emVar)
|
|
})
|
|
}
|
|
case "<=": {
|
|
const emVar = EmVer.parse(range.substring(2))
|
|
return new Checker((version) => {
|
|
const v = EmVer.from(version)
|
|
return v.lessThanOrEqual(emVar)
|
|
})
|
|
}
|
|
}
|
|
|
|
switch (range.substring(0, 1)) {
|
|
case ">": {
|
|
const emVar = EmVer.parse(range.substring(1))
|
|
return new Checker((version) => {
|
|
const v = EmVer.from(version)
|
|
return v.greaterThan(emVar)
|
|
})
|
|
}
|
|
case "<": {
|
|
const emVar = EmVer.parse(range.substring(1))
|
|
return new Checker((version) => {
|
|
const v = EmVer.from(version)
|
|
return v.lessThan(emVar)
|
|
})
|
|
}
|
|
case "=": {
|
|
const emVar = EmVer.parse(range.substring(1))
|
|
return new Checker((version) => {
|
|
const v = EmVer.from(version)
|
|
return v.equals(emVar)
|
|
})
|
|
}
|
|
}
|
|
throw new Error("Couldn't parse range: " + range)
|
|
}
|
|
constructor(
|
|
/**
|
|
* Check is the function that will be given a emver or unparsed emver and should give if it follows
|
|
* a pattern
|
|
*/
|
|
public readonly check: (value: ValidEmVer | EmVer) => boolean,
|
|
) {}
|
|
|
|
/**
|
|
* Used when we want the `and` condition with another checker
|
|
*/
|
|
public and(...others: (Checker | string)[]): Checker {
|
|
return new Checker((value) => {
|
|
if (!this.check(value)) {
|
|
return false
|
|
}
|
|
for (const other of others) {
|
|
if (!Checker.parse(other).check(value)) {
|
|
return false
|
|
}
|
|
}
|
|
return true
|
|
})
|
|
}
|
|
|
|
/**
|
|
* Used when we want the `or` condition with another checker
|
|
*/
|
|
public or(...others: (Checker | string)[]): Checker {
|
|
return new Checker((value) => {
|
|
if (this.check(value)) {
|
|
return true
|
|
}
|
|
for (const other of others) {
|
|
if (Checker.parse(other).check(value)) {
|
|
return true
|
|
}
|
|
}
|
|
return false
|
|
})
|
|
}
|
|
|
|
/**
|
|
* A useful example is making sure we don't match an exact version, like !=1.2.3
|
|
* @returns
|
|
*/
|
|
public not(): Checker {
|
|
return new Checker((value) => !this.check(value))
|
|
}
|
|
}
|