usertold 1.9.2 → 1.9.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "usertold",
-  "version": "1.9.2",
+  "version": "1.9.3",
   "description": "UserTold.ai CLI",
   "license": "UNLICENSED",
   "type": "module",

package/usertold

@@ -728,79 +728,98 @@ function generateState() {
 function base64UrlEncode(buffer) {
     return buffer.toString('base64').replace(/\+/g, '-').replace(/\//g, '_').replace(/=+$/g, '');
 }
-async function waitForAuthorizationCode(port, expectedState) {
-    return new Promise((resolve, reject)=>{
-        const server = http.createServer((req, res)=>{
-            if (!req.url) {
-                res.writeHead(400, {
-                    'Content-Type': 'text/html'
-                });
-                res.end(getErrorPage('invalid_request', 'Invalid request'));
-                return;
-            }
-            const url = new URL(req.url, `http://127.0.0.1:${port}`);
-            if (url.pathname !== '/callback') {
-                res.writeHead(404, {
-                    'Content-Type': 'text/html'
-                });
-                res.end(getErrorPage('not_found', 'Page not found'));
-                return;
-            }
-            const code = url.searchParams.get('code');
-            const state = url.searchParams.get('state');
-            const error = url.searchParams.get('error');
-            const errorDescription = url.searchParams.get('error_description');
-            // Handle OAuth error response
-            if (error) {
-                res.writeHead(400, {
-                    'Content-Type': 'text/html'
-                });
-                res.end(getErrorPage(error, errorDescription || undefined));
-                clearTimeout(timeout);
-                server.close();
-                reject(new Error(`OAuth error: ${error}${errorDescription ? ` - ${errorDescription}` : ''}`));
-                return;
-            }
-            if (!code) {
-                res.writeHead(400, {
-                    'Content-Type': 'text/html'
-                });
-                res.end(getErrorPage('invalid_request', 'Missing authorization code'));
-                clearTimeout(timeout);
-                server.close();
-                reject(new Error('Missing authorization code'));
-                return;
-            }
-            if (state !== expectedState) {
-                res.writeHead(400, {
-                    'Content-Type': 'text/html'
-                });
-                res.end(getErrorPage('invalid_request', 'State parameter mismatch - possible CSRF attack'));
-                clearTimeout(timeout);
-                server.close();
-                reject(new Error('State mismatch'));
-                return;
-            }
-            res.writeHead(200, {
+function startAuthorizationCodeListener(port, expectedState) {
+    const server = http.createServer((req, res)=>{
+        if (!req.url) {
+            res.writeHead(400, {
+                'Content-Type': 'text/html'
+            });
+            res.end(getErrorPage('invalid_request', 'Invalid request'));
+            return;
+        }
+        const url = new URL(req.url, `http://127.0.0.1:${port}`);
+        if (url.pathname !== '/callback') {
+            res.writeHead(404, {
+                'Content-Type': 'text/html'
+            });
+            res.end(getErrorPage('not_found', 'Page not found'));
+            return;
+        }
+        const code = url.searchParams.get('code');
+        const state = url.searchParams.get('state');
+        const error = url.searchParams.get('error');
+        const errorDescription = url.searchParams.get('error_description');
+        // Handle OAuth error response
+        if (error) {
+            res.writeHead(400, {
                 'Content-Type': 'text/html'
             });
-            res.end(getSuccessPage());
+            res.end(getErrorPage(error, errorDescription || undefined));
             clearTimeout(timeout);
             server.close();
-            resolve({
-                code
+            rejectResult(new Error(`OAuth error: ${error}${errorDescription ? ` - ${errorDescription}` : ''}`));
+            return;
+        }
+        if (!code) {
+            res.writeHead(400, {
+                'Content-Type': 'text/html'
             });
+            res.end(getErrorPage('invalid_request', 'Missing authorization code'));
+            clearTimeout(timeout);
+            server.close();
+            rejectResult(new Error('Missing authorization code'));
+            return;
+        }
+        if (state !== expectedState) {
+            res.writeHead(400, {
+                'Content-Type': 'text/html'
+            });
+            res.end(getErrorPage('invalid_request', 'State parameter mismatch - possible CSRF attack'));
+            clearTimeout(timeout);
+            server.close();
+            rejectResult(new Error('State mismatch'));
+            return;
+        }
+        res.writeHead(200, {
+            'Content-Type': 'text/html'
+        });
+        res.end(getSuccessPage());
+        clearTimeout(timeout);
+        server.close();
+        resolveResult({
+            code
         });
-        server.listen(port, '127.0.0.1');
-        server.on('error', (error)=>{
+    });
+    let rejectResult = ()=>{};
+    let resolveResult = ()=>{};
+    const result = new Promise((resolve, reject)=>{
+        resolveResult = resolve;
+        rejectResult = reject;
+    });
+    const ready = new Promise((resolve, reject)=>{
+        const handleStartupError = (error)=>{
             clearTimeout(timeout);
+            rejectResult(new Error(`Failed to start local callback server: ${error.message}`));
             reject(new Error(`Failed to start local callback server: ${error.message}`));
+        };
+        server.once('error', handleStartupError);
+        server.listen(port, '127.0.0.1', ()=>{
+            server.off('error', handleStartupError);
+            server.on('error', (error)=>{
+                clearTimeout(timeout);
+                rejectResult(new Error(`Local callback server error: ${error.message}`));
+            });
+            resolve();
         });
-        const timeout = setTimeout(()=>{
-            server.close();
-            reject(new Error('Login timed out waiting for authorization response'));
-        }, 5 * 60 * 1000);
     });
+    const timeout = setTimeout(()=>{
+        server.close();
+        rejectResult(new Error('Login timed out waiting for authorization response'));
+    }, 5 * 60 * 1000);
+    return {
+        ready,
+        result
+    };
 }
 // =============================================================================
 // CLI Auth Page Design Tokens
@@ -1052,6 +1071,8 @@ async function handleLogin(parsed) {
     authUrl.searchParams.set('code_challenge_method', 'S256');
     authUrl.searchParams.set('state', state);
     authUrl.searchParams.set('access_type', 'offline');
+    const authorizationCodeListener = startAuthorizationCodeListener(redirectPort, state);
+    await authorizationCodeListener.ready;
     // Always print the URL so it works on headless/remote hosts
     console.log('\nOpen this URL in your browser to authenticate:\n');
     console.log(authUrl.toString());
@@ -1068,7 +1089,7 @@ async function handleLogin(parsed) {
             console.log('(Could not open browser — use the URL above)');
         }
     }
-    const { code } = await waitForAuthorizationCode(redirectPort, state);
+    const { code } = await authorizationCodeListener.result;
     console.log('Received authorization code. Exchanging for access token...');
     const tokenResponse = await exchangeCodeForToken({
         baseUrl,
@@ -14713,7 +14734,7 @@ function printExtractHelp() {
     console.log(EXTRACT_HELP);
 }
 
-const CLI_VERSION$1 = '1.9.2';
+const CLI_VERSION$1 = '1.9.3';
 const GLOBAL_FLAGS = [
     'env',
     'json',
@@ -15009,7 +15030,7 @@ function printCompletionsHelp() {
     console.log(COMPLETIONS_HELP);
 }
 
-const CLI_VERSION = '1.9.2';
+const CLI_VERSION = '1.9.3';
 function detectJsonMode() {
     const argv = process$2.argv.slice(2);
     if (argv.includes('--json')) return true;