requestshield 0.1.4 → 0.1.6

package/src/cli.mjs

@@ -1,51 +1,277 @@
-#!/usr/bin/env node
-// @ts-check
-
-import { parseArgs } from "./args.mjs";
-import { ManagementApiClient } from "./api-client.mjs";
-import { SessionStore } from "./session-store.mjs";
-import { signin } from "./commands/signin.mjs";
-import { createKeys } from "./commands/keys-create.mjs";
-import { setupAgent } from "./commands/agent-setup.mjs";
-import { checkForUpdate } from "./commands/update-check.mjs";
-import packageJson from "../package.json" with { type: "json" };
-
-/**
- * @param {string[]} argv
- * @param {{ log?: (message: string) => void, api?: ManagementApiClient, sessions?: SessionStore, env?: NodeJS.ProcessEnv, homeDir?: string, sourceDir?: string, executablePath?: string, detectAgents?: () => Promise<Array<"codex" | "claude">>, selectAgent?: (detected: Array<"codex" | "claude">) => Promise<"codex" | "claude">, wait?: (milliseconds: number) => Promise<unknown>, confirm?: () => Promise<boolean>, fetchImpl?: typeof fetch, confirmUpdate?: () => Promise<boolean>, installLatest?: (packageName: string, version: string) => Promise<void> }} [deps]
- */
-export async function run(argv, deps = {}) {
-  const parsed = parseArgs(argv);
-  const log = deps.log ?? ((message) => console.log(message));
-  if (parsed.command === "help") return log(parsed.help);
-  if (parsed.command === "version") return log("requestshield " + packageJson.version);
-  if (parsed.command === "update-check") {
-    return checkForUpdate({
-      currentVersion: packageJson.version,
-      packageName: packageJson.name,
-      log,
-      fetchImpl: deps.fetchImpl,
-      confirm: deps.confirmUpdate,
-      install: deps.installLatest,
-    });
-  }
-
-  if (parsed.command === "agent-setup") {
-    return setupAgent(parsed, { log, ...deps });
-  }
-
-  const env = deps.env ?? process.env;
-
-  const api = deps.api ?? new ManagementApiClient({
-    baseUrl:
-        env.REQUESTSHIELD_API_URL ??
-        "https://api.intellifend.ai",
-  });
-
-  const sessions = deps.sessions ?? new SessionStore({
-    env,
-    homeDir: deps.homeDir,
-  });
-  if (parsed.command === "signin") return signin({ api, sessions, log, ...deps });
-  if (parsed.command === "keys-create") return createKeys(parsed, { api, sessions, log, ...deps });
-}
+#!/usr/bin/env node
+// @ts-check
+
+import { parseArgs } from "./args.mjs";
+import { ManagementApiClient } from "./api-client.mjs";
+import { SessionStore } from "./session-store.mjs";
+import { OAuthClient } from "./oauth-client.mjs";
+
+import { signin } from "./commands/signin.mjs";
+import { createKeys } from "./commands/keys-create.mjs";
+import { renameApp, setAppEnabled } from "./commands/application-mutations.mjs";
+import { rotateSecret, revealSecret, revokeSecret } from "./commands/secret-commands.mjs";
+import { showAuthStatus } from "./commands/auth-status.mjs";
+import { signout } from "./commands/signout.mjs";
+import { listApps } from "./commands/apps-list.mjs";
+import { getApp } from "./commands/apps-get.mjs";
+import { setupAgent } from "./commands/agent-setup.mjs";
+import { checkForUpdate } from "./commands/update-check.mjs";
+
+import packageJson from "../package.json" with { type: "json" };
+import { getApiUrl, getAuthorizationIssuer, getCommandInvocation, getCommandName, getOAuthConfig } from "./config.mjs";
+
+/**
+ * @typedef {{
+ *   log: (message: string) => void,
+ *   warn?: (message: string) => void,
+ *   api?: ManagementApiClient,
+ *   sessions?: SessionStore,
+ *   oauth?: OAuthClient,
+ *   authorizationIssuer?: string,
+ *   openBrowser?: typeof import('./browser-opener.mjs').openBrowser,
+ *   signal?: AbortSignal,
+ *   env?: NodeJS.ProcessEnv,
+ *   profile?: import('./config.mjs').Profile,
+ *   homeDir?: string,
+ *   sourceDir?: string,
+ *   executablePath?: string,
+ *   detectAgents?: () => Promise<Array<"codex" | "claude">>,
+ *   selectAgent?: (
+ *     detected: Array<"codex" | "claude">
+ *   ) => Promise<"codex" | "claude">,
+ *   wait?: (milliseconds: number) => Promise<unknown>,
+ *   confirm?: () => Promise<boolean>,
+ *   fetchImpl?: typeof fetch,
+ *   confirmUpdate?: () => Promise<boolean>,
+ *   installLatest?: (
+ *     packageName: string,
+ *     version: string
+ *   ) => Promise<void>
+ * }} CommandContext
+ */
+
+/**
+ * @typedef {CommandContext & {
+ *   api: ManagementApiClient,
+ *   sessions: SessionStore
+ * }} AuthenticatedCommandContext
+ */
+
+/**
+ * @typedef {{
+ *   requiresApiSession: boolean,
+ *   handler: (
+ *     parsed: any,
+ *     context: CommandContext
+ *   ) => unknown | Promise<unknown>
+ * }} CommandHandler
+ */
+
+/**
+ * Put every CLI command handler here.
+ *
+ * @type {Record<string, CommandHandler>}
+ */
+const COMMAND_HANDLERS = {
+  "help": {
+    requiresApiSession: false,
+    handler: (parsed, context) =>
+      context.log(parsed.help.replace(/^  requestshield /gm, `  ${getCommandInvocation(context.profile)} `)),
+  },
+
+  "version": {
+    requiresApiSession: false,
+    handler: (_parsed, context) =>
+      context.log(`${getCommandName(context.profile)} ${packageJson.version}`),
+  },
+
+  "update-check": {
+    requiresApiSession: false,
+    handler: (_parsed, context) =>
+      checkForUpdate({
+        profile: context.profile,
+        currentVersion: packageJson.version,
+        packageName: packageJson.name,
+        log: context.log,
+        fetchImpl: context.fetchImpl,
+        confirm: context.confirmUpdate,
+        install: context.installLatest,
+      }),
+  },
+
+  "agent-setup": {
+    requiresApiSession: false,
+    handler: (parsed, context) =>
+      setupAgent(parsed, context),
+  },
+
+  "signin": {
+    requiresApiSession: false,
+    handler: (parsed, context) => {
+      const env = context.env ?? process.env;
+      const oauth = context.oauth ?? new OAuthClient({config: getOAuthConfig(context.profile), fetchImpl: context.fetchImpl});
+      const authorizationIssuer = context.authorizationIssuer ?? (context.oauth
+        ? oauth.config.issuer : getAuthorizationIssuer(context.profile, oauth.config.issuer));
+      const sessions = context.sessions ?? new SessionStore({env, homeDir: context.homeDir, oauth, config: oauth.config, profile: context.profile});
+      return signin(parsed, {...context, oauth, sessions, authorizationIssuer});
+    },
+  },
+
+  "keys-create": {
+    requiresApiSession: true,
+    handler: (parsed, context) =>
+      createKeys(parsed, requireApiSession(context)),
+  },
+
+  "keys-rotate": {requiresApiSession: true, handler: (parsed, context) => rotateSecret(parsed, requireApiSession(context))},
+  "keys-reveal": {requiresApiSession: true, handler: (parsed, context) => revealSecret(parsed, requireApiSession(context))},
+  "keys-revoke": {requiresApiSession: true, handler: (parsed, context) => revokeSecret(parsed, requireApiSession(context))},
+  "apps-rename": {requiresApiSession: true, handler: (parsed, context) => renameApp(parsed, requireApiSession(context))},
+  "apps-enable": {requiresApiSession: true, handler: (parsed, context) => setAppEnabled(parsed, requireApiSession(context))},
+  "apps-disable": {requiresApiSession: true, handler: (parsed, context) => setAppEnabled(parsed, requireApiSession(context))},
+  "auth-status": {requiresApiSession: false, handler: (parsed, context) => showAuthStatus(parsed, {...context, sessions: localSessions(context)})},
+  "signout": {requiresApiSession: false, handler: (parsed, context) => signout(parsed, {...context, sessions: localSessions(context)})},
+
+  "apps-list": {
+    requiresApiSession: true,
+    handler: (parsed, context) =>
+      listApps(parsed, requireApiSession(context)),
+  },
+
+  "apps-get": {
+    requiresApiSession: true,
+    handler: (parsed, context) =>
+      getApp(parsed, requireApiSession(context)),
+  },
+
+};
+
+/** @param {CommandContext} context */
+function localSessions(context) {
+  return context.sessions ?? new SessionStore({env: context.env, homeDir: context.homeDir, profile: context.profile});
+}
+
+/**
+ * Narrow the shared context before an authenticated handler can use it.
+ *
+ * @param {CommandContext} context
+ * @returns {AuthenticatedCommandContext}
+ */
+function requireApiSession(context) {
+  if (!context.api || !context.sessions) {
+    throw new Error("Authenticated command context was not initialized");
+  }
+
+  return {
+    ...context,
+    api: context.api,
+    sessions: context.sessions,
+  };
+}
+
+/**
+ * @param {string[]} argv
+ * @param {{
+ *   log?: (message: string) => void,
+ *   warn?: (message: string) => void,
+ *   api?: ManagementApiClient,
+ *   sessions?: SessionStore,
+ *   oauth?: OAuthClient,
+ *   authorizationIssuer?: string,
+ *   openBrowser?: typeof import('./browser-opener.mjs').openBrowser,
+ *   signal?: AbortSignal,
+ *   env?: NodeJS.ProcessEnv,
+ *   profile?: import('./config.mjs').Profile,
+ *   homeDir?: string,
+ *   sourceDir?: string,
+ *   executablePath?: string,
+ *   detectAgents?: () => Promise<Array<"codex" | "claude">>,
+ *   selectAgent?: (
+ *     detected: Array<"codex" | "claude">
+ *   ) => Promise<"codex" | "claude">,
+ *   wait?: (milliseconds: number) => Promise<unknown>,
+ *   confirm?: () => Promise<boolean>,
+ *   fetchImpl?: typeof fetch,
+ *   confirmUpdate?: () => Promise<boolean>,
+ *   installLatest?: (
+ *     packageName: string,
+ *     version: string
+ *   ) => Promise<void>
+ * }} [deps]
+ */
+export async function run(argv, deps = {}) {
+  const profile = deps.profile ?? "prod";
+  getCommandName(profile);
+  const parsed = parseArgs(argv);
+
+  const log =
+    deps.log ??
+    ((message) => console.log(message));
+
+  /*
+   * Find the requested command.
+   */
+  const command = COMMAND_HANDLERS[parsed.command];
+
+  if (!command) {
+    throw new Error(
+      `Unsupported command: ${String(parsed.command)}`
+    );
+  }
+
+  /*
+  * Dependencies available to every command.
+  */
+  /** @type {CommandContext} */
+  const context = {
+    ...deps,
+    profile,
+    log,
+    warn: deps.warn ?? ((message) => console.error(message)),
+  };
+
+  /*
+   * Only initialize the Management API and session
+   * for commands that require them.
+   */
+  if (command.requiresApiSession) {
+    const env =
+      deps.env ??
+      process.env;
+
+    const api =
+      deps.api ??
+      new ManagementApiClient({
+        baseUrl: getApiUrl(profile),
+        fetchImpl: deps.fetchImpl,
+      });
+
+    const sessions =
+      deps.sessions ??
+      new SessionStore({
+        env,
+        homeDir: deps.homeDir,
+        profile,
+      });
+
+    const authenticatedContext = {
+      ...context,
+      env,
+      api,
+      sessions,
+    };
+
+    return command.handler(
+      parsed,
+      authenticatedContext
+    );
+  }
+
+  /*
+   * Execute commands that do not need an API session.
+   */
+  return command.handler(
+    parsed,
+    context
+  );
+}