@forgeax/engine-host 0.1.27 → 0.1.28

package/dist/index.mjs

@@ -350,6 +350,30 @@ function modulesFromCatalog(catalog, realm, version = "static") {
     ...record.digest === void 0 ? {} : { digest: record.digest }
   }));
 }
+async function createHostStartup(options = {}) {
+  const context = options.context ?? new Context();
+  const ownedContext = options.context === void 0;
+  const fibers = [];
+  let disposed = false;
+  try {
+    for (const plugin of options.startupPlugins ?? []) fibers.push(await context.plugin(plugin));
+  } catch (error) {
+    for (const fiber of fibers.reverse()) await fiber.dispose();
+    if (ownedContext) await context.fiber.dispose();
+    throw error;
+  }
+  return {
+    context,
+    ownedContext,
+    fibers,
+    async dispose() {
+      if (disposed) return;
+      disposed = true;
+      for (const fiber of [...fibers].reverse()) await fiber.dispose();
+      if (ownedContext) await context.fiber.dispose();
+    }
+  };
+}
 
 // src/transport.ts
 var HOST_ASSEMBLY_SERVICE = "host/assembly.get";
@@ -973,7 +997,6 @@ function assertBackendCatalogIdentity(catalog, modules) {
 }
 async function createBackendHost(options = {}) {
   const context = options.context ?? new Context();
-  const ownedContext = options.context === void 0;
   const realm = options.realm ?? "engine";
   const catalog = options.catalog;
   const pairedBackendEntries = options.pairs?.flatMap((pair) => pair.backend === void 0 ? [] : [pair.backend.entry]) ?? [];
@@ -989,7 +1012,7 @@ async function createBackendHost(options = {}) {
   });
   const checkedInitial = validateHostAssembly(initialAssembly);
   if (!checkedInitial.ok) {
-    if (ownedContext) await context.fiber.dispose();
+    if (options.context === void 0) await context.fiber.dispose();
     throw checkedInitial.error;
   }
   const backendModules = options.pairs === void 0 ? modules : options.pairs.flatMap((pair) => pair.backend === void 0 ? [] : [pair.backend.module]);
@@ -998,18 +1021,21 @@ async function createBackendHost(options = {}) {
   const assembly = authority.authority;
   const bootstrapRevision = checkedInitial.value.revision;
   const transport = options.transport ?? createHostTransport();
-  let foundationFiber;
+  let startup;
   let loaderFiber;
   let loader;
   let backendEntries = options.pairs === void 0 ? options.entries ?? options.assembly?.entries ?? [] : pairedBackendEntries;
-  const startupFibers = [];
   let unregisterAssemblyService;
   let unregisterActivationService;
   let unsubscribeAssembly;
   try {
-    foundationFiber = await context.plugin(hostFoundationPlugin(assembly, transport));
-    for (const plugin of options.startupPlugins ?? [])
-      startupFibers.push(await context.plugin(plugin));
+    startup = await createHostStartup({
+      context,
+      startupPlugins: [
+        hostFoundationPlugin(assembly, transport),
+        ...options.startupPlugins ?? []
+      ]
+    });
     if (catalog !== void 0) {
       const bootstrapped = await bootstrapCatalogLoader(context, catalog, realm, {
         catalogDigest: checkedInitial.value.revision,
@@ -1048,9 +1074,7 @@ async function createBackendHost(options = {}) {
     unregisterAssemblyService?.();
     unsubscribeAssembly?.();
     await loaderFiber?.dispose();
-    for (const fiber of startupFibers.reverse()) await fiber.dispose();
-    await foundationFiber?.dispose();
-    if (ownedContext) await context.fiber.dispose();
+    await startup?.dispose();
     throw error;
   }
   let disposed = false;
@@ -1059,7 +1083,7 @@ async function createBackendHost(options = {}) {
     ...loader === void 0 ? {} : { loader },
     assembly,
     transport,
-    ownedContext,
+    ownedContext: options.context === void 0,
     async update(nextInput) {
       if (disposed) {
         throw new HostAssemblyError(
@@ -1107,9 +1131,7 @@ async function createBackendHost(options = {}) {
       unregisterAssemblyService?.();
       transport.close();
       await loaderFiber?.dispose();
-      for (const fiber of startupFibers.reverse()) await fiber.dispose();
-      await foundationFiber?.dispose();
-      if (ownedContext) await context.fiber.dispose();
+      await startup?.dispose();
     }
   };
   return host;
@@ -1287,8 +1309,7 @@ async function createFrontendHost(options = {}) {
       return status;
     }
   };
-  const startupFibers = [];
-  let foundationFiber;
+  let startup;
   let loaderFiber;
   let loader;
   let disposed = false;
@@ -1332,9 +1353,13 @@ async function createFrontendHost(options = {}) {
     });
   }
   try {
-    foundationFiber = await context.plugin(hostFoundationPlugin2(state, options.transport));
-    for (const plugin of options.startupPlugins ?? [])
-      startupFibers.push(await context.plugin(plugin));
+    startup = await createHostStartup({
+      context,
+      startupPlugins: [
+        hostFoundationPlugin2(state, options.transport),
+        ...options.startupPlugins ?? []
+      ]
+    });
     if (options.autoActivate !== false) {
       const host2 = {
         context,
@@ -1370,9 +1395,7 @@ async function createFrontendHost(options = {}) {
   } catch (error) {
     removeTransportDisconnect?.();
     await loaderFiber?.dispose();
-    for (const fiber of startupFibers.reverse()) await fiber.dispose();
-    await foundationFiber?.dispose();
-    if (ownedContext) await context.fiber.dispose();
+    await startup?.dispose();
     throw error;
   }
   const host = {
@@ -1410,9 +1433,7 @@ async function createFrontendHost(options = {}) {
       disposed = true;
       removeTransportDisconnect?.();
       await loaderFiber?.dispose();
-      for (const fiber of startupFibers.reverse()) await fiber.dispose();
-      await foundationFiber?.dispose();
-      if (ownedContext) await context.fiber.dispose();
+      await startup?.dispose();
       status = { state: "disposed", revision: current.revision };
     }
   };
@@ -1468,6 +1489,6 @@ async function activateFrontendHost(host, next, options, realm, getLoader, setLo
   }
 }
 
-export { HOST_ACTIVATION_REPORT_SERVICE, HOST_ASSEMBLY_CHANGED_TOPIC, HOST_ASSEMBLY_SCHEMA_VERSION, HOST_ASSEMBLY_SERVICE, HostAssemblyError, attachHostWebSocketServer, canonicalHostJson, connectHostWebSocket, createBackendHost, createFrontendHost, createHostAssembly, createHostTransport, createHostWebSocketClient, hostRevision, modulesFromCatalog, validateHostAssembly };
+export { HOST_ACTIVATION_REPORT_SERVICE, HOST_ASSEMBLY_CHANGED_TOPIC, HOST_ASSEMBLY_SCHEMA_VERSION, HOST_ASSEMBLY_SERVICE, HostAssemblyError, attachHostWebSocketServer, canonicalHostJson, connectHostWebSocket, createBackendHost, createFrontendHost, createHostAssembly, createHostStartup, createHostTransport, createHostWebSocketClient, hostRevision, modulesFromCatalog, validateHostAssembly };
 //# sourceMappingURL=index.mjs.map
 //# sourceMappingURL=index.mjs.map