Using node-fetch

Author: schmidt-sebastian

packages/firestore/.idea/runConfigurations/firestore_lite_Tests__Emulator_.xml

@@ -625,7 +625,7 @@ function genericMutationTests(
     // The Transaction tests use backoff for updates that fail with failed
     // preconditions. This leads to test timeouts.
     // eslint-disable-next-line no-restricted-properties
-    (testRunnerMayUseBackoff ? it.skip : it)(
+    (testRunnerMayUseBackoff ? it.skip : it.only)(
       'enforces that document exists',
       () => {
         return withTestDoc(async docRef => {

packages/firestore/lite/test/integration.test.ts

@@ -64,6 +64,7 @@
     "@grpc/grpc-js": "^1.0.0",
     "@grpc/proto-loader": "^0.5.0",
     "axios": "^0.19.2",
+    "node-fetch": "2.6.0",
     "tslib": "^1.11.1"
   },
   "peerDependencies": {

packages/firestore/package.json

@@ -17,7 +17,7 @@
 
 // This file is only used under ts-node.
 // eslint-disable-next-line @typescript-eslint/no-require-imports
-const platform = require(`./${process.env.TEST_PLATFORM}/base64`);
+const platform = require(`./${process.env.TEST_PLATFORM ?? 'node'}/base64`);
 
 /** Converts a Base64 encoded string to a binary string. */
 export function decodeBase64(encoded: string): string {

packages/firestore/src/platform/base64.ts

@@ -23,5 +23,5 @@ export { newConnectivityMonitor } from '../browser/connection';
 
 /** Initializes the HTTP connection for the REST API. */
 export function newConnection(databaseInfo: DatabaseInfo): Promise<Connection> {
-  return Promise.resolve(new FetchConnection(databaseInfo));
+  return Promise.resolve(new FetchConnection(databaseInfo, fetch));
 }

packages/firestore/src/platform/browser_lite/connection.ts

@@ -13,16 +13,21 @@
  * 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.
- */
+ */import * as nodeFetch from 'node-fetch';
 
 import { Token } from '../../api/credentials';
 import { Stream } from '../../remote/connection';
 import { mapCodeFromHttpStatus } from '../../remote/rpc_error';
-import { FirestoreError } from '../../util/error';
+import { FirestoreError } from '../../util/error'; 
 import { StringMap } from '../../util/types';
 import { RestConnection } from '../../remote/rest_connection';
+import {DatabaseInfo} from "../../core/database_info";
 
 export class FetchConnection extends RestConnection {
+  constructor(databaseInfo: DatabaseInfo, private readonly fetchImpl: typeof fetch) {
+    super(databaseInfo);
+  }
+
   openStream<Req, Resp>(
     rpcName: string,
     token: Token | null
@@ -40,7 +45,7 @@ export class FetchConnection extends RestConnection {
     let response: Response;
 
     try {
-      response = await fetch(url, {
+      response = await this.fetchImpl(url, {
         method: 'POST',
         headers,
         body: requestJson
@@ -51,7 +56,14 @@ export class FetchConnection extends RestConnection {
         'Request failed with error: ' + err.statusText
       );
     }
-
-    return JSON.parse(await response.text());
+    
+    if (!response.ok) {
+      throw new FirestoreError(
+        mapCodeFromHttpStatus(response.status),
+        'Request failed with error: ' + response.statusText
+      );
+    }
+    
+    return response.json();
   }
 }

packages/firestore/src/platform/browser_lite/fetch_connection.ts

@@ -20,12 +20,13 @@ import {Connection} from "../remote/connection";
 
 // This file is only used under ts-node.
 // eslint-disable-next-line @typescript-eslint/no-require-imports
-const platform = require(`./${process.env.TEST_PLATFORM}/connection`);
+const platform = require(`./${process.env.TEST_PLATFORM ?? 'node'}/connection`);
 
 export function newConnectivityMonitor(): ConnectivityMonitor {
   return platform.newConnectivityMonitor();
 }
 
+// TODO(firestorexp): This doesn't need to return a Promise
 export function newConnection(databaseInfo: DatabaseInfo): Promise<Connection> {
   return platform.newConnection(databaseInfo);
 }

packages/firestore/src/platform/connection.ts

@@ -17,7 +17,7 @@
 
 // This file is only used under ts-node.
 // eslint-disable-next-line @typescript-eslint/no-require-imports
-const platform = require(`./${process.env.TEST_PLATFORM}/dom`);
+const platform = require(`./${process.env.TEST_PLATFORM ?? 'node'}/dom`);
 
 /** The Platform's 'window' implementation or null if not available. */
 export function getWindow(): Window | null {

packages/firestore/src/platform/dom.ts

@@ -17,7 +17,7 @@
 
 // This file is only used under ts-node.
 // eslint-disable-next-line @typescript-eslint/no-require-imports
-const platform = require(`./${process.env.TEST_PLATFORM}/format_json`);
+const platform = require(`./${process.env.TEST_PLATFORM ?? 'node'}/format_json`);
 
 /** Formats an object as a JSON string, suitable for logging. */
 export function formatJSON(value: unknown): string {

packages/firestore/src/platform/format_json.ts

@@ -15,13 +15,18 @@
  * limitations under the License.
  */
 
-import { DatabaseInfo } from '../../core/database_info';
-import { Connection } from '../../remote/connection';
-import { HttpConnection } from './http_connection';
+import * as nodeFetch from 'node-fetch';
+
+import {FetchConnection} from "../browser_lite/fetch_connection";
+import {DatabaseInfo} from "../../core/database_info";
+import {Connection} from "../../remote/connection";
 
 export { newConnectivityMonitor } from '../browser/connection';
 
 /** Initializes the HTTP connection for the REST API. */
 export function newConnection(databaseInfo: DatabaseInfo): Promise<Connection> {
-  return Promise.resolve(new HttpConnection(databaseInfo));
+  // node-fetch is meant to be API compatible with `fetch`, but its type don't
+  // match 100%.
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  return Promise.resolve(new FetchConnection(databaseInfo, nodeFetch as any));
 }

packages/firestore/src/platform/node_lite/connection.ts

@@ -17,7 +17,7 @@
 
 // This file is only used under ts-node.
 // eslint-disable-next-line @typescript-eslint/no-require-imports
-const platform = require(`./${process.env.TEST_PLATFORM}/random_bytes`);
+const platform = require(`./${process.env.TEST_PLATFORM ?? 'node'}/random_bytes`);
 
 /**
  * Generates `nBytes` of random bytes.

packages/firestore/src/platform/node_lite/http_connection.ts

@@ -19,7 +19,7 @@ import {JsonProtoSerializer} from "../remote/serializer";
 
 // This file is only used under ts-node.
 // eslint-disable-next-line @typescript-eslint/no-require-imports
-const platform = require(`./${process.env.TEST_PLATFORM}/serializer`);
+const platform = require(`./${process.env.TEST_PLATFORM ?? 'node'}/serializer`);
 
 export function newSerializer(databaseId: DatabaseId): JsonProtoSerializer {
     return platform.newSerializer(databaseId);

packages/firestore/src/platform/random_bytes.ts

@@ -92,7 +92,7 @@ export abstract class RestConnection implements Connection {
         return response;
       },
       (err: FirestoreError) => {
-        logWarn(LOG_TAG, `${rpcName} failed with error: `, err.message, 'url : ', url, 'request :', req);
+        logWarn(LOG_TAG, `${rpcName} failed with error: `, err.message, 'url: ', url, 'request:', req);
         throw err;
       }
     );

packages/firestore/src/platform/serializer.ts

@@ -125,15 +125,9 @@ describe('RestConnection', () => {
     expect(response).to.deep.equal({ response: true });
   });
 
-  it('returns error', async () => {
-    connection.nextResponse = Promise.reject(
-      new FirestoreError(Code.UNKNOWN, 'Test exception')
-    );
-    try {
-      await connection.invokeRPC('RunQuery', {}, null);
-      fail();
-    } catch (e) {
-      expect(e.code).to.equal(Code.UNKNOWN);
-    }
+  it('returns error', () => {
+    const error =  new FirestoreError(Code.UNKNOWN, 'Test exception');
+    connection.nextResponse = Promise.reject(error);
+    return expect(connection.invokeRPC('RunQuery', {}, null)).to.be.eventually.rejectedWith(error);
   });
 });

packages/firestore/src/remote/rest_connection.ts

@@ -1068,35 +1068,6 @@
     unique-filename "^1.1.1"
     which "^1.3.1"
 
-"@firebase/[email protected]":
-  version "0.1.16"
-  resolved "https://registry.npmjs.org/@firebase/component/-/component-0.1.16.tgz#7a0dbdfff1485d45b8485db87a982f053e68761a"
-  integrity sha512-FvffvFN0LWgv1H/FIyruTECOL69Dhy+JfwoTq+mV39V8Mz9lNpo41etonL5AOr7KmXxYJVbNwkx0L9Ei88i7JA==
-  dependencies:
-    "@firebase/util" "0.2.50"
-    tslib "^1.11.1"
-
-"@firebase/[email protected]":
-  version "1.16.1"
-  resolved "https://registry.npmjs.org/@firebase/firestore/-/firestore-1.16.1.tgz#ddf4e357b4d847abe6a57a89d3e2d5b950339176"
-  integrity sha512-TGtvNIGHMEFFEuOSsRswou576GPZY39vXIsenn0B1Dqz9ACpyDtvAT9YdbG38srlPq7ZKwsP5x04LB43zZ6eAg==
-  dependencies:
-    "@firebase/component" "0.1.16"
-    "@firebase/firestore-types" "1.12.0"
-    "@firebase/logger" "0.2.6"
-    "@firebase/util" "0.2.50"
-    "@firebase/webchannel-wrapper" "0.2.41"
-    "@grpc/grpc-js" "^1.0.0"
-    "@grpc/proto-loader" "^0.5.0"
-    tslib "^1.11.1"
-
-"@firebase/[email protected]":
-  version "0.2.50"
-  resolved "https://registry.npmjs.org/@firebase/util/-/util-0.2.50.tgz#77666b845dcb49bc217650aa296a7a8986c06b44"
-  integrity sha512-vFE6+Jfc25u0ViSpFxxq0q5s+XmuJ/y7CL3ud79RQe+WLFFg+j0eH1t23k0yNSG9vZNM7h3uHRIXbV97sYLAyw==
-  dependencies:
-    tslib "^1.11.1"
-
 "@google-cloud/paginator@^2.0.0":
   version "2.0.3"
   resolved "https://registry.npmjs.org/@google-cloud/paginator/-/paginator-2.0.3.tgz#c7987ad05d1c3ebcef554381be80e9e8da4e4882"