three-blocks-login 0.1.9 → 0.1.10

package/bin/login.js

@@ -382,7 +382,7 @@ loadEnvFromDotfile( process.cwd() );
 const BROKER_URL =
   args.endpoint ||
   process.env.THREE_BLOCKS_BROKER_URL ||
-  "https://www.threejs-blocks.com/api/npm/token"; // your Astro broker endpoint
+  "https://www.threejs-blocks.com/api/npm/token";
 
 const OAUTH_DEVICE_CODE_URL =
   process.env.THREE_BLOCKS_OAUTH_DEVICE_URL ||
@@ -429,6 +429,78 @@ const openBrowser = async ( url ) => {
 
 };
 
+const createSpinner = ( { stream = process.stderr } = {} ) => {
+
+	const enabled = !! ( stream?.isTTY && ! QUIET && ! NON_INTERACTIVE );
+	const frames = [ '⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏' ];
+	let idx = 0;
+	let timer = null;
+	let text = '';
+
+	const clearLine = () => {
+
+		if ( ! enabled ) return;
+		try {
+
+			readline.clearLine( stream, 0 );
+			readline.cursorTo( stream, 0 );
+
+		} catch {
+
+			// best effort
+
+		}
+
+	};
+
+	const render = () => {
+
+		if ( ! enabled ) return;
+		const frame = frames[ idx ];
+		idx = ( idx + 1 ) % frames.length;
+		clearLine();
+		stream.write( `${cyan( frame )} ${text}` );
+
+	};
+
+	const stop = () => {
+
+		if ( timer ) clearInterval( timer );
+		timer = null;
+		clearLine();
+
+	};
+
+	const start = ( nextText ) => {
+
+		if ( ! enabled ) return;
+		text = String( nextText ?? '' );
+		idx = 0;
+		render();
+		timer = setInterval( render, 80 );
+
+	};
+
+	const succeed = ( msg ) => {
+
+		if ( ! enabled ) return;
+		stop();
+		stream.write( `${green( "✔" )} ${msg || text}\n` );
+
+	};
+
+	const fail = ( msg ) => {
+
+		if ( ! enabled ) return;
+		stop();
+		stream.write( `${red( "✖" )} ${msg || text}\n` );
+
+	};
+
+	return { enabled, start, stop, succeed, fail };
+
+};
+
 const promptChoice = async ( label, choices ) => {
 
 	return await new Promise( ( resolve ) => {
@@ -637,22 +709,33 @@ const pollForToken = async ( deviceCode, interval, expiresIn ) => {
 const browserLogin = async () => {
 
 	log.info( bold( cyan( 'Three Blocks CLI' ) ) + ' ' + dim( `[mode: ${MODE}]` ) );
-	log.info( dim( 'Opening browser to log in...' ) );
+	const openSpinner = createSpinner();
+	if ( openSpinner.enabled ) openSpinner.start( 'Opening browser to log in...' );
+	else log.info( dim( 'Opening browser to log in...' ) );
 	console.log( '' );
 
 	// Start device code flow
-	const deviceData = await startDeviceCodeFlow();
-	const { device_code, verification_uri, verification_uri_complete, expires_in, interval } = deviceData;
+	let deviceData;
+	let browserOpened = false;
+	try {
 
-	// Try to open browser
-	const browserOpened = await openBrowser( verification_uri_complete || verification_uri );
+		deviceData = await startDeviceCodeFlow();
+		const { verification_uri, verification_uri_complete } = deviceData;
+		// Try to open browser
+		browserOpened = await openBrowser( verification_uri_complete || verification_uri );
+		if ( openSpinner.enabled ) openSpinner.succeed( browserOpened ? 'Browser opened.' : 'Login URL ready.' );
 
-	if ( ! browserOpened ) {
+	} catch ( error ) {
 
-		log.warn( 'Could not open browser automatically.' );
+		if ( openSpinner.enabled ) openSpinner.fail( 'Failed to start browser login.' );
+		throw error;
 
 	}
 
+	const { device_code, verification_uri, verification_uri_complete, expires_in, interval } = deviceData;
+
+	if ( ! browserOpened ) log.warn( 'Could not open browser automatically.' );
+
 	console.log( '' );
 	log.info( yellow( 'Browser didn\'t open? Use the URL below to sign in:' ) );
 	console.log( '' );
@@ -660,29 +743,20 @@ const browserLogin = async () => {
 	console.log( '' );
 	log.info( dim( 'Waiting for authorization...' ) );
 
-	// Show a simple spinner while waiting
-	const spinnerFrames = [ '⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏' ];
-	let spinnerIdx = 0;
-	const spinnerInterval = setInterval( () => {
-
-		process.stdout.write( `\r${cyan( spinnerFrames[ spinnerIdx ] )} Waiting for browser authorization...` );
-		spinnerIdx = ( spinnerIdx + 1 ) % spinnerFrames.length;
-
-	}, 100 );
+	const waitSpinner = createSpinner();
+	if ( waitSpinner.enabled ) waitSpinner.start( 'Waiting for browser authorization...' );
 
 	try {
 
 		const licenseKey = await pollForToken( device_code, interval || 2, expires_in || 900 );
-		clearInterval( spinnerInterval );
-		process.stdout.write( '\r' + ' '.repeat( 50 ) + '\r' ); // Clear spinner line
+		if ( waitSpinner.enabled ) waitSpinner.succeed( 'Authorization successful!' );
+		else log.ok( green( 'Authorization successful!' ) );
 		console.log( '' );
-		log.ok( green( 'Authorization successful!' ) );
 		return licenseKey;
 
 	} catch ( error ) {
 
-		clearInterval( spinnerInterval );
-		process.stdout.write( '\r' + ' '.repeat( 50 ) + '\r' );
+		if ( waitSpinner.enabled ) waitSpinner.fail( 'Authorization failed.' );
 		throw error;
 
 	}
@@ -876,7 +950,21 @@ const log = {
 
 		}
 
-		const tokenData = await fetchToken( BROKER_URL, LICENSE_CLEAN, CHANNEL );
+		const brokerSpinner = createSpinner();
+		if ( brokerSpinner.enabled ) brokerSpinner.start( 'Verifying secret key with broker...' );
+		let tokenData;
+		try {
+
+			tokenData = await fetchToken( BROKER_URL, LICENSE_CLEAN, CHANNEL );
+			if ( brokerSpinner.enabled ) brokerSpinner.succeed( 'Broker verified secret key.' );
+
+		} catch ( error ) {
+
+			if ( brokerSpinner.enabled ) brokerSpinner.fail( 'Broker verification failed.' );
+			throw error;
+
+		}
+
 		const {
 			registry,
 			token,
@@ -1217,7 +1305,9 @@ async function fetchToken( endpoint, license, channel ) {
 		let suggestion = "Request failed. Please retry.";
 		if ( res.status === 401 || res.status === 403 ) {
 
-			suggestion = "Authentication failed. Verify your license or access rights.";
+			suggestion = "Authentication failed. The broker did not accept your license key. "
+				+ "If THREE_BLOCKS_SECRET_KEY (or a local .env) is set, verify it contains your active tb_… key, "
+				+ "or unset it to be prompted again.";
 
 		} else if ( res.status === 404 ) {
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "three-blocks-login",
-  "version": "0.1.9",
+  "version": "0.1.10",
   "description": "Fetch a short-lived token from the three-blocks broker and configure npm for the current context.",
   "type": "module",
   "bin": {