return compressed size for each file

leyhline · Jun 24, 2023 · 780b282 · 780b282
1 parent 29d6fea
commit 780b282
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 7 deletions.
diff --git a/src/mecab-worker.ts b/src/mecab-worker.ts
@@ -292,15 +292,16 @@ async function collectFiles(
   while (true) {
     const { done, value } = await reader.read();
     if (done) break;
+    const [file, compressedSize] = value;
     const message: MecabNetwork | MecabCache = {
       id: 0,
       type: type,
-      name: value.name,
-      size: value.size,
+      name: file.name,
+      size: compressedSize,
       total: contentLength,
     };
     postMessage(message);
-    files.push(value);
+    files.push(file);
   }
   if (files.length === 0) {
     throw new Error("No files extracted");

diff --git a/src/unzip.ts b/src/unzip.ts
@@ -7,7 +7,7 @@ declare class DecompressionStream extends TransformStream<
 
 export async function unzipDictionary(
   response: Response
-): Promise<[ReadableStream<File>, number | null]> {
+): Promise<[ReadableStream<[File, number]>, number | null]> {
   if (!testDecompressionStreamSupport()) {
     throw new Error(
       "Cannot unzip dictionary. DecompressionStream API is not supported by this browser."
@@ -37,7 +37,7 @@ function testDecompressionStreamSupport(): boolean {
 
 async function unzip(
   stream: ReadableStream<Uint8Array>
-): Promise<ReadableStream<File>> {
+): Promise<ReadableStream<[File, number]>> {
   return new ReadableStream({
     pull: async (controller) => {
       const reader = new ZipReader(stream);
@@ -50,10 +50,16 @@ async function unzip(
         }
         if (header.compressionMethod === 8) {
           const data = await reader.decompress(header.compressedSize);
-          controller.enqueue(new File([data], header.fileName));
+          controller.enqueue([
+            new File([data], header.fileName),
+            header.compressedSize,
+          ]);
         } else {
           const data = await reader.read(header.compressedSize);
-          controller.enqueue(new File([data], header.fileName));
+          controller.enqueue([
+            new File([data], header.fileName),
+            header.compressedSize,
+          ]);
         }
       }
     },