urllib 3.19.0 → 3.19.2

package/README.md

@@ -288,7 +288,7 @@ Fork [undici benchmarks script](https://github.com/fengmk2/undici/blob/urllib-be
 
 ## Contributors
 
-|[<img src="https://avatars.githubusercontent.com/u/156269?v=4" width="100px;"/><br/><sub><b>fengmk2</b></sub>](https://github.com/fengmk2)<br/>|[<img src="https://avatars.githubusercontent.com/u/985607?v=4" width="100px;"/><br/><sub><b>dead-horse</b></sub>](https://github.com/dead-horse)<br/>|[<img src="https://avatars.githubusercontent.com/u/288288?v=4" width="100px;"/><br/><sub><b>xingrz</b></sub>](https://github.com/xingrz)<br/>|[<img src="https://avatars.githubusercontent.com/u/32174276?v=4" width="100px;"/><br/><sub><b>semantic-release-bot</b></sub>](https://github.com/semantic-release-bot)<br/>|[<img src="https://avatars.githubusercontent.com/u/360661?v=4" width="100px;"/><br/><sub><b>popomore</b></sub>](https://github.com/popomore)<br/>|[<img src="https://avatars.githubusercontent.com/u/327019?v=4" width="100px;"/><br/><sub><b>JacksonTian</b></sub>](https://github.com/JacksonTian)<br/>|
+|[<img src="https://avatars.githubusercontent.com/u/156269?v=4" width="100px;"/><br/><sub><b>fengmk2</b></sub>](https://github.com/fengmk2)<br/>|[<img src="https://avatars.githubusercontent.com/u/985607?v=4" width="100px;"/><br/><sub><b>dead-horse</b></sub>](https://github.com/dead-horse)<br/>|[<img src="https://avatars.githubusercontent.com/u/32174276?v=4" width="100px;"/><br/><sub><b>semantic-release-bot</b></sub>](https://github.com/semantic-release-bot)<br/>|[<img src="https://avatars.githubusercontent.com/u/288288?v=4" width="100px;"/><br/><sub><b>xingrz</b></sub>](https://github.com/xingrz)<br/>|[<img src="https://avatars.githubusercontent.com/u/360661?v=4" width="100px;"/><br/><sub><b>popomore</b></sub>](https://github.com/popomore)<br/>|[<img src="https://avatars.githubusercontent.com/u/327019?v=4" width="100px;"/><br/><sub><b>JacksonTian</b></sub>](https://github.com/JacksonTian)<br/>|
 | :---: | :---: | :---: | :---: | :---: | :---: |
 |[<img src="https://avatars.githubusercontent.com/u/543405?v=4" width="100px;"/><br/><sub><b>ibigbug</b></sub>](https://github.com/ibigbug)<br/>|[<img src="https://avatars.githubusercontent.com/u/14790466?v=4" width="100px;"/><br/><sub><b>greenkeeperio-bot</b></sub>](https://github.com/greenkeeperio-bot)<br/>|[<img src="https://avatars.githubusercontent.com/u/227713?v=4" width="100px;"/><br/><sub><b>atian25</b></sub>](https://github.com/atian25)<br/>|[<img src="https://avatars.githubusercontent.com/u/6897780?v=4" width="100px;"/><br/><sub><b>killagu</b></sub>](https://github.com/killagu)<br/>|[<img src="https://avatars.githubusercontent.com/u/5381764?v=4" width="100px;"/><br/><sub><b>paambaati</b></sub>](https://github.com/paambaati)<br/>|[<img src="https://avatars.githubusercontent.com/u/1433247?v=4" width="100px;"/><br/><sub><b>denghongcai</b></sub>](https://github.com/denghongcai)<br/>|
 |[<img src="https://avatars.githubusercontent.com/u/4635838?v=4" width="100px;"/><br/><sub><b>gemwuu</b></sub>](https://github.com/gemwuu)<br/>|[<img src="https://avatars.githubusercontent.com/u/2842176?v=4" width="100px;"/><br/><sub><b>XadillaX</b></sub>](https://github.com/XadillaX)<br/>|[<img src="https://avatars.githubusercontent.com/u/1147375?v=4" width="100px;"/><br/><sub><b>alsotang</b></sub>](https://github.com/alsotang)<br/>|[<img src="https://avatars.githubusercontent.com/u/546535?v=4" width="100px;"/><br/><sub><b>leoner</b></sub>](https://github.com/leoner)<br/>|[<img src="https://avatars.githubusercontent.com/u/19908330?v=4" width="100px;"/><br/><sub><b>hyj1991</b></sub>](https://github.com/hyj1991)<br/>|[<img src="https://avatars.githubusercontent.com/u/1747852?v=4" width="100px;"/><br/><sub><b>isayme</b></sub>](https://github.com/isayme)<br/>|
@@ -297,7 +297,7 @@ Fork [undici benchmarks script](https://github.com/fengmk2/undici/blob/urllib-be
 |[<img src="https://avatars.githubusercontent.com/u/3689968?v=4" width="100px;"/><br/><sub><b>Amunu</b></sub>](https://github.com/Amunu)<br/>|[<img src="https://avatars.githubusercontent.com/in/9426?v=4" width="100px;"/><br/><sub><b>azure-pipelines[bot]</b></sub>](https://github.com/apps/azure-pipelines)<br/>|[<img src="https://avatars.githubusercontent.com/u/108602490?v=4" width="100px;"/><br/><sub><b>capsice</b></sub>](https://github.com/capsice)<br/>|[<img src="https://avatars.githubusercontent.com/u/1281323?v=4" width="100px;"/><br/><sub><b>changzhiwin</b></sub>](https://github.com/changzhiwin)<br/>|[<img src="https://avatars.githubusercontent.com/u/929503?v=4" width="100px;"/><br/><sub><b>yuzhigang33</b></sub>](https://github.com/yuzhigang33)<br/>|[<img src="https://avatars.githubusercontent.com/u/5574625?v=4" width="100px;"/><br/><sub><b>elrrrrrrr</b></sub>](https://github.com/elrrrrrrr)<br/>|
 [<img src="https://avatars.githubusercontent.com/u/981128?v=4" width="100px;"/><br/><sub><b>fishbar</b></sub>](https://github.com/fishbar)<br/>|[<img src="https://avatars.githubusercontent.com/u/1207064?v=4" width="100px;"/><br/><sub><b>gxcsoccer</b></sub>](https://github.com/gxcsoccer)<br/>|[<img src="https://avatars.githubusercontent.com/u/17476119?v=4" width="100px;"/><br/><sub><b>mars-coder</b></sub>](https://github.com/mars-coder)<br/>|[<img src="https://avatars.githubusercontent.com/u/929179?v=4" width="100px;"/><br/><sub><b>rockdai</b></sub>](https://github.com/rockdai)<br/>|[<img src="https://avatars.githubusercontent.com/u/2196373?v=4" width="100px;"/><br/><sub><b>dickeylth</b></sub>](https://github.com/dickeylth)<br/>|[<img src="https://avatars.githubusercontent.com/u/13050025?v=4" width="100px;"/><br/><sub><b>aladdin-add</b></sub>](https://github.com/aladdin-add)<br/>
 
-This project follows the git-contributor [spec](https://github.com/xudafeng/git-contributor), auto updated at `Mon Apr 24 2023 17:42:08 GMT+0800`.
+This project follows the git-contributor [spec](https://github.com/xudafeng/git-contributor), auto updated at `Sat Sep 16 2023 01:02:26 GMT+0800`.
 
 <!-- GITCONTRIBUTOR_END -->
 

package/dist/commonjs/HttpClient.js

@@ -73,7 +73,7 @@ class HttpClientRequestTimeoutError extends Error {
         Error.captureStackTrace(this, this.constructor);
     }
 }
-exports.HEADER_USER_AGENT = (0, default_user_agent_1.default)('node-urllib', '3.19.0');
+exports.HEADER_USER_AGENT = (0, default_user_agent_1.default)('node-urllib', '3.19.2');
 function getFileName(stream) {
     const filePath = stream.path;
     if (filePath) {

package/dist/commonjs/IncomingHttpHeaders.d.ts

@@ -0,0 +1,6 @@
+/// <reference types="node" />
+import type { Except } from 'type-fest';
+import type { IncomingHttpHeaders as HTTPIncomingHttpHeaders } from 'node:http';
+export interface IncomingHttpHeaders extends Except<HTTPIncomingHttpHeaders, 'set-cookie'> {
+    'set-cookie'?: string | string[];
+}

package/dist/commonjs/IncomingHttpHeaders.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/commonjs/Request.d.ts

@@ -1,10 +1,9 @@
 /// <reference types="node" />
 /// <reference types="node" />
 /// <reference types="node" />
-/// <reference types="node" />
-import { Readable, Writable } from 'node:stream';
-import type { IncomingHttpHeaders } from 'node:http';
+import type { Readable, Writable } from 'node:stream';
 import type { Dispatcher } from 'undici';
+import type { IncomingHttpHeaders } from './IncomingHttpHeaders.js';
 import type { HttpClientResponse } from './Response.js';
 export type HttpMethod = Dispatcher.HttpMethod;
 export type RequestURL = string | URL;

package/dist/commonjs/Response.d.ts

@@ -1,7 +1,6 @@
 /// <reference types="node" />
-/// <reference types="node" />
-import { Readable } from 'node:stream';
-import { IncomingHttpHeaders } from 'node:http';
+import type { Readable } from 'node:stream';
+import type { IncomingHttpHeaders } from './IncomingHttpHeaders.js';
 export type SocketInfo = {
     id: number;
     localAddress: string;

package/dist/commonjs/index.d.ts

@@ -4,7 +4,8 @@ export declare function curl<T = any>(url: RequestURL, options?: RequestOptions)
 export { MockAgent, ProxyAgent, Agent, Dispatcher, setGlobalDispatcher, getGlobalDispatcher, } from 'undici';
 export { HttpClient, HttpClient as HttpClient2, HEADER_USER_AGENT as USER_AGENT, RequestDiagnosticsMessage, ResponseDiagnosticsMessage, } from './HttpClient.js';
 export { RequestOptions, RequestOptions as RequestOptions2, RequestURL, HttpMethod, FixJSONCtlCharsHandler, FixJSONCtlChars, } from './Request.js';
-export { SocketInfo, Timing, RawResponseWithMeta, HttpClientResponse } from './Response.js';
+export { SocketInfo, Timing, RawResponseWithMeta, HttpClientResponse, } from './Response.js';
+export { IncomingHttpHeaders, } from './IncomingHttpHeaders.js';
 declare const _default: {
     request: typeof request;
     curl: typeof curl;

package/dist/esm/HttpClient.js

@@ -67,7 +67,7 @@ class HttpClientRequestTimeoutError extends Error {
         Error.captureStackTrace(this, this.constructor);
     }
 }
-export const HEADER_USER_AGENT = createUserAgent('node-urllib', '3.19.0');
+export const HEADER_USER_AGENT = createUserAgent('node-urllib', '3.19.2');
 function getFileName(stream) {
     const filePath = stream.path;
     if (filePath) {

package/dist/esm/IncomingHttpHeaders.d.ts

@@ -0,0 +1,6 @@
+/// <reference types="node" resolution-mode="require"/>
+import type { Except } from 'type-fest';
+import type { IncomingHttpHeaders as HTTPIncomingHttpHeaders } from 'node:http';
+export interface IncomingHttpHeaders extends Except<HTTPIncomingHttpHeaders, 'set-cookie'> {
+    'set-cookie'?: string | string[];
+}

package/dist/esm/IncomingHttpHeaders.js

@@ -0,0 +1 @@
+export {};

package/dist/esm/Request.d.ts

@@ -1,10 +1,9 @@
 /// <reference types="node" resolution-mode="require"/>
 /// <reference types="node" resolution-mode="require"/>
 /// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
-import { Readable, Writable } from 'node:stream';
-import type { IncomingHttpHeaders } from 'node:http';
+import type { Readable, Writable } from 'node:stream';
 import type { Dispatcher } from 'undici';
+import type { IncomingHttpHeaders } from './IncomingHttpHeaders.js';
 import type { HttpClientResponse } from './Response.js';
 export type HttpMethod = Dispatcher.HttpMethod;
 export type RequestURL = string | URL;

package/dist/esm/Response.d.ts

@@ -1,7 +1,6 @@
 /// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
-import { Readable } from 'node:stream';
-import { IncomingHttpHeaders } from 'node:http';
+import type { Readable } from 'node:stream';
+import type { IncomingHttpHeaders } from './IncomingHttpHeaders.js';
 export type SocketInfo = {
     id: number;
     localAddress: string;

package/dist/esm/index.d.ts

@@ -4,7 +4,8 @@ export declare function curl<T = any>(url: RequestURL, options?: RequestOptions)
 export { MockAgent, ProxyAgent, Agent, Dispatcher, setGlobalDispatcher, getGlobalDispatcher, } from 'undici';
 export { HttpClient, HttpClient as HttpClient2, HEADER_USER_AGENT as USER_AGENT, RequestDiagnosticsMessage, ResponseDiagnosticsMessage, } from './HttpClient.js';
 export { RequestOptions, RequestOptions as RequestOptions2, RequestURL, HttpMethod, FixJSONCtlCharsHandler, FixJSONCtlChars, } from './Request.js';
-export { SocketInfo, Timing, RawResponseWithMeta, HttpClientResponse } from './Response.js';
+export { SocketInfo, Timing, RawResponseWithMeta, HttpClientResponse, } from './Response.js';
+export { IncomingHttpHeaders, } from './IncomingHttpHeaders.js';
 declare const _default: {
     request: typeof request;
     curl: typeof curl;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "urllib",
-  "version": "3.19.0",
+  "version": "3.19.2",
   "publishConfig": {
     "tag": "latest"
   },
@@ -38,7 +38,6 @@
     },
     "./package.json": "./package.json"
   },
-  "typings": "./dist/commonjs/index.d.ts",
   "files": [
     "dist",
     "src"
@@ -50,7 +49,7 @@
   "scripts": {
     "lint": "eslint src test --ext .ts --cache",
     "prebuild": "npm run clean",
-    "build": "tsc --version && tshy && npm run build:version",
+    "build": "tsc --version && tshy && tshy-after && npm run build:version",
     "postbuild": "rm -rf *.tsbuildinfo",
     "build:version": "node ./scripts/replace_urllib_version.js",
     "build:cjs:test": "cd test/cjs && rm -rf node_modules && npm link ../.. && node index.js",
@@ -77,6 +76,7 @@
     "mime-types": "^2.1.35",
     "pump": "^3.0.0",
     "qs": "^6.11.2",
+    "type-fest": "^4.3.1",
     "undici": "^5.22.1",
     "ylru": "^1.3.2"
   },
@@ -102,11 +102,13 @@
     "selfsigned": "^2.0.1",
     "tar-stream": "^2.2.0",
     "tshy": "^1.0.0-3",
+    "tshy-after": "^1.0.0",
     "typescript": "^5.0.4",
     "vitest": "^0.32.0"
   },
   "engines": {
     "node": ">= 14.19.3"
   },
-  "license": "MIT"
+  "license": "MIT",
+  "types": "./dist/commonjs/index.d.ts"
 }

package/src/HttpClient.ts

@@ -2,7 +2,6 @@ import diagnosticsChannel from 'node:diagnostics_channel';
 import { EventEmitter } from 'node:events';
 import { LookupFunction } from 'node:net';
 import { STATUS_CODES } from 'node:http';
-import type { IncomingHttpHeaders } from 'node:http';
 import { debuglog } from 'node:util';
 import {
   createGunzip,
@@ -31,6 +30,7 @@ import pump from 'pump';
 // Compatible with old style formstream
 import FormStream from 'formstream';
 import { HttpAgent, CheckAddressFunction } from './HttpAgent.js';
+import type { IncomingHttpHeaders } from './IncomingHttpHeaders.js';
 import { RequestURL, RequestOptions, HttpMethod, RequestMeta } from './Request.js';
 import { RawResponseWithMeta, HttpClientResponse, SocketInfo } from './Response.js';
 import { parseJSON, sleep, digestAuthHeader, globalId, performanceTime, isReadable } from './utils.js';

package/src/IncomingHttpHeaders.ts

@@ -0,0 +1,7 @@
+import type { Except } from 'type-fest';
+import type { IncomingHttpHeaders as HTTPIncomingHttpHeaders } from 'node:http';
+
+// fix set-cookie type define https://github.com/nodejs/undici/pull/1893
+export interface IncomingHttpHeaders extends Except<HTTPIncomingHttpHeaders, 'set-cookie'> {
+  'set-cookie'?: string | string[];
+}

package/src/Request.ts

@@ -1,9 +1,7 @@
-import { Readable, Writable } from 'node:stream';
-import type { IncomingHttpHeaders } from 'node:http';
+import type { Readable, Writable } from 'node:stream';
 import type { Dispatcher } from 'undici';
-import type {
-  HttpClientResponse,
-} from './Response.js';
+import type { IncomingHttpHeaders } from './IncomingHttpHeaders.js';
+import type { HttpClientResponse } from './Response.js';
 
 export type HttpMethod = Dispatcher.HttpMethod;
 

package/src/Response.ts

@@ -1,5 +1,5 @@
-import { Readable } from 'node:stream';
-import { IncomingHttpHeaders } from 'node:http';
+import type { Readable } from 'node:stream';
+import type { IncomingHttpHeaders } from './IncomingHttpHeaders.js';
 
 export type SocketInfo = {
   id: number;

package/src/index.ts

@@ -46,7 +46,13 @@ export {
   FixJSONCtlCharsHandler, FixJSONCtlChars,
 } from './Request.js';
 
-export { SocketInfo, Timing, RawResponseWithMeta, HttpClientResponse } from './Response.js';
+export {
+  SocketInfo, Timing, RawResponseWithMeta, HttpClientResponse,
+} from './Response.js';
+export {
+  IncomingHttpHeaders,
+} from './IncomingHttpHeaders.js';
+
 
 export default {
   request,