chore: updated compositional types to tagged types

Author: aryanjassal

src/secrets/CommandCat.ts

@@ -95,7 +95,7 @@ class CommandGet extends CommandPolykey {
           // Print out incoming data to standard out
           let hasErrored = false;
           for await (const result of response.readable) {
-            if (result.type === 'error') {
+            if (result.type === 'ErrorMessage') {
               hasErrored = true;
               switch (result.code) {
                 case 'ENOENT':

src/secrets/CommandEdit.ts

@@ -27,7 +27,6 @@ class CommandEdit extends CommandPolykey {
       const secretPath = fullSecretPath[1] ?? '/';
       const os = await import('os');
       const { spawn } = await import('child_process');
-      const vaultsErrors = await import('polykey/dist/vaults/errors');
       const { default: PolykeyClient } = await import(
         'polykey/dist/PolykeyClient'
       );
@@ -66,41 +65,48 @@ class CommandEdit extends CommandPolykey {
         const secretExists = await binUtils.retryAuthentication(
           async (auth) => {
             let exists = true;
-            const response = await pkClient.rpcClient.methods.vaultsSecretsGet({
+            const response =
+              await pkClient.rpcClient.methods.vaultsSecretsCat();
+            const writer = response.writable.getWriter();
+            await writer.write({
               nameOrId: vaultName,
               secretName: secretPath,
               metadata: auth,
             });
-            try {
-              let rawSecretContent: string = '';
-              for await (const chunk of response) {
+            await writer.close();
+            let rawSecretContent: string = '';
+            for await (const chunk of response.readable) {
+              if (chunk.type === 'SuccessMessage') {
                 rawSecretContent += chunk.secretContent;
+              } else {
+                if (chunk.code === 'ENOENT') {
+                  exists = false;
+                  break;
+                } else if (chunk.code === 'EISDIR') {
+                  // First, write the inline error to standard error like other
+                  // secrets commands do.
+                  process.stderr.write(
+                    `edit: ${secretPath}: No such file or directory\n`,
+                  );
+                  // Then, throw an error to get the non-zero exit code. As this
+                  // command is Polykey-specific, the code doesn't really matter
+                  // that much.
+                  throw new errors.ErrorPolykeyCLIEditSecret(
+                    'The specified secret cannot be edited',
+                  );
+                } else {
+                  throw new errors.ErrorPolykeyCLIEditSecret(
+                    `Unexpected error value returned: ${chunk.code} (${chunk.data})`,
+                  );
+                }
               }
+            }
+            // Only make the temp file is the secret actually exists
+            if (exists) {
               const secretContent = Buffer.from(rawSecretContent, 'binary');
               await this.fs.promises.writeFile(tmpFile, secretContent);
-            } catch (e) {
-              const [cause, _] = binUtils.remoteErrorCause(e);
-              if (cause instanceof vaultsErrors.ErrorSecretsSecretUndefined) {
-                exists = false;
-              } else if (
-                cause instanceof vaultsErrors.ErrorSecretsIsDirectory
-              ) {
-                // First, write the inline error to standard error like other
-                // secrets commands do.
-                process.stderr.write(
-                  `edit: ${secretPath}: No such file or directory\n`,
-                );
-                // Then, throw an error to get the non-zero exit code. As this
-                // command is Polykey-specific, the code doesn't really matter
-                // that much.
-                throw new errors.ErrorPolykeyCLIEditSecret(
-                  'Failed to edit secret',
-                );
-              } else {
-                throw e;
-              }
+              return exists;
             }
-            return exists;
           },
           meta,
         );
@@ -141,6 +147,7 @@ class CommandEdit extends CommandPolykey {
           editorProc.on('error', onError);
           editorProc.on('close', onClose);
         });
+        // TODO: don't write secret if it matches what we already have
         let content: string;
         try {
           const buffer = await this.fs.promises.readFile(tmpFile);

src/secrets/CommandMkdir.ts

@@ -78,7 +78,7 @@ class CommandMkdir extends CommandPolykey {
           // TypeScript cannot properly perform type narrowing on this type, so
           // the `as` keyword is used to help it out.
           for await (const result of response.readable) {
-            if (result.type === 'error') {
+            if (result.type === 'ErrorMessage') {
               hasErrored = true;
               switch (result.code) {
                 case 'ENOENT':

src/secrets/CommandRemove.ts

@@ -79,7 +79,7 @@ class CommandRemove extends CommandPolykey {
           // Check if any errors were raised
           let hasErrored = false;
           for await (const result of response.readable) {
-            if (result.type === 'error') {
+            if (result.type === 'ErrorMessage') {
               hasErrored = true;
               switch (result.code) {
                 case 'ENOTEMPTY':