From 1a1dc55b72d077ce36afedd46d88695618ac7376 Mon Sep 17 00:00:00 2001 From: Aryan Jassal Date: Fri, 9 Aug 2024 16:52:37 +1000 Subject: [PATCH] chore: updated handler name --- src/client/handlers/VaultsSecretsList.ts | 20 ++++---------------- tests/client/handlers/vaults.test.ts | 6 ++++-- 2 files changed, 8 insertions(+), 18 deletions(-) diff --git a/src/client/handlers/VaultsSecretsList.ts b/src/client/handlers/VaultsSecretsList.ts index 7119cf9a5..f2f2b0c9d 100644 --- a/src/client/handlers/VaultsSecretsList.ts +++ b/src/client/handlers/VaultsSecretsList.ts @@ -9,7 +9,7 @@ import * as vaultsErrors from '../../vaults/errors'; import * as utils from '../../utils'; import { fileTree } from '../../vaults'; -class VaultsSecretsGet extends RawHandler<{ +class VaultsSecretsGetFileTree extends RawHandler<{ vaultManager: VaultManager; db: DB; }> { @@ -67,26 +67,14 @@ class VaultsSecretsGet extends RawHandler<{ }); }); - async function* filterTransform( - source: AsyncGenerator, - ): AsyncGenerator { - for await (const chunk of source) { - if (chunk instanceof Uint8Array) { - // @ts-ignore while the types don't fully match, they match enough - yield Buffer.from(chunk).toString(); - } - } - } - const filteredFilesData = filterTransform(filesData); - const filesDataStream = new ReadableStream({ pull: async (controller) => { - const next = await filteredFilesData.next(); + const next = await filesData.next(); if (next.done === true) return controller.close(); controller.enqueue(next.value); }, cancel: async() => { - filteredFilesData.return('Closed'); + filesData.return('Closed'); } }); @@ -94,4 +82,4 @@ class VaultsSecretsGet extends RawHandler<{ }; } -export default VaultsSecretsGet; +export default VaultsSecretsGetFileTree; diff --git a/tests/client/handlers/vaults.test.ts b/tests/client/handlers/vaults.test.ts index 523e7d860..cbc3aa886 100644 --- a/tests/client/handlers/vaults.test.ts +++ b/tests/client/handlers/vaults.test.ts @@ -1602,15 +1602,17 @@ describe('vaultsSecretsNewDir and vaultsSecretsList', () => { }); console.log(secrets); - console.log(secrets.readable); const secretDataStream = secrets.readable; const parserTransform = fileTree.parserTransformStreamFactory(); const parsedFilesStream = secretDataStream.pipeThrough(parserTransform); - const parsedFiles: Array = [] + console.log('after parsing files'); + const parsedFiles: Array = [] for await (const file of parsedFilesStream) { + console.log('adding file'); parsedFiles.push(file); + console.log('file added'); } console.log(parsedFiles);