open-notepad 1.0.6 → 1.0.8

package/bin/note.js

@@ -141,101 +141,155 @@ async function apiFetch(config, endpoint, options = {}) {
 
 // Commands
 async function handleLogin(apiUrlArg) {
-  clearScreen();
-  log(`${colors.bgBlue}${colors.white}${colors.bold}   Configure Notepad CLI   ${colors.reset}\n`);
-
   const current = await loadConfig();
   const apiUrl = apiUrlArg || current.apiUrl || 'https://notepad.web.id';
 
-  // Generate a random session code
-  const sessionCode = 'cli_' + Math.random().toString(36).substring(2, 15) + Math.random().toString(36).substring(2, 15);
+  // Present choices
+  const loginOptions = [
+    '🌐 Sign in with Google (Browser Redirect)',
+    '🔑 Enter API Key (Manual)'
+  ];
 
-  // Try browser-based login
-  info('Registering CLI session...');
-  try {
-    const regRes = await fetch(`${apiUrl.replace(/\/$/, '')}/api/cli/session`, {
-      method: 'POST',
-      headers: { 'Content-Type': 'application/json' },
-      body: JSON.stringify({ code: sessionCode })
-    });
+  const titleCallback = () => {
+    log(`${colors.bgBlue}${colors.white}${colors.bold}   Configure Notepad CLI   ${colors.reset}`);
+    log(`${colors.dim}Select how you want to authenticate with ${colors.reset}${colors.cyan}${apiUrl}${colors.reset}\n`);
+  };
 
-    if (!regRes.ok) {
-      throw new Error(`Server returned ${regRes.status}`);
-    }
+  const choice = await selectMenuOption(loginOptions, titleCallback);
 
-    // Open browser
-    const authPageUrl = `${apiUrl.replace(/\/$/, '')}/auth-cli-20260628dontuseforyounote?session=${sessionCode}`;
-    info(`Opening browser for authentication...`);
-    log(`\n${colors.dim}If browser does not open automatically, visit:${colors.reset}`);
-    log(`${colors.bold}${colors.cyan}${authPageUrl}${colors.reset}\n`);
-
-    // Platform-specific browser open
-    const openCmd = process.platform === 'win32' ? 'start' 
-                  : process.platform === 'darwin' ? 'open' 
-                  : 'xdg-open';
-    const child = spawn(openCmd, [authPageUrl], { shell: true, stdio: 'ignore', detached: true });
-    child.unref();
-
-    // Poll for completion
-    info('Waiting for browser authorization...');
-    const maxAttempts = 120; // 2 minutes (polling every 1.5s)
-    let attempts = 0;
+  if (choice === -1) {
+    return;
+  }
+
+  if (choice === 0) {
+    // Google Login (Browser flow)
+    clearScreen();
+    log(`${colors.bgBlue}${colors.white}${colors.bold}   Google Authentication   ${colors.reset}\n`);
     
-    while (attempts < maxAttempts) {
-      await new Promise(r => setTimeout(r, 1500));
-      attempts++;
+    // Generate a random session code
+    const sessionCode = 'cli_' + Math.random().toString(36).substring(2, 15) + Math.random().toString(36).substring(2, 15);
 
-      try {
-        const pollRes = await fetch(`${apiUrl.replace(/\/$/, '')}/api/cli/session/${sessionCode}`);
-        
-        if (pollRes.status === 404) {
-          // Session expired or not found
-          if (attempts > 10) {
-            error('Session expired. Please try again.');
-            return;
-          }
-          continue;
+    info('Registering CLI session...');
+    try {
+      const regRes = await fetch(`${apiUrl.replace(/\/$/, '')}/api/cli/session`, {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/json' },
+        body: JSON.stringify({ code: sessionCode })
+      });
+
+      if (!regRes.ok) {
+        throw new Error(`Server returned ${regRes.status}`);
+      }
+
+      // Open browser
+      const authPageUrl = `${apiUrl.replace(/\/$/, '')}/auth-cli-20260628dontuseforyounote?session=${sessionCode}`;
+      info(`Opening browser for authentication...`);
+      log(`\n${colors.dim}If browser does not open automatically, visit:${colors.reset}`);
+      log(`${colors.bold}${colors.cyan}${authPageUrl}${colors.reset}\n`);
+
+      // Platform-specific browser open
+      const openCmd = process.platform === 'win32' ? 'start' 
+                    : process.platform === 'darwin' ? 'open' 
+                    : 'xdg-open';
+      const child = spawn(openCmd, [authPageUrl], { shell: true, stdio: 'ignore', detached: true });
+      child.unref();
+
+      // Poll for completion
+      info('Waiting for browser authorization...');
+      log(`${colors.dim}Press Esc at any time to cancel and return to menu.${colors.reset}\n`);
+      const maxAttempts = 120; // 2 minutes (polling every 1.5s)
+      let attempts = 0;
+      let cancelled = false;
+
+      // Listen to Esc keypress during polling
+      const hasTTY = process.stdin.isTTY && typeof process.stdin.setRawMode === 'function';
+      const onPollKeypress = (str, key) => {
+        if (key && (key.name === 'escape' || (key.ctrl && key.name === 'c'))) {
+          cancelled = true;
         }
+      };
 
-        if (pollRes.ok) {
-          const data = await pollRes.json();
+      if (hasTTY) {
+        readline.emitKeypressEvents(process.stdin);
+        try {
+          process.stdin.setRawMode(true);
+        } catch (e) {}
+        process.stdin.resume();
+        process.stdin.on('keypress', onPollKeypress);
+      }
+      
+      while (attempts < maxAttempts && !cancelled) {
+        await new Promise(r => setTimeout(r, 1500));
+        if (cancelled) break;
+        attempts++;
+
+        try {
+          const pollRes = await fetch(`${apiUrl.replace(/\/$/, '')}/api/cli/session/${sessionCode}`);
           
-          if (data.status === 'completed' && data.room_id && data.api_key) {
-            clearScreen();
-            log(`${colors.bgBlue}${colors.white}${colors.bold}   CLI Connected Successfully!   ${colors.reset}\n`);
-            await saveConfig({ 
-              apiUrl, 
-              roomId: data.room_id, 
-              apiKey: data.api_key 
-            });
-            success(`Linked to room: ${colors.bold}${data.room_id}.notepad.web.id${colors.reset}`);
-            info('You can now use all CLI commands. Try: note list');
-            return;
+          if (pollRes.status === 404) {
+            if (attempts > 10) {
+              error('Session expired. Please try again.');
+              break;
+            }
+            continue;
+          }
+
+          if (pollRes.ok) {
+            const data = await pollRes.json();
+            
+            if (data.status === 'completed' && data.room_id && data.api_key) {
+              clearScreen();
+              log(`${colors.bgBlue}${colors.white}${colors.bold}   CLI Connected Successfully!   ${colors.reset}\n`);
+              await saveConfig({ 
+                apiUrl, 
+                roomId: data.room_id, 
+                apiKey: data.api_key 
+              });
+              success(`Linked to room: ${colors.bold}${data.room_id}.notepad.web.id${colors.reset}`);
+              info('You can now use all CLI commands. Try: note list');
+              cancelled = false; // Reset to indicate success
+              break;
+            }
           }
+        } catch (pollErr) {
+          // Silently continue polling
+        }
+
+        if (attempts % 4 === 0) {
+          process.stdout.write(`\r${colors.dim}  Polling... (${Math.round(attempts * 1.5)}s elapsed, waiting for browser auth)${colors.reset}  `);
         }
-      } catch (pollErr) {
-        // Silently continue polling
       }
 
-      // Progress indicator
-      if (attempts % 4 === 0) {
-        process.stdout.write(`\r${colors.dim}  Polling... (${attempts}s elapsed, waiting for browser auth)${colors.reset}  `);
+      if (hasTTY) {
+        try {
+          process.stdin.off('keypress', onPollKeypress);
+          process.stdin.setRawMode(false);
+        } catch (e) {}
       }
-    }
 
-    process.stdout.write('\n');
-    warning('Browser authorization timed out.');
-    info('Falling back to manual configuration...\n');
-  } catch (e) {
-    warning(`Browser login unavailable: ${e.message}`);
-    info('Using manual configuration instead...\n');
-  }
+      if (cancelled) {
+        process.stdout.write('\n');
+        warning('Browser authorization cancelled by user.');
+        return;
+      }
 
-  // Fallback: manual configuration
-  const roomId = await ask('Enter Subdomain/Room ID (e.g. "saya")', current.roomId);
-  const apiKey = await ask('Enter Room API Token/Key', current.apiKey);
+      if (attempts >= maxAttempts) {
+        process.stdout.write('\n');
+        warning('Browser authorization timed out.');
+      }
+    } catch (e) {
+      error(`Browser login unavailable: ${e.message}`);
+    }
+  } else {
+    // Manual API Key configuration
+    clearScreen();
+    log(`${colors.bgBlue}${colors.white}${colors.bold}   Manual API Key Config   ${colors.reset}\n`);
+    
+    const roomId = await ask('Enter Subdomain/Room ID (e.g. "saya")', current.roomId);
+    const apiKey = await ask('Enter Room API Token/Key', current.apiKey);
 
-  await saveConfig({ apiUrl, roomId, apiKey });
+    await saveConfig({ apiUrl, roomId, apiKey });
+  }
 }
 
 async function handleList() {
@@ -633,7 +687,7 @@ function selectMenuOption(options, titleCallback) {
           log(`   ${colors.dim}${opt}${colors.reset}`);
         }
       });
-      log(`\n${colors.dim}Use Up/Down arrows to navigate, Enter to select.${colors.reset}`);
+      log(`\n${colors.dim}Use Up/Down arrows to navigate, Enter to select, Esc to go back.${colors.reset}`);
     };
 
     readline.emitKeypressEvents(process.stdin);
@@ -665,6 +719,12 @@ function selectMenuOption(options, titleCallback) {
         } catch (e) {}
         process.stdin.off('keypress', onKeypress);
         resolve(activeIndex);
+      } else if (key && key.name === 'escape') {
+        try {
+          process.stdin.setRawMode(false);
+        } catch (e) {}
+        process.stdin.off('keypress', onKeypress);
+        resolve(-1);
       }
     };
 
@@ -694,6 +754,12 @@ async function startMainMenu() {
 
     const choice = await selectMenuOption(options, titleCallback);
 
+    if (choice === -1 || choice === 6) {
+      clearScreen();
+      log('Goodbye!');
+      process.exit(0);
+    }
+
     switch (choice) {
       case 0:
         await handleList();
@@ -719,10 +785,6 @@ async function startMainMenu() {
         await handleLogin();
         await ask('Press Enter to return to menu');
         break;
-      case 6:
-        clearScreen();
-        log('Goodbye!');
-        process.exit(0);
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "open-notepad",
-  "version": "1.0.6",
+  "version": "1.0.8",
   "description": "CLI tool for notepad.web.id to access, edit, create, and list room notes interactively.",
   "type": "module",
   "bin": {