@camstack/agent 1.0.8 → 1.1.0

package/dist/cli.js

@@ -369,6 +369,29 @@ async function applyDeployedBundle(input) {
   return { addonDir: liveDir };
 }
 
+// src/fetch-bundle-from-hub.ts
+var import_node_crypto2 = require("crypto");
+var import_undici = require("undici");
+async function fetchBundleFromHub(opts) {
+  const authHeader = { Authorization: `Bearer ${opts.token}` };
+  const res = opts.fetchImpl ? await opts.fetchImpl(opts.url, { headers: authHeader }) : await (0, import_undici.fetch)(opts.url, {
+    headers: authHeader,
+    dispatcher: new import_undici.Agent({ connect: { rejectUnauthorized: false } })
+  });
+  if (!res.ok) {
+    throw new Error(`bundle fetch failed: HTTP ${res.status}`);
+  }
+  const buffer = Buffer.from(await res.arrayBuffer());
+  if (buffer.length !== opts.bytes) {
+    throw new Error(`bundle bytes mismatch: expected ${opts.bytes}, got ${buffer.length}`);
+  }
+  const sha = (0, import_node_crypto2.createHash)("sha256").update(buffer).digest("hex");
+  if (sha !== opts.sha256) {
+    throw new Error(`bundle sha256 mismatch: expected ${opts.sha256}, got ${sha}`);
+  }
+  return buffer;
+}
+
 // src/agent-service.ts
 var deploySwapLogger = {
   info: (msg) => console.log(`[Agent] ${msg}`),
@@ -402,6 +425,28 @@ async function withTimeout(p, ms, fallback) {
   }
 }
 var METRICS_SNAPSHOT_TIMEOUT_MS = 2e3;
+function resolveDeployAction(seam) {
+  return async (params) => {
+    const { addonId, source, bundle } = params;
+    if (source && (0, import_system.isAddonDeploySource)(source)) {
+      if (source.kind === "npm") {
+        await seam.installFromNpm(addonId, source.version);
+        return { success: true, addonId };
+      }
+      const buf2 = await seam.fetchBundle(source);
+      const { addonDir: addonDir2 } = await seam.applyBundle(buf2);
+      seam.onApplied(addonDir2);
+      return { success: true, addonId, path: addonDir2 };
+    }
+    if (bundle === void 0) {
+      throw new Error("$agent.deploy: no source descriptor and no legacy bundle provided");
+    }
+    const buf = typeof bundle === "string" ? Buffer.from(bundle, "base64") : bundle;
+    const { addonDir } = await seam.applyBundle(buf);
+    seam.onApplied(addonDir);
+    return { success: true, addonId, path: addonDir };
+  };
+}
 function readHubAddressFromConfig(configPath) {
   if (!configPath) return null;
   try {
@@ -574,8 +619,7 @@ function createAgentService(deps) {
       deploy: {
         handler: async (ctx) => {
           const { params } = ctx;
-          const { addonId, bundle } = params;
-          const bufferData = typeof bundle === "string" ? Buffer.from(bundle, "base64") : bundle;
+          const { addonId, source, bundle } = params;
           const { execFile } = await import("child_process");
           const { promisify } = await import("util");
           const execFileAsync = promisify(execFile);
@@ -593,17 +637,37 @@ function createAgentService(deps) {
               }
             }
           };
-          const { addonDir } = await applyDeployedBundle({
-            addonsDir: deps.addonsDir,
-            addonId,
-            bundle: bufferData,
-            extract,
-            logger: deploySwapLogger
-          });
-          for (const declId of readDeployedAddonIds(addonDir)) {
-            deps.loadedAddons.delete(declId);
-          }
-          return { success: true, addonId, path: addonDir };
+          const seam = {
+            installFromNpm: (pkg, v) => {
+              if (!deps.installFromNpm) {
+                throw new Error("npm deploy source unsupported on this agent");
+              }
+              return deps.installFromNpm(pkg, v);
+            },
+            applyBundle: (buf) => applyDeployedBundle({
+              addonsDir: deps.addonsDir,
+              addonId,
+              bundle: buf,
+              extract,
+              logger: deploySwapLogger
+            }),
+            fetchBundle: (s) => fetchBundleFromHub(s),
+            // Evict every addon DECLARATION id this package contributes
+            // from `loadedAddons` so the follow-up `$agent.reload` actually
+            // re-instantiates it. `loadDeployedAddons` skips any addon
+            // still present in `loadedAddons`; without this eviction a
+            // redeploy would leave the agent pinned to the pre-update
+            // version. The `deploy` param `addonId` is the PACKAGE name
+            // (used only as the on-disk dir), whereas `loadedAddons` is
+            // keyed by the addon DECLARATION id — they differ for scoped
+            // packages, so we read the extracted manifest to bridge them.
+            onApplied: (addonDir) => {
+              for (const declId of readDeployedAddonIds(addonDir)) {
+                deps.loadedAddons.delete(declId);
+              }
+            }
+          };
+          return resolveDeployAction(seam)({ addonId, source, bundle });
         }
       },
       /**
@@ -1070,7 +1134,10 @@ async function startAgent(configPath) {
       subtree.registerNode(params);
       triggerUpwardRegistration();
     },
-    expectedClusterSecretHash: config.secret ? (0, import_system3.hashClusterSecret)(config.secret) : void 0
+    expectedClusterSecretHash: config.secret ? (0, import_system3.hashClusterSecret)(config.secret) : void 0,
+    installFromNpm: async (pkg, version) => {
+      await installer.install(pkg, version);
+    }
   });
   broker.createService(agentServiceSchema);
   const agentTcpPort = (0, import_system3.deriveAgentListenPort)(broker.nodeID);