open-notepad 1.0.7 → 1.0.8

package/bin/note.js

@@ -157,6 +157,10 @@ async function handleLogin(apiUrlArg) {
 
   const choice = await selectMenuOption(loginOptions, titleCallback);
 
+  if (choice === -1) {
+    return;
+  }
+
   if (choice === 0) {
     // Google Login (Browser flow)
     clearScreen();
@@ -192,11 +196,31 @@ async function handleLogin(apiUrlArg) {
 
       // 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 (hasTTY) {
+        readline.emitKeypressEvents(process.stdin);
+        try {
+          process.stdin.setRawMode(true);
+        } catch (e) {}
+        process.stdin.resume();
+        process.stdin.on('keypress', onPollKeypress);
+      }
       
-      while (attempts < maxAttempts) {
+      while (attempts < maxAttempts && !cancelled) {
         await new Promise(r => setTimeout(r, 1500));
+        if (cancelled) break;
         attempts++;
 
         try {
@@ -205,7 +229,7 @@ async function handleLogin(apiUrlArg) {
           if (pollRes.status === 404) {
             if (attempts > 10) {
               error('Session expired. Please try again.');
-              return;
+              break;
             }
             continue;
           }
@@ -223,7 +247,8 @@ async function handleLogin(apiUrlArg) {
               });
               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;
+              cancelled = false; // Reset to indicate success
+              break;
             }
           }
         } catch (pollErr) {
@@ -231,12 +256,27 @@ async function handleLogin(apiUrlArg) {
         }
 
         if (attempts % 4 === 0) {
-          process.stdout.write(`\r${colors.dim}  Polling... (${attempts}s elapsed, waiting for browser auth)${colors.reset}  `);
+          process.stdout.write(`\r${colors.dim}  Polling... (${Math.round(attempts * 1.5)}s elapsed, waiting for browser auth)${colors.reset}  `);
         }
       }
 
-      process.stdout.write('\n');
-      warning('Browser authorization timed out.');
+      if (hasTTY) {
+        try {
+          process.stdin.off('keypress', onPollKeypress);
+          process.stdin.setRawMode(false);
+        } catch (e) {}
+      }
+
+      if (cancelled) {
+        process.stdout.write('\n');
+        warning('Browser authorization cancelled by user.');
+        return;
+      }
+
+      if (attempts >= maxAttempts) {
+        process.stdout.write('\n');
+        warning('Browser authorization timed out.');
+      }
     } catch (e) {
       error(`Browser login unavailable: ${e.message}`);
     }
@@ -647,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);
@@ -679,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);
       }
     };
 
@@ -708,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();
@@ -733,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.7",
+  "version": "1.0.8",
   "description": "CLI tool for notepad.web.id to access, edit, create, and list room notes interactively.",
   "type": "module",
   "bin": {