@mintlify/cli 4.0.1085 → 4.0.1087

package/bin/workflow.js

@@ -13,7 +13,7 @@ import { addLog, addLogs, SuccessLog } from '@mintlify/previewing';
 import fse from 'fs-extra';
 import { Text } from 'ink';
 import path from 'path';
-import { CMD_EXEC_PATH } from './constants.js';
+import { CMD_EXEC_PATH } from './helpers.js';
 export function slugify(name) {
     return name
         .toLowerCase()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mintlify/cli",
-  "version": "4.0.1085",
+  "version": "4.0.1087",
   "description": "The Mintlify CLI",
   "engines": {
     "node": ">=18.0.0"
@@ -93,5 +93,5 @@
     "vitest": "2.1.9",
     "vitest-mock-process": "1.0.4"
   },
-  "gitHead": "78f288690da1e848e93ed14655df3bf08262b647"
+  "gitHead": "2098cd9c9868b0e8e7118290c5c768ecf90d54ff"
 }

package/src/accessibilityCheck.tsx

@@ -6,8 +6,7 @@ import { Text } from 'ink';
 
 import { checkDocsColors, type AccessibilityCheckResult } from './accessibility.js';
 import { ContrastResult } from './accessibility.js';
-import { CMD_EXEC_PATH } from './constants.js';
-import { checkForDocsJson } from './helpers.js';
+import { CMD_EXEC_PATH, checkForDocsJson } from './helpers.js';
 
 export type TerminateCode = 0 | 1;
 

package/src/analytics/client.ts

@@ -1,3 +1,4 @@
+import { API_URL } from '../constants.js';
 import type {
   BucketThreadsResponse,
   BucketsResponse,
@@ -10,8 +11,6 @@ import type {
   VisitorsResponse,
 } from './types.js';
 
-const API_BASE = process.env.MINTLIFY_API_URL ?? 'http://localhost:5000';
-
 type Params = Record<string, string | number | undefined>;
 
 async function getAuthHeaders(): Promise<Record<string, string>> {
@@ -32,7 +31,7 @@ async function getAuthHeaders(): Promise<Record<string, string>> {
 }
 
 async function request<T>(path: string, params: Params = {}): Promise<T> {
-  const url = new URL(`${API_BASE}/api/cli/analytics${path}`);
+  const url = new URL(`${API_URL}/api/cli/analytics${path}`);
   for (const [key, value] of Object.entries(params)) {
     if (value !== undefined) url.searchParams.set(key, String(value));
   }

package/src/callbackServer.ts

@@ -0,0 +1,64 @@
+import { CALLBACK_PORT, DASHBOARD_URL } from './constants.js';
+
+export async function startCallbackServer(): Promise<{
+  codePromise: Promise<string>;
+  close: () => void;
+}> {
+  const { default: http } = await import('http');
+
+  let resolveCode: (code: string) => void;
+  let rejectCode: (err: Error) => void;
+  let closed = false;
+
+  const codePromise = new Promise<string>((res, rej) => {
+    resolveCode = res;
+    rejectCode = rej;
+  });
+
+  const server = http.createServer((req, res) => {
+    res.setHeader('Access-Control-Allow-Origin', DASHBOARD_URL);
+    res.setHeader('Access-Control-Allow-Methods', 'POST, OPTIONS');
+    res.setHeader('Access-Control-Allow-Headers', 'Content-Type');
+
+    if (req.method === 'OPTIONS') {
+      res.writeHead(204);
+      res.end();
+      return;
+    }
+
+    if (req.method === 'POST') {
+      let body = '';
+      req.on('data', (chunk) => {
+        body += chunk;
+      });
+      req.on('end', () => {
+        try {
+          const { code } = JSON.parse(body) as { code: string };
+          res.writeHead(200, { 'Content-Type': 'application/json' });
+          res.end(JSON.stringify({ ok: true }));
+          closed = true;
+          server.close();
+          resolveCode(code);
+        } catch {
+          res.writeHead(400);
+          res.end(JSON.stringify({ error: 'invalid body' }));
+        }
+      });
+    } else {
+      res.writeHead(405);
+      res.end();
+    }
+  });
+
+  server.listen(CALLBACK_PORT, 'localhost');
+
+  const close = () => {
+    if (!closed) {
+      closed = true;
+      server.close();
+      rejectCode(new Error('Login cancelled'));
+    }
+  };
+
+  return { codePromise, close };
+}

package/src/cli.tsx

@@ -22,8 +22,8 @@ import { accessibilityCheck } from './accessibilityCheck.js';
 import { analyticsBuilder } from './analytics/index.js';
 import { setTelemetryEnabled } from './config.js';
 import { getConfigValue, setConfigValue, clearConfigValue } from './config.js';
-import { CMD_EXEC_PATH } from './constants.js';
 import {
+  CMD_EXEC_PATH,
   checkPort,
   checkNodeVersion,
   autoUpgradeIfNeeded,
@@ -317,7 +317,7 @@ export const cli = ({ packageName = 'mint' }: { packageName?: string }) => {
       )
       .command(
         'status',
-        false,
+        'View current authentication status',
         () => undefined,
         async () => {
           await status();
@@ -326,7 +326,7 @@ export const cli = ({ packageName = 'mint' }: { packageName?: string }) => {
       )
       .command(
         'logout',
-        false,
+        'logout of your mintlify account',
         () => undefined,
         async () => {
           await logout();
@@ -335,7 +335,7 @@ export const cli = ({ packageName = 'mint' }: { packageName?: string }) => {
       )
       .command(
         'login',
-        false,
+        'authenticate your account to mintlify',
         () => undefined,
         async () => {
           await login();

package/src/constants.ts

@@ -1,14 +1,33 @@
+import { LOCAL_LINKED_CLI_VERSION } from '@mintlify/previewing';
 import os from 'os';
 import path from 'path';
 
+import { getCliVersion } from './helpers.js';
+
 export const HOME_DIR = os.homedir();
-export const CMD_EXEC_PATH = process.cwd();
 
 export const CONFIG_DIR = path.join(HOME_DIR, '.config', 'mintlify');
 export const CLI_CONFIG_FILE = path.join(CONFIG_DIR, 'config.json');
 export const TELEMETRY_ASYNC_TIMEOUT_MS = 10_000;
 
-export const DASHBOARD_URL = process.env.MINTLIFY_DASHBOARD_URL ?? 'http://localhost:3000';
-export const TOKEN_ENDPOINT =
+export const CALLBACK_PORT = 11582;
+
+const IS_LOCAL_BUILD =
+  process.env.CLI_TEST_MODE === 'true' ? true : getCliVersion() == LOCAL_LINKED_CLI_VERSION;
+
+export const API_URL =
+  process.env.MINTLIFY_API_URL ??
+  (IS_LOCAL_BUILD ? 'http://localhost:5000' : 'https://leaves.mintlify.com');
+export const DASHBOARD_URL =
+  process.env.MINTLIFY_DASHBOARD_URL ??
+  (IS_LOCAL_BUILD ? 'http://localhost:3000' : 'https://dashboard.mintlify.com');
+
+const DEV_TOKEN_ENDPOINT =
   'https://test.stytch.com/v1/public/project-test-2d86347b-dfdb-4609-be69-12d8146220bd/oauth2/token';
-export const STYTCH_CLIENT_ID = 'connected-app-test-b597afb3-304a-420f-bc13-dacca566c59f';
+const DEV_STYTCH_CLIENT_ID = 'connected-app-test-b597afb3-304a-420f-bc13-dacca566c59f';
+const PROD_TOKEN_ENDPOINT =
+  'https://api.stytch.com/v1/public/project-live-731b7a04-9ac3-4923-90b8-0806d4aa29d4/oauth2/token';
+const PROD_STYTCH_CLIENT_ID = 'connected-app-live-d813eedd-dbb0-434b-a1f9-2ce69e5efc49';
+
+export const TOKEN_ENDPOINT = IS_LOCAL_BUILD ? DEV_TOKEN_ENDPOINT : PROD_TOKEN_ENDPOINT;
+export const STYTCH_CLIENT_ID = IS_LOCAL_BUILD ? DEV_STYTCH_CLIENT_ID : PROD_STYTCH_CLIENT_ID;

package/src/helpers.tsx

@@ -23,9 +23,10 @@ import path from 'path';
 import type { ArgumentsCamelCase } from 'yargs';
 import yargs from 'yargs';
 
-import { CMD_EXEC_PATH } from './constants.js';
 import { shutdownPostHog } from './telemetry/client.js';
 
+export const CMD_EXEC_PATH = process.cwd();
+
 export const checkPort = async (argv: ArgumentsCamelCase): Promise<number | undefined> => {
   const initialPort = typeof argv.port === 'number' ? argv.port : 3000;
   if (initialPort === (await detect(initialPort))) return initialPort;

package/src/login.tsx

@@ -10,6 +10,7 @@ import {
   randomState,
 } from 'openid-client';
 
+import { startCallbackServer } from './callbackServer.js';
 import { DASHBOARD_URL, STYTCH_CLIENT_ID, TOKEN_ENDPOINT } from './constants.js';
 import { storeCredentials } from './keyring.js';
 
@@ -36,6 +37,8 @@ export async function login(): Promise<void> {
   authorizeUrl.searchParams.set('code_challenge', codeChallenge);
   const url = authorizeUrl.toString();
 
+  const { codePromise, close: closeServer } = await startCallbackServer();
+
   addLog(
     <Box flexDirection="column" gap={1} paddingY={1}>
       <Text bold>
@@ -60,7 +63,7 @@ export async function login(): Promise<void> {
   // Let ink finish rendering before inquirer takes over stdout
   await new Promise((resolve) => setTimeout(resolve, 50));
 
-  const code = await input({
+  const inputPromise = input({
     message: '█',
     theme: {
       prefix: chalk.dim(' │'),
@@ -70,6 +73,19 @@ export async function login(): Promise<void> {
     },
   });
 
+  let code: string;
+  try {
+    code = await Promise.race([codePromise, inputPromise]);
+  } catch {
+    closeServer();
+    inputPromise.cancel();
+    addLog(<Text color="red">✖ Login cancelled.</Text>);
+    return;
+  }
+
+  closeServer();
+  inputPromise.cancel();
+
   const res = await fetch(TOKEN_ENDPOINT, {
     method: 'POST',
     headers: { 'Content-Type': 'application/json' },
@@ -95,6 +111,5 @@ export async function login(): Promise<void> {
 
   const token = body as TokenResponse;
   await storeCredentials(token.access_token, token.refresh_token);
-
   addLog(<Text color="green">✔ Logged in successfully.</Text>);
 }

package/src/status.tsx

@@ -2,10 +2,9 @@ import { addLog } from '@mintlify/previewing';
 import { Text } from 'ink';
 import { z } from 'zod';
 
+import { API_URL } from './constants.js';
 import { getAccessToken } from './keyring.js';
 
-const API_URL = process.env.MINTLIFY_API_URL ?? 'http://localhost:5000';
-
 const StatusResponseSchema = z.object({
   user: z.object({ email: z.string() }),
   org: z.object({ name: z.string() }),

package/src/telemetry/client.ts

@@ -1,6 +1,6 @@
 import { PostHog } from 'posthog-node';
 
-import { TELEMETRY_ASYNC_TIMEOUT_MS } from '../constants.js';
+const TELEMETRY_ASYNC_TIMEOUT_MS = 10_000;
 
 const POSTHOG_API_KEY = 'phc_eNuN6Ojnk9O7uWfC17z12AK85fNR0BY6IiGVy0Gfwzw';
 const POSTHOG_HOST = 'https://ph.mintlify.com';

package/src/workflow.tsx

@@ -4,7 +4,7 @@ import fse from 'fs-extra';
 import { Text } from 'ink';
 import path from 'path';
 
-import { CMD_EXEC_PATH } from './constants.js';
+import { CMD_EXEC_PATH } from './helpers.js';
 
 export function slugify(name: string): string {
   return name