@braid-cloud/cli 0.1.19 → 0.1.20

package/dist/index.js

@@ -860,7 +860,7 @@ var init_device_auth = __esm({
 
 // src/lib/api.ts
 import { Data as Data3, Effect as Effect4, pipe as pipe4 } from "effect";
-var TRAILING_SLASH_REGEX, ALLOW_UNTRUSTED_SERVER_ENV, SESSION_TOKEN_PREFIX, isTruthy, isLocalHost, isConvexSiteHost, isTrustedApiServerUrl, isSessionApiServerUrl, REAUTH_REQUIRED_MESSAGE, RAW_AUTH_ERROR_PATTERN, normalizeAuthenticationErrorMessage, ApiError, AuthenticationError, NetworkError, resolveApiKey, resolveServerUrl, resolveApiRequestServerUrl, normalizeApiServerBaseUrl, readJsonResponseAsync, readJsonResponse, getApiErrorResponse, isAuthenticationErrorResponse, parseResponse, buildApiUrl, buildExportUrl, executeApiRequest, parseScopeOptionsResponse, fetchScopeOptions, buildLibraryOptionsUrl, fetchLibraryOptions, fetchSkills, runLifecycleCommand, DEFAULT_PUBLIC_SERVER_URL, NotFoundError, RateLimitedError, handlePublicApiResponse, fetchPublicMetadata, fetchPublicExport, fetchPublicMetadataAsync, fetchPublicExportAsync, validateApiKey, fetchSkillsAsync, validateApiKeyAsync, fetchScopeOptionsAsync, fetchLibraryOptionsAsync, runLifecycleCommandAsync;
+var TRAILING_SLASH_REGEX, ALLOW_UNTRUSTED_SERVER_ENV, SESSION_TOKEN_PREFIX, isTruthy, isLocalHost, isConvexSiteHost, isTrustedApiServerUrl, isSessionApiServerUrl, REAUTH_REQUIRED_MESSAGE, RAW_AUTH_ERROR_PATTERN, normalizeAuthenticationErrorMessage, ApiError, AuthenticationError, NetworkError, resolveApiKey, resolveServerUrl, resolveApiRequestServerUrl, resolvePublicRequestServerUrl, normalizeApiServerBaseUrl, readJsonResponseAsync, readJsonResponse, getApiErrorResponse, isAuthenticationErrorResponse, parseResponse, buildApiUrl, buildExportUrl, executeApiRequest, parseScopeOptionsResponse, fetchScopeOptions, buildLibraryOptionsUrl, fetchLibraryOptions, fetchSkills, runLifecycleCommand, DEFAULT_PUBLIC_SERVER_URL, NotFoundError, RateLimitedError, handlePublicApiResponse, fetchPublicMetadata, fetchPublicExport, fetchPublicMetadataAsync, fetchPublicExportAsync, validateApiKey, fetchSkillsAsync, validateApiKeyAsync, fetchScopeOptionsAsync, fetchLibraryOptionsAsync, runLifecycleCommandAsync;
 var init_api = __esm({
   "src/lib/api.ts"() {
     "use strict";
@@ -989,6 +989,7 @@ var init_api = __esm({
         })
       );
     };
+    resolvePublicRequestServerUrl = (serverUrl, apiKey) => resolveApiRequestServerUrl(serverUrl, apiKey);
     normalizeApiServerBaseUrl = (serverUrl) => {
       const trimmed = serverUrl.replace(TRAILING_SLASH_REGEX, "");
       try {
@@ -1368,72 +1369,84 @@ var init_api = __esm({
         })
       );
     };
-    fetchPublicMetadata = (handle, slug, serverUrl, version) => {
-      const baseUrl = (serverUrl ?? DEFAULT_PUBLIC_SERVER_URL).replace(
+    fetchPublicMetadata = (handle, slug, serverUrl, version, apiKey) => {
+      const requestedBaseUrl = (serverUrl ?? DEFAULT_PUBLIC_SERVER_URL).replace(
         TRAILING_SLASH_REGEX,
         ""
       );
-      const url = new URL(`${baseUrl}/api/public/@${handle}/${slug}`);
-      if (version !== void 0) {
-        url.searchParams.set("version", String(version));
-      }
       return pipe4(
-        Effect4.tryPromise({
-          try: () => fetch(url.toString(), {
-            method: "GET",
-            headers: mergeAutomationHeaders()
-          }),
-          catch: (e) => new NetworkError({
-            message: `Failed to connect to ${baseUrl}`,
-            cause: e
-          })
-        }),
-        Effect4.flatMap(
-          (response) => pipe4(
-            readJsonResponse(response),
+        resolvePublicRequestServerUrl(requestedBaseUrl, apiKey),
+        Effect4.flatMap((baseUrl) => {
+          const url = new URL(`${baseUrl}/api/public/@${handle}/${slug}`);
+          if (version !== void 0) {
+            url.searchParams.set("version", String(version));
+          }
+          return pipe4(
+            Effect4.tryPromise({
+              try: () => fetch(url.toString(), {
+                method: "GET",
+                headers: mergeAutomationHeaders()
+              }),
+              catch: (e) => new NetworkError({
+                message: `Failed to connect to ${baseUrl}`,
+                cause: e
+              })
+            }),
             Effect4.flatMap(
-              (json) => handlePublicApiResponse(response, json)
+              (response) => pipe4(
+                readJsonResponse(response),
+                Effect4.flatMap(
+                  (json) => handlePublicApiResponse(response, json)
+                )
+              )
             )
-          )
-        )
+          );
+        })
       );
     };
-    fetchPublicExport = (handle, slug, ruleIds, serverUrl, version) => {
-      const baseUrl = (serverUrl ?? DEFAULT_PUBLIC_SERVER_URL).replace(
+    fetchPublicExport = (handle, slug, ruleIds, serverUrl, version, apiKey) => {
+      const requestedBaseUrl = (serverUrl ?? DEFAULT_PUBLIC_SERVER_URL).replace(
         TRAILING_SLASH_REGEX,
         ""
       );
-      const url = new URL(`${baseUrl}/api/public/@${handle}/${slug}/export`);
-      if (ruleIds && ruleIds.length > 0) {
-        url.searchParams.set("ruleIds", ruleIds.join(","));
-      }
-      if (version !== void 0) {
-        url.searchParams.set("version", String(version));
-      }
       return pipe4(
-        Effect4.tryPromise({
-          try: () => fetch(url.toString(), {
-            method: "GET",
-            headers: mergeAutomationHeaders()
-          }),
-          catch: (e) => new NetworkError({
-            message: `Failed to connect to ${baseUrl}`,
-            cause: e
-          })
-        }),
-        Effect4.flatMap(
-          (response) => pipe4(
-            readJsonResponse(response),
+        resolvePublicRequestServerUrl(requestedBaseUrl, apiKey),
+        Effect4.flatMap((baseUrl) => {
+          const url = new URL(`${baseUrl}/api/public/@${handle}/${slug}/export`);
+          if (ruleIds && ruleIds.length > 0) {
+            url.searchParams.set("ruleIds", ruleIds.join(","));
+          }
+          if (version !== void 0) {
+            url.searchParams.set("version", String(version));
+          }
+          return pipe4(
+            Effect4.tryPromise({
+              try: () => fetch(url.toString(), {
+                method: "GET",
+                headers: mergeAutomationHeaders()
+              }),
+              catch: (e) => new NetworkError({
+                message: `Failed to connect to ${baseUrl}`,
+                cause: e
+              })
+            }),
             Effect4.flatMap(
-              (json) => handlePublicApiResponse(response, json)
+              (response) => pipe4(
+                readJsonResponse(response),
+                Effect4.flatMap(
+                  (json) => handlePublicApiResponse(response, json)
+                )
+              )
             )
-          )
-        )
+          );
+        })
       );
     };
-    fetchPublicMetadataAsync = (handle, slug, serverUrl, version) => Effect4.runPromise(fetchPublicMetadata(handle, slug, serverUrl, version));
-    fetchPublicExportAsync = (handle, slug, ruleIds, serverUrl, version) => Effect4.runPromise(
-      fetchPublicExport(handle, slug, ruleIds, serverUrl, version)
+    fetchPublicMetadataAsync = (handle, slug, serverUrl, version, apiKey) => Effect4.runPromise(
+      fetchPublicMetadata(handle, slug, serverUrl, version, apiKey)
+    );
+    fetchPublicExportAsync = (handle, slug, ruleIds, serverUrl, version, apiKey) => Effect4.runPromise(
+      fetchPublicExport(handle, slug, ruleIds, serverUrl, version, apiKey)
     );
     validateApiKey = (apiKey, serverUrl) => pipe4(
       Effect4.try({
@@ -4620,7 +4633,7 @@ function showInstallOutro(totalWritten, totalErrors, suffix) {
     outro(`Successfully installed ${totalWritten} items${suffix}.`);
   }
 }
-async function fetchPublicContent(handle, slug, version, lockedRuleIds, options, installSpinner) {
+async function fetchPublicContent(handle, slug, version, lockedRuleIds, apiKey, options, installSpinner) {
   if (version !== void 0 && lockedRuleIds) {
     installSpinner.stop(`Installing pinned version v${version}`);
     installSpinner.start("Downloading content...");
@@ -4630,7 +4643,8 @@ async function fetchPublicContent(handle, slug, version, lockedRuleIds, options,
         slug,
         lockedRuleIds,
         options.server,
-        version
+        version,
+        apiKey
       ),
       ruleIds: lockedRuleIds
     };
@@ -4639,7 +4653,8 @@ async function fetchPublicContent(handle, slug, version, lockedRuleIds, options,
     handle,
     slug,
     options.server,
-    version
+    version,
+    apiKey
   );
   installSpinner.stop("Found public content");
   displayPublicMetadata(metadata);
@@ -4651,7 +4666,8 @@ async function fetchPublicContent(handle, slug, version, lockedRuleIds, options,
       slug,
       ruleIds,
       options.server,
-      version
+      version,
+      apiKey
     ),
     ruleIds
   };
@@ -4734,6 +4750,7 @@ async function publicInstallCommand(source, options) {
       slug,
       version,
       lockedRuleIds,
+      config.token,
       {
         ...options,
         server: serverUrl
@@ -7519,7 +7536,8 @@ async function findPreviousActiveVersion(args) {
         args.slug,
         args.ruleIds,
         args.server,
-        v
+        v,
+        args.apiKey
       );
       return { version: v, response };
     } catch (error) {
@@ -7599,7 +7617,8 @@ async function rollbackCommand(source, options) {
       slug: publicSource.slug,
       currentVersion: parsed.version,
       ruleIds: currentValue.ruleIds,
-      server: serverUrl
+      server: serverUrl,
+      apiKey: config.token
     });
     if (!result) {
       rollbackSpinner.stop("No active version found");