freestyle-sandboxes 0.1.33 → 0.1.35

package/cli.mjs

@@ -499,6 +499,31 @@ function getDefaultTeamId() {
   return stored?.defaultTeamId;
 }
 
+function normalizeCliProxyError(errorText) {
+  try {
+    const parsed = JSON.parse(errorText);
+    if (typeof parsed.code === "string" && typeof parsed.message === "string") {
+      return {
+        body: JSON.stringify(parsed),
+        contentType: "application/json"
+      };
+    }
+    const message = [parsed.error, parsed.message, parsed.reason].find(
+      (value) => typeof value === "string" && value.length > 0
+    );
+    if (message) {
+      return {
+        body: message,
+        contentType: "text/plain; charset=utf-8"
+      };
+    }
+  } catch {
+  }
+  return {
+    body: errorText || "Request failed",
+    contentType: "text/plain; charset=utf-8"
+  };
+}
 function createProxyFetch(accessToken, teamId) {
   const dashboardApiUrl = process.env.FREESTYLE_DASHBOARD_URL || "https://dash.freestyle.sh";
   return async (url, init) => {
@@ -522,9 +547,13 @@ function createProxyFetch(accessToken, teamId) {
     });
     if (!proxyResponse.ok) {
       const errorText = await proxyResponse.text();
-      return new Response(errorText, {
+      const normalizedError = normalizeCliProxyError(errorText);
+      return new Response(normalizedError.body, {
         status: proxyResponse.status,
-        statusText: proxyResponse.statusText
+        statusText: proxyResponse.statusText,
+        headers: {
+          "Content-Type": normalizedError.contentType
+        }
       });
     }
     const data = await proxyResponse.json();
@@ -1911,6 +1940,25 @@ const logoutCommand = {
   }
 };
 
+const whoamiCommand = {
+  command: "whoami",
+  describe: "Display information about the currently authenticated user",
+  builder: (yargs) => yargs,
+  handler: async (_argv) => {
+    loadEnv();
+    try {
+      const client = await getFreestyleClient();
+      const info = await client.whoami();
+      console.log(`Account ID: ${info.accountId}`);
+      if (info.identityId) {
+        console.log(`Identity ID: ${info.identityId}`);
+      }
+    } catch (e) {
+      handleError(e);
+    }
+  }
+};
+
 dotenv.config({ quiet: true });
 yargs(hideBin(process.argv)).scriptName("freestyle").usage("$0 <command> [options]").option("team", {
   type: "string",
@@ -1920,4 +1968,4 @@ yargs(hideBin(process.argv)).scriptName("freestyle").usage("$0 <command> [option
   if (argv.team && typeof argv.team === "string") {
     process.env.FREESTYLE_TEAM_ID = argv.team;
   }
-}).command(vmCommand).command(gitCommand).command(domainsCommand).command(cronCommand).command(loginCommand).command(logoutCommand).command(deployCommand).command(runCommand).demandCommand(1, "You need to specify a command").help().alias("help", "h").version().alias("version", "v").strict().parse();
+}).command(vmCommand).command(gitCommand).command(domainsCommand).command(cronCommand).command(loginCommand).command(logoutCommand).command(whoamiCommand).command(deployCommand).command(runCommand).demandCommand(1, "You need to specify a command").help().alias("help", "h").version().alias("version", "v").strict().parse();