From 47291c45121e0ec9d5f6132339c54280c44b0fa2 Mon Sep 17 00:00:00 2001 From: Frazer Smith Date: Sun, 10 Sep 2023 10:30:19 +0100 Subject: [PATCH] perf: use `node:` prefix to bypass require.cache call for builtins (#125) --- README.md | 16 ++++++++-------- bench/dicer/multiparty-bench-multipart-parser.js | 2 +- bench/dicer/parted-bench-multipart-parser.js | 2 +- bench/dicer/parted-multipart.js | 8 ++++---- benchmarks/common/resultsCombinator.js | 4 ++-- deps/dicer/lib/Dicer.js | 4 ++-- deps/dicer/lib/HeaderParser.js | 4 ++-- deps/dicer/lib/PartStream.js | 4 ++-- deps/streamsearch/sbmh.js | 4 ++-- lib/main.js | 4 ++-- lib/types/multipart.js | 4 ++-- test/dicer-multipart-extra-trailer.spec.js | 8 ++++---- test/dicer-multipart-nolisteners.spec.js | 8 ++++---- test/dicer-multipart.spec.js | 8 ++++---- test/multipart-stream-pause.spec.js | 2 +- test/parse-params.spec.js | 2 +- test/types-multipart.spec.js | 2 +- test/types-urlencoded.spec.js | 2 +- 18 files changed, 44 insertions(+), 44 deletions(-) diff --git a/README.md b/README.md index 0385d2d..c74e618 100644 --- a/README.md +++ b/README.md @@ -51,8 +51,8 @@ Examples * Parsing (multipart) with default options: ```javascript -const http = require('http'); -const { inspect } = require('util'); +const http = require('node:http'); +const { inspect } = require('node:util'); const Busboy = require('busboy'); http.createServer((req, res) => { @@ -103,10 +103,10 @@ http.createServer((req, res) => { * Save all incoming files to disk: ```javascript -const http = require('http'); -const path = require('path'); -const os = require('os'); -const fs = require('fs'); +const http = require('node:http'); +const path = require('node:path'); +const os = require('node:os'); +const fs = require('node:fs'); const Busboy = require('busboy'); @@ -133,8 +133,8 @@ http.createServer(function(req, res) { * Parsing (urlencoded) with default options: ```javascript -const http = require('http'); -const { inspect } = require('util'); +const http = require('node:http'); +const { inspect } = require('node:util'); const Busboy = require('busboy'); diff --git a/bench/dicer/multiparty-bench-multipart-parser.js b/bench/dicer/multiparty-bench-multipart-parser.js index da52651..08e4a76 100644 --- a/bench/dicer/multiparty-bench-multipart-parser.js +++ b/bench/dicer/multiparty-bench-multipart-parser.js @@ -1,4 +1,4 @@ -var assert = require('assert'), +var assert = require('node:assert'), Form = require('multiparty').Form, boundary = '-----------------------------168072824752491622650073', mb = 100, diff --git a/bench/dicer/parted-bench-multipart-parser.js b/bench/dicer/parted-bench-multipart-parser.js index b031e30..66762d4 100644 --- a/bench/dicer/parted-bench-multipart-parser.js +++ b/bench/dicer/parted-bench-multipart-parser.js @@ -2,7 +2,7 @@ // because otherwise it attempts to do some things above and beyond just parsing // -- like saving to disk and whatnot -var assert = require('assert'); +var assert = require('node:assert'); var Parser = require('./parted-multipart'), boundary = '-----------------------------168072824752491622650073', parser = new Parser('boundary=' + boundary), diff --git a/bench/dicer/parted-multipart.js b/bench/dicer/parted-multipart.js index 49444f0..312a099 100644 --- a/bench/dicer/parted-multipart.js +++ b/bench/dicer/parted-multipart.js @@ -4,10 +4,10 @@ * Copyright (c) 2011, Christopher Jeffrey. (MIT Licensed) */ -var fs = require('fs') - , path = require('path') - , EventEmitter = require('events').EventEmitter - , StringDecoder = require('string_decoder').StringDecoder +var fs = require('node:fs') + , path = require('node:path') + , EventEmitter = require('node:events').EventEmitter + , StringDecoder = require('node:string_decoder').StringDecoder , set = require('qs').set , each = Array.prototype.forEach; diff --git a/benchmarks/common/resultsCombinator.js b/benchmarks/common/resultsCombinator.js index 53c8da3..ac0a55a 100644 --- a/benchmarks/common/resultsCombinator.js +++ b/benchmarks/common/resultsCombinator.js @@ -1,5 +1,5 @@ -const fs = require('fs') -const path = require('path') +const fs = require('node:fs') +const path = require('node:path') const getopts = require('getopts') const systemInformation = require('systeminformation') const { loadResults } = require('photofinish') diff --git a/deps/dicer/lib/Dicer.js b/deps/dicer/lib/Dicer.js index 483cff8..79da160 100644 --- a/deps/dicer/lib/Dicer.js +++ b/deps/dicer/lib/Dicer.js @@ -1,7 +1,7 @@ 'use strict' -const WritableStream = require('stream').Writable -const inherits = require('util').inherits +const WritableStream = require('node:stream').Writable +const inherits = require('node:util').inherits const StreamSearch = require('../../streamsearch/sbmh') diff --git a/deps/dicer/lib/HeaderParser.js b/deps/dicer/lib/HeaderParser.js index 2ec8fb2..65f667b 100644 --- a/deps/dicer/lib/HeaderParser.js +++ b/deps/dicer/lib/HeaderParser.js @@ -1,7 +1,7 @@ 'use strict' -const EventEmitter = require('events').EventEmitter -const inherits = require('util').inherits +const EventEmitter = require('node:events').EventEmitter +const inherits = require('node:util').inherits const getLimit = require('../../../lib/utils/getLimit') const StreamSearch = require('../../streamsearch/sbmh') diff --git a/deps/dicer/lib/PartStream.js b/deps/dicer/lib/PartStream.js index d5c0dfe..c91da1c 100644 --- a/deps/dicer/lib/PartStream.js +++ b/deps/dicer/lib/PartStream.js @@ -1,7 +1,7 @@ 'use strict' -const inherits = require('util').inherits -const ReadableStream = require('stream').Readable +const inherits = require('node:util').inherits +const ReadableStream = require('node:stream').Readable function PartStream (opts) { ReadableStream.call(this, opts) diff --git a/deps/streamsearch/sbmh.js b/deps/streamsearch/sbmh.js index 21745ac..b90c0e8 100644 --- a/deps/streamsearch/sbmh.js +++ b/deps/streamsearch/sbmh.js @@ -26,8 +26,8 @@ * Based heavily on the Streaming Boyer-Moore-Horspool C++ implementation * by Hongli Lai at: https://github.com/FooBarWidget/boyer-moore-horspool */ -const EventEmitter = require('events').EventEmitter -const inherits = require('util').inherits +const EventEmitter = require('node:events').EventEmitter +const inherits = require('node:util').inherits function SBMH (needle) { if (typeof needle === 'string') { diff --git a/lib/main.js b/lib/main.js index de4754f..8794beb 100644 --- a/lib/main.js +++ b/lib/main.js @@ -1,7 +1,7 @@ 'use strict' -const WritableStream = require('stream').Writable -const { inherits } = require('util') +const WritableStream = require('node:stream').Writable +const { inherits } = require('node:util') const Dicer = require('../deps/dicer/lib/Dicer') const MultipartParser = require('./types/multipart') diff --git a/lib/types/multipart.js b/lib/types/multipart.js index 0f3e4e6..ad242db 100644 --- a/lib/types/multipart.js +++ b/lib/types/multipart.js @@ -7,8 +7,8 @@ // * support limits.fieldNameSize // -- this will require modifications to utils.parseParams -const { Readable } = require('stream') -const { inherits } = require('util') +const { Readable } = require('node:stream') +const { inherits } = require('node:util') const Dicer = require('../../deps/dicer/lib/Dicer') diff --git a/test/dicer-multipart-extra-trailer.spec.js b/test/dicer-multipart-extra-trailer.spec.js index 1adf385..a089a9e 100644 --- a/test/dicer-multipart-extra-trailer.spec.js +++ b/test/dicer-multipart-extra-trailer.spec.js @@ -1,8 +1,8 @@ const Dicer = require('../deps/dicer/lib/Dicer') -const assert = require('assert') -const fs = require('fs') -const path = require('path') -const inspect = require('util').inspect +const assert = require('node:assert') +const fs = require('node:fs') +const path = require('node:path') +const inspect = require('node:util').inspect const FIXTURES_ROOT = path.join(__dirname, 'fixtures/') diff --git a/test/dicer-multipart-nolisteners.spec.js b/test/dicer-multipart-nolisteners.spec.js index 381f333..a435abc 100644 --- a/test/dicer-multipart-nolisteners.spec.js +++ b/test/dicer-multipart-nolisteners.spec.js @@ -1,8 +1,8 @@ const Dicer = require('../deps/dicer/lib/Dicer') -const assert = require('assert') -const fs = require('fs') -const path = require('path') -const inspect = require('util').inspect +const assert = require('node:assert') +const fs = require('node:fs') +const path = require('node:path') +const inspect = require('node:util').inspect const FIXTURES_ROOT = path.join(__dirname, 'fixtures/') diff --git a/test/dicer-multipart.spec.js b/test/dicer-multipart.spec.js index 3255029..8f3ec94 100644 --- a/test/dicer-multipart.spec.js +++ b/test/dicer-multipart.spec.js @@ -1,8 +1,8 @@ const Dicer = require('../deps/dicer/lib/Dicer') -const assert = require('assert') -const fs = require('fs') -const path = require('path') -const inspect = require('util').inspect +const assert = require('node:assert') +const fs = require('node:fs') +const path = require('node:path') +const inspect = require('node:util').inspect const FIXTURES_ROOT = path.join(__dirname, 'fixtures/') diff --git a/test/multipart-stream-pause.spec.js b/test/multipart-stream-pause.spec.js index 65040f7..ce09085 100644 --- a/test/multipart-stream-pause.spec.js +++ b/test/multipart-stream-pause.spec.js @@ -1,4 +1,4 @@ -const { inspect } = require('util') +const { inspect } = require('node:util') const { assert } = require('chai') const Busboy = require('..') diff --git a/test/parse-params.spec.js b/test/parse-params.spec.js index 1032d14..9b5814b 100644 --- a/test/parse-params.spec.js +++ b/test/parse-params.spec.js @@ -1,4 +1,4 @@ -const { inspect } = require('util') +const { inspect } = require('node:util') const { assert } = require('chai') const parseParams = require('../lib/utils/parseParams') diff --git a/test/types-multipart.spec.js b/test/types-multipart.spec.js index 191acbb..a1ab251 100644 --- a/test/types-multipart.spec.js +++ b/test/types-multipart.spec.js @@ -1,6 +1,6 @@ const Busboy = require('..') -const { inspect } = require('util') +const { inspect } = require('node:util') const { assert } = require('chai') const EMPTY_FN = function () { diff --git a/test/types-urlencoded.spec.js b/test/types-urlencoded.spec.js index 2dd3823..b0ad8b0 100644 --- a/test/types-urlencoded.spec.js +++ b/test/types-urlencoded.spec.js @@ -1,4 +1,4 @@ -const { inspect } = require('util') +const { inspect } = require('node:util') const { assert } = require('chai') const Busboy = require('..')