@get-dx/cli 0.3.1 → 0.3.2

package/README.md

@@ -18,6 +18,13 @@ Interactively login and install the AI agent skill:
 dx init
 ```
 
+For CI, Docker/dev containers, or other headless environments, pass the token
+through the environment instead of storing it in the OS credential store:
+
+```shell
+DX_API_TOKEN="$DX_TOKEN" dx auth status
+```
+
 Show help text:
 
 ```shell
@@ -42,8 +49,8 @@ Set the env vars once when initializing:
 # Interactive login
 DX_WEB_BASE_URL="https://mycompany.getdx.io" DX_API_BASE_URL="https://api.mycompany.getdx.io" dx init
 
-# Non-interactive login for CI or remote agents
-DX_WEB_BASE_URL="https://mycompany.getdx.io" DX_API_BASE_URL="https://api.mycompany.getdx.io" dx auth login --token $DX_TOKEN
+# Non-interactive use for CI, containers, or remote agents
+DX_WEB_BASE_URL="https://mycompany.getdx.io" DX_API_BASE_URL="https://api.mycompany.getdx.io" DX_API_TOKEN="$DX_TOKEN" dx auth status
 ```
 
 #### For managed deployments
@@ -54,8 +61,8 @@ Set the env vars once when initializing:
 # Interactive login
 DX_WEB_BASE_URL="https://dx.some-example-subdomain.example.com" DX_API_BASE_URL="https://api.dx.some-example-subdomain.example.com" dx init
 
-# Non-interactive login for CI or remote agents
-DX_WEB_BASE_URL="https://dx.some-example-subdomain.example.com" DX_API_BASE_URL="https://api.dx.some-example-subdomain.example.com" dx auth login --token $DX_TOKEN
+# Non-interactive use for CI, containers, or remote agents
+DX_WEB_BASE_URL="https://dx.some-example-subdomain.example.com" DX_API_BASE_URL="https://api.dx.some-example-subdomain.example.com" DX_API_TOKEN="$DX_TOKEN" dx auth status
 ```
 
 ## Logging

package/dist/authCodeCallbackServer.js

@@ -3,6 +3,7 @@ import { CliError } from "./errors.js";
 export class AuthCodeCallbackServer {
     server = null;
     address = null;
+    requestReceived = false;
     async start() {
         await new Promise((resolve, reject) => {
             const srv = createServer();
@@ -23,19 +24,34 @@ export class AuthCodeCallbackServer {
     }
     async listenForCode(onCodeReceipt) {
         return new Promise((resolve, reject) => {
-            if (!this.server) {
+            const srv = this.server;
+            if (!srv) {
                 reject(new Error("Unreachable: server not started"));
                 return;
             }
-            this.server.on("request", async (req, res) => {
-                this.stop();
+            srv.on("request", async (req, res) => {
+                if (this.requestReceived) {
+                    res.writeHead(409, { Connection: "close" }).end();
+                    return;
+                }
+                this.requestReceived = true;
                 const url = new URL(req.url ?? "/", this.address);
                 const code = url.searchParams.get("code");
                 const state = url.searchParams.get("state");
+                const stopServerAndResolve = (result) => {
+                    res.once("close", () => {
+                        this.stop();
+                        resolve(result);
+                    });
+                };
                 if (!code) {
                     const message = "Authentication failed: no code received";
-                    res.writeHead(500, { "Content-Type": "text/plain" }).end(message);
-                    resolve({ type: "ERROR", error: new CliError(message) });
+                    res.writeHead(500, {
+                        Connection: "close",
+                        "Content-Type": "text/plain",
+                    });
+                    stopServerAndResolve({ type: "ERROR", error: new CliError(message) });
+                    res.end(message);
                     return;
                 }
                 let result;
@@ -46,34 +62,52 @@ export class AuthCodeCallbackServer {
                     const message = err instanceof Error
                         ? err.message
                         : "Authentication failed: unknown error";
-                    res.writeHead(500, { "Content-Type": "text/plain" }).end(message);
-                    resolve({
+                    res.writeHead(500, {
+                        Connection: "close",
+                        "Content-Type": "text/plain",
+                    });
+                    stopServerAndResolve({
                         type: "ERROR",
                         error: err instanceof Error ? err : new CliError(message),
                     });
+                    res.end(message);
                     return;
                 }
                 if (result.type === "SUCCESS") {
                     if (result.redirectUri) {
-                        res.writeHead(302, { Location: result.redirectUri }).end();
+                        res.writeHead(302, {
+                            Connection: "close",
+                            Location: result.redirectUri,
+                        });
+                        stopServerAndResolve(result);
+                        res.end();
                     }
                     else {
-                        res
-                            .writeHead(200, { "Content-Type": "text/plain" })
-                            .end("Authentication successful");
+                        res.writeHead(200, {
+                            Connection: "close",
+                            "Content-Type": "text/plain",
+                        });
+                        stopServerAndResolve(result);
+                        res.end("Authentication successful");
                     }
                 }
                 else {
-                    res
-                        .writeHead(500, { "Content-Type": "text/plain" })
-                        .end(result.error.message);
+                    res.writeHead(500, {
+                        Connection: "close",
+                        "Content-Type": "text/plain",
+                    });
+                    stopServerAndResolve(result);
+                    res.end(result.error.message);
                 }
-                resolve(result);
             });
         });
     }
     stop() {
-        this.server?.close();
+        const srv = this.server;
+        if (!srv)
+            return;
+        srv.closeAllConnections();
+        srv.close();
         this.server = null;
     }
 }

package/dist/secrets.js

@@ -40,16 +40,28 @@ function macosSecretStore() {
             }
         },
         set(baseUrl, token) {
-            execaSync("security", [
-                "add-generic-password",
-                "-U",
-                "-s",
-                SERVICE,
-                "-a",
-                baseUrl,
-                "-w",
-                token,
-            ]);
+            try {
+                execaSync("security", [
+                    "add-generic-password",
+                    "-U",
+                    "-s",
+                    SERVICE,
+                    "-a",
+                    baseUrl,
+                    "-w",
+                    token,
+                ]);
+            }
+            catch (error) {
+                throw new CliError([
+                    "Unable to save the DX API token securely using macOS Keychain.",
+                    "",
+                    "Set DX_API_TOKEN in the environment, or try again from a macOS session with Keychain access.",
+                    formatErrorDetails(error),
+                ]
+                    .filter(Boolean)
+                    .join("\n"));
+            }
         },
         delete(baseUrl) {
             try {
@@ -84,10 +96,78 @@ function linuxSecretStore() {
             }
         },
         set(baseUrl, token) {
-            execaSync("secret-tool", ["store", "--label=dx-cli", "service", SERVICE, "account", baseUrl], { input: token });
+            try {
+                execaSync("secret-tool", ["store", "--label=dx-cli", "service", SERVICE, "account", baseUrl], { input: token });
+            }
+            catch (error) {
+                throw buildLinuxTokenStorageError(error);
+            }
         },
         delete(_baseUrl) {
             throw new CliError("Linux token deletion is not supported by secret-tool in this implementation");
         },
     };
 }
+function buildLinuxTokenStorageError(error) {
+    if (hasErrorCode(error, "ENOENT")) {
+        return new CliError([
+            "Unable to save the DX API token securely because `secret-tool` is not installed.",
+            "",
+            "Install `libsecret-tools`, or set DX_API_TOKEN in the environment instead of using `dx auth login` or `dx init` to store credentials.",
+        ].join("\n"));
+    }
+    if (isLinuxSecretServiceUnavailable(error)) {
+        return new CliError([
+            "Unable to save the DX API token securely because the Linux Secret Service/keyring is not available.",
+            "",
+            "This often happens in Docker or dev containers, even when `secret-tool` is installed. Set DX_API_TOKEN in the container environment instead of using `dx auth login` or `dx init` to store credentials, or run the CLI in an environment with a working Secret Service provider such as GNOME Keyring.",
+            formatErrorDetails(error),
+        ]
+            .filter(Boolean)
+            .join("\n"));
+    }
+    return new CliError([
+        "Unable to save the DX API token securely using `secret-tool`.",
+        "",
+        "Set DX_API_TOKEN in the environment, or configure a working Linux Secret Service provider such as GNOME Keyring.",
+        formatErrorDetails(error),
+    ]
+        .filter(Boolean)
+        .join("\n"));
+}
+function hasErrorCode(error, code) {
+    if (!isRecord(error)) {
+        return false;
+    }
+    return error.code === code;
+}
+function isLinuxSecretServiceUnavailable(error) {
+    const text = errorText(error);
+    return [
+        "org.freedesktop.secrets",
+        "Cannot autolaunch D-Bus",
+        "No such secret service",
+    ].some((message) => text.includes(message));
+}
+function formatErrorDetails(error) {
+    if (!isRecord(error) || typeof error.stderr !== "string") {
+        return null;
+    }
+    const stderr = error.stderr.trim();
+    return stderr ? `Details: ${stderr}` : null;
+}
+function errorText(error) {
+    if (!isRecord(error)) {
+        return String(error);
+    }
+    return [
+        typeof error.stderr === "string" ? error.stderr : null,
+        typeof error.shortMessage === "string" ? error.shortMessage : null,
+        typeof error.message === "string" ? error.message : null,
+    ]
+        .filter(Boolean)
+        .join("\n");
+}
+function isRecord(value) {
+    return typeof value === "object" && value !== null;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@get-dx/cli",
-  "version": "0.3.1",
+  "version": "0.3.2",
   "description": "DX CLI",
   "author": "DX <developers@getdx.com>",
   "bugs": {