Cast ReadableStream to ReadableStream<UInt8Array>

Author: dlarocque

packages/storage/src/api.browser.ts

@@ -18,7 +18,6 @@
 import { StorageReference } from './public-types';
 import { Reference, getBlobInternal } from './reference';
 import { getModularInstance } from '@firebase/util';
-import { ReadableStream } from 'stream/web';
 
 /**
  * Downloads the data at the object's location. Returns an error if the object

packages/storage/src/api.node.ts

@@ -18,7 +18,6 @@
 import { StorageReference } from './public-types';
 import { Reference, getStreamInternal } from './reference';
 import { getModularInstance } from '@firebase/util';
-import { ReadableStream } from 'stream/web';
 
 /**
  * Downloads the data at the object's location. Returns an error if the object

packages/storage/src/implementation/connection.ts

@@ -14,13 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { ReadableStream } from 'stream/web';
-
 /** Network headers */
 export type Headers = Record<string, string>;
 
 /** Response type exposed by the networking APIs. */
-export type ConnectionType = string | ArrayBuffer | Blob | ReadableStream;
+export type ConnectionType = string | ArrayBuffer | Blob | ReadableStream<Uint8Array>;
 
 /**
  * A lightweight wrapper around XMLHttpRequest with a

packages/storage/src/platform/browser/connection.ts

@@ -22,7 +22,6 @@ import {
   Headers
 } from '../../implementation/connection';
 import { internalError } from '../../implementation/error';
-import { ReadableStream } from 'stream/web';
 
 /** An override for the text-based Connection. Used in tests. */
 let textFactoryOverride: (() => Connection<string>) | null = null;

packages/storage/src/platform/connection.ts

@@ -22,7 +22,6 @@ import {
   newStreamConnection as nodeNewStreamConnection,
   injectTestConnection as nodeInjectTestConnection
 } from './node/connection';
-import { ReadableStream } from 'stream/web';
 
 export function injectTestConnection(
   factory: (() => Connection<string>) | null
@@ -46,7 +45,7 @@ export function newBlobConnection(): Connection<Blob> {
   return nodeNewBlobConnection();
 }
 
-export function newStreamConnection(): Connection<ReadableStream> {
+export function newStreamConnection(): Connection<ReadableStream<Uint8Array>> {
   // This file is only used in Node.js tests using ts-node.
   return nodeNewStreamConnection();
 }

packages/storage/src/platform/node/connection.ts

@@ -22,7 +22,6 @@ import {
 } from '../../implementation/connection';
 import { internalError } from '../../implementation/error';
 import { fetch as undiciFetch, Headers as undiciHeaders } from 'undici';
-import { ReadableStream } from 'stream/web';
 
 /** An override for the text-based Connection. Used in tests. */
 let textFactoryOverride: (() => Connection<string>) | null = null;
@@ -147,8 +146,8 @@ export function newBytesConnection(): Connection<ArrayBuffer> {
   return new FetchBytesConnection();
 }
 
-export class FetchStreamConnection extends FetchConnection<ReadableStream> {
-  private stream_: ReadableStream | null = null;
+export class FetchStreamConnection extends FetchConnection<ReadableStream<Uint8Array>> {
+  private stream_: ReadableStream<Uint8Array> | null = null;
 
   async send(
     url: string,
@@ -170,7 +169,7 @@ export class FetchStreamConnection extends FetchConnection<ReadableStream> {
       this.headers_ = response.headers;
       this.statusCode_ = response.status;
       this.errorCode_ = ErrorCode.NO_ERROR;
-      this.stream_ = response.body;
+      this.stream_ = response.body as ReadableStream<Uint8Array>;
     } catch (e) {
       this.errorText_ = (e as Error)?.message;
       // emulate XHR which sets status to 0 when encountering a network error
@@ -187,7 +186,7 @@ export class FetchStreamConnection extends FetchConnection<ReadableStream> {
   }
 }
 
-export function newStreamConnection(): Connection<ReadableStream> {
+export function newStreamConnection(): Connection<ReadableStream<Uint8Array>> {
   return new FetchStreamConnection();
 }
 

packages/storage/src/reference.ts

@@ -19,7 +19,7 @@
  * @fileoverview Defines the Firebase StorageReference class.
  */
 
-import { ReadableStream, TransformStream, Transformer } from 'stream/web';
+// import { ReadableStream, TransformStream, Transformer } from 'stream/web';
 
 import { FbsBlob } from './implementation/blob';
 import { Location } from './implementation/location';

packages/storage/test/node/stream.test.ts

@@ -20,7 +20,6 @@ import { createApp, createStorage } from '../integration/integration.test';
 import { FirebaseApp, deleteApp } from '@firebase/app';
 import { getStream, ref, uploadBytes } from '../../src/index.node';
 import * as types from '../../src/public-types';
-import { ReadableStream } from 'stream/web';
 
 // See: https://developer.mozilla.org/en-US/docs/Web/API/ReadableStream/getReader
 async function readData(readableStream: ReadableStream): Promise<Uint8Array> {