Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Do not patch global Headers if it is native, and support URL as a fir…
…st parameter of `fetch`
- Loading branch information
Showing
8 changed files
with
161 additions
and
147 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| --- | ||
| '@whatwg-node/fetch': patch | ||
| '@whatwg-node/server': patch | ||
| --- | ||
|
|
||
| Do not patch global Headers if it is native, and support URL as a first parameter of `fetch` |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,19 +1,20 @@ | ||
| const streams = require('stream'); | ||
|
|
||
| module.exports = function readableStreamToReadable(readableStream) { | ||
| return streams.Readable.from({ | ||
| [Symbol.asyncIterator]() { | ||
| const reader = readableStream.getReader(); | ||
| return { | ||
| next() { | ||
| return reader.read(); | ||
| }, | ||
| async return() { | ||
| reader.releaseLock(); | ||
| await readableStream.cancel(); | ||
| return Promise.resolve({ done: true }); | ||
| } | ||
| } | ||
| } | ||
| }); | ||
| return streams.Readable.from({ | ||
| [Symbol.asyncIterator]() { | ||
| const reader = readableStream.getReader(); | ||
| return { | ||
| next() { | ||
| return reader.read(); | ||
| }, | ||
| async return() { | ||
| reader.cancel(); | ||
| reader.releaseLock(); | ||
| await readableStream.cancel(); | ||
| return { done: true }; | ||
| } | ||
| } | ||
| } | ||
| }); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,43 +1,47 @@ | ||
| import { createFetch } from '@whatwg-node/fetch'; | ||
| import { createTestContainer } from '../../server/test/create-test-container'; | ||
|
|
||
| describe('getFormDataMethod', () => { | ||
| ['fieldsFirst:true', 'fieldsFirst:false'].forEach(fieldsFirstFlag => { | ||
| const fetchAPI = createFetch({ | ||
| formDataLimits: { | ||
| fieldsFirst: fieldsFirstFlag === 'fieldsFirst:true', | ||
| }, | ||
| }); | ||
| describe(fieldsFirstFlag, () => { | ||
| it('should parse fields correctly', async () => { | ||
| const formData = new fetchAPI.FormData(); | ||
| formData.append('greetings', 'Hello world!'); | ||
| formData.append('bye', 'Goodbye world!'); | ||
| const request = new fetchAPI.Request('http://localhost:8080', { | ||
| method: 'POST', | ||
| body: formData, | ||
| }); | ||
| const formdata = await request.formData(); | ||
| expect(formdata.get('greetings')).toBe('Hello world!'); | ||
| expect(formdata.get('bye')).toBe('Goodbye world!'); | ||
| }); | ||
| it('should parse and receive text files correctly', async () => { | ||
| const formData = new fetchAPI.FormData(); | ||
| const greetingsFile = new fetchAPI.File(['Hello world!'], 'greetings.txt', { type: 'text/plain' }); | ||
| const byeFile = new fetchAPI.File(['Goodbye world!'], 'bye.txt', { type: 'text/plain' }); | ||
| formData.append('greetings', greetingsFile); | ||
| formData.append('bye', byeFile); | ||
| const request = new fetchAPI.Request('http://localhost:8080', { | ||
| method: 'POST', | ||
| body: formData, | ||
| }); | ||
| const formdata = await request.formData(); | ||
| const receivedGreetingsFile = formdata.get('greetings') as File; | ||
| const receivedGreetingsText = await receivedGreetingsFile.text(); | ||
| expect(receivedGreetingsText).toBe('Hello world!'); | ||
| const receivedByeFile = formdata.get('bye') as File; | ||
| const receivedByeText = await receivedByeFile.text(); | ||
| expect(receivedByeText).toBe('Goodbye world!'); | ||
| }); | ||
| createTestContainer( | ||
| fetchAPI => { | ||
| it('should parse fields correctly', async () => { | ||
| const formData = new fetchAPI.FormData(); | ||
| formData.append('greetings', 'Hello world!'); | ||
| formData.append('bye', 'Goodbye world!'); | ||
| const request = new fetchAPI.Request('http://localhost:8080', { | ||
| method: 'POST', | ||
| body: formData, | ||
| }); | ||
| const formdata = await request.formData(); | ||
| expect(formdata.get('greetings')).toBe('Hello world!'); | ||
| expect(formdata.get('bye')).toBe('Goodbye world!'); | ||
| }); | ||
| it('should parse and receive text files correctly', async () => { | ||
| const formData = new fetchAPI.FormData(); | ||
| const greetingsFile = new fetchAPI.File(['Hello world!'], 'greetings.txt', { type: 'text/plain' }); | ||
| const byeFile = new fetchAPI.File(['Goodbye world!'], 'bye.txt', { type: 'text/plain' }); | ||
| formData.append('greetings', greetingsFile); | ||
| formData.append('bye', byeFile); | ||
| const request = new fetchAPI.Request('http://localhost:8080', { | ||
| method: 'POST', | ||
| body: formData, | ||
| }); | ||
| const formdata = await request.formData(); | ||
| const receivedGreetingsFile = formdata.get('greetings') as File; | ||
| const receivedGreetingsText = await receivedGreetingsFile.text(); | ||
| expect(receivedGreetingsText).toBe('Hello world!'); | ||
| const receivedByeFile = formdata.get('bye') as File; | ||
| const receivedByeText = await receivedByeFile.text(); | ||
| expect(receivedByeText).toBe('Goodbye world!'); | ||
| }); | ||
| }, | ||
| { | ||
| formDataLimits: { | ||
| fieldsFirst: fieldsFirstFlag === 'fieldsFirst:true', | ||
| }, | ||
| } | ||
| ); | ||
| }); | ||
| }); | ||
| }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.