@sandblocks/cli 0.6.3 → 0.6.5

package/dist/cli.js

@@ -13387,7 +13387,7 @@ async function deployUnlocked(args, dependencies) {
     await deployDevelopmentUnlocked(context, loaded, preview);
     return;
   }
-  const deploymentTarget = await resolveDeploymentTarget(context, process.env.SANDBLOCKS_SANDBOX_TARGET_HOST ?? preview.targetHost);
+  const deploymentTarget = await resolveDeploymentTarget(context, serviceMemoryReservation(preview.services), process.env.SANDBLOCKS_SANDBOX_TARGET_HOST ?? preview.targetHost);
   const targetHost = deploymentTarget.targetHost;
   context.state.deploymentHostId = deploymentTarget.hostId;
   context.state.deploymentWorkerId = deploymentTarget.workerId;
@@ -13428,6 +13428,7 @@ async function deployUnlocked(args, dependencies) {
           apiUrl: context.apiUrl,
           apiKey: context.apiKey,
           idempotencyKey: `preview:${deploymentId}:build-import`,
+          memoryReservationBytes: 2 * 1024 * 1024 * 1024,
           source: dependencies.source,
           ..."image" in loaded.manifest.workspace && loaded.manifest.workspace.image ? { workspaceImage: loaded.manifest.workspace.image } : {}
         });
@@ -14003,15 +14004,22 @@ async function resolveDevelopmentTarget(context, fallback) {
     targetHost
   };
 }
-async function resolveDeploymentTarget(context, fallback) {
+async function resolveDeploymentTarget(context, memoryReservationBytes, fallback) {
   const project = encodeURIComponent(context.state.projectId);
-  const workerBody = await request(context.apiUrl, context.apiKey, `/v1/projects/${project}/workers`);
-  const workers = Array.isArray(workerBody.workers) ? workerBody.workers : [];
   const requestedPool = process.env.SANDBLOCKS_DEPLOYMENT_WORKER_POOL?.trim() || process.env.SANDBLOCKS_RUNTIME_WORKER_POOL?.trim();
-  const eligible = workers.filter((worker2) => worker2?.status === "online" && Array.isArray(worker2.roles) && worker2.roles.includes("runtime"));
-  const worker = eligible.find((candidate) => typeof fallback === "string" && candidate?.configuration?.targetAddress === fallback.trim()) ?? eligible.find((candidate) => requestedPool && candidate.pool === requestedPool) ?? eligible[0];
-  if (!worker?.id)
-    throw new Error("no online deployment worker is available");
+  const [workerBody, placementBody] = await Promise.all([
+    request(context.apiUrl, context.apiKey, `/v1/projects/${project}/workers`),
+    request(context.apiUrl, context.apiKey, `/v1/projects/${project}/placement/explain?kind=workspace.service.deploy&role=runtime&memoryReservationBytes=${memoryReservationBytes}${requestedPool ? `&pool=${encodeURIComponent(requestedPool)}` : ""}`)
+  ]);
+  const workers = Array.isArray(workerBody.workers) ? workerBody.workers : [];
+  const candidates = Array.isArray(placementBody?.explanation?.candidates) ? placementBody.explanation.candidates : [];
+  const eligibleWorkerIds = new Set(candidates.filter((candidate) => candidate?.eligible === true).map((candidate) => candidate.workerId));
+  const eligible = workers.filter((worker2) => worker2?.status === "online" && Array.isArray(worker2.roles) && worker2.roles.includes("runtime") && eligibleWorkerIds.has(worker2.id));
+  const worker = eligible.find((candidate) => typeof fallback === "string" && candidate?.configuration?.targetAddress === fallback.trim()) ?? eligible[0];
+  if (!worker?.id) {
+    const reasons = candidates.filter((candidate) => candidate?.workerId).map((candidate) => `${candidate.workerName ?? candidate.workerId}: ${(candidate.reasons ?? []).join(", ")}`).join("; ");
+    throw new Error(`no eligible deployment worker is available${reasons ? ` (${reasons})` : ""}`);
+  }
   let configuredTarget = worker?.configuration?.targetAddress;
   if (!configuredTarget && worker.hostId) {
     const legacyHosts = await request(context.apiUrl, context.apiKey, `/v1/projects/${project}/hosts`);
@@ -14141,6 +14149,7 @@ async function importSource(input) {
       "x-sandblocks-workspace-id": input.workspaceId,
       ...input.sandboxId ? { "x-sandblocks-sandbox-id": input.sandboxId } : {},
       "x-sandblocks-worker-pool": input.pool,
+      ...input.memoryReservationBytes ? { "x-sandblocks-memory-reservation-bytes": String(input.memoryReservationBytes) } : {},
       ...input.workspaceImage ? { "x-sandblocks-workspace-image": input.workspaceImage } : {},
       "idempotency-key": input.idempotencyKey
     },
@@ -16649,4 +16658,4 @@ export {
   parse2 as parse
 };
 
-//# debugId=1BF5DC414419B92F64756E2164756E21
+//# debugId=818C8E6D2946F5CD64756E2164756E21