Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat!: Do not treat Buffers as JSON by default #621

Draft
wants to merge 21 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
58c7dc2
feat!: Upgrade to `node-fetch` v3
danielbankhead Apr 16, 2024
f8570d9
Merge branch 'main' into upgrade-node-fetch
danielbankhead Apr 16, 2024
7fd2a95
refactor: Use native `FormData` in testing
danielbankhead Apr 17, 2024
0cc7856
Merge branch 'upgrade-node-fetch' of github.com:googleapis/gaxios int…
danielbankhead Apr 17, 2024
a61cfa5
feat!: Improve spec compliance
danielbankhead Apr 19, 2024
35a73b1
test(temp): Run 18+
danielbankhead Apr 19, 2024
e7addeb
🦉 Updates from OwlBot post-processor
gcf-owl-bot[bot] Apr 19, 2024
9816229
feat: Improve types, streamline, and standardize
danielbankhead May 14, 2024
7315442
feat!: Do Not Treat Buffers as JSON By Default
danielbankhead May 15, 2024
93bf4a8
Merge branch 'main' of github.com:googleapis/gaxios into upgrade-node…
danielbankhead May 15, 2024
273e516
Merge branch 'upgrade-node-fetch' of github.com:googleapis/gaxios int…
danielbankhead May 15, 2024
9164b87
test: Adopt `Headers` type from merge
danielbankhead May 15, 2024
d01ecde
Merge branch 'upgrade-node-fetch' of github.com:googleapis/gaxios int…
danielbankhead May 15, 2024
84faea8
feat: Introduce `GaxiosOptionsPrepared` for improved type guarantees
danielbankhead May 16, 2024
4e6de5f
feat: Ensure `GaxiosOptionsPrepared.url` is always a `URL`
danielbankhead May 16, 2024
e6c2371
refactor: Clean-up Types & Resolve lint warnings
danielbankhead May 16, 2024
2089d83
Merge branch 'upgrade-node-fetch' of github.com:googleapis/gaxios int…
danielbankhead May 16, 2024
98f7009
refactor: streamline `.data` for `Response`
danielbankhead May 20, 2024
e66c4ba
Merge branch 'upgrade-node-fetch' of github.com:googleapis/gaxios int…
danielbankhead May 20, 2024
0baab44
Merge branch 'main' of github.com:googleapis/gaxios into do-not-treat…
danielbankhead Jul 1, 2024
b2ec395
docs: clarification
danielbankhead Jul 1, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 26 additions & 26 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,16 +53,26 @@ interface GaxiosOptions = {
baseURL: 'https://example.com';

// The HTTP methods to be sent with the request.
headers: { 'some': 'header' },

// The data to send in the body of the request. Data objects will be
// serialized as JSON.
headers: { 'some': 'header' } || new Headers(),

// The data to send in the body of the request. Objects will be serialized as JSON
// except for:
// - `ArrayBuffer`
// - `Blob`
// - `Buffer` (Node.js)
// - `DataView`
// - `File`
// - `FormData`
// - `ReadableStream`
// - `stream.Readable` (Node.js)
// - strings
// - `TypedArray` (e.g. `Uint8Array`, `BigInt64Array`)
// - `URLSearchParams`
// - all other objects where:
// - headers['Content-Type'] === 'application/x-www-form-urlencoded' (serialized as `URLSearchParams`)
//
// Note: if you would like to provide a Content-Type header other than
// application/json you you must provide a string or readable stream, rather
// than an object:
// data: JSON.stringify({some: 'data'})
// data: fs.readFile('./some-data.jpeg')
// In all other cases, if you would like to prevent `application/json` as the
// default you must set the `Content-Type` header.
data: {
some: 'data'
},
Expand All @@ -71,23 +81,12 @@ interface GaxiosOptions = {
// Defaults to `0`, which is the same as unset.
maxContentLength: 2000,

// The max number of HTTP redirects to follow.
// Defaults to 100.
maxRedirects: 100,

// The querystring parameters that will be encoded using `qs` and
// The query parameters that will be encoded using `URLSearchParams` and
// appended to the url
params: {
querystring: 'parameters'
},

// By default, we use the `querystring` package in node core to serialize
// querystring parameters. You can override that and provide your
// own implementation.
paramsSerializer: (params) => {
return qs.stringify(params);
},

// The timeout for the HTTP request in milliseconds. Defaults to 0.
timeout: 1000,

Expand All @@ -105,6 +104,8 @@ interface GaxiosOptions = {
// The expected return type of the request. Options are:
// json | stream | blob | arraybuffer | text | unknown
// Defaults to `unknown`.
// If the `fetchImplementation` is native `fetch`, the
// stream is a `ReadableStream`, otherwise `readable.Stream`
responseType: 'unknown',

// The node.js http agent to use for the request.
Expand All @@ -114,9 +115,9 @@ interface GaxiosOptions = {
// status code. Defaults to (>= 200 && < 300)
validateStatus: (status: number) => true,

// Implementation of `fetch` to use when making the API call. By default,
// will use the browser context if available, and fall back to `node-fetch`
// in node.js otherwise.
/**
* Implementation of `fetch` to use when making the API call. Will use `fetch` by default.
*/
fetchImplementation?: typeof fetch;

// Configuration for retrying of requests.
Expand Down Expand Up @@ -151,8 +152,7 @@ interface GaxiosOptions = {
// Enables default configuration for retries.
retry: boolean,

// Cancelling a request requires the `abort-controller` library.
// See https://github.com/bitinn/node-fetch#request-cancellation-with-abortsignal
// Enables aborting via AbortController
signal?: AbortSignal

/**
Expand Down
4 changes: 2 additions & 2 deletions browser-test/test.browser.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
import assert from 'assert';
import {describe, it} from 'mocha';
import {request} from '../src/index';
import * as uuid from 'uuid';
const port = 7172; // should match the port defined in `webserver.ts`

describe('💻 browser tests', () => {
Expand Down Expand Up @@ -53,7 +52,8 @@ describe('💻 browser tests', () => {
body: 'hello world!',
},
];
const boundary = uuid.v4();
const boundary =
globalThis?.crypto.randomUUID() || (await import('crypto')).randomUUID();
const finale = `--${boundary}--`;
headers['Content-Type'] = `multipart/related; boundary=${boundary}`;

Expand Down
10 changes: 2 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,18 +47,14 @@
"@types/mv": "^2.1.0",
"@types/ncp": "^2.0.1",
"@types/node": "^20.0.0",
"@types/node-fetch": "^2.5.7",
"@types/sinon": "^17.0.0",
"@types/tmp": "0.2.6",
"@types/uuid": "^10.0.0",
"abort-controller": "^3.0.0",
"assert": "^2.0.0",
"browserify": "^17.0.0",
"c8": "^8.0.0",
"cors": "^2.8.5",
"execa": "^5.0.0",
"express": "^4.16.4",
"form-data": "^4.0.0",
"gts": "^5.0.0",
"is-docker": "^2.0.0",
"karma": "^6.0.0",
Expand All @@ -74,7 +70,7 @@
"multiparty": "^4.2.1",
"mv": "^2.1.1",
"ncp": "^2.0.0",
"nock": "^13.0.0",
"nock": "^14.0.0-beta.5",
"null-loader": "^4.0.0",
"puppeteer": "^19.0.0",
"sinon": "^18.0.0",
Expand All @@ -88,8 +84,6 @@
"dependencies": {
"extend": "^3.0.2",
"https-proxy-agent": "^7.0.1",
"is-stream": "^2.0.0",
"node-fetch": "^2.6.9",
"uuid": "^10.0.0"
"node-fetch": "^3.3.2"
}
}
Loading
Loading