fix: assorted fixes across container-runtime, core, and sdk

- Fix parseInt callback in container-runtime to avoid extra map arguments
- Use proper error propagation in list_service_interfaces instead of unwrap_or_default
- Handle non-plain objects by reference in deepEqual
This commit is contained in:
Aiden McClelland
2026-03-27 15:58:52 -06:00
parent 879f953a9f
commit d6b81f3c9b
3 changed files with 19 additions and 7 deletions

View File

@@ -494,7 +494,7 @@ export class SystemForEmbassy implements System {
const host = new MultiHost({ effects, id }) const host = new MultiHost({ effects, id })
const internalPorts = new Set( const internalPorts = new Set(
Object.values(interfaceValue["tor-config"]?.["port-mapping"] ?? {}) Object.values(interfaceValue["tor-config"]?.["port-mapping"] ?? {})
.map(Number.parseInt) .map((v) => parseInt(v))
.concat( .concat(
...Object.values(interfaceValue["lan-config"] ?? {}).map( ...Object.values(interfaceValue["lan-config"] ?? {}).map(
(c) => c.internal, (c) => c.internal,

View File

@@ -134,8 +134,7 @@ pub async fn list_service_interfaces(
.expect("valid json pointer"); .expect("valid json pointer");
let mut watch = context.seed.ctx.db.watch(ptr).await; let mut watch = context.seed.ctx.db.watch(ptr).await;
let res = imbl_value::from_value(watch.peek_and_mark_seen()?) let res = from_value(watch.peek_and_mark_seen()?)?;
.unwrap_or_default();
if let Some(callback) = callback { if let Some(callback) = callback {
let callback = callback.register(&context.seed.persistent_container); let callback = callback.register(&context.seed.persistent_container);
@@ -174,9 +173,7 @@ pub async fn clear_service_interfaces(
.as_idx_mut(&package_id) .as_idx_mut(&package_id)
.or_not_found(&package_id)? .or_not_found(&package_id)?
.as_service_interfaces_mut() .as_service_interfaces_mut()
.mutate(|s| { .mutate(|s| Ok(s.retain(|id, _| except.contains(id))))
Ok(s.retain(|id, _| except.contains(id)))
})
}) })
.await .await
.result?; .result?;

View File

@@ -1,7 +1,10 @@
/** /**
* Performs a deep structural equality check across all provided arguments. * Performs a deep structural equality check across all provided arguments.
* Returns true only if every argument is deeply equal to every other argument. * Returns true only if every argument is deeply equal to every other argument.
* Handles primitives, arrays, and plain objects recursively. * Handles primitives, arrays, and plain objects (JSON-like) recursively.
*
* Non-plain objects (Set, Map, Date, etc.) are compared by reference only,
* since Object.keys() does not enumerate their contents.
* *
* @param args - Two or more values to compare for deep equality * @param args - Two or more values to compare for deep equality
* @returns True if all arguments are deeply equal * @returns True if all arguments are deeply equal
@@ -23,6 +26,18 @@ export function deepEqual(...args: unknown[]) {
} }
if (objects.length !== args.length) return false if (objects.length !== args.length) return false
if (objects.some(Array.isArray) && !objects.every(Array.isArray)) return false if (objects.some(Array.isArray) && !objects.every(Array.isArray)) return false
if (
objects.some(
(x) => !Array.isArray(x) && Object.getPrototypeOf(x) !== Object.prototype,
)
) {
return (
objects.reduce<object | null>(
(a, b) => (a === b ? a : null),
objects[0],
) !== null
)
}
const allKeys = new Set(objects.flatMap((x) => Object.keys(x))) const allKeys = new Set(objects.flatMap((x) => Object.keys(x)))
for (const key of allKeys) { for (const key of allKeys) {
for (const x of objects) { for (const x of objects) {