@zlink-systems/framework 0.26.0 → 0.28.0

package/src/runtime/host/runtime-shutdown.ts

@@ -18,11 +18,13 @@ export interface ZLinkRuntimeStartRollbackParts {
   readonly spotNodeRuntime?: ZLinkSpotNodeRuntimeManager;
   readonly channelRuntime?: ZLinkChannelRuntimeManager;
   readonly ownedStores?: readonly ZLinkRuntimeOwnedStore[];
+  readonly shutdownSignal?: AbortSignal;
 }
 
 export interface ZLinkRuntimeStopParts {
   readonly state: ZLinkFrameworkExecutionState;
   readonly cleanupDeadline?: Date;
+  readonly shutdownSignal?: AbortSignal;
   readonly locationSnapshot: ZLinkLocationRuntimeStopSnapshot;
   readonly streamRuntime?: ZLinkStreamRuntimeManager;
   readonly spotNodeRuntime?: ZLinkSpotNodeRuntimeManager;
@@ -32,19 +34,19 @@ export interface ZLinkRuntimeStopParts {
 }
 
 export async function rollbackRuntimeStart(parts: ZLinkRuntimeStartRollbackParts): Promise<void> {
-  await Promise.allSettled([
-    parts.streamRuntime?.dispose(),
-    parts.spotNodeRuntime?.dispose(),
-    parts.channelRuntime?.dispose()
-  ]);
-  await parts.startedLocationRuntime?.stop().catch(() => undefined);
-  await parts.context.dispose().catch(() => undefined);
-  await disposeOwnedStores(parts.ownedStores);
+  const errors: unknown[] = [];
+  await runShutdownStep(errors, () => parts.streamRuntime?.dispose());
+  await runShutdownStep(errors, () => parts.spotNodeRuntime?.dispose());
+  await runShutdownStep(errors, () => parts.channelRuntime?.dispose());
+  await runShutdownStep(errors, () => parts.startedLocationRuntime?.stop(parts.shutdownSignal));
+  if (errors.length === 0) await runShutdownStep(errors, () => parts.context.dispose());
+  await disposeOwnedStores(parts.ownedStores, errors);
+  if (errors.length === 1) throw errors[0];
+  if (errors.length > 1) throw new AggregateError(errors, 'Framework start rollback failed.');
 }
 
 export async function stopRuntimeParts(parts: ZLinkRuntimeStopParts): Promise<void> {
   const state = parts.state;
-  state.abortController.abort();
   const errors: unknown[] = [];
   await runShutdownStep(errors, () => parts.streamRuntime?.dispose());
   await runShutdownStep(errors, () =>
@@ -53,11 +55,14 @@ export async function stopRuntimeParts(parts: ZLinkRuntimeStopParts): Promise<vo
   await runShutdownStep(errors, () => parts.channelRuntime?.dispose());
   await runShutdownStep(errors, () => parts.serviceRelocation?.dispose());
   await runShutdownStep(errors, () => parts.locationSnapshot.lifecycle?.dispose());
-  await runShutdownStep(errors, () => parts.locationSnapshot.runtime?.stop());
+  await runShutdownStep(errors, () => parts.locationSnapshot.runtime?.stop(parts.shutdownSignal));
   await Promise.allSettled(state.listenerTasks);
-  await runShutdownStep(errors, () => state.dispose());
+  if (errors.every(isShutdownAbort)) await runShutdownStep(errors, () => state.dispose());
   await disposeOwnedStores(parts.ownedStores, errors);
   const failures = errors.filter((error) => !isShutdownAbort(error));
+  for (const failure of failures) {
+    state.errorSink.reportRuntimeTaskException('framework shutdown', failure);
+  }
   if (failures.length === 1) throw failures[0];
   if (failures.length > 1) {
     throw new AggregateError(failures, 'Framework runtime shutdown failed.');
@@ -66,21 +71,12 @@ export async function stopRuntimeParts(parts: ZLinkRuntimeStopParts): Promise<vo
 
 async function disposeOwnedStores(
   stores: readonly ZLinkRuntimeOwnedStore[] | undefined,
-  errors?: unknown[]
+  errors: unknown[]
 ): Promise<void> {
   const disposed = new Set<ZLinkRuntimeOwnedStore>();
   for (const store of stores ?? []) {
     if (disposed.has(store)) continue;
     disposed.add(store);
-    if (errors === undefined) {
-      try {
-        await store.dispose?.();
-      } catch {
-        // Rollback is already handling the original start failure. Store
-        // cleanup remains best effort in this path.
-      }
-      continue;
-    }
     await runShutdownStep(errors, () => store.dispose?.());
   }
 }

package/src/runtime/host/service-relocation-control.ts

@@ -1,3 +1,11 @@
+import {
+  SERVICE_WIRE_MAJOR_OFFSET,
+  SERVICE_WIRE_PREFIX_SIZE
+} from '../foundation/service-wire-binary-primitives';
+import {
+  SERVICE_WIRE_MAGIC,
+  SERVICE_WIRE_MAJOR
+} from '../foundation/service-wire-constants.generated';
 import {
   decodeMaintenanceRelocationControl,
   encodeMaintenanceRelocationControl,
@@ -19,7 +27,12 @@ export function decodeServiceRelocationControlRequest(
   const bytes = Buffer.isBuffer(payload)
     ? payload
     : Buffer.from(payload.buffer, payload.byteOffset, payload.byteLength);
-  if (bytes.byteLength < 5 || bytes[0] !== 0x5a || bytes[1] !== 0x4d || bytes[2] !== 1)
+  if (
+    bytes.byteLength < SERVICE_WIRE_PREFIX_SIZE ||
+    bytes[0] !== SERVICE_WIRE_MAGIC[0] ||
+    bytes[1] !== SERVICE_WIRE_MAGIC[1] ||
+    bytes[SERVICE_WIRE_MAJOR_OFFSET] !== SERVICE_WIRE_MAJOR
+  )
     return undefined;
   return decodeMaintenanceRelocationControl(bytes);
 }