Merge pull request #1 from david50407/fix/untar-readable-boundry

Fixup untar readable boundry
BlackAsLight · Jul 31, 2024 · 5f07d4e · 5f07d4e
2 parents 85db11c + f89f576
commit 5f07d4e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/deno.json b/deno.json
@@ -1,6 +1,6 @@
 {
   "name": "@doctor/tar-stream",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "exports": {
     ".": "./mod.ts",
     "./tar": "./tar.ts",

diff --git a/tests.ts b/tests.ts
@@ -214,6 +214,11 @@ Deno.test('expandTarArchiveCheckingBodiesDefaultStream', async function () {
       size: text.length,
       iterable: [text.slice()],
     },
+    {
+      pathname: './text2.txt',
+      size: text.length,
+      iterable: [text.slice()],
+    },
   ])
     .pipeThrough(new TarStream())
     .pipeThrough(new UnTarStream())

diff --git a/untar.ts b/untar.ts
@@ -3,7 +3,7 @@
  */
 
 /**
- * The original tar	archive	header format.
+ * The original tar archive header format.
  */
 export interface OldStyleFormat {
   name: string
@@ -188,7 +188,7 @@ export class UnTarStream {
             readable: new ReadableStream({
               type: 'bytes',
               async pull(controller) {
-                if (i >= 0) {
+                if (i > 0) {
                   lock = true
                   const { done, value } = await async function () {
                     const x = await reader.read()
@@ -200,15 +200,13 @@ export class UnTarStream {
                   if (done) {
                     header = undefined
                     lock = false
-                    controller.close()
-                    controller.byobRequest?.respond(0)
+                    controller.error('Tarball ended unexpectedly.')
                     return
                   }
                   if (controller.byobRequest?.view) {
                     const buffer = new Uint8Array(
                       controller.byobRequest.view.buffer,
                     )
-
                     const size = buffer.length
                     if (size < value.length) {
                       buffer.set(value.slice(0, size))
@@ -228,6 +226,7 @@ export class UnTarStream {
                     reader.cancel(reason)
                   }
                   controller.close()
+                  controller.byobRequest?.respond(0)
                 }
               },
               async cancel(r) {