google-apis-cli 0.4.0 → 0.4.1

package/dist/src/credentials.js

@@ -38,7 +38,18 @@ export function openCredentials({ dir, env, oauth = (opts) => new OAuth2Client(o
     let apiKey;
     let tokenClient;
     let saving; // the refreshed-token write the 'tokens' event starts
-    const ask = (q, opts) => defaultPrompt(q, { ...opts, input: stdin, output: stderr });
+    // Each prompting command reads stdin through one session, closed when it ends (TTY raw mode).
+    const withPrompt = async (given, fn) => {
+        if (given)
+            return fn(given);
+        const p = openPrompt({ input: stdin, output: stderr });
+        try {
+            return await fn(p.ask);
+        }
+        finally {
+            p.close();
+        }
+    };
     // Only a missing file reads as {}: anything else stops before `setup` can overwrite it.
     // The parse error is not echoed, since V8 quotes the file text (secrets) in it.
     const readConfig = async () => {
@@ -171,7 +182,7 @@ export function openCredentials({ dir, env, oauth = (opts) => new OAuth2Client(o
         return token ? hash('sha256', token) : undefined;
     }
     // Both flows send `state` and a PKCE S256 challenge, and redeem one redirect URL.
-    async function login({ consent, manual = false, prompt = ask, }) {
+    async function login({ consent, manual = false, prompt, }) {
         const c = await client(REDIRECT_URI);
         const state = randomBytes(32).toString('base64url');
         const { codeVerifier, codeChallenge } = await c.generateCodeVerifierAsync();
@@ -206,7 +217,8 @@ export function openCredentials({ dir, env, oauth = (opts) => new OAuth2Client(o
             stderr.write(`Open this URL and grant access:\n${url}\n` +
                 `After consent the browser cannot load ${LOOPBACK_HOST}:${LOOPBACK_PORT}; ` +
                 'paste the full URL from its address bar.\n');
-            const redirect = URL.parse((await prompt('redirected URL: ')).trim());
+            const answer = await withPrompt(prompt, (ask) => ask('redirected URL: '));
+            const redirect = URL.parse(answer.trim());
             if (!redirect)
                 throw new GapiError(2, 'not a URL; paste the full URL from the address bar');
             return redeem(redirect);
@@ -279,7 +291,7 @@ export function openCredentials({ dir, env, oauth = (opts) => new OAuth2Client(o
         await rm(credentialsFile, { force: true });
     }
     // `headers`: every entry's header specs, tagged with the entry's api.
-    async function setup(headers, prompt = ask) {
+    async function setup(headers, prompt) {
         const cfg = await readConfig();
         const fields = [
             ...CLIENT_FIELDS,
@@ -291,15 +303,17 @@ export function openCredentials({ dir, env, oauth = (opts) => new OAuth2Client(o
             })),
             API_KEY_FIELD,
         ];
-        for (const { key, label, required, secret } of fields) {
-            const cur = cfg[key];
-            const hint = cur != null ? ' [keep current]' : required ? '' : ' (blank to skip)';
-            const v = (await prompt(`${label}${hint}: `, { secret })).trim();
-            if (v)
-                cfg[key] = v;
-            else if (required && cur == null)
-                throw new GapiError(3, `${label} is required`);
-        }
+        await withPrompt(prompt, async (ask) => {
+            for (const { key, label, required, secret } of fields) {
+                const cur = cfg[key];
+                const hint = cur != null ? ' [keep current]' : required ? '' : ' (blank to skip)';
+                const v = (await ask(`${label}${hint}: `, { secret })).trim();
+                if (v)
+                    cfg[key] = v;
+                else if (required && cur == null)
+                    throw new GapiError(3, `${label} is required`);
+            }
+        });
         await writeSecure(configFile, cfg);
         return configFile;
     }
@@ -318,25 +332,47 @@ function accountFromIdToken(idToken) {
         return null;
     }
 }
-// `secret: true` keeps the typed value off the screen. Node has no masking
-// option, so point readline's echo at a sink and print the question ourselves.
-// `terminal: true` is what makes this safe: it puts the tty in raw mode, so the
-// driver stops echoing too and the sink is the only writer left. Streams are
-// injected (Credentials passes the ones `run` got), so the masking has a test.
-export async function defaultPrompt(q, { secret = false, input, output, terminal, }) {
-    if (secret)
-        output.write(q);
+// `secret: true` keeps the typed value off the screen. Node has no masking option.
+// So readline echoes through a gate that drops writes during a secret.
+// TTY raw mode stops the driver echo; a pipe echoes nothing.
+export function openPrompt({ input, output, terminal, }) {
+    let muted = false; // a secret: drop the terminal echo of what the user types
     const rl = createInterface({
         input,
-        output: secret ? new Writable({ write: (_c, _e, cb) => cb() }) : output,
-        terminal: secret ? true : terminal,
+        output: new Writable({
+            write: (c, _e, cb) => {
+                if (!muted)
+                    output.write(c);
+                cb();
+            },
+        }),
+        terminal: terminal ?? ('isTTY' in input && input.isTTY === true),
     });
-    try {
-        return await rl.question(secret ? '' : q);
-    }
-    finally {
-        rl.close();
-        if (secret)
-            output.write('\n'); // the swallowed Enter never printed one
-    }
+    // One reader per session, made before any await: a pipe sends all answers in one chunk (#233).
+    const lines = rl[Symbol.asyncIterator]();
+    let ended = false; // input closed: buffered lines remain, but `rl.prompt` throws
+    rl.on('close', () => {
+        ended = true;
+    });
+    const ask = async (q, { secret = false } = {}) => {
+        muted = secret;
+        if (secret || ended)
+            output.write(q);
+        else {
+            rl.setPrompt(q); // terminal mode redraws the prompt on line edits
+            rl.prompt();
+        }
+        try {
+            const { value, done } = await lines.next();
+            if (done)
+                throw new GapiError(3, `input ended before an answer to: ${q.trim()}`);
+            return value;
+        }
+        finally {
+            muted = false;
+            if (secret)
+                output.write('\n'); // the swallowed Enter (TTY) or the pipe never printed one
+        }
+    };
+    return { ask, close: () => rl.close() };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "google-apis-cli",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "description": "One discovery-driven CLI (gapi) for 49 Google marketing and data APIs: Ads, GA4, Search Console, Tag Manager, Indexing, Merchant, Business Profile, SA360, CM360, DV360, YouTube, PageSpeed, CrUX, BigQuery, Sheets, Places and more. One login, read+write.",
   "type": "module",
   "bin": {