@firebase/storage 0.8.3 → 0.8.4-2021927221742

package/dist/src/{implementation/connectionPool.d.ts → api.browser.d.ts}

@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright 2017 Google LLC
+ * Copyright 2021 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,13 +14,4 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-/**
- * @fileoverview Replacement for goog.net.XhrIoPool that works with fbs.XhrIo.
- */
-import { Connection } from './connection';
-/**
- * Factory-like class for creating XhrIo instances.
- */
-export declare class ConnectionPool {
-    createConnection(): Connection;
-}
+export {};

package/dist/src/api.d.ts

@@ -32,6 +32,7 @@ export { FbsBlob as _FbsBlob } from './implementation/blob';
 export { dataFromString as _dataFromString } from './implementation/string';
 export { invalidRootOperation as _invalidRootOperation, invalidArgument as _invalidArgument } from './implementation/error';
 export { TaskEvent as _TaskEvent, TaskState as _TaskState } from './implementation/taskenums';
+export { StringFormat };
 /**
  * Uploads data to this object's location.
  * The upload is not resumable.
@@ -159,7 +160,6 @@ export declare function ref(storageOrRef: FirebaseStorage | StorageReference, pa
  * @internal
  */
 export declare function _getChild(ref: StorageReference, childPath: string): Reference;
-export { StringFormat } from './implementation/string';
 /**
  * Gets a {@link FirebaseStorage} instance for the given Firebase app.
  * @public

package/dist/src/{implementation/requestmaker.d.ts → api.node.d.ts}

@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright 2017 Google LLC
+ * Copyright 2021 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,8 +14,4 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { Request } from './request';
-import { RequestInfo } from './requestinfo';
-import { ConnectionPool } from './connectionPool';
-declare type requestMaker = <T>(requestInfo: RequestInfo<T>, appId: string | null, authToken: string | null, pool: ConnectionPool) => Request<T>;
-export { requestMaker };
+export {};

package/dist/src/implementation/connection.d.ts

@@ -14,17 +14,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-/**
- * Network headers
- */
-export interface Headers {
-    [name: string]: string;
-}
+/** Network headers */
+export declare type Headers = Record<string, string>;
 /**
  * A lightweight wrapper around XMLHttpRequest with a
  * goog.net.XhrIo-like interface.
  */
 export interface Connection {
+    /**
+     * This method should never reject. In case of encountering an error, set an error code internally which can be accessed
+     * by calling getErrorCode() by callers.
+     */
     send(url: string, method: string, body?: ArrayBufferView | Blob | string | null, headers?: Headers): Promise<void>;
     getErrorCode(): ErrorCode;
     getStatus(): number;

package/dist/src/implementation/request.d.ts

@@ -16,7 +16,6 @@
  */
 import { RequestInfo } from './requestinfo';
 import { Headers, Connection } from './connection';
-import { ConnectionPool } from './connectionPool';
 export interface Request<T> {
     getPromise(): Promise<T>;
     /**
@@ -45,4 +44,4 @@ export declare function addAuthHeader_(headers: Headers, authToken: string | nul
 export declare function addVersionHeader_(headers: Headers, firebaseVersion?: string): void;
 export declare function addGmpidHeader_(headers: Headers, appId: string | null): void;
 export declare function addAppCheckHeader_(headers: Headers, appCheckToken: string | null): void;
-export declare function makeRequest<T>(requestInfo: RequestInfo<T>, appId: string | null, authToken: string | null, appCheckToken: string | null, pool: ConnectionPool, firebaseVersion?: string): Request<T>;
+export declare function makeRequest<T>(requestInfo: RequestInfo<T>, appId: string | null, authToken: string | null, appCheckToken: string | null, requestFactory: () => Connection, firebaseVersion?: string): Request<T>;

package/dist/src/implementation/requestinfo.d.ts

@@ -22,6 +22,14 @@ import { Headers, Connection } from './connection';
 export interface UrlParams {
     [name: string]: string | number;
 }
+/**
+ * A function that converts a server response to the API type expected by the
+ * SDK.
+ *
+ * @param I - the type of the backend's network response
+ * @param O - the output response type used by the rest of the SDK.
+ */
+export declare type RequestHandler<I, O> = (connection: Connection, response: I) => O;
 export declare class RequestInfo<T> {
     url: string;
     method: string;
@@ -32,12 +40,12 @@ export declare class RequestInfo<T> {
      * Note: The XhrIo passed to this function may be reused after this callback
      * returns. Do not keep a reference to it in any way.
      */
-    handler: (p1: Connection, p2: string) => T;
+    handler: RequestHandler<string, T>;
     timeout: number;
     urlParams: UrlParams;
     headers: Headers;
     body: Blob | string | Uint8Array | null;
-    errorHandler: ((p1: Connection, p2: StorageError) => StorageError) | null;
+    errorHandler: RequestHandler<StorageError, StorageError> | null;
     /**
      * Called with the current number of bytes uploaded and total size (-1 if not
      * computable) of the request body (i.e. used to report upload progress).
@@ -53,5 +61,5 @@ export declare class RequestInfo<T> {
      * Note: The XhrIo passed to this function may be reused after this callback
      * returns. Do not keep a reference to it in any way.
      */
-    handler: (p1: Connection, p2: string) => T, timeout: number);
+    handler: RequestHandler<string, T>, timeout: number);
 }

package/dist/src/index.d.ts

@@ -3,5 +3,5 @@
  *
  * @packageDocumentation
  */
-export { StringFormat } from '../src/implementation/string';
 export * from './api';
+export * from './api.browser';

package/dist/src/index.node.d.ts

@@ -0,0 +1,7 @@
+/**
+ * Cloud Storage for Firebase
+ *
+ * @packageDocumentation
+ */
+export * from './api';
+export * from './api.node';

package/dist/src/platform/browser/connection.d.ts

@@ -25,38 +25,15 @@ export declare class XhrConnection implements Connection {
     private sendPromise_;
     private sent_;
     constructor();
-    /**
-     * @override
-     */
     send(url: string, method: string, body?: ArrayBufferView | Blob | string, headers?: Headers): Promise<void>;
-    /**
-     * @override
-     */
     getErrorCode(): ErrorCode;
-    /**
-     * @override
-     */
     getStatus(): number;
-    /**
-     * @override
-     */
     getResponseText(): string;
-    /**
-     * Aborts the request.
-     * @override
-     */
+    /** Aborts the request. */
     abort(): void;
-    /**
-     * @override
-     */
     getResponseHeader(header: string): string | null;
-    /**
-     * @override
-     */
     addUploadProgressListener(listener: (p1: ProgressEvent) => void): void;
-    /**
-     * @override
-     */
     removeUploadProgressListener(listener: (p1: ProgressEvent) => void): void;
 }
 export declare function newConnection(): Connection;
+export declare function injectTestConnection(factory: (() => Connection) | null): void;

package/dist/src/platform/connection.d.ts

@@ -16,3 +16,4 @@
  */
 import { Connection } from '../implementation/connection';
 export declare function newConnection(): Connection;
+export declare function injectTestConnection(factory: (() => Connection) | null): void;

package/dist/src/platform/node/connection.d.ts

@@ -27,6 +27,7 @@ export declare class FetchConnection implements Connection {
     private body_;
     private headers_;
     private sent_;
+    private fetch_;
     constructor();
     send(url: string, method: string, body?: ArrayBufferView | Blob | string, headers?: Record<string, string>): Promise<void>;
     getErrorCode(): ErrorCode;
@@ -41,3 +42,4 @@ export declare class FetchConnection implements Connection {
     removeUploadProgressListener(listener: (p1: ProgressEvent) => void): void;
 }
 export declare function newConnection(): Connection;
+export declare function injectTestConnection(factory: (() => Connection) | null): void;

package/dist/src/service.d.ts

@@ -17,7 +17,6 @@
 import { Location } from './implementation/location';
 import { Request } from './implementation/request';
 import { RequestInfo } from './implementation/requestinfo';
-import { ConnectionPool } from './implementation/connectionPool';
 import { Reference } from './reference';
 import { Provider } from '@firebase/component';
 import { FirebaseAuthInternalName } from '@firebase/auth-interop-types';
@@ -25,6 +24,7 @@ import { AppCheckInternalComponentName } from '@firebase/app-check-interop-types
 import { FirebaseApp } from '@firebase/app';
 import { FirebaseStorage } from './public-types';
 import { EmulatorMockTokenOptions } from '@firebase/util';
+import { Connection } from './implementation/connection';
 export declare function isUrl(path?: string): boolean;
 /**
  * Returns a storage Reference for the given url.
@@ -64,7 +64,6 @@ export declare class FirebaseStorageImpl implements FirebaseStorage {
     /**
      * @internal
      */
-    readonly _pool: ConnectionPool;
     readonly _url?: string | undefined;
     readonly _firebaseVersion?: string | undefined;
     _bucket: Location | null;
@@ -93,7 +92,7 @@ export declare class FirebaseStorageImpl implements FirebaseStorage {
     /**
      * @internal
      */
-    _pool: ConnectionPool, _url?: string | undefined, _firebaseVersion?: string | undefined);
+    _url?: string | undefined, _firebaseVersion?: string | undefined);
     /**
      * The host string for this service, in the form of `host` or
      * `host:port`.
@@ -126,6 +125,6 @@ export declare class FirebaseStorageImpl implements FirebaseStorage {
      * @param requestInfo - HTTP RequestInfo object
      * @param authToken - Firebase auth token
      */
-    _makeRequest<T>(requestInfo: RequestInfo<T>, authToken: string | null, appCheckToken: string | null): Request<T>;
-    makeRequestWithTokens<T>(requestInfo: RequestInfo<T>): Promise<Request<T>>;
+    _makeRequest<T>(requestInfo: RequestInfo<T>, requestFactory: () => Connection, authToken: string | null, appCheckToken: string | null): Request<T>;
+    makeRequestWithTokens<T>(requestInfo: RequestInfo<T>, requestFactory: () => Connection): Promise<T>;
 }

package/dist/storage.d.ts

@@ -26,6 +26,10 @@ declare type CompleteFn_2 = () => void;
  * goog.net.XhrIo-like interface.
  */
 declare interface Connection {
+    /**
+     * This method should never reject. In case of encountering an error, set an error code internally which can be accessed
+     * by calling getErrorCode() by callers.
+     */
     send(url: string, method: string, body?: ArrayBufferView | Blob | string | null, headers?: Headers_2): Promise<void>;
     getErrorCode(): ErrorCode;
     getStatus(): number;
@@ -39,13 +43,6 @@ declare interface Connection {
     removeUploadProgressListener(listener: (p1: ProgressEvent) => void): void;
 }
 
-/**
- * Factory-like class for creating XhrIo instances.
- */
-declare class ConnectionPool {
-    createConnection(): Connection;
-}
-
 /**
  * Modify this {@link FirebaseStorage} instance to communicate with the Cloud Storage emulator.
  *
@@ -163,7 +160,6 @@ export declare class _FirebaseStorageImpl implements FirebaseStorage {
     /**
      * @internal
      */
-    readonly _pool: ConnectionPool;
     readonly _url?: string | undefined;
     readonly _firebaseVersion?: string | undefined;
     _bucket: _Location | null;
@@ -192,7 +188,7 @@ export declare class _FirebaseStorageImpl implements FirebaseStorage {
     /**
      * @internal
      */
-    _pool: ConnectionPool, _url?: string | undefined, _firebaseVersion?: string | undefined);
+    _url?: string | undefined, _firebaseVersion?: string | undefined);
     /**
      * The host string for this service, in the form of `host` or
      * `host:port`.
@@ -225,8 +221,8 @@ export declare class _FirebaseStorageImpl implements FirebaseStorage {
      * @param requestInfo - HTTP RequestInfo object
      * @param authToken - Firebase auth token
      */
-    _makeRequest<T>(requestInfo: RequestInfo_2<T>, authToken: string | null, appCheckToken: string | null): Request_2<T>;
-    makeRequestWithTokens<T>(requestInfo: RequestInfo_2<T>): Promise<Request_2<T>>;
+    _makeRequest<T>(requestInfo: RequestInfo_2<T>, requestFactory: () => Connection, authToken: string | null, appCheckToken: string | null): Request_2<T>;
+    makeRequestWithTokens<T>(requestInfo: RequestInfo_2<T>, requestFactory: () => Connection): Promise<T>;
 }
 
 /**
@@ -328,12 +324,8 @@ export declare function getStorage(app?: FirebaseApp, bucketUrl?: string): Fireb
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-/**
- * Network headers
- */
-declare interface Headers_2 {
-    [name: string]: string;
-}
+/** Network headers */
+declare type Headers_2 = Record<string, string>;
 
 /**
  * Internal enum for task state.
@@ -580,6 +572,15 @@ declare interface Request_2<T> {
     cancel(appDelete?: boolean): void;
 }
 
+/**
+ * A function that converts a server response to the API type expected by the
+ * SDK.
+ *
+ * @param I - the type of the backend's network response
+ * @param O - the output response type used by the rest of the SDK.
+ */
+declare type RequestHandler<I, O> = (connection: Connection, response: I) => O;
+
 declare class RequestInfo_2<T> {
     url: string;
     method: string;
@@ -590,12 +591,12 @@ declare class RequestInfo_2<T> {
      * Note: The XhrIo passed to this function may be reused after this callback
      * returns. Do not keep a reference to it in any way.
      */
-    handler: (p1: Connection, p2: string) => T;
+    handler: RequestHandler<string, T>;
     timeout: number;
     urlParams: UrlParams;
     headers: Headers_2;
     body: Blob | string | Uint8Array | null;
-    errorHandler: ((p1: Connection, p2: StorageError_2) => StorageError_2) | null;
+    errorHandler: RequestHandler<StorageError_2, StorageError_2> | null;
     /**
      * Called with the current number of bytes uploaded and total size (-1 if not
      * computable) of the request body (i.e. used to report upload progress).
@@ -611,7 +612,7 @@ declare class RequestInfo_2<T> {
      * Note: The XhrIo passed to this function may be reused after this callback
      * returns. Do not keep a reference to it in any way.
      */
-    handler: (p1: Connection, p2: string) => T, timeout: number);
+    handler: RequestHandler<string, T>, timeout: number);
 }
 
 /**

package/dist/test/browser/connection.test.d.ts

@@ -0,0 +1,17 @@
+/**
+ * @license
+ * Copyright 2021 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.
+ */
+export {};

package/dist/test/unit/connection.d.ts

@@ -43,3 +43,4 @@ export declare class TestingConnection implements Connection {
     addUploadProgressListener(): void;
     removeUploadProgressListener(): void;
 }
+export declare function newTestConnection(sendHook?: SendHook | null): Connection;

package/dist/test/unit/connection.test.d.ts

@@ -0,0 +1,17 @@
+/**
+ * @license
+ * Copyright 2021 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.
+ */
+export {};

package/dist/test/unit/testshared.d.ts

@@ -1,8 +1,6 @@
 import { FirebaseApp } from '@firebase/app-types';
 import { StorageError } from '../../src/implementation/error';
 import { Headers, Connection } from '../../src/implementation/connection';
-import { ConnectionPool } from '../../src/implementation/connectionPool';
-import { SendHook } from './connection';
 import { FirebaseAuthInternalName } from '@firebase/auth-interop-types';
 import { Provider } from '@firebase/component';
 import { AppCheckInternalComponentName } from '@firebase/app-check-interop-types';
@@ -22,7 +20,6 @@ export declare function makeFakeAuthProvider(token: {
 export declare function makeFakeAppCheckProvider(tokenResult: {
     token: string;
 }): Provider<AppCheckInternalComponentName>;
-export declare function makePool(sendHook: SendHook | null): ConnectionPool;
 /**
  * Returns something that looks like an fbs.XhrIo with the given headers
  * and status.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@firebase/storage",
-  "version": "0.8.3",
+  "version": "0.8.4-2021927221742",
   "description": "",
   "author": "Firebase <firebase-support@google.com> (https://firebase.google.com/)",
   "main": "dist/index.cjs.js",
@@ -22,7 +22,7 @@
     "test:browser:unit": "karma start --single-run --unit",
     "test:browser:integration": "karma start --single-run --integration",
     "test:browser": "karma start --single-run",
-    "test:node": "TS_NODE_FILES=true TS_NODE_CACHE=NO TS_NODE_COMPILER_OPTIONS='{\"module\":\"commonjs\"}' nyc --reporter lcovonly -- mocha 'test/{,!(browser)/**/}*.test.ts' --file src/index.ts --config ../../config/mocharc.node.js",
+    "test:node": "TS_NODE_FILES=true TS_NODE_CACHE=NO TS_NODE_COMPILER_OPTIONS='{\"module\":\"commonjs\"}' nyc --reporter lcovonly -- mocha 'test/{,!(browser)/**/}*.test.ts' --file src/index.node.ts --config ../../config/mocharc.node.js",
     "test:debug": "karma start --browser=Chrome",
     "prettier": "prettier --write 'src/**/*.ts' 'test/**/*.ts'",
     "api-report": "api-extractor run --local --verbose && ts-node-script ../../repo-scripts/prune-dts/prune-dts.ts --input dist/storage-public.d.ts --output dist/storage-public.d.ts",
@@ -32,16 +32,16 @@
   "dependencies": {
     "@firebase/util": "1.4.0",
     "@firebase/component": "0.5.7",
-    "node-fetch": "2.6.2",
+    "node-fetch": "2.6.5",
     "tslib": "^2.1.0"
   },
   "peerDependencies": {
     "@firebase/app": "0.x"
   },
   "devDependencies": {
-    "@firebase/app": "0.7.1",
-    "@firebase/auth": "0.18.0",
-    "rollup": "2.56.3",
+    "@firebase/app": "0.7.4",
+    "@firebase/auth": "0.19.0-2021927221742",
+    "rollup": "2.57.0",
     "@rollup/plugin-alias": "3.1.5",
     "@rollup/plugin-json": "4.1.0",
     "rollup-plugin-typescript2": "0.30.0",