@jeffusion/bungee-core 6.0.1 → 6.0.3

package/dist/config-storage-worker.js

@@ -10419,6 +10419,7 @@ class ConfigRepository {
       migrateConfigurationDatabase(db);
       verifyRepositoryIntegrity(db);
       const repository = new ConfigRepository(db, options, freezeSnapshot(readRepositorySnapshot(db)));
+      repository.removeUnavailablePlugins();
       repository.getSnapshot();
       repository.getSupervisionState();
       repository.getRuntimeRecoveryBudget();
@@ -10450,6 +10451,80 @@ class ConfigRepository {
     this.snapshot = projection.snapshot;
     return projection;
   }
+  removeUnavailablePlugins() {
+    const available = this.options.compileOptions?.availablePlugins;
+    if (available === undefined)
+      return;
+    runRepositoryAction(() => this.mutationTransaction(() => {
+      const snapshot = readRepositorySnapshot(this.db);
+      const removed = new Set;
+      const installed = (name) => {
+        if (available.has(name))
+          return true;
+        removed.add(name);
+        return false;
+      };
+      const bindings = (values) => values.filter((value) => installed(value.name));
+      const endpoints = (values) => values.map((value) => {
+        const { managedBy, ...endpoint } = value;
+        return {
+          ...endpoint,
+          plugins: bindings(value.plugins),
+          ...managedBy && installed(managedBy.plugin) ? { managedBy } : {}
+        };
+      });
+      const logical = snapshot.aggregate.logical_configuration;
+      const aggregate = {
+        plugin_activations: snapshot.aggregate.plugin_activations.filter((value) => installed(value.plugin_name)),
+        logical_configuration: {
+          ...logical,
+          plugins: bindings(logical.plugins),
+          services: logical.services.map((service) => ({
+            ...service,
+            plugins: bindings(service.plugins),
+            endpoints: endpoints(service.endpoints)
+          })),
+          routes: logical.routes.map((route) => ({
+            ...route,
+            plugins: bindings(route.plugins),
+            ...route.endpoints === undefined ? {} : { endpoints: endpoints(route.endpoints) }
+          }))
+        }
+      };
+      if (removed.size === 0)
+        return;
+      const protection = readManagementProtection(this.db);
+      const provider = protection.selectedProvider !== null && available.has(protection.selectedProvider) ? protection.selectedProvider : null;
+      const now = Date.now(), operationId = randomUUID2();
+      const prepared = prepareCommitCommand({
+        mutation_id: operationId,
+        expected_revision: snapshot.revision,
+        aggregate,
+        kind: "config",
+        created_at: now,
+        target_worker_slots: []
+      });
+      const command = {
+        ...prepared,
+        managementProvider: provider,
+        requestHash: hashConfigurationRequest({
+          kind: prepared.kind,
+          expected_revision: prepared.expectedRevision,
+          aggregate: prepared.aggregate,
+          target_worker_slots: [],
+          management_provider: provider,
+          offline_management: true
+        })
+      };
+      const result = commitTransaction(this.db, command, this.options, snapshot, true);
+      if (result.kind !== "committed")
+        throw new ConfigRepositoryError("invalid_operation", `plugin catalog reconciliation cannot proceed (${result.kind})`);
+      beginPublication(this.db, operationId, now);
+      markDraining(this.db, operationId, now);
+      finalizePublication(this.db, operationId, { outcome: "converged", old_workers_exited: true }, now);
+    }));
+    this.snapshot = freezeSnapshot(readRepositorySnapshot(this.db));
+  }
   setManagementProviderOffline(provider, operationId, now) {
     if (this.options.offline !== true)
       throw new ConfigRepositoryError("invalid_command", "management protection changes require an offline repository");
@@ -10884,12 +10959,16 @@ scope.onmessage = (event) => {
     if (closed || !Array.isArray(request.args))
       throw new ConfigRepositoryError("invalid_command", "storage request is invalid");
     if (request.method === "open") {
-      if (repository !== null || request.args.length !== 2 || typeof request.args[0] !== "string" || typeof request.args[1] !== "object" || request.args[1] === null || typeof request.args[1].offline !== "boolean" || !Array.isArray(request.args[1].managementProviders) || request.args[1].managementProviders.some((name) => typeof name !== "string")) {
+      if (repository !== null || request.args.length !== 2 || typeof request.args[0] !== "string" || typeof request.args[1] !== "object" || request.args[1] === null || typeof request.args[1].offline !== "boolean" || !Array.isArray(request.args[1].managementProviders) || request.args[1].managementProviders.some((name) => typeof name !== "string") || request.args[1].availablePlugins !== undefined && (!Array.isArray(request.args[1].availablePlugins) || request.args[1].availablePlugins.some((name) => typeof name !== "string"))) {
         throw new ConfigRepositoryError("invalid_command", "storage open request is invalid");
       }
       repository = ConfigRepository.open(request.args[0], {
         offline: request.args[1].offline,
-        compileOptions: { pluginSchemas: new Map, managementProviders: new Set(request.args[1].managementProviders) }
+        compileOptions: {
+          pluginSchemas: new Map,
+          managementProviders: new Set(request.args[1].managementProviders),
+          availablePlugins: request.args[1].availablePlugins === undefined ? undefined : new Set(request.args[1].availablePlugins)
+        }
       });
       scope.postMessage({ id, ok: true, result: {
         ...repository.getControlProjection(),

package/dist/main.js

@@ -9182,7 +9182,11 @@ class AsyncConfigRepository {
   static async open(dbPath, options = {}) {
     const client = new AsyncConfigRepository(options);
     try {
-      const startup = await client.send("open", [dbPath, { offline: options.offline === true, managementProviders: [...options.compileOptions?.managementProviders ?? []] }]);
+      const startup = await client.send("open", [dbPath, {
+        offline: options.offline === true,
+        managementProviders: [...options.compileOptions?.managementProviders ?? []],
+        availablePlugins: options.compileOptions?.availablePlugins === undefined ? undefined : [...options.compileOptions.availablePlugins]
+      }]);
       client.installControlProjection(startup);
       client.supervision = freezeProjection(startup.supervision);
       client.state = "open";
@@ -201121,7 +201125,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@jeffusion/bungee-core",
-    version: "6.0.1",
+    version: "6.0.3",
     description: "Bungee reverse proxy core engine",
     main: "./dist/main.js",
     types: "./dist/main.d.ts",
@@ -259559,6 +259563,18 @@ function keepStoppedProcessAlive() {
   process.exitCode = undefined;
   const keeper = setInterval(() => {}, 60000);
   let listener = null;
+  let stopping = false;
+  const stop = () => {
+    if (stopping)
+      return;
+    stopping = true;
+    Promise.resolve(listener?.stop()).finally(() => {
+      clearInterval(keeper);
+      process.exit(0);
+    });
+  };
+  process.once("SIGTERM", stop);
+  process.once("SIGINT", stop);
   try {
     const options = readMasterProcessOptions();
     listener = createManagementListener({
@@ -259574,18 +259590,6 @@ function keepStoppedProcessAlive() {
   } catch {
     logger2.error({ code: "stopped_listener_unavailable" }, "Stopped master requires local offline recovery");
   }
-  let stopping = false;
-  const stop = () => {
-    if (stopping)
-      return;
-    stopping = true;
-    Promise.resolve(listener?.stop()).finally(() => {
-      clearInterval(keeper);
-      process.exit(0);
-    });
-  };
-  process.once("SIGTERM", stop);
-  process.once("SIGINT", stop);
 }
 var init_stopped_process = __esm(() => {
   init_management_listener();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jeffusion/bungee-core",
-  "version": "6.0.1",
+  "version": "6.0.3",
   "description": "Bungee reverse proxy core engine",
   "main": "./dist/main.js",
   "types": "./dist/main.d.ts",
@@ -16,7 +16,7 @@
     "@iconify-json/lucide": "^1.2.145",
     "@iconify-json/tabler": "^1.2.42",
     "@iconify/utils": "^3.1.7",
-    "@jeffusion/bungee-types": "^6.0.1",
+    "@jeffusion/bungee-types": "^6.0.3",
     "@types/lodash-es": "^4.17.12",
     "@types/ws": "^8.18.1",
     "acorn": "^8.15.0",