@clipdone/cli 0.1.0 → 0.1.2

package/README.md

@@ -8,13 +8,13 @@ Install globally for normal use:
 
 ```bash
 npm install -g @clipdone/cli
-clipdone auth login
+clipdone login
 ```
 
 For one-off use without a global install:
 
 ```bash
-npx @clipdone/cli auth login
+npx @clipdone/cli login
 pnpm dlx @clipdone/cli projects
 ```
 
@@ -25,21 +25,21 @@ The CLI requires Node.js 18 or newer.
 Authorize the CLI in your browser:
 
 ```bash
-clipdone auth login
+clipdone login
 ```
 
 On remote machines or environments where the CLI cannot open a browser automatically:
 
 ```bash
-clipdone auth login --no-open
+clipdone login --no-open
 ```
 
 Check or remove the current login:
 
 ```bash
 clipdone me
-clipdone auth logout
-clipdone auth revoke
+clipdone logout
+clipdone revoke
 ```
 
 `logout` removes only the local token. `revoke` also revokes the current OAuth tokens with ClipDone.

package/bin/clipdone.js

@@ -148,6 +148,8 @@ var OAUTH_AUTHORIZE_PATH = "/api/auth/oauth2/authorize";
 var OAUTH_REGISTER_PATH = "/api/auth/oauth2/register";
 var OAUTH_TOKEN_PATH = "/api/auth/oauth2/token";
 var OAUTH_REVOKE_PATH = "/api/auth/oauth2/revoke";
+var OAUTH_CLIENT_REGISTRATION_VERSION = 2;
+var OAUTH_LOOPBACK_PORTS = [59852, 59853, 59854, 59855, 59856, 59857, 59858, 59859];
 var PRODUCTION_APP_URL = "https://app.clipdone.app";
 var LOCAL_APP_URL = "http://localhost:3000";
 var REQUEST_TIMEOUT_MS = 15e3;
@@ -239,16 +241,25 @@ function clearStoredAuth() {
   delete config.token;
   delete config.tokenExpiresAt;
   delete config.oauth;
+  delete config.oauthClient;
+  writeConfig(config);
+}
+function clearStoredOAuthClientRegistration() {
+  const config = readConfig();
+  if (!config.oauthClient) return;
+  delete config.oauthClient;
   writeConfig(config);
 }
 function readStoredOAuthClientRegistration(scope, resource) {
   const registration = readConfig().oauthClient;
   if (!registration || typeof registration !== "object") return null;
+  const version = Number(registration.version);
   const clientId = normalizeString(registration.clientId);
   const apiUrl = normalizeString(registration.apiUrl);
   const storedScope = normalizeString(registration.scope);
   const storedResource = normalizeString(registration.resource);
   if (!clientId || !apiUrl || !storedScope || !storedResource) return null;
+  if (version !== OAUTH_CLIENT_REGISTRATION_VERSION) return null;
   if (apiUrl !== apiBase()) return null;
   if (storedScope !== normalizeString(scope)) return null;
   if (storedResource !== normalizeString(resource)) return null;
@@ -261,6 +272,7 @@ function writeStoredOAuthClientRegistration(clientId, scope, resource) {
   if (!normalizedClientId || !normalizedScope || !normalizedResource) return;
   const config = readConfig();
   config.oauthClient = {
+    version: OAUTH_CLIENT_REGISTRATION_VERSION,
     clientId: normalizedClientId,
     apiUrl: apiBase(),
     scope: normalizedScope,
@@ -525,7 +537,7 @@ async function oauthRegisterClient({ scope }) {
       },
       body: JSON.stringify({
         client_name: "ClipDone CLI",
-        redirect_uris: ["http://127.0.0.1/callback"],
+        redirect_uris: OAUTH_LOOPBACK_PORTS.map((port) => `http://127.0.0.1:${port}/callback`),
         grant_types: ["authorization_code", "refresh_token"],
         response_types: ["code"],
         token_endpoint_auth_method: "none",
@@ -553,10 +565,14 @@ async function oauthRegisterClient({ scope }) {
   return { clientId };
 }
 async function resolveOAuthClient(authConfig) {
+  const activeSession = readStoredOAuthSession();
   const cached = readStoredOAuthClientRegistration(authConfig?.scope, authConfig?.resource);
-  if (cached) {
+  if (cached && activeSession?.clientId === cached.clientId) {
     return cached;
   }
+  if (cached) {
+    clearStoredOAuthClientRegistration();
+  }
   const registered = await oauthRegisterClient({ scope: authConfig.scope });
   writeStoredOAuthClientRegistration(registered.clientId, authConfig.scope, authConfig.resource);
   return registered;
@@ -984,10 +1000,10 @@ function printHelp() {
   writeLine("Usage: clipdone <command> [options]");
   writeLine();
   writeLine("Preferred commands:");
-  writeLine("  auth login                         Authorize this CLI in your browser");
+  writeLine("  login                              Authorize this CLI in your browser");
   writeLine("  me                                 Show the current CLI login");
-  writeLine("  auth logout                        Remove the local login only");
-  writeLine("  auth revoke                        Revoke the current CLI login");
+  writeLine("  logout                             Remove the local login only");
+  writeLine("  revoke                             Revoke the current CLI login");
   writeLine("                                     Login options: --no-open --print-auth-url");
   writeLine("  projects                           List projects");
   writeLine("  projects create [--name <name>]    Create a project");
@@ -1024,7 +1040,7 @@ function printHelp() {
   writeLine('  clipdone projects <id> upload "/path/with spaces/video (1).mp4" --type footage');
   writeLine("  clipdone projects <id> process");
   writeLine("  clipdone projects <id> status");
-  writeLine("  clipdone auth login --no-open");
+  writeLine("  clipdone login --no-open");
   writeLine();
   writeLine("Useful options:");
   writeLine("  --help                             Show command help");
@@ -1097,17 +1113,36 @@ async function generateCodeChallenge(verifier) {
   const digest = await webcrypto.subtle.digest("SHA-256", new TextEncoder().encode(verifier));
   return base64UrlEncode(new Uint8Array(digest));
 }
+async function listenOnLoopbackPort() {
+  const errors = [];
+  for (const port of OAUTH_LOOPBACK_PORTS) {
+    const server = http.createServer();
+    try {
+      await new Promise((resolve, reject) => {
+        server.once("error", reject);
+        server.listen(port, "127.0.0.1", () => resolve());
+      });
+      return { server, port };
+    } catch (error) {
+      server.close();
+      const code = typeof error?.code === "string" ? error.code : null;
+      if (code === "EADDRINUSE" || code === "EACCES") {
+        errors.push(`${port}:${code}`);
+        continue;
+      }
+      throw error;
+    }
+  }
+  const detail = errors.length > 0 ? ` Tried ${errors.join(", ")}.` : "";
+  throw new Error(`Could not reserve a local callback port for ClipDone login.${detail}`);
+}
 async function login(args) {
   const authConfig = { resource: API_OAUTH_RESOURCE, scope: API_OAUTH_SCOPES.join(" ") };
   const oauthClient = await resolveOAuthClient(authConfig);
   const state = randomState();
   const codeVerifier = generateCodeVerifier();
   const codeChallenge = await generateCodeChallenge(codeVerifier);
-  const server = http.createServer();
-  const port = await new Promise((resolve, reject) => {
-    server.once("error", reject);
-    server.listen(0, "127.0.0.1", () => resolve(server.address().port));
-  });
+  const { server, port } = await listenOnLoopbackPort();
   const redirectUri = `http://127.0.0.1:${port}/callback`;
   const authUrl = new URL(OAUTH_AUTHORIZE_PATH, appBase());
   authUrl.searchParams.set("client_id", oauthClient.clientId);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clipdone/cli",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "description": "Command line access to ClipDone projects and exports",
   "license": "UNLICENSED",
   "type": "module",