@knolo/cli 5.2.1 → 5.2.3

package/bin/registry/http.mjs

@@ -1,15 +1,31 @@
-import { RegistryError, RegistryNetworkError, registryErrorMessage } from './errors.mjs';
+import {
+  RegistryError,
+  RegistryNetworkError,
+  registryErrorMessage,
+} from './errors.mjs';
 
-export async function getJson(url, { fetchImpl = globalThis.fetch, headers = {} } = {}) {
+export async function getJson(
+  url,
+  { fetchImpl = globalThis.fetch, headers = {} } = {}
+) {
   return requestJson(url, { fetchImpl, headers, method: 'GET' });
 }
 
-export async function postJson(url, body, { fetchImpl = globalThis.fetch, headers = {} } = {}) {
+export async function postJson(
+  url,
+  body,
+  { fetchImpl = globalThis.fetch, headers = {} } = {}
+) {
   return requestJson(url, { fetchImpl, headers, method: 'POST', body });
 }
 
-export async function putBytes(url, bytes, { fetchImpl = globalThis.fetch, headers = {} } = {}) {
-  if (typeof fetchImpl !== 'function') throw new Error('This Node runtime does not provide fetch.');
+export async function putBytes(
+  url,
+  bytes,
+  { fetchImpl = globalThis.fetch, headers = {} } = {}
+) {
+  if (typeof fetchImpl !== 'function')
+    throw new Error('This Node runtime does not provide fetch.');
 
   let response;
   try {
@@ -20,34 +36,83 @@ export async function putBytes(url, bytes, { fetchImpl = globalThis.fetch, heade
       body: bytes,
     });
   } catch (error) {
-    throw new RegistryNetworkError(`Could not upload artifact to ${new URL(url).origin}.`, { url: String(url), cause: error });
+    throw new RegistryNetworkError(
+      `Could not upload artifact to ${new URL(url).origin}.`,
+      { url: String(url), cause: error }
+    );
+  }
+
+  const text = await readResponseText(response, url);
+  let parsed;
+  if (text) {
+    try {
+      parsed = JSON.parse(text);
+    } catch {
+      parsed = undefined;
+    }
   }
 
   if (!response.ok) {
-    const detail = await readResponseText(response, url);
-    throw new RegistryError(`Blob upload failed with HTTP ${response.status}${detail ? `: ${detail}` : '.'}`, {
-      status: response.status,
-      url: String(url),
-      body: detail,
-    });
+    const detail =
+      (parsed && typeof parsed.error === 'object' && parsed.error?.message) ||
+      (typeof parsed?.error === 'string' && parsed.error) ||
+      (typeof parsed?.message === 'string' && parsed.message) ||
+      (text ? text.slice(0, 240) : '');
+    throw new RegistryError(
+      `Blob upload failed with HTTP ${response.status}${detail ? `: ${detail}` : '.'}`,
+      {
+        status: response.status,
+        url: String(url),
+        body: parsed ?? text,
+      }
+    );
   }
 
-  return { status: response.status, url: response.url || String(url) };
+  const publicUrl =
+    (parsed && typeof parsed.url === 'string' && parsed.url) ||
+    response.url ||
+    String(url);
+  return {
+    status: response.status,
+    url: publicUrl,
+    pathname: parsed && typeof parsed.pathname === 'string' ? parsed.pathname : undefined,
+    body: parsed,
+  };
 }
 
-async function requestJson(url, { fetchImpl = globalThis.fetch, headers = {}, method = 'GET', body: requestBody } = {}) {
-  if (typeof fetchImpl !== 'function') throw new Error('This Node runtime does not provide fetch.');
+async function requestJson(
+  url,
+  {
+    fetchImpl = globalThis.fetch,
+    headers = {},
+    method = 'GET',
+    body: requestBody,
+  } = {}
+) {
+  if (typeof fetchImpl !== 'function')
+    throw new Error('This Node runtime does not provide fetch.');
 
   let response;
   try {
     response = await fetchImpl(url, {
       method,
       redirect: 'follow',
-      headers: { accept: 'application/json', ...(requestBody !== undefined ? { 'content-type': 'application/json' } : {}), ...headers },
-      ...(requestBody !== undefined ? { body: JSON.stringify(requestBody) } : {}),
+      headers: {
+        accept: 'application/json',
+        ...(requestBody !== undefined
+          ? { 'content-type': 'application/json' }
+          : {}),
+        ...headers,
+      },
+      ...(requestBody !== undefined
+        ? { body: JSON.stringify(requestBody) }
+        : {}),
     });
   } catch (error) {
-    throw new RegistryNetworkError(`Could not reach registry at ${new URL(url).origin}.`, { url: String(url), cause: error });
+    throw new RegistryNetworkError(
+      `Could not reach registry at ${new URL(url).origin}.`,
+      { url: String(url), cause: error }
+    );
   }
 
   const text = await readResponseText(response, url);
@@ -57,11 +122,14 @@ async function requestJson(url, { fetchImpl = globalThis.fetch, headers = {}, me
       body = JSON.parse(text);
     } catch {
       if (!response.ok) {
-        throw new RegistryError(`Registry returned HTTP ${response.status} with a non-JSON response.`, {
-          status: response.status,
-          url: String(url),
-          body: text.slice(0, 240),
-        });
+        throw new RegistryError(
+          `Registry returned HTTP ${response.status} with a non-JSON response.`,
+          {
+            status: response.status,
+            url: String(url),
+            body: text.slice(0, 240),
+          }
+        );
       }
       throw new RegistryError('Registry returned invalid JSON.', {
         status: response.status,
@@ -74,12 +142,20 @@ async function requestJson(url, { fetchImpl = globalThis.fetch, headers = {}, me
 
   if (!response.ok) {
     const code = typeof body?.code === 'string' ? body.code : undefined;
-    throw new RegistryError(registryErrorMessage({ status: response.status, code, body, url: String(url) }), {
-      status: response.status,
-      code,
-      url: String(url),
-      body,
-    });
+    throw new RegistryError(
+      registryErrorMessage({
+        status: response.status,
+        code,
+        body,
+        url: String(url),
+      }),
+      {
+        status: response.status,
+        code,
+        url: String(url),
+        body,
+      }
+    );
   }
 
   return body;
@@ -89,6 +165,9 @@ async function readResponseText(response, url) {
   try {
     return await response.text();
   } catch (error) {
-    throw new RegistryNetworkError(`Could not read registry response from ${new URL(url).origin}.`, { url: String(url), cause: error });
+    throw new RegistryNetworkError(
+      `Could not read registry response from ${new URL(url).origin}.`,
+      { url: String(url), cause: error }
+    );
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@knolo/cli",
-  "version": "5.2.1",
+  "version": "5.2.3",
   "type": "module",
   "bin": {
     "knolo": "bin/knolo.mjs"