chore: stream consumption must be inside retryAuthentication

Author: aryanjassal

src/secrets/CommandCat.ts

@@ -78,7 +78,8 @@ class CommandGet extends CommandPolykey {
           });
           return;
         }
-        const response = await binUtils.retryAuthentication(async (auth) => {
+        const hasErrored = await binUtils.retryAuthentication(async (auth) => {
+          // Write secret paths to input stream
           const response = await pkClient.rpcClient.methods.vaultsSecretsGet();
           const writer = response.writable.getWriter();
           let first = true;
@@ -93,17 +94,18 @@ class CommandGet extends CommandPolykey {
             first = false;
           }
           await writer.close();
-          return response;
-        }, meta);
-        let hasErrored = false;
-        for await (const chunk of response.readable) {
-          if (chunk.error) {
-            hasErrored = true;
-            process.stderr.write(chunk.error);
-          } else {
-            process.stdout.write(chunk.secretContent);
+          // Print out incoming data to standard out
+          let hasErrored = false;
+          for await (const chunk of response.readable) {
+            if (chunk.error) {
+              hasErrored = true;
+              process.stderr.write(chunk.error);
+            } else {
+              process.stdout.write(chunk.secretContent);
+            }
           }
-        }
+          return hasErrored;
+        }, meta);
         if (hasErrored) {
           throw new errors.ErrorPolykeyCLICatSecret(
             'Failed to concatenate one or more secrets',

src/secrets/CommandMkdir.ts

@@ -59,7 +59,8 @@ class CommandMkdir extends CommandPolykey {
           },
           logger: this.logger.getChild(PolykeyClient.name),
         });
-        const response = await binUtils.retryAuthentication(async (auth) => {
+        const hasErrored = await binUtils.retryAuthentication(async (auth) => {
+          // Write directory paths to input stream
           const response =
             await pkClient.rpcClient.methods.vaultsSecretsMkdir();
           const writer = response.writable.getWriter();
@@ -75,35 +76,36 @@ class CommandMkdir extends CommandPolykey {
             first = false;
           }
           await writer.close();
-          return response;
-        }, meta);
-
-        let hasErrored = false;
-        for await (const result of response.readable) {
-          if (result.type === 'error') {
-            // TS cannot properly evaluate a type this deeply nested, so we use
-            // the as keyword to help it. Inside this block, the type of data is
-            // ensured to be 'error'.
-            const error = result as ErrorMessage;
-            hasErrored = true;
-            let message: string = '';
-            switch (error.code) {
-              case 'ENOENT':
-                message = 'No such secret or directory';
-                break;
-              case 'EEXIST':
-                message = 'Secret or directory exists';
-                break;
-              default:
-                throw new ErrorPolykeyCLIUncaughtException(
-                  `Unexpected error code: ${error.code}`,
-                );
+          // Print out incoming data to standard out, or incoming errors to
+          // standard error.
+          let hasErrored = false;
+          for await (const result of response.readable) {
+            if (result.type === 'error') {
+              // TS cannot properly evaluate a type this deeply nested, so we use
+              // the as keyword to help it. Inside this block, the type of data
+              // is ensured to be 'error'.
+              const error = result as ErrorMessage;
+              hasErrored = true;
+              let message: string = '';
+              switch (error.code) {
+                case 'ENOENT':
+                  message = 'No such secret or directory';
+                  break;
+                case 'EEXIST':
+                  message = 'Secret or directory exists';
+                  break;
+                default:
+                  throw new ErrorPolykeyCLIUncaughtException(
+                    `Unexpected error code: ${error.code}`,
+                  );
+              }
+              process.stderr.write(
+                `mkdir: cannot create directory ${error.reason}: ${message}\n`,
+              );
             }
-            process.stderr.write(
-              `${error.code}: cannot create directory ${error.reason}: ${message}\n`,
-            );
           }
-        }
+          return hasErrored;
+        }, meta);
         if (hasErrored) {
           throw new ErrorPolykeyCLIMakeDirectory(
             'Failed to create one or more directories',

src/secrets/CommandRemove.ts

@@ -59,28 +59,25 @@ class CommandRemove extends CommandPolykey {
           options: { nodePath: options.nodePath },
           logger: this.logger.getChild(PolykeyClient.name),
         });
-        const response = await binUtils.retryAuthentication(async (auth) => {
+        await binUtils.retryAuthentication(async (auth) => {
           const response =
             await pkClient.rpcClient.methods.vaultsSecretsRemove();
-          await (async () => {
-            const writer = response.writable.getWriter();
-            let first = true;
-            for (const [vault, path] of secretPaths) {
-              await writer.write({
-                nameOrId: vault,
-                secretName: path,
-                metadata: first
-                  ? { ...auth, options: { recursive: options.recursive } }
-                  : undefined,
-              });
-              first = false;
-            }
-            await writer.close();
-          })();
-          return response;
+          const writer = response.writable.getWriter();
+          let first = true;
+          for (const [vault, path] of secretPaths) {
+            await writer.write({
+              nameOrId: vault,
+              secretName: path,
+              metadata: first
+                ? { ...auth, options: { recursive: options.recursive } }
+                : undefined,
+            });
+            first = false;
+          }
+          await writer.close();
+          // Wait for the program to generate a response (complete processing).
+          await response.output;
         }, meta);
-        // Wait for the program to generate a response (complete processing).
-        await response.output;
       } finally {
         if (pkClient! != null) await pkClient.stop();
       }