feat: build target up to ES2022

.eslintrc

@@ -1,10 +1,13 @@
 {
-  "extends": "eslint-config-egg/typescript",
+  "extends": [
+    "eslint-config-egg/typescript",
+    "eslint-config-egg/lib/rules/enforce-node-prefix"
+  ],
   "parserOptions": {
     // recommend to use another config file like tsconfig.eslint.json and extends tsconfig.json in it.
     // because you may be need to lint test/**/*.test.ts but no need to emit to js.
     // @see https://github.com/typescript-eslint/typescript-eslint/issues/890
-    "project": "./tsconfig.json"
+    "project": "./tsconfig.eslint.json"
   },
   "ignorePatterns": [
     "src/**/*.js",

.github/workflows/nodejs.yml

@@ -15,4 +15,4 @@ jobs:
     uses: artusjs/github-actions/.github/workflows/node-test.yml@v1
     with:
       os: 'ubuntu-latest, macos-latest, windows-latest'
-      version: '14, 16, 18, 19'
+      version: '14.19.3, 14, 16, 18, 19'

package.json

@@ -41,7 +41,7 @@
     "url": "git://github.com/node-modules/urllib.git"
   },
   "scripts": {
-    "lint": "eslint src --ext .ts",
+    "lint": "eslint src test --ext .ts",
     "build": "npm run build:dist",
     "build:cjs": "tsc -p ./tsconfig.build.cjs.json",
     "build:esm": "tsc -p ./tsconfig.build.esm.json && node ./scripts/esm_import_fix.js",
@@ -74,7 +74,7 @@
     "@types/pump": "^1.1.1",
     "@types/selfsigned": "^2.0.1",
     "@types/tar-stream": "^2.2.2",
-    "@vitest/coverage-c8": "^0.23.4",
+    "@vitest/coverage-c8": "^0.29.7",
     "busboy": "^1.6.0",
     "eslint": "^8.25.0",
     "eslint-config-egg": "^12.1.0",
@@ -84,10 +84,10 @@
     "selfsigned": "^2.0.1",
     "tar-stream": "^2.2.0",
     "typescript": "^4.8.3",
-    "vitest": "^0.28.5"
+    "vitest": "^0.29.7"
   },
   "engines": {
-    "node": ">= 14.17.0"
+    "node": ">= 14.19.3"
   },
   "license": "MIT"
 }

src/HttpAgent.ts

@@ -1,5 +1,5 @@
-import dns from 'dns';
-import { LookupFunction, isIP } from 'net';
+import dns from 'node:dns';
+import { LookupFunction, isIP } from 'node:net';
 import {
   Agent,
 } from 'undici';

src/HttpClient.ts

@@ -1,20 +1,21 @@
-import { EventEmitter } from 'events';
-import { LookupFunction } from 'net';
-import { STATUS_CODES } from 'http';
-import { debuglog } from 'util';
+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,
   createBrotliDecompress,
   gunzipSync,
   brotliDecompressSync,
-} from 'zlib';
-import { Blob } from 'buffer';
-import { Readable, pipeline } from 'stream';
-import stream from 'stream';
-import { basename } from 'path';
-import { createReadStream } from 'fs';
-import { format as urlFormat } from 'url';
-import { performance } from 'perf_hooks';
+} from 'node:zlib';
+import { Blob } from 'node:buffer';
+import { Readable, pipeline } from 'node:stream';
+import stream from 'node:stream';
+import { basename } from 'node:path';
+import { createReadStream } from 'node:fs';
+import { format as urlFormat } from 'node:url';
+import { performance } from 'node:perf_hooks';
 import {
   FormData as FormDataNative,
   request as undiciRequest,
@@ -33,7 +34,6 @@ import { RawResponseWithMeta, HttpClientResponse, SocketInfo } from './Response'
 import { parseJSON, sleep, digestAuthHeader, globalId, performanceTime, isReadable } from './utils';
 import symbols from './symbols';
 import { initDiagnosticsChannel } from './diagnosticsChannel';
-import type { IncomingHttpHeaders } from 'http';
 
 type Exists<T> = T extends undefined ? never : T;
 type UndiciRequestOption = Exists<Parameters<typeof undiciRequest>[1]>;

src/Request.ts

@@ -1,5 +1,5 @@
-import { Readable, Writable } from 'stream';
-import type { IncomingHttpHeaders } from 'http';
+import { Readable, Writable } from 'node:stream';
+import type { IncomingHttpHeaders } from 'node:http';
 import type Dispatcher from 'undici/types/dispatcher';
 import type {
   HttpClientResponse,

src/Response.ts

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

src/diagnosticsChannel.ts

@@ -1,6 +1,6 @@
-import diagnosticsChannel from 'diagnostics_channel';
-import { performance } from 'perf_hooks';
-import { debuglog } from 'util';
+import diagnosticsChannel from 'node:diagnostics_channel';
+import { performance } from 'node:perf_hooks';
+import { debuglog } from 'node:util';
 import { DiagnosticsChannel } from 'undici';
 import symbols from './symbols';
 import { globalId, performanceTime } from './utils';

src/utils.ts

@@ -1,6 +1,6 @@
-import { randomBytes, createHash } from 'crypto';
-import { Readable } from 'stream';
-import { performance } from 'perf_hooks';
+import { randomBytes, createHash } from 'node:crypto';
+import { Readable } from 'node:stream';
+import { performance } from 'node:perf_hooks';
 import { FixJSONCtlChars } from './Request';
 
 const JSONCtlCharsMap = {

test/HttpClient.connect.rejectUnauthorized.test.ts

@@ -1,5 +1,5 @@
+import { strict as assert } from 'node:assert';
 import { describe, it, beforeAll, afterAll } from 'vitest';
-import { strict as assert } from 'assert';
 import { HttpClient } from '../src';
 import { startServer } from './fixtures/server';
 

test/HttpClient.events.test.ts

@@ -1,6 +1,6 @@
 
+import { strict as assert } from 'node:assert';
 import { describe, it, beforeAll, afterAll } from 'vitest';
-import { strict as assert } from 'assert';
 import { HttpClient } from '../src';
 import { startServer } from './fixtures/server';
 
@@ -91,7 +91,7 @@ describe('HttpClient.events.test.ts', () => {
     const httpclient = new HttpClient();
     let requestCount = 0;
     let responseCount = 0;
-    httpclient.on('request', info => {
+    httpclient.on('request', () => {
       requestCount++;
     });
     httpclient.on('response', info => {
@@ -124,5 +124,7 @@ describe('HttpClient.events.test.ts', () => {
       assert.equal(err.status, -1);
       return true;
     });
+    assert.equal(requestCount, 1);
+    assert.equal(responseCount, 1);
   });
 });

test/HttpClient.test.ts

@@ -1,8 +1,8 @@
+import { strict as assert } from 'node:assert';
+import dns from 'node:dns';
 import { describe, it, beforeAll, afterAll } from 'vitest';
-import { strict as assert } from 'assert';
-import dns from 'dns';
 import { HttpClient } from '../src';
-import { HttpClientResponseMeta } from '../src/Response';
+import { RawResponseWithMeta } from '../src/Response';
 import { startServer } from './fixtures/server';
 
 describe('HttpClient.test.ts', () => {
@@ -50,7 +50,7 @@ describe('HttpClient.test.ts', () => {
       let response = await httpclient.request(_url);
       assert.equal(lookupCallCounter, 1);
       assert.equal(response.status, 200);
-      const res = response.res as HttpClientResponseMeta;
+      const res = response.res as RawResponseWithMeta;
       assert(res.rt > 100, `rt ${res.rt} should bigger than 100`);
       // will cache dns lookup
       let count = 10;
@@ -74,7 +74,7 @@ describe('HttpClient.test.ts', () => {
       let response = await httpclient.request('https://registry.npmmirror.com/urllib');
       assert.equal(lookupCallCounter, 1);
       assert.equal(response.status, 200);
-      const res = response.res as HttpClientResponseMeta;
+      const res = response.res as RawResponseWithMeta;
       // console.log(res);
       assert(res.rt > 100, `rt ${res.rt} should bigger than 100`);
       // will cache dns lookup
@@ -96,7 +96,7 @@ describe('HttpClient.test.ts', () => {
           return true;
         },
       });
-      
+
       await assert.rejects(async () => {
         await httpclient.request(_url);
       }, (err: any) => {
@@ -130,7 +130,7 @@ describe('HttpClient.test.ts', () => {
           return true;
         },
       });
-      
+
       await assert.rejects(async () => {
         await httpclient.request(_url);
       }, (err: any) => {
@@ -224,7 +224,7 @@ describe('HttpClient.test.ts', () => {
 
     it('should throw error when follow redirect and redirect address illegal', async () => {
       const httpclient = new HttpClient({
-        checkAddress(address) {
+        checkAddress() {
           // return address !== '127.0.0.1';
           return false;
         },

test/diagnostics_channel.test.ts

@@ -1,6 +1,6 @@
+import { strict as assert } from 'node:assert';
+import diagnosticsChannel from 'node:diagnostics_channel';
 import { describe, it, beforeAll, afterAll } from 'vitest';
-import { strict as assert } from 'assert';
-import diagnosticsChannel from 'diagnostics_channel';
 import urllib from '../src';
 import symbols from '../src/symbols';
 import { startServer } from './fixtures/server';

test/fixtures/server.ts

@@ -1,12 +1,12 @@
-import { Socket } from 'net';
-import { createServer, Server, IncomingMessage, ServerResponse } from 'http';
-import { createServer as createHttpsServer } from 'https';
-import { createBrotliCompress, createGzip, gzipSync, brotliCompressSync } from 'zlib';
-import { createReadStream } from 'fs';
+import { Socket } from 'node:net';
+import { createServer, Server, IncomingMessage, ServerResponse } from 'node:http';
+import { createServer as createHttpsServer } from 'node:https';
+import { createBrotliCompress, createGzip, gzipSync, brotliCompressSync } from 'node:zlib';
+import { createReadStream } from 'node:fs';
 import busboy from 'busboy';
 import iconv from 'iconv-lite';
-import { readableToBytes, sleep } from '../utils';
 import selfsigned from 'selfsigned';
+import { readableToBytes, sleep } from '../utils';
 
 const requestsPerSocket = Symbol('requestsPerSocket');
 
@@ -188,7 +188,7 @@ export async function startServer(options?: {
     if (pathname === '/wrongjson-gbk') {
       res.setHeader('content-type', 'application/json');
       createReadStream(__filename).pipe(res);
-      return
+      return;
     }
     if (pathname === '/json_with_controls_unicode') {
       return res.end(Buffer.from('{"foo":"\b\f\n\r\tbar\u000e!1!\u0086!2!\u0000!3!\u001F!4!\u005C!5!end\u005C\\"}'));
@@ -289,7 +289,7 @@ export async function startServer(options?: {
     if (req.headers['content-type']?.startsWith('application/x-www-form-urlencoded')) {
       const searchParams = new URLSearchParams(requestBytes.toString());
       requestBody = {};
-      for (const [field, value] of searchParams.entries()) {
+      for (const [ field, value ] of searchParams.entries()) {
         requestBody[field] = value;
       }
     } else if (req.headers['content-type']?.startsWith('application/json')) {

test/fixtures/socket_server.ts

@@ -1,5 +1,4 @@
-import { createServer, Server } from 'http';
-
+import { createServer, Server } from 'node:http';
 
 const socketPath = '/tmp/urllib.unix.sock';
 export async function startServer(): Promise<{
@@ -19,11 +18,11 @@ export async function startServer(): Promise<{
   return new Promise(resolve => {
     unixSocketServer.listen(socketPath, () => {
       resolve({
-        url: `http://localhost/`,
+        url: 'http://localhost/',
         server: unixSocketServer,
         socketPath,
         closeServer: () => new Promise(resolve => unixSocketServer.close(resolve)),
-      })
+      });
     });
-  })
+  });
 }

test/fixtures/ts/hello.ts

@@ -10,3 +10,5 @@ async function request(url: RequestURL, options: RequestOptions): Promise<HttpCl
 async function request2(url: RequestURL, options: RequestOptions2): Promise<HttpClientResponse> {
   return await urllib2.curl(url, options);
 }
+
+console.log(request, request2);

test/index.test.ts

@@ -1,8 +1,7 @@
+import { strict as assert } from 'node:assert';
+import { parse as urlparse } from 'node:url';
+import { readFileSync } from 'node:fs';
 import { describe, it, beforeAll, afterAll } from 'vitest';
-import { strict as assert } from 'assert';
-import { parse as urlparse } from 'url';
-import { createReadStream, readFileSync } from 'fs';
-import { Readable } from 'stream';
 import urllib from '../src';
 import { MockAgent, setGlobalDispatcher, getGlobalDispatcher } from '../src';
 import { startServer } from './fixtures/server';
@@ -140,7 +139,7 @@ describe('index.test.ts', () => {
 
   describe('Mocking request', () => {
     let mockAgent: MockAgent;
-    let globalAgent = getGlobalDispatcher();
+    const globalAgent = getGlobalDispatcher();
     beforeAll(() => {
       mockAgent = new MockAgent();
       setGlobalDispatcher(mockAgent);

test/keep-alive-header.test.ts

@@ -1,5 +1,5 @@
+import { strict as assert } from 'node:assert';
 import { describe, it, beforeAll, afterAll } from 'vitest';
-import { strict as assert } from 'assert';
 import urllib from '../src';
 import { startServer } from './fixtures/server';
 import { sleep } from './utils';

test/non-ascii-request-header.test.ts

@@ -1,5 +1,5 @@
+import { strict as assert } from 'node:assert';
 import { describe, it, beforeAll, afterAll } from 'vitest';
-import { strict as assert } from 'assert';
 import urllib from '../src';
 import { startServer } from './fixtures/server';
 

test/options.auth.test.ts

@@ -1,5 +1,5 @@
+import { strict as assert } from 'node:assert';
 import { describe, it, beforeAll, afterAll } from 'vitest';
-import { strict as assert } from 'assert';
 import urllib from '../src';
 import { startServer } from './fixtures/server';
 

test/options.compressed.test.ts

@@ -1,6 +1,6 @@
+import { strict as assert } from 'node:assert';
+import { createWriteStream, createReadStream } from 'node:fs';
 import { describe, it, beforeAll, afterAll, beforeEach, afterEach } from 'vitest';
-import { strict as assert } from 'assert';
-import { createWriteStream, createReadStream } from 'fs';
 import urllib from '../src';
 import { startServer } from './fixtures/server';
 import { readableToString, createTempfile } from './utils';

test/options.content.test.ts

@@ -1,7 +1,7 @@
+import { strict as assert } from 'node:assert';
+import { createReadStream } from 'node:fs';
 import { describe, it, beforeAll, afterAll } from 'vitest';
-import { strict as assert } from 'assert';
-import { createReadStream } from 'fs';
-import fs from 'fs/promises';
+import fs from 'node:fs/promises';
 import urllib from '../src';
 import { startServer } from './fixtures/server';
 

test/options.data.test.ts

@@ -1,7 +1,7 @@
+import { strict as assert } from 'node:assert';
+import { createReadStream } from 'node:fs';
+import { Readable } from 'node:stream';
 import { describe, it, beforeAll, afterAll } from 'vitest';
-import { strict as assert } from 'assert';
-import { createReadStream } from 'fs';
-import { Readable } from 'stream';
 import urllib from '../src';
 import { startServer } from './fixtures/server';
 

test/options.dataType.test.ts

@@ -1,6 +1,5 @@
+import { strict as assert } from 'node:assert';
 import { describe, it, beforeAll, afterAll } from 'vitest';
-import { strict as assert } from 'assert';
-import { Readable } from 'stream';
 import urllib from '../src';
 import { startServer } from './fixtures/server';
 import { readableToBytes } from './utils';