@firebase/storage 0.8.3 → 0.8.4-2021927221742

package/dist/index.esm2017.js

@@ -2,32 +2,6 @@ import { getApp, _getProvider, _registerComponent, registerVersion, SDK_VERSION
 import { FirebaseError, createMockUserToken, getModularInstance } from '@firebase/util';
 import { Component } from '@firebase/component';
 
-/**
- * @license
- * Copyright 2017 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/**
- * Error codes for requests made by the the XhrIo wrapper.
- */
-var ErrorCode;
-(function (ErrorCode) {
-    ErrorCode[ErrorCode["NO_ERROR"] = 0] = "NO_ERROR";
-    ErrorCode[ErrorCode["NETWORK_ERROR"] = 1] = "NETWORK_ERROR";
-    ErrorCode[ErrorCode["ABORT"] = 2] = "ABORT";
-})(ErrorCode || (ErrorCode = {}));
-
 /**
  * @license
  * Copyright 2017 Google LLC
@@ -200,160 +174,6 @@ function internalError(message) {
     throw new StorageError("internal-error" /* INTERNAL_ERROR */, 'Internal error: ' + message);
 }
 
-/**
- * @license
- * Copyright 2017 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/**
- * Network layer for browsers. We use this instead of goog.net.XhrIo because
- * goog.net.XhrIo is hyuuuuge and doesn't work in React Native on Android.
- */
-class XhrConnection {
-    constructor() {
-        this.sent_ = false;
-        this.xhr_ = new XMLHttpRequest();
-        this.errorCode_ = ErrorCode.NO_ERROR;
-        this.sendPromise_ = new Promise(resolve => {
-            this.xhr_.addEventListener('abort', () => {
-                this.errorCode_ = ErrorCode.ABORT;
-                resolve();
-            });
-            this.xhr_.addEventListener('error', () => {
-                this.errorCode_ = ErrorCode.NETWORK_ERROR;
-                resolve();
-            });
-            this.xhr_.addEventListener('load', () => {
-                resolve();
-            });
-        });
-    }
-    /**
-     * @override
-     */
-    send(url, method, body, headers) {
-        if (this.sent_) {
-            throw internalError('cannot .send() more than once');
-        }
-        this.sent_ = true;
-        this.xhr_.open(method, url, true);
-        if (headers !== undefined) {
-            for (const key in headers) {
-                if (headers.hasOwnProperty(key)) {
-                    this.xhr_.setRequestHeader(key, headers[key].toString());
-                }
-            }
-        }
-        if (body !== undefined) {
-            this.xhr_.send(body);
-        }
-        else {
-            this.xhr_.send();
-        }
-        return this.sendPromise_;
-    }
-    /**
-     * @override
-     */
-    getErrorCode() {
-        if (!this.sent_) {
-            throw internalError('cannot .getErrorCode() before sending');
-        }
-        return this.errorCode_;
-    }
-    /**
-     * @override
-     */
-    getStatus() {
-        if (!this.sent_) {
-            throw internalError('cannot .getStatus() before sending');
-        }
-        try {
-            return this.xhr_.status;
-        }
-        catch (e) {
-            return -1;
-        }
-    }
-    /**
-     * @override
-     */
-    getResponseText() {
-        if (!this.sent_) {
-            throw internalError('cannot .getResponseText() before sending');
-        }
-        return this.xhr_.responseText;
-    }
-    /**
-     * Aborts the request.
-     * @override
-     */
-    abort() {
-        this.xhr_.abort();
-    }
-    /**
-     * @override
-     */
-    getResponseHeader(header) {
-        return this.xhr_.getResponseHeader(header);
-    }
-    /**
-     * @override
-     */
-    addUploadProgressListener(listener) {
-        if (this.xhr_.upload != null) {
-            this.xhr_.upload.addEventListener('progress', listener);
-        }
-    }
-    /**
-     * @override
-     */
-    removeUploadProgressListener(listener) {
-        if (this.xhr_.upload != null) {
-            this.xhr_.upload.removeEventListener('progress', listener);
-        }
-    }
-}
-function newConnection() {
-    return new XhrConnection();
-}
-
-/**
- * @license
- * Copyright 2017 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/**
- * Factory-like class for creating XhrIo instances.
- */
-class ConnectionPool {
-    createConnection() {
-        return newConnection();
-    }
-}
-
 /**
  * @license
  * Copyright 2017 Google LLC
@@ -683,6 +503,32 @@ function makeQueryString(params) {
     return queryPart;
 }
 
+/**
+ * @license
+ * Copyright 2017 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ * Error codes for requests made by the the XhrIo wrapper.
+ */
+var ErrorCode;
+(function (ErrorCode) {
+    ErrorCode[ErrorCode["NO_ERROR"] = 0] = "NO_ERROR";
+    ErrorCode[ErrorCode["NETWORK_ERROR"] = 1] = "NETWORK_ERROR";
+    ErrorCode[ErrorCode["ABORT"] = 2] = "ABORT";
+})(ErrorCode || (ErrorCode = {}));
+
 /**
  * @license
  * Copyright 2017 Google LLC
@@ -700,22 +546,22 @@ function makeQueryString(params) {
  * limitations under the License.
  */
 class NetworkRequest {
-    constructor(url, method, headers, body, successCodes, additionalRetryCodes, callback, errorCallback, timeout, progressCallback, pool) {
+    constructor(url_, method_, headers_, body_, successCodes_, additionalRetryCodes_, callback_, errorCallback_, timeout_, progressCallback_, connectionFactory_) {
+        this.url_ = url_;
+        this.method_ = method_;
+        this.headers_ = headers_;
+        this.body_ = body_;
+        this.successCodes_ = successCodes_;
+        this.additionalRetryCodes_ = additionalRetryCodes_;
+        this.callback_ = callback_;
+        this.errorCallback_ = errorCallback_;
+        this.timeout_ = timeout_;
+        this.progressCallback_ = progressCallback_;
+        this.connectionFactory_ = connectionFactory_;
         this.pendingConnection_ = null;
         this.backoffId_ = null;
         this.canceled_ = false;
         this.appDelete_ = false;
-        this.url_ = url;
-        this.method_ = method;
-        this.headers_ = headers;
-        this.body_ = body;
-        this.successCodes_ = successCodes.slice();
-        this.additionalRetryCodes_ = additionalRetryCodes.slice();
-        this.callback_ = callback;
-        this.errorCallback_ = errorCallback;
-        this.progressCallback_ = progressCallback;
-        this.timeout_ = timeout;
-        this.pool_ = pool;
         this.promise_ = new Promise((resolve, reject) => {
             this.resolve_ = resolve;
             this.reject_ = reject;
@@ -726,54 +572,56 @@ class NetworkRequest {
      * Actually starts the retry loop.
      */
     start_() {
-        const self = this;
-        function doTheRequest(backoffCallback, canceled) {
+        const doTheRequest = (backoffCallback, canceled) => {
             if (canceled) {
                 backoffCallback(false, new RequestEndStatus(false, null, true));
                 return;
             }
-            const connection = self.pool_.createConnection();
-            self.pendingConnection_ = connection;
-            function progressListener(progressEvent) {
+            const connection = this.connectionFactory_();
+            this.pendingConnection_ = connection;
+            const progressListener = progressEvent => {
                 const loaded = progressEvent.loaded;
-                const total = progressEvent.lengthComputable ? progressEvent.total : -1;
-                if (self.progressCallback_ !== null) {
-                    self.progressCallback_(loaded, total);
+                const total = progressEvent.lengthComputable
+                    ? progressEvent.total
+                    : -1;
+                if (this.progressCallback_ !== null) {
+                    this.progressCallback_(loaded, total);
                 }
-            }
-            if (self.progressCallback_ !== null) {
+            };
+            if (this.progressCallback_ !== null) {
                 connection.addUploadProgressListener(progressListener);
             }
+            // connection.send() never rejects, so we don't need to have a error handler or use catch on the returned promise.
             // eslint-disable-next-line @typescript-eslint/no-floating-promises
             connection
-                .send(self.url_, self.method_, self.body_, self.headers_)
+                .send(this.url_, this.method_, this.body_, this.headers_)
                 .then(() => {
-                if (self.progressCallback_ !== null) {
+                if (this.progressCallback_ !== null) {
                     connection.removeUploadProgressListener(progressListener);
                 }
-                self.pendingConnection_ = null;
+                this.pendingConnection_ = null;
                 const hitServer = connection.getErrorCode() === ErrorCode.NO_ERROR;
                 const status = connection.getStatus();
-                if (!hitServer || self.isRetryStatusCode_(status)) {
+                if (!hitServer || this.isRetryStatusCode_(status)) {
                     const wasCanceled = connection.getErrorCode() === ErrorCode.ABORT;
                     backoffCallback(false, new RequestEndStatus(false, null, wasCanceled));
                     return;
                 }
-                const successCode = self.successCodes_.indexOf(status) !== -1;
+                const successCode = this.successCodes_.indexOf(status) !== -1;
                 backoffCallback(true, new RequestEndStatus(successCode, connection));
             });
-        }
+        };
         /**
          * @param requestWentThrough - True if the request eventually went
          *     through, false if it hit the retry limit or was canceled.
          */
-        function backoffDone(requestWentThrough, status) {
-            const resolve = self.resolve_;
-            const reject = self.reject_;
+        const backoffDone = (requestWentThrough, status) => {
+            const resolve = this.resolve_;
+            const reject = this.reject_;
             const connection = status.connection;
             if (status.wasSuccessCode) {
                 try {
-                    const result = self.callback_(connection, connection.getResponseText());
+                    const result = this.callback_(connection, connection.getResponseText());
                     if (isJustDef(result)) {
                         resolve(result);
                     }
@@ -789,8 +637,8 @@ class NetworkRequest {
                 if (connection !== null) {
                     const err = unknown();
                     err.serverResponse = connection.getResponseText();
-                    if (self.errorCallback_) {
-                        reject(self.errorCallback_(connection, err));
+                    if (this.errorCallback_) {
+                        reject(this.errorCallback_(connection, err));
                     }
                     else {
                         reject(err);
@@ -798,7 +646,7 @@ class NetworkRequest {
                 }
                 else {
                     if (status.canceled) {
-                        const err = self.appDelete_ ? appDeleted() : canceled();
+                        const err = this.appDelete_ ? appDeleted() : canceled();
                         reject(err);
                     }
                     else {
@@ -807,7 +655,7 @@ class NetworkRequest {
                     }
                 }
             }
-        }
+        };
         if (this.canceled_) {
             backoffDone(false, new RequestEndStatus(false, null, true));
         }
@@ -875,7 +723,7 @@ function addAppCheckHeader_(headers, appCheckToken) {
         headers['X-Firebase-AppCheck'] = appCheckToken;
     }
 }
-function makeRequest(requestInfo, appId, authToken, appCheckToken, pool, firebaseVersion) {
+function makeRequest(requestInfo, appId, authToken, appCheckToken, requestFactory, firebaseVersion) {
     const queryPart = makeQueryString(requestInfo.urlParams);
     const url = requestInfo.url + queryPart;
     const headers = Object.assign({}, requestInfo.headers);
@@ -883,7 +731,7 @@ function makeRequest(requestInfo, appId, authToken, appCheckToken, pool, firebas
     addAuthHeader_(headers, authToken);
     addVersionHeader_(headers, firebaseVersion);
     addAppCheckHeader_(headers, appCheckToken);
-    return new NetworkRequest(url, requestInfo.method, headers, requestInfo.body, requestInfo.successCodes, requestInfo.additionalRetryCodes, requestInfo.handler, requestInfo.errorHandler, requestInfo.timeout, requestInfo.progressCallback, pool);
+    return new NetworkRequest(url, requestInfo.method, headers, requestInfo.body, requestInfo.successCodes, requestInfo.additionalRetryCodes, requestInfo.handler, requestInfo.errorHandler, requestInfo.timeout, requestInfo.progressCallback, requestFactory);
 }
 
 /**
@@ -2135,6 +1983,115 @@ function async(f) {
     };
 }
 
+/**
+ * @license
+ * Copyright 2017 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/** An override for the text-based Connection. Used in tests. */
+let connectionFactoryOverride = null;
+/**
+ * Network layer for browsers. We use this instead of goog.net.XhrIo because
+ * goog.net.XhrIo is hyuuuuge and doesn't work in React Native on Android.
+ */
+class XhrConnection {
+    constructor() {
+        this.sent_ = false;
+        this.xhr_ = new XMLHttpRequest();
+        this.errorCode_ = ErrorCode.NO_ERROR;
+        this.sendPromise_ = new Promise(resolve => {
+            this.xhr_.addEventListener('abort', () => {
+                this.errorCode_ = ErrorCode.ABORT;
+                resolve();
+            });
+            this.xhr_.addEventListener('error', () => {
+                this.errorCode_ = ErrorCode.NETWORK_ERROR;
+                resolve();
+            });
+            this.xhr_.addEventListener('load', () => {
+                resolve();
+            });
+        });
+    }
+    send(url, method, body, headers) {
+        if (this.sent_) {
+            throw internalError('cannot .send() more than once');
+        }
+        this.sent_ = true;
+        this.xhr_.open(method, url, true);
+        if (headers !== undefined) {
+            for (const key in headers) {
+                if (headers.hasOwnProperty(key)) {
+                    this.xhr_.setRequestHeader(key, headers[key].toString());
+                }
+            }
+        }
+        if (body !== undefined) {
+            this.xhr_.send(body);
+        }
+        else {
+            this.xhr_.send();
+        }
+        return this.sendPromise_;
+    }
+    getErrorCode() {
+        if (!this.sent_) {
+            throw internalError('cannot .getErrorCode() before sending');
+        }
+        return this.errorCode_;
+    }
+    getStatus() {
+        if (!this.sent_) {
+            throw internalError('cannot .getStatus() before sending');
+        }
+        try {
+            return this.xhr_.status;
+        }
+        catch (e) {
+            return -1;
+        }
+    }
+    getResponseText() {
+        if (!this.sent_) {
+            throw internalError('cannot .getResponseText() before sending');
+        }
+        return this.xhr_.responseText;
+    }
+    /** Aborts the request. */
+    abort() {
+        this.xhr_.abort();
+    }
+    getResponseHeader(header) {
+        return this.xhr_.getResponseHeader(header);
+    }
+    addUploadProgressListener(listener) {
+        if (this.xhr_.upload != null) {
+            this.xhr_.upload.addEventListener('progress', listener);
+        }
+    }
+    removeUploadProgressListener(listener) {
+        if (this.xhr_.upload != null) {
+            this.xhr_.upload.removeEventListener('progress', listener);
+        }
+    }
+}
+function newConnection() {
+    return connectionFactoryOverride
+        ? connectionFactoryOverride()
+        : new XhrConnection();
+}
+
 /**
  * @license
  * Copyright 2017 Google LLC
@@ -2274,7 +2231,7 @@ class UploadTask {
     _createResumable() {
         this._resolveToken((authToken, appCheckToken) => {
             const requestInfo = createResumableUpload(this._ref.storage, this._ref._location, this._mappings, this._blob, this._metadata);
-            const createRequest = this._ref.storage._makeRequest(requestInfo, authToken, appCheckToken);
+            const createRequest = this._ref.storage._makeRequest(requestInfo, newConnection, authToken, appCheckToken);
             this._request = createRequest;
             createRequest.getPromise().then((url) => {
                 this._request = undefined;
@@ -2289,7 +2246,7 @@ class UploadTask {
         const url = this._uploadUrl;
         this._resolveToken((authToken, appCheckToken) => {
             const requestInfo = getResumableUploadStatus(this._ref.storage, this._ref._location, url, this._blob);
-            const statusRequest = this._ref.storage._makeRequest(requestInfo, authToken, appCheckToken);
+            const statusRequest = this._ref.storage._makeRequest(requestInfo, newConnection, authToken, appCheckToken);
             this._request = statusRequest;
             statusRequest.getPromise().then(status => {
                 status = status;
@@ -2318,7 +2275,7 @@ class UploadTask {
                 this._transition("error" /* ERROR */);
                 return;
             }
-            const uploadRequest = this._ref.storage._makeRequest(requestInfo, authToken, appCheckToken);
+            const uploadRequest = this._ref.storage._makeRequest(requestInfo, newConnection, authToken, appCheckToken);
             this._request = uploadRequest;
             uploadRequest.getPromise().then((newStatus) => {
                 this._increaseMultiplier();
@@ -2344,7 +2301,7 @@ class UploadTask {
     _fetchMetadata() {
         this._resolveToken((authToken, appCheckToken) => {
             const requestInfo = getMetadata$2(this._ref.storage, this._ref._location, this._mappings);
-            const metadataRequest = this._ref.storage._makeRequest(requestInfo, authToken, appCheckToken);
+            const metadataRequest = this._ref.storage._makeRequest(requestInfo, newConnection, authToken, appCheckToken);
             this._request = metadataRequest;
             metadataRequest.getPromise().then(metadata => {
                 this._request = undefined;
@@ -2356,7 +2313,7 @@ class UploadTask {
     _oneShotUpload() {
         this._resolveToken((authToken, appCheckToken) => {
             const requestInfo = multipartUpload(this._ref.storage, this._ref._location, this._mappings, this._blob, this._metadata);
-            const multipartRequest = this._ref.storage._makeRequest(requestInfo, authToken, appCheckToken);
+            const multipartRequest = this._ref.storage._makeRequest(requestInfo, newConnection, authToken, appCheckToken);
             this._request = multipartRequest;
             multipartRequest.getPromise().then(metadata => {
                 this._request = undefined;
@@ -2734,8 +2691,7 @@ function uploadBytes$1(ref, data, metadata) {
     ref._throwIfRoot('uploadBytes');
     const requestInfo = multipartUpload(ref.storage, ref._location, getMappings(), new FbsBlob(data, true), metadata);
     return ref.storage
-        .makeRequestWithTokens(requestInfo)
-        .then(request => request.getPromise())
+        .makeRequestWithTokens(requestInfo, newConnection)
         .then(finalMetadata => {
         return {
             metadata: finalMetadata,
@@ -2841,7 +2797,7 @@ async function listAllHelper(ref, accumulator, pageToken) {
  *      contains references to objects in this folder. `nextPageToken`
  *      can be used to get the rest of the results.
  */
-async function list$1(ref, options) {
+function list$1(ref, options) {
     if (options != null) {
         if (typeof options.maxResults === 'number') {
             validateNumber('options.maxResults', 
@@ -2852,7 +2808,7 @@ async function list$1(ref, options) {
     const op = options || {};
     const requestInfo = list$2(ref.storage, ref._location, 
     /*delimiter= */ '/', op.pageToken, op.maxResults);
-    return (await ref.storage.makeRequestWithTokens(requestInfo)).getPromise();
+    return ref.storage.makeRequestWithTokens(requestInfo, newConnection);
 }
 /**
  * A `Promise` that resolves with the metadata for this object. If this
@@ -2861,10 +2817,10 @@ async function list$1(ref, options) {
  * @public
  * @param ref - StorageReference to get metadata from.
  */
-async function getMetadata$1(ref) {
+function getMetadata$1(ref) {
     ref._throwIfRoot('getMetadata');
     const requestInfo = getMetadata$2(ref.storage, ref._location, getMappings());
-    return (await ref.storage.makeRequestWithTokens(requestInfo)).getPromise();
+    return ref.storage.makeRequestWithTokens(requestInfo, newConnection);
 }
 /**
  * Updates the metadata for this object.
@@ -2877,10 +2833,10 @@ async function getMetadata$1(ref) {
  *     with the new metadata for this object.
  *     See `firebaseStorage.Reference.prototype.getMetadata`
  */
-async function updateMetadata$1(ref, metadata) {
+function updateMetadata$1(ref, metadata) {
     ref._throwIfRoot('updateMetadata');
     const requestInfo = updateMetadata$2(ref.storage, ref._location, metadata, getMappings());
-    return (await ref.storage.makeRequestWithTokens(requestInfo)).getPromise();
+    return ref.storage.makeRequestWithTokens(requestInfo, newConnection);
 }
 /**
  * Returns the download URL for the given Reference.
@@ -2888,11 +2844,11 @@ async function updateMetadata$1(ref, metadata) {
  * @returns A `Promise` that resolves with the download
  *     URL for this object.
  */
-async function getDownloadURL$1(ref) {
+function getDownloadURL$1(ref) {
     ref._throwIfRoot('getDownloadURL');
     const requestInfo = getDownloadUrl(ref.storage, ref._location, getMappings());
-    return (await ref.storage.makeRequestWithTokens(requestInfo))
-        .getPromise()
+    return ref.storage
+        .makeRequestWithTokens(requestInfo, newConnection)
         .then(url => {
         if (url === null) {
             throw noDownloadURL();
@@ -2906,10 +2862,10 @@ async function getDownloadURL$1(ref) {
  * @param ref - StorageReference for object to delete.
  * @returns A `Promise` that resolves if the deletion succeeds.
  */
-async function deleteObject$1(ref) {
+function deleteObject$1(ref) {
     ref._throwIfRoot('deleteObject');
     const requestInfo = deleteObject$2(ref.storage, ref._location);
-    return (await ref.storage.makeRequestWithTokens(requestInfo)).getPromise();
+    return ref.storage.makeRequestWithTokens(requestInfo, newConnection);
 }
 /**
  * Returns reference for object obtained by appending `childPath` to `ref`.
@@ -3030,11 +2986,10 @@ class FirebaseStorageImpl {
     /**
      * @internal
      */
-    _pool, _url, _firebaseVersion) {
+    _url, _firebaseVersion) {
         this.app = app;
         this._authProvider = _authProvider;
         this._appCheckProvider = _appCheckProvider;
-        this._pool = _pool;
         this._url = _url;
         this._firebaseVersion = _firebaseVersion;
         this._bucket = null;
@@ -3145,9 +3100,9 @@ class FirebaseStorageImpl {
      * @param requestInfo - HTTP RequestInfo object
      * @param authToken - Firebase auth token
      */
-    _makeRequest(requestInfo, authToken, appCheckToken) {
+    _makeRequest(requestInfo, requestFactory, authToken, appCheckToken) {
         if (!this._deleted) {
-            const request = makeRequest(requestInfo, this._appId, authToken, appCheckToken, this._pool, this._firebaseVersion);
+            const request = makeRequest(requestInfo, this._appId, authToken, appCheckToken, requestFactory, this._firebaseVersion);
             this._requests.add(request);
             // Request removes itself from set when complete.
             request.getPromise().then(() => this._requests.delete(request), () => this._requests.delete(request));
@@ -3157,17 +3112,17 @@ class FirebaseStorageImpl {
             return new FailRequest(appDeleted());
         }
     }
-    async makeRequestWithTokens(requestInfo) {
+    async makeRequestWithTokens(requestInfo, requestFactory) {
         const [authToken, appCheckToken] = await Promise.all([
             this._getAuthToken(),
             this._getAppCheckToken()
         ]);
-        return this._makeRequest(requestInfo, authToken, appCheckToken);
+        return this._makeRequest(requestInfo, requestFactory, authToken, appCheckToken).getPromise();
     }
 }
 
 const name = "@firebase/storage";
-const version = "0.8.3";
+const version = "0.8.4-2021927221742";
 
 /**
  * @license
@@ -3389,11 +3344,14 @@ function factory(container, { instanceIdentifier: url }) {
     const app = container.getProvider('app').getImmediate();
     const authProvider = container.getProvider('auth-internal');
     const appCheckProvider = container.getProvider('app-check-internal');
-    return new FirebaseStorageImpl(app, authProvider, appCheckProvider, new ConnectionPool(), url, SDK_VERSION);
+    return new FirebaseStorageImpl(app, authProvider, appCheckProvider, url, SDK_VERSION);
 }
 function registerStorage() {
     _registerComponent(new Component(STORAGE_TYPE, factory, "PUBLIC" /* PUBLIC */).setMultipleInstances(true));
-    registerVersion(name, version);
+    //RUNTIME_ENV will be replaced during the compilation to "node" for nodejs and an empty string for browser
+    registerVersion(name, version, '');
+    // BUILD_TARGET will be replaced by values like esm5, esm2017, cjs5, etc during the compilation
+    registerVersion(name, version, 'esm2017');
 }
 registerStorage();