bug: working on throwing errors

[ci skip]

Author: aryanjassal

src/client/handlers/VaultsSecretsGet.ts

@@ -75,25 +75,23 @@ class VaultsSecretsGet extends RawHandler<{
           throw new vaultsErrors.ErrorVaultsVaultUndefined();
         }
         // Get secret contents
-        yield* vaultManager.withVaultsG([vaultId], (vault) => {
-          return vault.readG(async function* (fs): AsyncGenerator<
-            Uint8Array,
-            void,
-            void
-          > {
-            const contents = fileTree.serializerStreamFactory(fs, secretNames);
-            try {
+        yield* vaultManager.withVaultsG(
+          [vaultId],
+          (vault) => {
+            return vault.readG(async function* (fs): AsyncGenerator<
+              Uint8Array,
+              void,
+              void
+            > {
+              const contents = fileTree.serializerStreamFactory(
+                fs,
+                secretNames,
+              );
               for await (const chunk of contents) yield chunk;
-            } catch (e) {
-              if (e.name === 'ErrorSecretsSecretUndefined') {
-                throw new vaultsErrors.ErrorSecretsSecretUndefined(e.message, {
-                  cause: e.cause,
-                });
-              }
-              throw e;
-            }
-          });
-        });
+            });
+          },
+          tran,
+        );
       },
     );
 

src/utils/utils.ts

@@ -560,9 +560,13 @@ function asyncGeneratorToStream<T>(
         if (done) controller.close();
         else controller.enqueue(value);
       } catch (e) {
+        console.error('from generator: ', e)
         controller.error(e);
       }
     },
+    cancel: async (reason) => {
+      await generator.throw(reason).catch(() => {});
+    },
   });
 }
 

src/vaults/VaultInternal.ts

@@ -433,7 +433,11 @@ class VaultInternal {
   ): AsyncGenerator<T, TReturn, TNext> {
     const efsVault = this.efsVault;
     return withG([this.lock.read()], async function* () {
-      return yield* g(efsVault);
+      try {
+        return yield* g(efsVault);
+      } catch (e) {
+        throw e;
+      }
     });
   }
 

src/vaults/VaultManager.ts

@@ -1046,9 +1046,13 @@ class VaultManager {
     tran?: DBTransaction,
   ): AsyncGenerator<T, Treturn, Tnext> {
     if (tran == null) {
-      return yield* this.db.withTransactionG((tran) =>
-        this.withVaultsG(vaultIds, g, tran),
-      );
+      try {
+        return yield* this.db.withTransactionG((tran) =>
+          this.withVaultsG(vaultIds, g, tran),
+        );
+      } catch (e) {
+        throw e;
+      }
     }
 
     // Obtaining locks

tests/utils/utils.ts

@@ -17,6 +17,7 @@ const expectRemoteError = async <T>(
   try {
     return await promise;
   } catch (e) {
+    console.error(e.cause);
     expect(e.cause).toBeInstanceOf(error);
   }
 };