feat: Basic GET Support for Request objects

`node-fetch` does not yet support webstreams, which is required for `.body` node-fetch/node-fetch#387
googleapis · Sep 11, 2024 · 8413f68 · 8413f68
1 parent a7e2e83
commit 8413f68
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 17 deletions.
diff --git a/src/common.ts b/src/common.ts
@@ -155,16 +155,6 @@ export interface GaxiosOptions extends RequestInit {
    */
   baseUrl?: string;
   baseURL?: string | URL;
-  method?:
-    | 'GET'
-    | 'HEAD'
-    | 'POST'
-    | 'DELETE'
-    | 'PUT'
-    | 'CONNECT'
-    | 'OPTIONS'
-    | 'TRACE'
-    | 'PATCH';
   /**
    * The data to send in the {@link RequestInit.body} of the request. Objects will be
    * serialized as JSON, except for:
@@ -325,7 +315,7 @@ export interface GaxiosOptionsPrepared extends GaxiosOptions {
 }
 
 /**
- * Configuration for the Gaxios `request` method.
+ * Gaxios retry configuration.
  */
 export interface RetryConfig {
   /**

diff --git a/src/gaxios.ts b/src/gaxios.ts
@@ -415,7 +415,6 @@ export class Gaxios {
     if (!preparedHeaders.has('accept') && opts.responseType === 'json') {
       preparedHeaders.set('accept', 'application/json');
     }
-    opts.method = opts.method || 'GET';
 
     const proxy =
       opts.proxy ||

diff --git a/src/retry.ts b/src/retry.ts
@@ -118,8 +118,9 @@ function shouldRetryRequest(err: GaxiosError) {
 
   // Only retry with configured HttpMethods.
   if (
-    !err.config.method ||
-    config.httpMethodsToRetry!.indexOf(err.config.method.toUpperCase()) < 0
+    config.httpMethodsToRetry!.indexOf(
+      err.config.method?.toUpperCase() || 'GET'
+    ) < 0
   ) {
     return false;
   }

diff --git a/test/test.getch.ts b/test/test.getch.ts
@@ -139,11 +139,18 @@ describe('🚙 error handling', () => {
 });
 
 describe('🥁 configuration options', () => {
-  it('should accept URL objects', async () => {
+  it('should accept `URL` objects', async () => {
     const scope = nock(url).get('/').reply(204);
     const res = await request({url: new URL(url)});
     scope.done();
-    assert.strictEqual(res.config.method, 'GET');
+    assert.strictEqual(res.status, 204);
+  });
+
+  it('should accept `Request` objects', async () => {
+    const scope = nock(url).get('/').reply(204);
+    const res = await request(new Request(url));
+    scope.done();
+    assert.strictEqual(res.status, 204);
   });
 
   it('should use options passed into the constructor', async () => {
@@ -686,7 +693,7 @@ describe('🥁 configuration options', () => {
 });
 
 describe('🎏 data handling', () => {
-  it('should accpet a ReadableStream as request data', async () => {
+  it.only('should accpet a ReadableStream as request data', async () => {
     const body = fs.createReadStream('package.json');
     // eslint-disable-next-line @typescript-eslint/no-var-requires
     const contents = require('../../package.json');