1
1
import process from 'process' ;
2
2
import { Buffer } from 'buffer' ;
3
- import { promisify } from 'util' ;
4
3
import fs from 'fs' ;
5
4
import { Agent as HttpAgent } from 'http' ;
6
5
import stream , { Readable as ReadableStream , Writable } from 'stream' ;
6
+ import { pipeline as streamPipeline } from 'stream/promises' ;
7
7
import { Readable as Readable2 } from 'readable-stream' ;
8
8
import test from 'ava' ;
9
9
import type { Handler } from 'express' ;
@@ -15,8 +15,6 @@ import delay from 'delay';
15
15
import got , { HTTPError , RequestError } from '../source/index.js' ;
16
16
import withServer from './helpers/with-server.js' ;
17
17
18
- const pStreamPipeline = promisify ( stream . pipeline ) ;
19
-
20
18
const defaultHandler : Handler = ( _request , response ) => {
21
19
response . writeHead ( 200 , {
22
20
unicorn : 'rainbow' ,
@@ -33,7 +31,7 @@ const redirectHandler: Handler = (_request, response) => {
33
31
} ;
34
32
35
33
const postHandler : Handler = async ( request , response ) => {
36
- await pStreamPipeline ( request , response ) ;
34
+ await streamPipeline ( request , response ) ;
37
35
} ;
38
36
39
37
const errorHandler : Handler = ( _request , response ) => {
@@ -196,7 +194,7 @@ test('piping works', withServer, async (t, server, got) => {
196
194
test ( 'proxying headers works' , withServer , async ( t , server , got ) => {
197
195
server . get ( '/' , defaultHandler ) ;
198
196
server . get ( '/proxy' , async ( _request , response ) => {
199
- await pStreamPipeline (
197
+ await streamPipeline (
200
198
got . stream ( '' ) ,
201
199
response ,
202
200
) ;
@@ -211,7 +209,7 @@ test('proxying headers works', withServer, async (t, server, got) => {
211
209
test ( 'piping server request to Got proxies also headers' , withServer , async ( t , server , got ) => {
212
210
server . get ( '/' , headersHandler ) ;
213
211
server . get ( '/proxy' , async ( request , response ) => {
214
- await pStreamPipeline (
212
+ await streamPipeline (
215
213
request ,
216
214
got . stream ( '' ) ,
217
215
response ,
@@ -231,7 +229,7 @@ test('skips proxying headers after server has sent them already', withServer, as
231
229
server . get ( '/proxy' , async ( _request , response ) => {
232
230
response . writeHead ( 200 ) ;
233
231
234
- await pStreamPipeline (
232
+ await streamPipeline (
235
233
got . stream ( '' ) ,
236
234
response ,
237
235
) ;
@@ -244,7 +242,7 @@ test('skips proxying headers after server has sent them already', withServer, as
244
242
test ( 'proxies `content-encoding` header when `options.decompress` is false' , withServer , async ( t , server , got ) => {
245
243
server . get ( '/' , defaultHandler ) ;
246
244
server . get ( '/proxy' , async ( _request , response ) => {
247
- await pStreamPipeline (
245
+ await streamPipeline (
248
246
got . stream ( { decompress : false } ) ,
249
247
response ,
250
248
) ;
@@ -286,13 +284,14 @@ test('piping to got.stream.put()', withServer, async (t, server, got) => {
286
284
server . put ( '/post' , postHandler ) ;
287
285
288
286
await t . notThrowsAsync ( async ( ) => {
289
- await getStream (
290
- stream . pipeline (
291
- got . stream ( '' ) ,
292
- got . stream . put ( 'post' ) ,
293
- ( ) => { } ,
294
- ) ,
287
+ const stream = got . stream . put ( 'post' ) ;
288
+
289
+ await streamPipeline (
290
+ got . stream ( '' ) ,
291
+ stream ,
295
292
) ;
293
+
294
+ await getStream ( stream ) ;
296
295
} ) ;
297
296
} ) ;
298
297
@@ -310,7 +309,7 @@ test.skip('no unhandled body stream errors', async t => {
310
309
} ) ;
311
310
312
311
test ( 'works with pipeline' , async t => {
313
- await t . throwsAsync ( pStreamPipeline (
312
+ await t . throwsAsync ( streamPipeline (
314
313
new ReadableStream ( {
315
314
read ( ) {
316
315
this . push ( null ) ;
@@ -369,7 +368,7 @@ test('the socket is alive on a successful pipeline', withServer, async (t, serve
369
368
t . is ( gotStream . socket , undefined ) ;
370
369
371
370
const receiver = new stream . PassThrough ( ) ;
372
- await promisify ( stream . pipeline ) ( gotStream , receiver ) ;
371
+ await streamPipeline ( gotStream , receiver ) ;
373
372
374
373
t . is ( await getStream ( receiver ) , payload ) ;
375
374
t . truthy ( gotStream . socket ) ;
0 commit comments