Start9/start-os
2
0
Fork 0
mirror of https://github.com/Start9Labs/start-os.git synced 2026-04-04 14:29:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'integration/new-container-runtime' of github.com:Start9Labs/start-os into integration/new-container-runtime

Browse Source
This commit is contained in:
Aiden McClelland
2024-03-11 17:16:07 -06:00
parent 750f35bc36 c99d9d95c5
commit 1f47abf195
4 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
View File

@@ -228,7 +228,6 @@ export class SystemForEmbassy implements System {
previousVersion: Optional<string>, previousVersion: Optional<string>,
): Promise<void> { ): Promise<void> {
if (previousVersion) await this.migration(effects, previousVersion) if (previousVersion) await this.migration(effects, previousVersion)
await this.properties(effects)
await effects.setMainStatus({ status: "stopped" }) await effects.setMainStatus({ status: "stopped" })
} }
private async uninit( private async uninit(
@@ -458,9 +457,12 @@ export class SystemForEmbassy implements System {
path: "/properties", path: "/properties",
value: exposeUis.map((x) => x.value), value: exposeUis.map((x) => x.value),
}) })
await effects.exposeUi( await effects.exposeUi({
exposeUis.map((x, i) => ({ ...x, path: `/properties/${i}` }) as any), paths: exposeUis.map((x, i) => ({
) ...x,
path: `/properties/${i}`,
})) as any[],
})
} else if (setConfigValue.type === "script") { } else if (setConfigValue.type === "script") {
const moduleCode = this.moduleCode const moduleCode = this.moduleCode
const method = moduleCode.properties const method = moduleCode.properties
@@ -479,9 +481,12 @@ export class SystemForEmbassy implements System {
path: "/properties", path: "/properties",
value: exposeUis.map((x) => x.value), value: exposeUis.map((x) => x.value),
}) })
await effects.exposeUi( await effects.exposeUi({
exposeUis.map((x, i) => ({ ...x, path: `/properties/${i}` }) as any), paths: exposeUis.map((x, i) => ({
) ...x,
path: `/properties/${i}`,
})) as any[],
})
} }
} }
private async health( private async health(

3
core/startos/src/service/service_effect_handler.rs
View File

@@ -340,6 +340,9 @@ async fn set_store(
.or_not_found(&package_id)? .or_not_found(&package_id)?
.as_store_mut(); .as_store_mut();
let mut model_value = model.de()?; let mut model_value = model.de()?;
if model_value.is_null() {
model_value = json!({});
}
path.set(&mut model_value, value, true) path.set(&mut model_value, value, true)
.with_kind(ErrorKind::ParseDbField)?; .with_kind(ErrorKind::ParseDbField)?;
model.ser(&model_value) model.ser(&model_value)

2
sdk/lib/inits/setupInit.ts
View File

@@ -32,7 +32,7 @@ export function setupInit<Manifest extends SDKManifest, Store>(
utils, utils,
}) })
await opts.effects.exposeForDependents(services) await opts.effects.exposeForDependents(services)
await opts.effects.exposeUi(ui) await opts.effects.exposeUi({ paths: ui })
}, },
uninit: async (opts) => { uninit: async (opts) => {
await migrations.uninit(opts) await migrations.uninit(opts)

4
sdk/lib/types.ts
View File

@@ -372,7 +372,9 @@ export type Effects = {
options: ExposeServicePaths<Store>, options: ExposeServicePaths<Store>,
): Promise<void> ): Promise<void>
exposeUi<Store = never>(options: ExposeUiPaths<Store>): Promise<void> exposeUi<Store = never>(options: {
paths: ExposeUiPaths<Store>
}): Promise<void>
/** /**
* There are times that we want to see the addresses that where exported * There are times that we want to see the addresses that where exported
* @param options.addressId If we want to filter the address id * @param options.addressId If we want to filter the address id