@supacloud/admin 0.17.0 → 0.18.0

package/dist/index.js

@@ -26123,6 +26123,14 @@ function validatedPostTimeout(options) {
   }
   return timeoutMs;
 }
+function validatedResponseTimeout(timeoutMs) {
+  if (timeoutMs === undefined)
+    return;
+  if (!Number.isSafeInteger(timeoutMs) || timeoutMs <= 0 || timeoutMs > MAX_POST_TIMEOUT_MS) {
+    throw new RangeError(`HTTP response timeout must be between 1 and ${MAX_POST_TIMEOUT_MS} ms`);
+  }
+  return timeoutMs;
+}
 function validatedGetResponseLimit(options) {
   const maxBytes = options.maxResponseBytes;
   if (maxBytes === undefined)
@@ -26154,16 +26162,12 @@ function joinedResponseBytes(chunks, totalBytes) {
   }
   return responseBytes;
 }
-async function boundedResponseBytes(response, maxBytes) {
-  if (responseExceedsDeclaredLimit(response, maxBytes)) {
-    response.body?.cancel().catch(() => {
-      return;
-    });
-    return null;
-  }
-  if (!response.body)
-    return new Uint8Array;
-  const reader = response.body.getReader();
+function cancelResponseReader(reader) {
+  reader.cancel().catch(() => {
+    return;
+  });
+}
+async function responseBytesFromReader(reader, maxBytes) {
   const chunks = [];
   let totalBytes = 0;
   while (true) {
@@ -26172,14 +26176,41 @@ async function boundedResponseBytes(response, maxBytes) {
       return joinedResponseBytes(chunks, totalBytes);
     totalBytes += value.byteLength;
     if (totalBytes > maxBytes) {
-      reader.cancel().catch(() => {
-        return;
-      });
+      cancelResponseReader(reader);
       return null;
     }
     chunks.push(value);
   }
 }
+async function responseBytesBeforeDeadline(reader, maxBytes, responseTimeoutMs) {
+  let deadlineTimer;
+  const deadline = new Promise((resolve2) => {
+    deadlineTimer = setTimeout(() => {
+      cancelResponseReader(reader);
+      resolve2(null);
+    }, responseTimeoutMs);
+  });
+  try {
+    return await Promise.race([responseBytesFromReader(reader, maxBytes), deadline]);
+  } catch {
+    cancelResponseReader(reader);
+    return null;
+  } finally {
+    clearTimeout(deadlineTimer);
+  }
+}
+async function boundedResponseBytes(response, maxBytes, responseTimeoutMs) {
+  if (responseExceedsDeclaredLimit(response, maxBytes)) {
+    response.body?.cancel().catch(() => {
+      return;
+    });
+    return null;
+  }
+  if (!response.body)
+    return new Uint8Array;
+  const reader = response.body.getReader();
+  return responseTimeoutMs === undefined ? responseBytesFromReader(reader, maxBytes) : responseBytesBeforeDeadline(reader, maxBytes, responseTimeoutMs);
+}
 async function boundedResponseJson(response, maxBytes) {
   const responseBytes = await boundedResponseBytes(response, maxBytes);
   if (responseBytes === null)
@@ -26193,8 +26224,8 @@ async function boundedResponseJson(response, maxBytes) {
     throw error;
   }
 }
-async function strictBoundedResponseJson(response, maxBytes) {
-  const responseBytes = await boundedResponseBytes(response, maxBytes);
+async function strictBoundedResponseJson(response, maxBytes, responseTimeoutMs) {
+  const responseBytes = await boundedResponseBytes(response, maxBytes, responseTimeoutMs);
   if (responseBytes === null)
     throw new Error("HTTP JSON response exceeded its byte limit");
   const responseText = new TextDecoder("utf-8", { fatal: true }).decode(responseBytes);
@@ -26282,6 +26313,7 @@ class HttpTransport {
   async post(path, body, options) {
     const timeoutMs = validatedPostTimeout(options);
     const maxJsonBytes = validatedStrictJsonLimit({ maxJsonBytes: options?.maxJsonBytes });
+    const responseTimeoutMs = validatedResponseTimeout(options?.responseTimeoutMs);
     let response;
     try {
       response = await fetchWithRetry(`${this.baseUrl}${path}`, {
@@ -26294,7 +26326,7 @@ class HttpTransport {
     }
     if (maxJsonBytes !== undefined) {
       try {
-        const data2 = await strictBoundedResponseJson(response, maxJsonBytes);
+        const data2 = await strictBoundedResponseJson(response, maxJsonBytes, responseTimeoutMs);
         return { ok: response.ok, status: response.status, data: data2 };
       } catch {
         return responseBodyFailure(response.status);
@@ -26315,6 +26347,7 @@ class HttpTransport {
     }
     const maxJsonBytes = validatedStrictJsonLimit({ maxJsonBytes: options.maxJsonBytes });
     const timeoutMs = validatedPostTimeout(options.timeoutMs === undefined ? undefined : { timeoutMs: options.timeoutMs });
+    const responseTimeoutMs = validatedResponseTimeout(options.responseTimeoutMs);
     try {
       const request = {
         method: "POST",
@@ -26329,7 +26362,7 @@ class HttpTransport {
       };
       const response = await fetchWithRetry(`${this.baseUrl}${path}`, request, timeoutMs);
       try {
-        const data = await strictBoundedResponseJson(response, maxJsonBytes);
+        const data = await strictBoundedResponseJson(response, maxJsonBytes, responseTimeoutMs);
         return { ok: response.ok, status: response.status, data };
       } catch {
         return responseBodyFailure(response.status);
@@ -32072,7 +32105,7 @@ Actions: routes, upsert_route, update_route, delete_route, config, get_certifica
   });
 }
 
-// src/shared/tools/frontend-release-control.ts
+// ../cli/src/shared/tools/frontend-release-control.ts
 import { createHash as createHash3 } from "node:crypto";
 import { constants as fsConstants2 } from "node:fs";
 import { open as open2 } from "node:fs/promises";
@@ -32086,6 +32119,7 @@ var ARCHIVE_MAX_BYTES = 100 * 1024 * 1024;
 var ARCHIVE_CHUNK_BYTES = 64 * 1024;
 var RESPONSE_MAX_BYTES = 1024 * 1024;
 var UPLOAD_REQUEST_TIMEOUT_MS = 10 * 60000;
+var MUTATION_RESPONSE_TIMEOUT_MS = 5000;
 var RELEASE_LIST_LIMIT_MAX = 100;
 function toolResponse(payload) {
   return { content: [{ type: "text", text: JSON.stringify(payload, null, 2) }] };
@@ -32296,7 +32330,8 @@ async function uploadFrontendRelease(http, projectRef, deploymentId, archivePath
       contentLength: archive.sizeBytes,
       contentSha256: archive.sha256,
       maxJsonBytes: RESPONSE_MAX_BYTES,
-      timeoutMs: UPLOAD_REQUEST_TIMEOUT_MS
+      timeoutMs: UPLOAD_REQUEST_TIMEOUT_MS,
+      responseTimeoutMs: MUTATION_RESPONSE_TIMEOUT_MS
     });
   } finally {
     await archive.handle.close();
@@ -32429,7 +32464,10 @@ async function activateFrontendRelease(http, input) {
     expected_active_release_id: input.expectedActiveReleaseId,
     expected_activation_id: input.expectedActivationId,
     mutation_id: mutationId
-  }, { maxJsonBytes: RESPONSE_MAX_BYTES });
+  }, {
+    maxJsonBytes: RESPONSE_MAX_BYTES,
+    responseTimeoutMs: MUTATION_RESPONSE_TIMEOUT_MS
+  });
   const release = activationReceipt(response.data, { ...input, mutationId });
   if (!response.ok || !release) {
     if (response.status >= 400 && response.status < 500 && response.status !== 408 && !response.transportError) {
@@ -32473,7 +32511,6 @@ async function activationReadback(http, input, mutationId, activationStatus) {
     release: readback.release
   });
 }
-
 // src/shared/tools/frontend-tools.ts
 function registerFrontendTools(server, http) {
   server.tool("frontend", `Immutable prebuilt frontend release control.
@@ -32548,7 +32585,7 @@ Actions: list_releases, get_release, upload_release, activate_release`, {
 // package.json
 var package_default = {
   name: "@supacloud/admin",
-  version: "0.17.0",
+  version: "0.18.0",
   description: "Platform administration CLI for SupaCloud operators",
   type: "module",
   main: "./dist/index.js",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@supacloud/admin",
-  "version": "0.17.0",
+  "version": "0.18.0",
   "description": "Platform administration CLI for SupaCloud operators",
   "type": "module",
   "main": "./dist/index.js",