|
2 | 2 |
|
3 | 3 | const { pipeline } = require('node:stream') |
4 | 4 | const { fetching } = require('../fetch') |
5 | | -const { makeRequest } = require('../fetch/request') |
6 | 5 | const { webidl } = require('../webidl') |
7 | 6 | const { EventSourceStream } = require('./eventsource-stream') |
8 | 7 | const { parseMIMEType } = require('../fetch/data-url') |
9 | 8 | const { createFastMessageEvent } = require('../websocket/events') |
10 | 9 | const { isNetworkError } = require('../fetch/response') |
11 | 10 | const { kEnumerableProperty } = require('../../core/util') |
12 | 11 | const { environmentSettingsObject } = require('../fetch/util') |
| 12 | +const { createPotentialCORSRequest } = require('./util') |
13 | 13 |
|
14 | 14 | let experimentalWarned = false |
15 | 15 |
|
@@ -160,33 +160,22 @@ class EventSource extends EventTarget { |
160 | 160 |
|
161 | 161 | // 8. Let request be the result of creating a potential-CORS request given |
162 | 162 | // urlRecord, the empty string, and corsAttributeState. |
163 | | - const initRequest = { |
164 | | - redirect: 'follow', |
165 | | - keepalive: true, |
166 | | - // @see https://html.spec.whatwg.org/multipage/urls-and-fetching.html#cors-settings-attributes |
167 | | - mode: 'cors', |
168 | | - credentials: corsAttributeState === 'anonymous' |
169 | | - ? 'same-origin' |
170 | | - : 'omit', |
171 | | - referrer: 'no-referrer' |
172 | | - } |
| 163 | + const request = createPotentialCORSRequest(urlRecord, '', corsAttributeState) |
173 | 164 |
|
174 | 165 | // 9. Set request's client to settings. |
175 | | - initRequest.client = environmentSettingsObject.settingsObject |
| 166 | + request.client = environmentSettingsObject.settingsObject |
176 | 167 |
|
177 | 168 | // 10. User agents may set (`Accept`, `text/event-stream`) in request's header list. |
178 | | - initRequest.headersList = [['accept', { name: 'accept', value: 'text/event-stream' }]] |
| 169 | + request.headersList.set('Accept', 'text/event-stream') |
179 | 170 |
|
180 | 171 | // 11. Set request's cache mode to "no-store". |
181 | | - initRequest.cache = 'no-store' |
| 172 | + request.cache = 'no-store' |
182 | 173 |
|
183 | 174 | // 12. Set request's initiator type to "other". |
184 | | - initRequest.initiator = 'other' |
185 | | - |
186 | | - initRequest.urlList = [new URL(this.#url)] |
| 175 | + request.initiator = 'other' |
187 | 176 |
|
188 | 177 | // 13. Set ev's request to request. |
189 | | - this.#request = makeRequest(initRequest) |
| 178 | + this.#request = request |
190 | 179 |
|
191 | 180 | this.#connect() |
192 | 181 | } |
|
0 commit comments