Guided-auth removal, OAuth smoke testing, and TUI/CLI support (#1531)
* refactor(web): update OAuth E2E tests to use new authentication method - Replaced `runGuidedAuth` with `authenticate` in the InspectorClient OAuth end-to-end tests to support quick authentication with CIMD pre-registration. - Updated comments to reflect the change in authentication method and its support for HTTP test metadata URLs. - Ensured that the tests continue to validate the expected authorization URL after the change. Additionally, imported `ensureCimdClientRegistration` in the OAuthManager to streamline client registration during the authentication process. * Guided-auth removal, OAuth smoke testing, and TUI/CLI support * Added CLI OAuth runner flags tests * Added clarifying comment on port 0 binding * README notes on TUI oauth callback port, prettier fixes for CLI tests * CIMD validation uses inline like EMA IdP * Fixed TUI test failures from merge * test: bring 5 OAuth files over the 90 per-file coverage gate The guided-auth-removal work added/touched several files that fell below the repo's >=90 per-file coverage gate (npm run coverage). CI doesn't run the gate (it's local-only), so validate + test:integration passed while these gaps slipped through. Bring them all back over the line: - core/auth/node/runner-oauth-callback.ts: test bad-URL/non-http-scheme throws, no-port->80 default, and IPv6 hostname bracketing. Annotate the provably-dead guards (empty host, out-of-range port, String(err) fallback, pathname "/" fallback) -- all rejected by new URL() upstream -- with justified v8 ignore comments instead of lowering the gate. - core/auth/cimd.ts: test the AS-doesn't-support-CIMD early return. - core/react/useClientSettingsDraft.ts: test the functional-updater path, the stale-onChange-after-close prev===null guard, and the timer-fires-after-close value===null guard. - ClientSettingsForm.tsx: test the CIMD checkbox toggle and CIMD URL clear. - clients/tui/src/utils/oauthDisplay.ts: test static/dcr registration kinds, the expired IdP session, and the configured-scope/empty-scope branches of formatScopes. npm run coverage now passes (exit 0) across web, cli, tui, launcher. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> --------- Co-authored-by: Cursor <cursoragent@cursor.com> Co-authored-by: cliffhall <cliff@futurescale.com> Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
Bob Dickinson
GitHub
parent
4a927d3978
commit
13dafe457b
3 changed files with 5702 additions and 4444 deletions
|
|
@ -11,7 +11,10 @@ import { createServer, type InlineConfig } from "vite";
|
|||
import react from "@vitejs/plugin-react";
|
||||
import type { WebServerConfig } from "./web-server-config.js";
|
||||
import { honoMiddlewarePlugin } from "./vite-hono-plugin.js";
|
||||
import { getViteBaseConfig } from "./vite-base-config.js";
|
||||
import {
|
||||
clearViteDepsCache,
|
||||
getViteDevOptimizeDeps,
|
||||
} from "./vite-base-config.js";
|
||||
import { vitestSharedPaths } from "../../../vitest.shared.mts";
|
||||
import type { WebServerHandle } from "./types.js";
|
||||
|
||||
|
|
@ -25,9 +28,9 @@ const __dirname = dirname(fileURLToPath(import.meta.url));
|
|||
export async function startViteDevServer(
|
||||
config: WebServerConfig,
|
||||
): Promise<WebServerHandle> {
|
||||
// Canonicalize so Vite's config hash is stable and matches the deps cache.
|
||||
// Canonicalize paths under clients/web.
|
||||
const root = resolve(join(__dirname, ".."));
|
||||
const baseConfig = getViteBaseConfig();
|
||||
clearViteDepsCache(root);
|
||||
// `configFile: false` means this in-process server never loads
|
||||
// `vite.config.ts`, so it must reproduce that file's `resolve` block and
|
||||
// `server.fs.allow` here. Without them, App.tsx's `@inspector/core/*`
|
||||
|
|
@ -38,7 +41,7 @@ export async function startViteDevServer(
|
|||
const { repoRoot, sharedAliases, sharedDedupe, nodeModulesAliases } =
|
||||
vitestSharedPaths(root);
|
||||
const inlineConfig: InlineConfig = {
|
||||
...baseConfig,
|
||||
optimizeDeps: getViteDevOptimizeDeps(),
|
||||
configFile: false,
|
||||
root,
|
||||
resolve: {
|
||||
|
|
|
|||
|
|
@ -8,35 +8,58 @@
|
|||
* the parts needed by both the CLI runner and `vite dev` belong here.
|
||||
*/
|
||||
|
||||
import { rmSync } from "node:fs";
|
||||
import { join } from "node:path";
|
||||
|
||||
const NODE_ONLY_OPTIMIZE_DEPS_EXCLUDE = [
|
||||
"@modelcontextprotocol/sdk/client/stdio.js",
|
||||
// `atomically` is reached only through `core/storage/store-io.ts`,
|
||||
// which is imported by `core/mcp/remote/node/server.ts` (the Hono
|
||||
// app). The module never lands in the browser graph; excluding it
|
||||
// keeps Vite's dev-time scanner from chasing it through the plugin's
|
||||
// node-only import chain.
|
||||
"atomically",
|
||||
// `chokidar` is only loaded inside `core/mcp/remote/node/server.ts`
|
||||
// when the lazy mcp.json watcher starts. It transitively imports
|
||||
// `readdirp` and core node fs/os modules; excluding it keeps Vite's
|
||||
// dep scanner from walking into them during dev startup.
|
||||
"chokidar",
|
||||
"cross-spawn",
|
||||
"which",
|
||||
// `@napi-rs/keyring` is loaded only inside
|
||||
// `core/auth/node/secret-store.ts` from the Hono `/api/servers`
|
||||
// handlers. It's a native-binding package (no browser code path) so
|
||||
// excluding it keeps Vite's dep scanner from chasing into the
|
||||
// platform-specific binaries during dev startup.
|
||||
"@napi-rs/keyring",
|
||||
] as const;
|
||||
|
||||
export function getViteBaseConfig() {
|
||||
return {
|
||||
optimizeDeps: {
|
||||
// Node-only modules that the dev backend (core/mcp/remote/node/*,
|
||||
// core/mcp/node/*) consumes. Excluding them from Vite's dep-pre-bundling
|
||||
// step keeps `vite dev` from trying to scan/bundle them into the
|
||||
// browser graph during startup.
|
||||
exclude: [
|
||||
"@modelcontextprotocol/sdk/client/stdio.js",
|
||||
// `atomically` is reached only through `core/storage/store-io.ts`,
|
||||
// which is imported by `core/mcp/remote/node/server.ts` (the Hono
|
||||
// app). The module never lands in the browser graph; excluding it
|
||||
// keeps Vite's dev-time scanner from chasing it through the plugin's
|
||||
// node-only import chain.
|
||||
"atomically",
|
||||
// `chokidar` is only loaded inside `core/mcp/remote/node/server.ts`
|
||||
// when the lazy mcp.json watcher starts. It transitively imports
|
||||
// `readdirp` and core node fs/os modules; excluding it keeps Vite's
|
||||
// dep scanner from walking into them during dev startup.
|
||||
"chokidar",
|
||||
"cross-spawn",
|
||||
"which",
|
||||
// `@napi-rs/keyring` is loaded only inside
|
||||
// `core/auth/node/secret-store.ts` from the Hono `/api/servers`
|
||||
// handlers. It's a native-binding package (no browser code path) so
|
||||
// excluding it keeps Vite's dep scanner from chasing into the
|
||||
// platform-specific binaries during dev startup.
|
||||
"@napi-rs/keyring",
|
||||
],
|
||||
exclude: [...NODE_ONLY_OPTIMIZE_DEPS_EXCLUDE],
|
||||
},
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* Dev-server optimizeDeps: rebuild from scratch each launch — no stale
|
||||
* pre-bundles carried across restarts (avoids 504 Outdated Optimize Dep).
|
||||
* Do not use under Vitest.
|
||||
*/
|
||||
export function getViteDevOptimizeDeps() {
|
||||
return {
|
||||
exclude: [...NODE_ONLY_OPTIMIZE_DEPS_EXCLUDE],
|
||||
force: true,
|
||||
ignoreOutdatedRequests: true,
|
||||
include: ["ajv", "@modelcontextprotocol/sdk/validation/ajv"],
|
||||
};
|
||||
}
|
||||
|
||||
/** Remove Vite's pre-bundle cache under clients/web before a dev launch. */
|
||||
export function clearViteDepsCache(clientWebRoot: string): void {
|
||||
rmSync(join(clientWebRoot, "node_modules", ".vite"), {
|
||||
recursive: true,
|
||||
force: true,
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -118,7 +118,16 @@ export function honoMiddlewarePlugin(config: WebServerConfig): Plugin {
|
|||
};
|
||||
|
||||
server.httpServer.once("listening", () => {
|
||||
setImmediate(logBanner);
|
||||
setImmediate(async () => {
|
||||
// Pre-bundle the app entry before opening the browser so the first
|
||||
// page load does not race Vite's dep optimizer (504 Outdated Optimize Dep).
|
||||
try {
|
||||
await server.warmupRequest("/src/main.tsx");
|
||||
} catch (err) {
|
||||
console.warn("[vite] entry warmup failed:", err);
|
||||
}
|
||||
logBanner();
|
||||
});
|
||||
});
|
||||
|
||||
const honoMiddleware = async (
|
||||
|
|
|
|||
Loading…
Reference in a new issue