urllib 3.8.0 → 3.9.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (17) hide show
  1. package/package.json +3 -2
  2. package/src/HttpClient.ts +6 -14
  3. package/src/Response.ts +2 -7
  4. package/src/cjs/HttpClient.js +4 -12
  5. package/src/cjs/HttpClient.js.map +1 -1
  6. package/src/cjs/Response.d.ts +2 -5
  7. package/src/cjs/index.d.ts +4 -4
  8. package/src/cjs/index.js +5 -3
  9. package/src/cjs/index.js.map +1 -1
  10. package/src/esm/HttpClient.js +4 -12
  11. package/src/esm/HttpClient.js.map +1 -1
  12. package/src/esm/Response.d.ts +2 -5
  13. package/src/esm/index.d.ts +4 -4
  14. package/src/esm/index.js +1 -1
  15. package/src/esm/index.js.map +1 -1
  16. package/src/index.ts +8 -3
  17. package/History.md +0 -972
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "urllib",
3
- "version": "3.8.0",
3
+ "version": "3.9.0",
4
4
  "publishConfig": {
5
5
  "tag": "latest"
6
6
  },
@@ -48,7 +48,8 @@
48
48
  "build:dist": "tsc --version && npm run build:cjs && npm run build:esm",
49
49
  "build:cjs:test": "cd test/cjs && rm -rf node_modules && npm link ../.. && node index.js",
50
50
  "build:esm:test": "cd test/esm && rm -rf node_modules && npm link ../.. && node index.js",
51
- "build:test": "npm run build && npm run build:cjs:test && npm run build:esm:test",
51
+ "build:test": "npm run build && npm run build:cjs:test && npm run build:esm:test && npm run test-tsc",
52
+ "test-tsc": "tsc -p ./test/fixtures/ts/tsconfig.json",
52
53
  "test": "vitest run",
53
54
  "cov": "vitest run --coverage --no-threads",
54
55
  "ci": "npm run lint && npm run cov && npm run build:test",
package/src/HttpClient.ts CHANGED
@@ -29,7 +29,7 @@ import pump from 'pump';
29
29
  import FormStream from 'formstream';
30
30
  import { HttpAgent, CheckAddressFunction } from './HttpAgent';
31
31
  import { RequestURL, RequestOptions, HttpMethod } from './Request';
32
- import { HttpClientResponseMeta, HttpClientResponse, ReadableWithMeta, BaseResponseMeta, SocketInfo } from './Response';
32
+ import { RawResponseWithMeta, HttpClientResponse, SocketInfo } from './Response';
33
33
  import { parseJSON, sleep, digestAuthHeader, globalId, performanceTime, isReadable } from './utils';
34
34
  import symbols from './symbols';
35
35
  import { initDiagnosticsChannel } from './diagnosticsChannel';
@@ -243,7 +243,7 @@ export class HttpClient extends EventEmitter {
243
243
  };
244
244
  // keep urllib createCallbackResponse style
245
245
  const resHeaders: IncomingHttpHeaders = {};
246
- const res: HttpClientResponseMeta = {
246
+ let res = {
247
247
  status: -1,
248
248
  statusCode: -1,
249
249
  headers: resHeaders,
@@ -254,7 +254,7 @@ export class HttpClient extends EventEmitter {
254
254
  requestUrls: [],
255
255
  timing,
256
256
  socket: socketInfo,
257
- };
257
+ } as any as RawResponseWithMeta;
258
258
 
259
259
  let headersTimeout = 5000;
260
260
  let bodyTimeout = 5000;
@@ -471,24 +471,16 @@ export class HttpClient extends EventEmitter {
471
471
  }
472
472
 
473
473
  let data: any = null;
474
- let responseBodyStream: ReadableWithMeta | undefined;
475
474
  if (args.dataType === 'stream') {
476
475
  // streaming mode will disable retry
477
476
  args.retry = 0;
478
- const meta: BaseResponseMeta = {
479
- status: res.status,
480
- statusCode: res.statusCode,
481
- headers: res.headers,
482
- timing,
483
- socket: socketInfo,
484
- };
485
477
  // only auto decompress on request args.compressed = true
486
478
  if (args.compressed === true && isCompressedContent) {
487
479
  // gzip or br
488
480
  const decoder = contentEncoding === 'gzip' ? createGunzip() : createBrotliDecompress();
489
- responseBodyStream = Object.assign(pipeline(response.body, decoder, noop), meta);
481
+ res = Object.assign(pipeline(response.body, decoder, noop), res);
490
482
  } else {
491
- responseBodyStream = Object.assign(response.body, meta);
483
+ res = Object.assign(response.body, res);
492
484
  }
493
485
  } else if (args.writeStream) {
494
486
  // streaming mode will disable retry
@@ -535,7 +527,7 @@ export class HttpClient extends EventEmitter {
535
527
  url: lastUrl,
536
528
  redirected: res.requestUrls.length > 1,
537
529
  requestUrls: res.requestUrls,
538
- res: responseBodyStream ?? res,
530
+ res,
539
531
  };
540
532
 
541
533
  if (args.retry > 0 && requestContext.retries < args.retry) {
package/src/Response.ts CHANGED
@@ -34,16 +34,13 @@ export type Timing = {
34
34
  contentDownload: number;
35
35
  };
36
36
 
37
- export type BaseResponseMeta = {
37
+ export type RawResponseWithMeta = Readable & {
38
38
  status: number;
39
39
  statusCode: number;
40
40
  headers: IncomingHttpHeaders;
41
41
  timing: Timing;
42
42
  // SocketInfo
43
43
  socket: SocketInfo;
44
- };
45
-
46
- export type HttpClientResponseMeta = BaseResponseMeta & {
47
44
  size: number;
48
45
  aborted: boolean;
49
46
  rt: number;
@@ -51,8 +48,6 @@ export type HttpClientResponseMeta = BaseResponseMeta & {
51
48
  requestUrls: string[];
52
49
  };
53
50
 
54
- export type ReadableWithMeta = Readable & BaseResponseMeta;
55
-
56
51
  export type HttpClientResponse = {
57
52
  opaque: unknown;
58
53
  data: any;
@@ -63,5 +58,5 @@ export type HttpClientResponse = {
63
58
  url: string;
64
59
  redirected: boolean;
65
60
  requestUrls: string[];
66
- res: ReadableWithMeta | HttpClientResponseMeta;
61
+ res: RawResponseWithMeta;
67
62
  };
package/src/cjs/HttpClient.js CHANGED
@@ -187,7 +187,7 @@ _HttpClient_defaultArgs = new WeakMap(), _HttpClient_dispatcher = new WeakMap(),
187
187
  };
188
188
  // keep urllib createCallbackResponse style
189
189
  const resHeaders = {};
190
- const res = {
190
+ let res = {
191
191
  status: -1,
192
192
  statusCode: -1,
193
193
  headers: resHeaders,
@@ -419,25 +419,17 @@ _HttpClient_defaultArgs = new WeakMap(), _HttpClient_dispatcher = new WeakMap(),
419
419
  res.size = parseInt(res.headers['content-length']);
420
420
  }
421
421
  let data = null;
422
- let responseBodyStream;
423
422
  if (args.dataType === 'stream') {
424
423
  // streaming mode will disable retry
425
424
  args.retry = 0;
426
- const meta = {
427
- status: res.status,
428
- statusCode: res.statusCode,
429
- headers: res.headers,
430
- timing,
431
- socket: socketInfo,
432
- };
433
425
  // only auto decompress on request args.compressed = true
434
426
  if (args.compressed === true && isCompressedContent) {
435
427
  // gzip or br
436
428
  const decoder = contentEncoding === 'gzip' ? (0, zlib_1.createGunzip)() : (0, zlib_1.createBrotliDecompress)();
437
- responseBodyStream = Object.assign((0, stream_1.pipeline)(response.body, decoder, noop), meta);
429
+ res = Object.assign((0, stream_1.pipeline)(response.body, decoder, noop), res);
438
430
  }
439
431
  else {
440
- responseBodyStream = Object.assign(response.body, meta);
432
+ res = Object.assign(response.body, res);
441
433
  }
442
434
  }
443
435
  else if (args.writeStream) {
@@ -489,7 +481,7 @@ _HttpClient_defaultArgs = new WeakMap(), _HttpClient_dispatcher = new WeakMap(),
489
481
  url: lastUrl,
490
482
  redirected: res.requestUrls.length > 1,
491
483
  requestUrls: res.requestUrls,
492
- res: responseBodyStream !== null && responseBodyStream !== void 0 ? responseBodyStream : res,
484
+ res,
493
485
  };
494
486
  if (args.retry > 0 && requestContext.retries < args.retry) {
495
487
  const isRetry = (_g = args.isRetry) !== null && _g !== void 0 ? _g : defaultIsRetry;
package/src/cjs/HttpClient.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"HttpClient.js","sourceRoot":"","sources":["../HttpClient.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"HttpClient.js","sourceRoot":"","sources":["../HttpClient.ts"],"names":[],"mappings":"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"}
package/src/cjs/Response.d.ts CHANGED
@@ -25,21 +25,18 @@ export type Timing = {
25
25
  waiting: number;
26
26
  contentDownload: number;
27
27
  };
28
- export type BaseResponseMeta = {
28
+ export type RawResponseWithMeta = Readable & {
29
29
  status: number;
30
30
  statusCode: number;
31
31
  headers: IncomingHttpHeaders;
32
32
  timing: Timing;
33
33
  socket: SocketInfo;
34
- };
35
- export type HttpClientResponseMeta = BaseResponseMeta & {
36
34
  size: number;
37
35
  aborted: boolean;
38
36
  rt: number;
39
37
  keepAliveSocket: boolean;
40
38
  requestUrls: string[];
41
39
  };
42
- export type ReadableWithMeta = Readable & BaseResponseMeta;
43
40
  export type HttpClientResponse = {
44
41
  opaque: unknown;
45
42
  data: any;
@@ -49,5 +46,5 @@ export type HttpClientResponse = {
49
46
  url: string;
50
47
  redirected: boolean;
51
48
  requestUrls: string[];
52
- res: ReadableWithMeta | HttpClientResponseMeta;
49
+ res: RawResponseWithMeta;
53
50
  };
package/src/cjs/index.d.ts CHANGED
@@ -1,10 +1,10 @@
1
- import { HttpClient, HEADER_USER_AGENT } from './HttpClient';
2
- import { RequestOptions, RequestURL, HttpMethod } from './Request';
1
+ import { RequestOptions, RequestURL } from './Request';
3
2
  export declare function request(url: RequestURL, options?: RequestOptions): Promise<import("./Response").HttpClientResponse>;
4
3
  export declare function curl(url: RequestURL, options?: RequestOptions): Promise<import("./Response").HttpClientResponse>;
5
4
  export { MockAgent, ProxyAgent, Agent, Dispatcher, setGlobalDispatcher, getGlobalDispatcher, } from 'undici';
6
- export { HttpClient, HttpClient as HttpClient2, HEADER_USER_AGENT as USER_AGENT };
7
- export { RequestOptions, RequestOptions as RequestOptions2, RequestURL, HttpMethod };
5
+ export { HttpClient, HttpClient as HttpClient2, HEADER_USER_AGENT as USER_AGENT } from './HttpClient';
6
+ export { RequestOptions, RequestOptions as RequestOptions2, RequestURL, HttpMethod, FixJSONCtlCharsHandler, FixJSONCtlChars, } from './Request';
7
+ export { SocketInfo, Timing, RawResponseWithMeta, HttpClientResponse } from './Response';
8
8
  declare const _default: {
9
9
  request: typeof request;
10
10
  curl: typeof curl;
package/src/cjs/index.js CHANGED
@@ -2,9 +2,6 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.USER_AGENT = exports.HttpClient2 = exports.HttpClient = exports.getGlobalDispatcher = exports.setGlobalDispatcher = exports.Dispatcher = exports.Agent = exports.ProxyAgent = exports.MockAgent = exports.curl = exports.request = void 0;
4
4
  const HttpClient_1 = require("./HttpClient");
5
- Object.defineProperty(exports, "HttpClient", { enumerable: true, get: function () { return HttpClient_1.HttpClient; } });
6
- Object.defineProperty(exports, "HttpClient2", { enumerable: true, get: function () { return HttpClient_1.HttpClient; } });
7
- Object.defineProperty(exports, "USER_AGENT", { enumerable: true, get: function () { return HttpClient_1.HEADER_USER_AGENT; } });
8
5
  let httpclient;
9
6
  async function request(url, options) {
10
7
  if (!httpclient) {
@@ -36,6 +33,11 @@ Object.defineProperty(exports, "Agent", { enumerable: true, get: function () { r
36
33
  Object.defineProperty(exports, "Dispatcher", { enumerable: true, get: function () { return undici_1.Dispatcher; } });
37
34
  Object.defineProperty(exports, "setGlobalDispatcher", { enumerable: true, get: function () { return undici_1.setGlobalDispatcher; } });
38
35
  Object.defineProperty(exports, "getGlobalDispatcher", { enumerable: true, get: function () { return undici_1.getGlobalDispatcher; } });
36
+ // HttpClient2 is keep compatible with urlib@2 HttpClient2
37
+ var HttpClient_2 = require("./HttpClient");
38
+ Object.defineProperty(exports, "HttpClient", { enumerable: true, get: function () { return HttpClient_2.HttpClient; } });
39
+ Object.defineProperty(exports, "HttpClient2", { enumerable: true, get: function () { return HttpClient_2.HttpClient; } });
40
+ Object.defineProperty(exports, "USER_AGENT", { enumerable: true, get: function () { return HttpClient_2.HEADER_USER_AGENT; } });
39
41
  exports.default = {
40
42
  request,
41
43
  curl,
package/src/cjs/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":";;;AAAA,6CAA6D;AA+BpD,2FA/BA,uBAAU,OA+BA;AAAgB,4FA/B1B,uBAAU,OA+B2B;AAAuB,2FA/BhD,8BAAiB,OA+ByC;AA5B/E,IAAI,UAAsB,CAAC;AACpB,KAAK,UAAU,OAAO,CAAC,GAAe,EAAE,OAAwB;IACrE,IAAI,CAAC,UAAU,EAAE;QACf,IAAI,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,UAAU,EAAE;YACvB,UAAU,GAAG,IAAI,uBAAU,CAAC;gBAC1B,OAAO,EAAE,EAAE,UAAU,EAAE,OAAO,CAAC,UAAU,EAAE;aAC5C,CAAC,CAAC;SACJ;aAAM;YACL,UAAU,GAAG,IAAI,uBAAU,CAAC,EAAE,CAAC,CAAC;SACjC;KACF;IACD,OAAO,MAAM,UAAU,CAAC,OAAO,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;AAChD,CAAC;AAXD,0BAWC;AAED,0DAA0D;AAC1D,QAAQ;AACR,oCAAoC;AACpC,oBAAoB;AACpB,MAAM;AACC,KAAK,UAAU,IAAI,CAAC,GAAe,EAAE,OAAwB;IAClE,OAAO,MAAM,OAAO,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;AACrC,CAAC;AAFD,oBAEC;AAED,iCAGgB;AAFd,mGAAA,SAAS,OAAA;AAAE,oGAAA,UAAU,OAAA;AAAE,+FAAA,KAAK,OAAA;AAAE,oGAAA,UAAU,OAAA;AACxC,6GAAA,mBAAmB,OAAA;AAAE,6GAAA,mBAAmB,OAAA;AAO1C,kBAAe;IACb,OAAO;IACP,IAAI;IACJ,UAAU,EAAE,8BAAiB;CAC9B,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":";;;AAAA,6CAA6D;AAG7D,IAAI,UAAsB,CAAC;AACpB,KAAK,UAAU,OAAO,CAAC,GAAe,EAAE,OAAwB;IACrE,IAAI,CAAC,UAAU,EAAE;QACf,IAAI,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,UAAU,EAAE;YACvB,UAAU,GAAG,IAAI,uBAAU,CAAC;gBAC1B,OAAO,EAAE,EAAE,UAAU,EAAE,OAAO,CAAC,UAAU,EAAE;aAC5C,CAAC,CAAC;SACJ;aAAM;YACL,UAAU,GAAG,IAAI,uBAAU,CAAC,EAAE,CAAC,CAAC;SACjC;KACF;IACD,OAAO,MAAM,UAAU,CAAC,OAAO,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;AAChD,CAAC;AAXD,0BAWC;AAED,0DAA0D;AAC1D,QAAQ;AACR,oCAAoC;AACpC,oBAAoB;AACpB,MAAM;AACC,KAAK,UAAU,IAAI,CAAC,GAAe,EAAE,OAAwB;IAClE,OAAO,MAAM,OAAO,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;AACrC,CAAC;AAFD,oBAEC;AAED,iCAGgB;AAFd,mGAAA,SAAS,OAAA;AAAE,oGAAA,UAAU,OAAA;AAAE,+FAAA,KAAK,OAAA;AAAE,oGAAA,UAAU,OAAA;AACxC,6GAAA,mBAAmB,OAAA;AAAE,6GAAA,mBAAmB,OAAA;AAE1C,0DAA0D;AAC1D,2CAAsG;AAA7F,wGAAA,UAAU,OAAA;AAAE,yGAAA,UAAU,OAAe;AAAE,wGAAA,iBAAiB,OAAc;AAS/E,kBAAe;IACb,OAAO;IACP,IAAI;IACJ,UAAU,EAAE,8BAAiB;CAC9B,CAAC"}
package/src/esm/HttpClient.js CHANGED
@@ -183,7 +183,7 @@ _HttpClient_defaultArgs = new WeakMap(), _HttpClient_dispatcher = new WeakMap(),
183
183
  };
184
184
  // keep urllib createCallbackResponse style
185
185
  const resHeaders = {};
186
- const res = {
186
+ let res = {
187
187
  status: -1,
188
188
  statusCode: -1,
189
189
  headers: resHeaders,
@@ -415,25 +415,17 @@ _HttpClient_defaultArgs = new WeakMap(), _HttpClient_dispatcher = new WeakMap(),
415
415
  res.size = parseInt(res.headers['content-length']);
416
416
  }
417
417
  let data = null;
418
- let responseBodyStream;
419
418
  if (args.dataType === 'stream') {
420
419
  // streaming mode will disable retry
421
420
  args.retry = 0;
422
- const meta = {
423
- status: res.status,
424
- statusCode: res.statusCode,
425
- headers: res.headers,
426
- timing,
427
- socket: socketInfo,
428
- };
429
421
  // only auto decompress on request args.compressed = true
430
422
  if (args.compressed === true && isCompressedContent) {
431
423
  // gzip or br
432
424
  const decoder = contentEncoding === 'gzip' ? createGunzip() : createBrotliDecompress();
433
- responseBodyStream = Object.assign(pipeline(response.body, decoder, noop), meta);
425
+ res = Object.assign(pipeline(response.body, decoder, noop), res);
434
426
  }
435
427
  else {
436
- responseBodyStream = Object.assign(response.body, meta);
428
+ res = Object.assign(response.body, res);
437
429
  }
438
430
  }
439
431
  else if (args.writeStream) {
@@ -485,7 +477,7 @@ _HttpClient_defaultArgs = new WeakMap(), _HttpClient_dispatcher = new WeakMap(),
485
477
  url: lastUrl,
486
478
  redirected: res.requestUrls.length > 1,
487
479
  requestUrls: res.requestUrls,
488
- res: responseBodyStream !== null && responseBodyStream !== void 0 ? responseBodyStream : res,
480
+ res,
489
481
  };
490
482
  if (args.retry > 0 && requestContext.retries < args.retry) {
491
483
  const isRetry = (_g = args.isRetry) !== null && _g !== void 0 ? _g : defaultIsRetry;
package/src/esm/HttpClient.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"HttpClient.js","sourceRoot":"","sources":["../HttpClient.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"HttpClient.js","sourceRoot":"","sources":["../HttpClient.ts"],"names":[],"mappings":"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"}
package/src/esm/Response.d.ts CHANGED
@@ -25,21 +25,18 @@ export type Timing = {
25
25
  waiting: number;
26
26
  contentDownload: number;
27
27
  };
28
- export type BaseResponseMeta = {
28
+ export type RawResponseWithMeta = Readable & {
29
29
  status: number;
30
30
  statusCode: number;
31
31
  headers: IncomingHttpHeaders;
32
32
  timing: Timing;
33
33
  socket: SocketInfo;
34
- };
35
- export type HttpClientResponseMeta = BaseResponseMeta & {
36
34
  size: number;
37
35
  aborted: boolean;
38
36
  rt: number;
39
37
  keepAliveSocket: boolean;
40
38
  requestUrls: string[];
41
39
  };
42
- export type ReadableWithMeta = Readable & BaseResponseMeta;
43
40
  export type HttpClientResponse = {
44
41
  opaque: unknown;
45
42
  data: any;
@@ -49,5 +46,5 @@ export type HttpClientResponse = {
49
46
  url: string;
50
47
  redirected: boolean;
51
48
  requestUrls: string[];
52
- res: ReadableWithMeta | HttpClientResponseMeta;
49
+ res: RawResponseWithMeta;
53
50
  };
package/src/esm/index.d.ts CHANGED
@@ -1,10 +1,10 @@
1
- import { HttpClient, HEADER_USER_AGENT } from './HttpClient';
2
- import { RequestOptions, RequestURL, HttpMethod } from './Request';
1
+ import { RequestOptions, RequestURL } from './Request';
3
2
  export declare function request(url: RequestURL, options?: RequestOptions): Promise<import("./Response").HttpClientResponse>;
4
3
  export declare function curl(url: RequestURL, options?: RequestOptions): Promise<import("./Response").HttpClientResponse>;
5
4
  export { MockAgent, ProxyAgent, Agent, Dispatcher, setGlobalDispatcher, getGlobalDispatcher, } from 'undici';
6
- export { HttpClient, HttpClient as HttpClient2, HEADER_USER_AGENT as USER_AGENT };
7
- export { RequestOptions, RequestOptions as RequestOptions2, RequestURL, HttpMethod };
5
+ export { HttpClient, HttpClient as HttpClient2, HEADER_USER_AGENT as USER_AGENT } from './HttpClient';
6
+ export { RequestOptions, RequestOptions as RequestOptions2, RequestURL, HttpMethod, FixJSONCtlCharsHandler, FixJSONCtlChars, } from './Request';
7
+ export { SocketInfo, Timing, RawResponseWithMeta, HttpClientResponse } from './Response';
8
8
  declare const _default: {
9
9
  request: typeof request;
10
10
  curl: typeof curl;
package/src/esm/index.js CHANGED
@@ -23,7 +23,7 @@ export async function curl(url, options) {
23
23
  }
24
24
  export { MockAgent, ProxyAgent, Agent, Dispatcher, setGlobalDispatcher, getGlobalDispatcher, } from 'undici';
25
25
  // HttpClient2 is keep compatible with urlib@2 HttpClient2
26
- export { HttpClient, HttpClient as HttpClient2, HEADER_USER_AGENT as USER_AGENT };
26
+ export { HttpClient, HttpClient as HttpClient2, HEADER_USER_AGENT as USER_AGENT } from './HttpClient.js';
27
27
  export default {
28
28
  request,
29
29
  curl,
package/src/esm/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAG7D,IAAI,UAAsB,CAAC;AAC3B,MAAM,CAAC,KAAK,UAAU,OAAO,CAAC,GAAe,EAAE,OAAwB;IACrE,IAAI,CAAC,UAAU,EAAE;QACf,IAAI,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,UAAU,EAAE;YACvB,UAAU,GAAG,IAAI,UAAU,CAAC;gBAC1B,OAAO,EAAE,EAAE,UAAU,EAAE,OAAO,CAAC,UAAU,EAAE;aAC5C,CAAC,CAAC;SACJ;aAAM;YACL,UAAU,GAAG,IAAI,UAAU,CAAC,EAAE,CAAC,CAAC;SACjC;KACF;IACD,OAAO,MAAM,UAAU,CAAC,OAAO,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;AAChD,CAAC;AAED,0DAA0D;AAC1D,QAAQ;AACR,oCAAoC;AACpC,oBAAoB;AACpB,MAAM;AACN,MAAM,CAAC,KAAK,UAAU,IAAI,CAAC,GAAe,EAAE,OAAwB;IAClE,OAAO,MAAM,OAAO,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;AACrC,CAAC;AAED,OAAO,EACL,SAAS,EAAE,UAAU,EAAE,KAAK,EAAE,UAAU,EACxC,mBAAmB,EAAE,mBAAmB,GACzC,MAAM,QAAQ,CAAC;AAChB,0DAA0D;AAC1D,OAAO,EAAE,UAAU,EAAE,UAAU,IAAI,WAAW,EAAE,iBAAiB,IAAI,UAAU,EAAE,CAAC;AAIlF,eAAe;IACb,OAAO;IACP,IAAI;IACJ,UAAU,EAAE,iBAAiB;CAC9B,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAG7D,IAAI,UAAsB,CAAC;AAC3B,MAAM,CAAC,KAAK,UAAU,OAAO,CAAC,GAAe,EAAE,OAAwB;IACrE,IAAI,CAAC,UAAU,EAAE;QACf,IAAI,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,UAAU,EAAE;YACvB,UAAU,GAAG,IAAI,UAAU,CAAC;gBAC1B,OAAO,EAAE,EAAE,UAAU,EAAE,OAAO,CAAC,UAAU,EAAE;aAC5C,CAAC,CAAC;SACJ;aAAM;YACL,UAAU,GAAG,IAAI,UAAU,CAAC,EAAE,CAAC,CAAC;SACjC;KACF;IACD,OAAO,MAAM,UAAU,CAAC,OAAO,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;AAChD,CAAC;AAED,0DAA0D;AAC1D,QAAQ;AACR,oCAAoC;AACpC,oBAAoB;AACpB,MAAM;AACN,MAAM,CAAC,KAAK,UAAU,IAAI,CAAC,GAAe,EAAE,OAAwB;IAClE,OAAO,MAAM,OAAO,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;AACrC,CAAC;AAED,OAAO,EACL,SAAS,EAAE,UAAU,EAAE,KAAK,EAAE,UAAU,EACxC,mBAAmB,EAAE,mBAAmB,GACzC,MAAM,QAAQ,CAAC;AAChB,0DAA0D;AAC1D,OAAO,EAAE,UAAU,EAAE,UAAU,IAAI,WAAW,EAAE,iBAAiB,IAAI,UAAU,EAAE,MAAM,cAAc,CAAC;AAStG,eAAe;IACb,OAAO;IACP,IAAI;IACJ,UAAU,EAAE,iBAAiB;CAC9B,CAAC"}
package/src/index.ts CHANGED
@@ -1,5 +1,5 @@
1
1
  import { HttpClient, HEADER_USER_AGENT } from './HttpClient';
2
- import { RequestOptions, RequestURL, HttpMethod } from './Request';
2
+ import { RequestOptions, RequestURL } from './Request';
3
3
 
4
4
  let httpclient: HttpClient;
5
5
  export async function request(url: RequestURL, options?: RequestOptions) {
@@ -29,9 +29,14 @@ export {
29
29
  setGlobalDispatcher, getGlobalDispatcher,
30
30
  } from 'undici';
31
31
  // HttpClient2 is keep compatible with urlib@2 HttpClient2
32
- export { HttpClient, HttpClient as HttpClient2, HEADER_USER_AGENT as USER_AGENT };
32
+ export { HttpClient, HttpClient as HttpClient2, HEADER_USER_AGENT as USER_AGENT } from './HttpClient';
33
33
  // RequestOptions2 is keep compatible with urlib@2 RequestOptions2
34
- export { RequestOptions, RequestOptions as RequestOptions2, RequestURL, HttpMethod };
34
+ export {
35
+ RequestOptions, RequestOptions as RequestOptions2, RequestURL, HttpMethod,
36
+ FixJSONCtlCharsHandler, FixJSONCtlChars,
37
+ } from './Request';
38
+
39
+ export { SocketInfo, Timing, RawResponseWithMeta, HttpClientResponse } from './Response';
35
40
 
36
41
  export default {
37
42
  request,