Add unit tests for default WHATWG ReadableStream stream

Author: Borewit

package.json

@@ -127,7 +127,7 @@
     "del-cli": "^6.0.0",
     "mime": "^4.0.6",
     "mocha": "^11.1.0",
-    "node-readable-to-web-readable-stream": "^0.3.1",
+    "node-readable-to-web-readable-stream": "^0.4.0",
     "remark-cli": "^12.0.1",
     "remark-preset-lint-consistent": "^6.0.1",
     "ts-node": "^10.9.2",

test/metadata-parsers.ts

@@ -2,7 +2,7 @@ import fs from 'node:fs';
 
 import * as mm from '../lib/index.js';
 import type { IAudioMetadata, IOptions } from '../lib/index.js';
-import { makeReadableByteFileStream } from './util.js';
+import { makeByteReadableStreamFromFile, makeDefaultReadableStreamFromFile } from './util.js';
 
 type ParseFileMethod = (skipTest: () => void, filePath: string, mimeType?: string, options?: IOptions) => Promise<IAudioMetadata>;
 
@@ -36,10 +36,21 @@ export const Parsers: IParser[] = [
       }
     }
   }, {
-    description: 'parseWebStream',
+    description: 'parseWebStream from byte ReadableStream',
     webStream: true,
     parse: async (skipTest, filePath: string, mimeType?: string, options?: IOptions) => {
-      const webStream = await makeReadableByteFileStream(filePath);
+      const webStream = await makeByteReadableStreamFromFile(filePath);
+      try {
+        return await mm.parseWebStream(webStream.stream, {mimeType: mimeType, size: webStream.fileSize}, options);
+      } finally {
+        await webStream.stream.cancel();
+      }
+    }
+  }, {
+    description: 'parseWebStream from default ReadableStream',
+    webStream: true,
+    parse: async (skipTest, filePath: string, mimeType?: string, options?: IOptions) => {
+      const webStream = await makeDefaultReadableStreamFromFile(filePath);
       try {
         return await mm.parseWebStream(webStream.stream, {mimeType: mimeType, size: webStream.fileSize}, options);
       } finally {

test/util.ts

@@ -4,7 +4,7 @@ import { Readable } from 'node:stream';
 import path from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { stat } from 'node:fs/promises';
-import { makeByteReadableStreamFromNodeReadable } from 'node-readable-to-web-readable-stream';
+import { makeByteReadableStreamFromNodeReadable, makeDefaultReadableStreamFromNodeReadable } from 'node-readable-to-web-readable-stream';
 import { createReadStream } from 'node:fs';
 
 const filename = fileURLToPath(import.meta.url);
@@ -25,7 +25,7 @@ export class SourceStream extends Readable {
   }
 }
 
-export async function makeReadableByteFileStream(filename: string, delay = 0) {
+export async function makeByteReadableStreamFromFile(filename: string, delay = 0) {
 
   const fileInfo = await stat(filename);
   const nodeStream = createReadStream(filename);
@@ -36,4 +36,15 @@ export async function makeReadableByteFileStream(filename: string, delay = 0) {
   };
 }
 
+export async function makeDefaultReadableStreamFromFile(filename: string, delay = 0) {
+
+  const fileInfo = await stat(filename);
+  const nodeStream = createReadStream(filename);
+
+  return {
+    fileSize: fileInfo.size,
+    stream: makeDefaultReadableStreamFromNodeReadable(nodeStream)
+  };
+}
+
 export const samplePath = path.join(dirname, 'samples');

yarn.lock

@@ -2350,7 +2350,7 @@ __metadata:
     media-typer: "npm:^1.1.0"
     mime: "npm:^4.0.6"
     mocha: "npm:^11.1.0"
-    node-readable-to-web-readable-stream: "npm:^0.3.1"
+    node-readable-to-web-readable-stream: "npm:^0.4.0"
     remark-cli: "npm:^12.0.1"
     remark-preset-lint-consistent: "npm:^6.0.1"
     strtok3: "npm:^10.2.1"
@@ -2388,10 +2388,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"node-readable-to-web-readable-stream@npm:^0.3.1":
-  version: 0.3.1
-  resolution: "node-readable-to-web-readable-stream@npm:0.3.1"
-  checksum: 10c0/0034cc725399057444eec20a5b09413c164f37a10d073176b7889bc7926545f85bc30f12026ec997a30d18a8793248776e5bb370b213cab9f0f5f53b68d9fdb5
+"node-readable-to-web-readable-stream@npm:^0.4.0":
+  version: 0.4.0
+  resolution: "node-readable-to-web-readable-stream@npm:0.4.0"
+  checksum: 10c0/446d257f1eab223c9171418f559d928a1707e85911068451cb8f3246555312affec446842b2d1ca1e1c785d7232da12f1e8ff7ef31e944fc7bf3debdb301846c
   languageName: node
   linkType: hard