Create Chunk Promise when Chunk is created.

opentdf · Dec 8, 2023 · 490b4f9 · 490b4f9
1 parent b6caf22
commit 490b4f9
Showing 1 changed file with 17 additions and 9 deletions.
diff --git a/lib/tdf3/src/tdf.ts b/lib/tdf3/src/tdf.ts
@@ -111,6 +111,7 @@ type Chunk = {
   encryptedOffset: number;
   encryptedSegmentSize?: number;
   decryptedChunk?: null | DecryptResult;
+  promise: Promise<unknown>;
   _resolve?: (value: unknown) => void;
   _reject?: (value: unknown) => void;
 };
@@ -1052,11 +1053,21 @@ export async function readStream(cfg: DecryptConfiguration) {
   let mapOfRequestsOffset = 0;
   const chunkMap = new Map(
     segments.map(({ hash, encryptedSegmentSize = encryptedSegmentSizeDefault }) => {
-      const result = {
-        hash,
-        encryptedOffset: mapOfRequestsOffset,
-        encryptedSegmentSize,
-      } as Chunk;
+      const result = (() => {
+        let _resolve, _reject;
+        const chunk: Chunk = {
+          hash,
+          encryptedOffset: mapOfRequestsOffset,
+          encryptedSegmentSize,
+          promise: new Promise((resolve, reject) => {
+            _resolve = resolve;
+            _reject = reject;
+          }),
+        };
+        chunk._resolve = _resolve;
+        chunk._reject = _reject;
+        return chunk;
+      })();
       mapOfRequestsOffset += encryptedSegmentSize || encryptedSegmentSizeDefault;
       return [hash, result];
     })
@@ -1085,10 +1096,7 @@ export async function readStream(cfg: DecryptConfiguration) {
 
       const [hash, chunk] = chunkMap.entries().next().value;
       if (!chunk.decryptedChunk) {
-        await new Promise((resolve, reject) => {
-          chunk._resolve = resolve;
-          chunk._reject = reject;
-        });
+        await chunk.promise;
       }
       const decryptedSegment = chunk.decryptedChunk;