@@ -1415,6 +1415,20 @@ var require_util2 = __commonJS({
1415
1415
assert ( typeof result === "string" ) ;
1416
1416
return result ;
1417
1417
}
1418
+ var esIteratorPrototype = Object . getPrototypeOf ( Object . getPrototypeOf ( [ ] [ Symbol . iterator ] ( ) ) ) ;
1419
+ function makeIterator ( iterator , name ) {
1420
+ const i = {
1421
+ next ( ) {
1422
+ if ( Object . getPrototypeOf ( this ) !== i ) {
1423
+ throw new TypeError ( `'next' called on an object that does not implement interface ${ name } Iterator.` ) ;
1424
+ }
1425
+ return iterator . next ( ) ;
1426
+ } ,
1427
+ [ Symbol . toStringTag ] : `${ name } Iterator`
1428
+ } ;
1429
+ Object . setPrototypeOf ( i , esIteratorPrototype ) ;
1430
+ return Object . setPrototypeOf ( { } , i ) ;
1431
+ }
1418
1432
module2 . exports = {
1419
1433
isAborted,
1420
1434
isCancelled,
@@ -1444,7 +1458,8 @@ var require_util2 = __commonJS({
1444
1458
isValidReasonPhrase,
1445
1459
sameOrigin,
1446
1460
normalizeMethod,
1447
- serializeJavascriptValueToJSONString
1461
+ serializeJavascriptValueToJSONString,
1462
+ makeIterator
1448
1463
} ;
1449
1464
}
1450
1465
} ) ;
@@ -1453,7 +1468,7 @@ var require_util2 = __commonJS({
1453
1468
var require_formdata = __commonJS ( {
1454
1469
"lib/fetch/formdata.js" ( exports2 , module2 ) {
1455
1470
"use strict" ;
1456
- var { isBlobLike, isFileLike, toUSVString } = require_util2 ( ) ;
1471
+ var { isBlobLike, isFileLike, toUSVString, makeIterator } = require_util2 ( ) ;
1457
1472
var { kState } = require_symbols2 ( ) ;
1458
1473
var { File, FileLike } = require_file ( ) ;
1459
1474
var { Blob } = require ( "buffer" ) ;
@@ -1558,38 +1573,42 @@ var require_formdata = __commonJS({
1558
1573
get [ Symbol . toStringTag ] ( ) {
1559
1574
return this . constructor . name ;
1560
1575
}
1561
- * entries ( ) {
1576
+ entries ( ) {
1562
1577
if ( ! ( this instanceof _FormData ) ) {
1563
1578
throw new TypeError ( "Illegal invocation" ) ;
1564
1579
}
1565
- for ( const pair of this ) {
1566
- yield pair ;
1567
- }
1580
+ return makeIterator ( makeIterable ( this [ kState ] , "entries" ) , "FormData" ) ;
1568
1581
}
1569
- * keys ( ) {
1582
+ keys ( ) {
1570
1583
if ( ! ( this instanceof _FormData ) ) {
1571
1584
throw new TypeError ( "Illegal invocation" ) ;
1572
1585
}
1573
- for ( const [ key ] of this ) {
1574
- yield key ;
1586
+ return makeIterator ( makeIterable ( this [ kState ] , "keys" ) , "FormData" ) ;
1587
+ }
1588
+ values ( ) {
1589
+ if ( ! ( this instanceof _FormData ) ) {
1590
+ throw new TypeError ( "Illegal invocation" ) ;
1575
1591
}
1592
+ return makeIterator ( makeIterable ( this [ kState ] , "values" ) , "FormData" ) ;
1576
1593
}
1577
- * values ( ) {
1594
+ forEach ( callbackFn , thisArg = globalThis ) {
1578
1595
if ( ! ( this instanceof _FormData ) ) {
1579
1596
throw new TypeError ( "Illegal invocation" ) ;
1580
1597
}
1581
- for ( const [ , value ] of this ) {
1582
- yield value ;
1598
+ if ( arguments . length < 1 ) {
1599
+ throw new TypeError ( `Failed to execute 'forEach' on 'FormData': 1 argument required, but only ${ arguments . length } present.` ) ;
1583
1600
}
1584
- }
1585
- * [ Symbol . iterator ] ( ) {
1586
- for ( const { name, value } of this [ kState ] ) {
1587
- yield [ name , value ] ;
1601
+ if ( typeof callbackFn !== "function" ) {
1602
+ throw new TypeError ( "Failed to execute 'forEach' on 'FormData': parameter 1 is not of type 'Function'." ) ;
1603
+ }
1604
+ for ( const [ key , value ] of this ) {
1605
+ callbackFn . apply ( thisArg , [ value , key , this ] ) ;
1588
1606
}
1589
1607
}
1590
1608
} ;
1591
1609
var FormData = _FormData ;
1592
1610
__publicField ( FormData , "name" , "FormData" ) ;
1611
+ FormData . prototype [ Symbol . iterator ] = FormData . prototype . entries ;
1593
1612
function makeEntry ( name , value , filename ) {
1594
1613
const entry = {
1595
1614
name : null ,
@@ -1605,6 +1624,17 @@ var require_formdata = __commonJS({
1605
1624
entry . value = value ;
1606
1625
return entry ;
1607
1626
}
1627
+ function * makeIterable ( entries , type ) {
1628
+ for ( const { name, value } of entries ) {
1629
+ if ( type === "entries" ) {
1630
+ yield [ name , value ] ;
1631
+ } else if ( type === "values" ) {
1632
+ yield value ;
1633
+ } else {
1634
+ yield name ;
1635
+ }
1636
+ }
1637
+ }
1608
1638
module2 . exports = { FormData } ;
1609
1639
}
1610
1640
} ) ;
@@ -1622,7 +1652,7 @@ var require_body = __commonJS({
1622
1652
var assert = require ( "assert" ) ;
1623
1653
var { NotSupportedError } = require_errors ( ) ;
1624
1654
var { isErrored } = require_util ( ) ;
1625
- var { isUint8Array } = require ( "util/types" ) ;
1655
+ var { isUint8Array, isArrayBuffer } = require ( "util/types" ) ;
1626
1656
var ReadableStream ;
1627
1657
async function * blobGen ( blob ) {
1628
1658
if ( blob . stream ) {
@@ -1644,7 +1674,7 @@ var require_body = __commonJS({
1644
1674
} else if ( object instanceof URLSearchParams ) {
1645
1675
source = object . toString ( ) ;
1646
1676
contentType = "application/x-www-form-urlencoded;charset=UTF-8" ;
1647
- } else if ( object instanceof ArrayBuffer || ArrayBuffer . isView ( object ) ) {
1677
+ } else if ( isArrayBuffer ( object ) || ArrayBuffer . isView ( object ) ) {
1648
1678
if ( object instanceof DataView ) {
1649
1679
object = object . buffer ;
1650
1680
}
@@ -1880,7 +1910,7 @@ var require_request = __commonJS({
1880
1910
} , handler ) {
1881
1911
if ( typeof path !== "string" ) {
1882
1912
throw new InvalidArgumentError ( "path must be a string" ) ;
1883
- } else if ( path [ 0 ] !== "/" && ! ( path . startsWith ( "http://" ) || path . startsWith ( "https://" ) ) ) {
1913
+ } else if ( path [ 0 ] !== "/" && ! ( path . startsWith ( "http://" ) || path . startsWith ( "https://" ) ) && method !== "CONNECT" ) {
1884
1914
throw new InvalidArgumentError ( "path must be an absolute URL or start with a slash" ) ;
1885
1915
}
1886
1916
if ( typeof method !== "string" ) {
@@ -1903,12 +1933,12 @@ var require_request = __commonJS({
1903
1933
this . body = null ;
1904
1934
} else if ( util . isStream ( body ) ) {
1905
1935
this . body = body ;
1906
- } else if ( body instanceof DataView ) {
1907
- this . body = body . buffer . byteLength ? Buffer . from ( body . buffer ) : null ;
1908
- } else if ( body instanceof ArrayBuffer || ArrayBuffer . isView ( body ) ) {
1909
- this . body = body . byteLength ? Buffer . from ( body ) : null ;
1910
1936
} else if ( util . isBuffer ( body ) ) {
1911
1937
this . body = body . byteLength ? body : null ;
1938
+ } else if ( ArrayBuffer . isView ( body ) ) {
1939
+ this . body = body . buffer . byteLength ? Buffer . from ( body . buffer , body . byteOffset , body . byteLength ) : null ;
1940
+ } else if ( body instanceof ArrayBuffer ) {
1941
+ this . body = body . byteLength ? Buffer . from ( body ) : null ;
1912
1942
} else if ( typeof body === "string" ) {
1913
1943
this . body = body . length ? Buffer . from ( body ) : null ;
1914
1944
} else if ( util . isFormDataLike ( body ) || util . isIterable ( body ) || util . isBlobLike ( body ) ) {
@@ -2221,7 +2251,7 @@ var require_connect = __commonJS({
2221
2251
const sessionCache = /* @__PURE__ */ new Map ( ) ;
2222
2252
timeout = timeout == null ? 1e4 : timeout ;
2223
2253
maxCachedSessions = maxCachedSessions == null ? 100 : maxCachedSessions ;
2224
- return function connect ( { hostname, host, protocol, port, servername } , callback ) {
2254
+ return function connect ( { hostname, host, protocol, port, servername, httpSocket } , callback ) {
2225
2255
let socket ;
2226
2256
if ( protocol === "https:" ) {
2227
2257
if ( ! tls ) {
@@ -2236,6 +2266,7 @@ var require_connect = __commonJS({
2236
2266
...options ,
2237
2267
servername,
2238
2268
session,
2269
+ socket : httpSocket ,
2239
2270
port : port || 443 ,
2240
2271
host : hostname
2241
2272
} ) ;
@@ -2254,6 +2285,7 @@ var require_connect = __commonJS({
2254
2285
}
2255
2286
} ) ;
2256
2287
} else {
2288
+ assert ( ! httpSocket , "httpSocket can only be sent on TLS update" ) ;
2257
2289
socket = net . connect ( {
2258
2290
highWaterMark : 64 * 1024 ,
2259
2291
...options ,
@@ -4205,6 +4237,7 @@ var require_headers = __commonJS({
4205
4237
var { kHeadersList } = require_symbols ( ) ;
4206
4238
var { kGuard } = require_symbols2 ( ) ;
4207
4239
var { kEnumerableProperty } = require_util ( ) ;
4240
+ var { makeIterator } = require_util2 ( ) ;
4208
4241
var kHeadersMap = Symbol ( "headers map" ) ;
4209
4242
var kHeadersSortedMap = Symbol ( "headers map sorted" ) ;
4210
4243
function normalizeAndValidateHeaderName ( name ) {
@@ -4248,20 +4281,6 @@ var require_headers = __commonJS({
4248
4281
throw TypeError ( ) ;
4249
4282
}
4250
4283
}
4251
- var esIteratorPrototype = Object . getPrototypeOf ( Object . getPrototypeOf ( [ ] [ Symbol . iterator ] ( ) ) ) ;
4252
- function makeHeadersIterator ( iterator ) {
4253
- const i = {
4254
- next ( ) {
4255
- if ( Object . getPrototypeOf ( this ) !== i ) {
4256
- throw new TypeError ( "'next' called on an object that does not implement interface Headers Iterator." ) ;
4257
- }
4258
- return iterator . next ( ) ;
4259
- } ,
4260
- [ Symbol . toStringTag ] : "Headers Iterator"
4261
- } ;
4262
- Object . setPrototypeOf ( i , esIteratorPrototype ) ;
4263
- return Object . setPrototypeOf ( { } , i ) ;
4264
- }
4265
4284
var HeadersList = class {
4266
4285
constructor ( init ) {
4267
4286
if ( init instanceof HeadersList ) {
@@ -4396,19 +4415,19 @@ var require_headers = __commonJS({
4396
4415
if ( ! ( this instanceof Headers ) ) {
4397
4416
throw new TypeError ( "Illegal invocation" ) ;
4398
4417
}
4399
- return makeHeadersIterator ( this [ kHeadersSortedMap ] . keys ( ) ) ;
4418
+ return makeIterator ( this [ kHeadersSortedMap ] . keys ( ) , "Headers" ) ;
4400
4419
}
4401
4420
values ( ) {
4402
4421
if ( ! ( this instanceof Headers ) ) {
4403
4422
throw new TypeError ( "Illegal invocation" ) ;
4404
4423
}
4405
- return makeHeadersIterator ( this [ kHeadersSortedMap ] . values ( ) ) ;
4424
+ return makeIterator ( this [ kHeadersSortedMap ] . values ( ) , "Headers" ) ;
4406
4425
}
4407
4426
entries ( ) {
4408
4427
if ( ! ( this instanceof Headers ) ) {
4409
4428
throw new TypeError ( "Illegal invocation" ) ;
4410
4429
}
4411
- return makeHeadersIterator ( this [ kHeadersSortedMap ] . entries ( ) ) ;
4430
+ return makeIterator ( this [ kHeadersSortedMap ] . entries ( ) , "Headers" ) ;
4412
4431
}
4413
4432
forEach ( callbackFn , thisArg = globalThis ) {
4414
4433
if ( ! ( this instanceof Headers ) ) {
@@ -5950,7 +5969,7 @@ var require_fetch = __commonJS({
5950
5969
if ( actualResponse . status !== 303 && request . body != null && request . body . source == null ) {
5951
5970
return makeNetworkError ( ) ;
5952
5971
}
5953
- if ( [ 301 , 302 ] . includes ( actualResponse . status ) && request . method === "POST" || actualResponse . status === 303 && ! [ "GET" , "HEADER " ] . includes ( request . method ) ) {
5972
+ if ( [ 301 , 302 ] . includes ( actualResponse . status ) && request . method === "POST" || actualResponse . status === 303 && ! [ "GET" , "HEAD " ] . includes ( request . method ) ) {
5954
5973
request . method = "GET" ;
5955
5974
request . body = null ;
5956
5975
for ( const headerName of requestBodyHeader ) {
0 commit comments