open-notepad 1.0.0 → 1.0.2

package/bin/note.js

@@ -87,7 +87,7 @@ async function loadConfig() {
     }
   }
   return {
-    apiUrl: 'https://api-yuulabs-v1.notepad.web.id',
+    apiUrl: 'https://notepad.web.id',
     roomId: '',
     apiKey: ''
   };
@@ -102,6 +102,17 @@ async function saveConfig(config) {
   }
 }
 
+function resolveTarget(code, config) {
+  let targetRoom = config.roomId;
+  let targetCode = code;
+  if (code && code.includes(':')) {
+    const parts = code.split(':');
+    targetRoom = parts[0];
+    targetCode = parts[1];
+  }
+  return { targetRoom, targetCode };
+}
+
 // HTTP request wrappers
 async function apiFetch(config, endpoint, options = {}) {
   const url = `${config.apiUrl.replace(/\/$/, '')}${endpoint}`;
@@ -136,6 +147,92 @@ async function handleLogin() {
   const current = await loadConfig();
 
   const apiUrl = await ask('Enter Server API URL', current.apiUrl);
+
+  // Generate a random session code
+  const sessionCode = 'cli_' + Math.random().toString(36).substring(2, 15) + Math.random().toString(36).substring(2, 15);
+
+  // 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 })
+    });
+
+    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...');
+    const maxAttempts = 120; // 2 minutes (polling every 1s)
+    let attempts = 0;
+    
+    while (attempts < maxAttempts) {
+      await new Promise(r => setTimeout(r, 1500));
+      attempts++;
+
+      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;
+        }
+
+        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');
+            return;
+          }
+        }
+      } 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}  `);
+      }
+    }
+
+    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');
+  }
+
+  // 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);
 
@@ -184,22 +281,23 @@ async function handleList() {
 
 async function handleView(codeArg) {
   const config = await loadConfig();
-  if (!config.roomId) {
-    warning('Not configured. Please run `note login` first.');
-    return;
-  }
-
   const code = codeArg || await ask('Enter note code to view');
   if (!code) return;
 
-  info(`Loading note ${colors.bold}/${config.roomId}/${code}${colors.reset}...`);
+  const { targetRoom, targetCode } = resolveTarget(code, config);
+  if (!targetRoom) {
+    warning('No room specified. Please run `note login` or specify room:code.');
+    return;
+  }
+
+  info(`Loading note ${colors.bold}/${targetRoom}/${targetCode}${colors.reset}...`);
 
   try {
     // Attempt standard fetch with API key
-    let res = await apiFetch(config, `/api/notes/room/${config.roomId}/${code}`);
+    let res = await apiFetch(config, `/api/notes/room/${targetRoom}/${targetCode}`);
 
     if (res.status === 404) {
-      error(`Note "${code}" not found.`);
+      error(`Note "${targetCode}" not found in room "${targetRoom}".`);
       return;
     }
 
@@ -211,7 +309,7 @@ async function handleView(codeArg) {
 
       // Note: We bypass API Key header if providing note password for private notes
       // because backend rejects (is_api = true && private_note = true) outright.
-      res = await apiFetch(config, `/api/notes/room/${config.roomId}/${code}`, {
+      res = await apiFetch(config, `/api/notes/room/${targetRoom}/${targetCode}`, {
         headers: { 'x-note-password': pwd },
         skipApiKey: true
       });
@@ -229,7 +327,7 @@ async function handleView(codeArg) {
     }
 
     clearScreen();
-    log(`${colors.bold}${colors.blue}Note: /${config.roomId}/${code}${colors.reset}`);
+    log(`${colors.bold}${colors.blue}Note: /${targetRoom}/${targetCode}${colors.reset}`);
     log(`${colors.dim}------------------------------------------------------------${colors.reset}`);
     log(noteData.content || `${colors.dim}(Empty note)${colors.reset}`);
     log(`${colors.dim}------------------------------------------------------------${colors.reset}`);
@@ -240,14 +338,15 @@ async function handleView(codeArg) {
 
 async function handleCreate(codeArg) {
   const config = await loadConfig();
-  if (!config.roomId) {
-    warning('Not configured. Please run `note login` first.');
-    return;
-  }
-
   const code = codeArg || await ask('Enter new note code');
   if (!code) return;
 
+  const { targetRoom, targetCode } = resolveTarget(code, config);
+  if (!targetRoom) {
+    warning('No room specified. Please run `note login` or specify room:code.');
+    return;
+  }
+
   const isPublicStr = await ask('Make note public? (y/n)', 'y');
   const isPublic = isPublicStr.toLowerCase().startsWith('y');
 
@@ -265,11 +364,11 @@ async function handleCreate(codeArg) {
     }
   }
 
-  info(`Creating note ${colors.bold}/${config.roomId}/${code}${colors.reset}...`);
+  info(`Creating note ${colors.bold}/${targetRoom}/${targetCode}${colors.reset}...`);
 
   try {
     // 1. Create/Save note with empty content (must send API key)
-    let saveRes = await apiFetch(config, `/api/notes/room/${config.roomId}/${code}`, {
+    let saveRes = await apiFetch(config, `/api/notes/room/${targetRoom}/${targetCode}`, {
       method: 'POST',
       body: JSON.stringify({ content: '' })
     });
@@ -280,7 +379,7 @@ async function handleCreate(codeArg) {
     }
 
     // 2. Set visibility and password (calls settings endpoint)
-    const settingsRes = await apiFetch(config, `/api/notes/room/${config.roomId}/${code}/settings`, {
+    const settingsRes = await apiFetch(config, `/api/notes/room/${targetRoom}/${targetCode}/settings`, {
       method: 'POST',
       body: JSON.stringify({
         is_public: isPublic,
@@ -293,11 +392,11 @@ async function handleCreate(codeArg) {
       return;
     }
 
-    success(`Note "${code}" created successfully!`);
+    success(`Note "${targetCode}" created successfully in room "${targetRoom}"!`);
 
     const editNow = await ask('Open editor to write content now? (y/n)', 'y');
     if (editNow.toLowerCase().startsWith('y')) {
-      await handleEdit(code);
+      await handleEdit(`${targetRoom}:${targetCode}`);
     }
   } catch (e) {
     error(e.message);
@@ -306,25 +405,26 @@ async function handleCreate(codeArg) {
 
 async function handleEdit(codeArg) {
   const config = await loadConfig();
-  if (!config.roomId) {
-    warning('Not configured. Please run `note login` first.');
-    return;
-  }
-
   const code = codeArg || await ask('Enter note code to edit');
   if (!code) return;
 
-  info(`Fetching current content of /${config.roomId}/${code}...`);
+  const { targetRoom, targetCode } = resolveTarget(code, config);
+  if (!targetRoom) {
+    warning('No room specified. Please run `note login` or specify room:code.');
+    return;
+  }
+
+  info(`Fetching current content of /${targetRoom}/${targetCode}...`);
 
   try {
     let notePassword = '';
-    let res = await apiFetch(config, `/api/notes/room/${config.roomId}/${code}`);
+    let res = await apiFetch(config, `/api/notes/room/${targetRoom}/${targetCode}`);
 
     // If it doesn't exist, offer to create it
     if (res.status === 404) {
       const create = await ask('Note does not exist. Create it? (y/n)', 'y');
       if (create.toLowerCase().startsWith('y')) {
-        await handleCreate(code);
+        await handleCreate(`${targetRoom}:${targetCode}`);
       }
       return;
     }
@@ -335,7 +435,7 @@ async function handleEdit(codeArg) {
     if (noteData.has_password && (!noteData.content || res.status === 403)) {
       notePassword = await askPassword('Enter note password to edit');
 
-      res = await apiFetch(config, `/api/notes/room/${config.roomId}/${code}`, {
+      res = await apiFetch(config, `/api/notes/room/${targetRoom}/${targetCode}`, {
         headers: { 'x-note-password': notePassword },
         skipApiKey: true
       });
@@ -356,7 +456,7 @@ async function handleEdit(codeArg) {
 
     // Create temp file
     const tempDir = os.tmpdir();
-    const tempFilePath = path.join(tempDir, `note_${config.roomId}_${code}.txt`);
+    const tempFilePath = path.join(tempDir, `note_${targetRoom}_${targetCode}.txt`);
     await fs.writeFile(tempFilePath, initialContent, 'utf-8');
 
     // Open editor
@@ -380,7 +480,7 @@ async function handleEdit(codeArg) {
         info('Saving changes back to server...');
 
         // Save note
-        const saveRes = await apiFetch(config, `/api/notes/room/${config.roomId}/${code}`, {
+        const saveRes = await apiFetch(config, `/api/notes/room/${targetRoom}/${targetCode}`, {
           method: 'POST',
           headers: notePassword ? { 'x-note-password': notePassword } : {},
           skipApiKey: !!notePassword, // Skip API key header if note password is used
@@ -388,7 +488,7 @@ async function handleEdit(codeArg) {
         });
 
         if (saveRes.ok) {
-          success(`Saved /${config.roomId}/${code} successfully!`);
+          success(`Saved /${targetRoom}/${targetCode} successfully!`);
         } else {
           error(`Failed to save changes. Server returned status: ${saveRes.status}`);
         }
@@ -403,28 +503,29 @@ async function handleEdit(codeArg) {
 
 async function handleDelete(codeArg) {
   const config = await loadConfig();
-  if (!config.roomId) {
-    warning('Not configured. Please run `note login` first.');
-    return;
-  }
-
   const code = codeArg || await ask('Enter note code to delete');
   if (!code) return;
 
-  const confirm = await ask(`Are you sure you want to delete /${config.roomId}/${code}? (y/n)`, 'n');
+  const { targetRoom, targetCode } = resolveTarget(code, config);
+  if (!targetRoom) {
+    warning('No room specified. Please run `note login` or specify room:code.');
+    return;
+  }
+
+  const confirm = await ask(`Are you sure you want to delete /${targetRoom}/${targetCode}? (y/n)`, 'n');
   if (!confirm.toLowerCase().startsWith('y')) {
     info('Delete canceled.');
     return;
   }
 
-  info(`Deleting note /${config.roomId}/${code}...`);
+  info(`Deleting note /${targetRoom}/${targetCode}...`);
   try {
-    const res = await apiFetch(config, `/api/rooms/${config.roomId}/notes/${code}`, {
+    const res = await apiFetch(config, `/api/rooms/${targetRoom}/notes/${targetCode}`, {
       method: 'DELETE'
     });
 
     if (res.ok) {
-      success(`Note "${code}" deleted successfully.`);
+      success(`Note "${targetCode}" deleted successfully from room "${targetRoom}".`);
     } else {
       error(`Failed to delete note. Status: ${res.status}`);
     }

package/package.json

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