From 115f4c66e30732ecefacd169cbe3e78d837c3552 Mon Sep 17 00:00:00 2001 From: Luke Liu Date: Thu, 4 Feb 2021 17:01:27 -0800 Subject: [PATCH 01/11] Change Encode Url --- .gitignore | 1 + src/index.js | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index dddca890c..573f9abff 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ *.log node_modules coverage* +.DS_Store diff --git a/src/index.js b/src/index.js index 353c6e210..8246a62fd 100644 --- a/src/index.js +++ b/src/index.js @@ -220,21 +220,21 @@ HTTPSnippet.prototype.prepare = function (request) { // reset uriObj values for a clean url request.uriObj.query = null request.uriObj.search = null - request.uriObj.path = request.uriObj.pathname + request.uriObj.path = decodeURI(request.uriObj.pathname) // keep the base url clean of queryString - request.url = url.format(request.uriObj) + request.url = decodeURI(url.format(request.uriObj)) // update the uri object request.uriObj.query = request.queryObj request.uriObj.search = qs.stringify(request.queryObj) if (request.uriObj.search) { - request.uriObj.path = request.uriObj.pathname + '?' + request.uriObj.search + request.uriObj.path = decodeURI(request.uriObj.pathname) + '?' + request.uriObj.search } // construct a full url - request.fullUrl = url.format(request.uriObj) + request.fullUrl = decodeURI(url.format(request.uriObj)) return request } From fae4baf1d49b2ac2178cf02fbcecb5f9af89cc58 Mon Sep 17 00:00:00 2001 From: Luke Liu Date: Thu, 4 Feb 2021 19:19:03 -0800 Subject: [PATCH 02/11] add encodeurl --- src/index.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/index.js b/src/index.js index 0c6cf1bd6..32acb7873 100644 --- a/src/index.js +++ b/src/index.js @@ -167,21 +167,21 @@ HTTPSnippet.prototype.prepare = function (request) { // reset uriObj values for a clean url request.uriObj.query = null request.uriObj.search = null - request.uriObj.path = request.uriObj.pathname + request.uriObj.path = decodeURI(request.uriObj.pathname) // keep the base url clean of queryString - request.url = url.format(request.uriObj) + request.url = decodeURI(url.format(request.uriObj)) // update the uri object request.uriObj.query = request.queryObj request.uriObj.search = qs.stringify(request.queryObj) if (request.uriObj.search) { - request.uriObj.path = request.uriObj.pathname + '?' + request.uriObj.search + request.uriObj.path = decodeURI(request.uriObj.pathname) + '?' + request.uriObj.search } // construct a full url - request.fullUrl = url.format(request.uriObj) + request.fullUrl = decodeURI(url.format(request.uriObj)) return request } From 439f35211ea736160bbcce9c7a92044b3871e8bd Mon Sep 17 00:00:00 2001 From: Luke Liu Date: Sun, 7 Feb 2021 23:59:36 -0800 Subject: [PATCH 03/11] change if requirements --- src/index.js | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/src/index.js b/src/index.js index 8246a62fd..206adaa47 100644 --- a/src/index.js +++ b/src/index.js @@ -15,7 +15,7 @@ var validate = require('har-validator/lib/async') const { formDataIterator, isBlob } = require('./helpers/form-data.js') // constructor -var HTTPSnippet = function (data) { +var HTTPSnippet = function (data, encodeUri = true) { var entries var self = this var input = Object.assign({}, data) @@ -50,12 +50,12 @@ var HTTPSnippet = function (data) { throw err } - self.requests.push(self.prepare(entry.request)) + self.requests.push(self.prepare(entry.request, encodeUri)) }) }) } -HTTPSnippet.prototype.prepare = function (request) { +HTTPSnippet.prototype.prepare = function (request, encodeUri = true) { // construct utility properties request.queryObj = {} request.headersObj = {} @@ -220,21 +220,31 @@ HTTPSnippet.prototype.prepare = function (request) { // reset uriObj values for a clean url request.uriObj.query = null request.uriObj.search = null - request.uriObj.path = decodeURI(request.uriObj.pathname) + request.uriObj.path = request.uriObj.pathname + if (!encodeUri) { + request.uriObj.path = decodeURI(request.uriObj.pathname) + } + // keep the base url clean of queryString - request.url = decodeURI(url.format(request.uriObj)) + request.url = url.format(request.uriObj) + if (!encodeUri) { + request.url = decodeURI(url.format(request.uriObj)) + } // update the uri object request.uriObj.query = request.queryObj request.uriObj.search = qs.stringify(request.queryObj) if (request.uriObj.search) { - request.uriObj.path = decodeURI(request.uriObj.pathname) + '?' + request.uriObj.search + request.uriObj.path = request.uriObj.pathname + '?' + request.uriObj.search } // construct a full url - request.fullUrl = decodeURI(url.format(request.uriObj)) + request.fullUrl = url.format(request.uriObj) + if (!encodeUri) { + request.fullUrl = decodeURI(url.format(request.uriObj)) + } return request } From 066b990b99d26ae3d4f99bbda595172a2218568c Mon Sep 17 00:00:00 2001 From: Luke Liu Date: Tue, 9 Feb 2021 10:20:56 -0800 Subject: [PATCH 04/11] lint --- src/index.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/index.js b/src/index.js index 206adaa47..37d0cb7bb 100644 --- a/src/index.js +++ b/src/index.js @@ -224,7 +224,6 @@ HTTPSnippet.prototype.prepare = function (request, encodeUri = true) { if (!encodeUri) { request.uriObj.path = decodeURI(request.uriObj.pathname) } - // keep the base url clean of queryString request.url = url.format(request.uriObj) From ae9b04dd164d78162688e83cd858ec760d929a9e Mon Sep 17 00:00:00 2001 From: Luke Liu Date: Tue, 13 Apr 2021 14:52:53 -0700 Subject: [PATCH 05/11] refactor decode --- src/index.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/index.js b/src/index.js index 37d0cb7bb..c82dbd8ba 100644 --- a/src/index.js +++ b/src/index.js @@ -221,15 +221,9 @@ HTTPSnippet.prototype.prepare = function (request, encodeUri = true) { request.uriObj.query = null request.uriObj.search = null request.uriObj.path = request.uriObj.pathname - if (!encodeUri) { - request.uriObj.path = decodeURI(request.uriObj.pathname) - } // keep the base url clean of queryString request.url = url.format(request.uriObj) - if (!encodeUri) { - request.url = decodeURI(url.format(request.uriObj)) - } // update the uri object request.uriObj.query = request.queryObj @@ -241,8 +235,14 @@ HTTPSnippet.prototype.prepare = function (request, encodeUri = true) { // construct a full url request.fullUrl = url.format(request.uriObj) + + if (!encodeUri) { - request.fullUrl = decodeURI(url.format(request.uriObj)) + request.fullUrl = decodeURI(request.fullUrl) + request.url = decodeURI(request.url) + request.uriObj.path = decodeURI(request.uriObj.path) + request.uriObj.pathname = decodeURI(request.uriObj.pathname) + request.uriObj.href = decodeURI(request.uriObj.href) } return request From f9a58f310201cd1fc74709b7d8e038d07be33c62 Mon Sep 17 00:00:00 2001 From: Alex Cheng Date: Wed, 9 Feb 2022 10:31:25 -0600 Subject: [PATCH 06/11] Fixed curl to not error out if params is nil --- src/targets/shell/curl.js | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/src/targets/shell/curl.js b/src/targets/shell/curl.js index b6a82d386..cf8de4666 100644 --- a/src/targets/shell/curl.js +++ b/src/targets/shell/curl.js @@ -43,16 +43,18 @@ module.exports = function (source, options) { // construct post params switch (source.postData.mimeType) { case 'multipart/form-data': - source.postData.params.map(function (param) { - var post = '' - if (param.fileName) { - post = util.format('%s=@%s', param.name, param.fileName) - } else { - post = util.format('%s=%s', param.name, param.value) - } + if (source.postData.params) { + source.postData.params.map(function (param) { + var post = '' + if (param.fileName) { + post = util.format('%s=@%s', param.name, param.fileName) + } else { + post = util.format('%s=%s', param.name, param.value) + } - code.push('%s %s', opts.short ? '-F' : '--form', helpers.quote(post)) - }) + code.push('%s %s', opts.short ? '-F' : '--form', helpers.quote(post)) + }) + } break case 'application/x-www-form-urlencoded': From f31162676f81c9f6a8659be516791ce5f69ebc18 Mon Sep 17 00:00:00 2001 From: Luke Young <91491244+lyoung-confluent@users.noreply.github.com> Date: Wed, 23 Mar 2022 09:57:22 -0700 Subject: [PATCH 07/11] go/codeowners: Generate CODEOWNERS [ci skip] (#3) --- .github/CODEOWNERS | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .github/CODEOWNERS diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS new file mode 100644 index 000000000..5b11600d5 --- /dev/null +++ b/.github/CODEOWNERS @@ -0,0 +1,2 @@ +# See go/codeowners - automatically generated for confluentinc/httpsnippet: +* @confluentinc/api From 982f2a85c3fde360a61609a6b3ae18daef686edd Mon Sep 17 00:00:00 2001 From: ConfluentTools <96149134+ConfluentTools@users.noreply.github.com> Date: Sun, 11 Jun 2023 00:05:10 -0500 Subject: [PATCH 08/11] chore: update sonar-project.properties to reconfigure sonarqube scanning. (#4) Co-authored-by: Confluent Jenkins Bot --- sonar-project.properties | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 sonar-project.properties diff --git a/sonar-project.properties b/sonar-project.properties new file mode 100644 index 000000000..c50a0e105 --- /dev/null +++ b/sonar-project.properties @@ -0,0 +1,5 @@ +### service-bot sonarqube plugin managed file +sonar.coverage.exclusions=**/test/**/*,**/tests/**/*,**/mock/**/*,**/mocks/**/*,**/*mock*,**/*test* +sonar.exclusions=**/*.pb.*,**/mk-include/**/* +sonar.projectKey=httpsnippet +sonar.sources=. From 4aac3efb07ff2dedf09d0549dc6ba4bc5b5f4ac8 Mon Sep 17 00:00:00 2001 From: Pranavi Bajjuri Date: Fri, 11 Aug 2023 14:08:17 -0400 Subject: [PATCH 09/11] API-808: Fix URL Encoding Issue in API Reference Docs (#5) * changing the default value for encodeUri * lint fix * add test cases --- src/index.js | 5 ++--- test/index.js | 20 ++++++++++++++++++++ 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/src/index.js b/src/index.js index c82dbd8ba..14ef60a31 100644 --- a/src/index.js +++ b/src/index.js @@ -15,7 +15,7 @@ var validate = require('har-validator/lib/async') const { formDataIterator, isBlob } = require('./helpers/form-data.js') // constructor -var HTTPSnippet = function (data, encodeUri = true) { +var HTTPSnippet = function (data, encodeUri = false) { var entries var self = this var input = Object.assign({}, data) @@ -55,7 +55,7 @@ var HTTPSnippet = function (data, encodeUri = true) { }) } -HTTPSnippet.prototype.prepare = function (request, encodeUri = true) { +HTTPSnippet.prototype.prepare = function (request, encodeUri = false) { // construct utility properties request.queryObj = {} request.headersObj = {} @@ -236,7 +236,6 @@ HTTPSnippet.prototype.prepare = function (request, encodeUri = true) { // construct a full url request.fullUrl = url.format(request.uriObj) - if (!encodeUri) { request.fullUrl = decodeURI(request.fullUrl) request.url = decodeURI(request.url) diff --git a/test/index.js b/test/index.js index 29ba5cf56..5536e4036 100644 --- a/test/index.js +++ b/test/index.js @@ -8,6 +8,26 @@ var HTTPSnippet = require('../src') var should = require('should') describe('HTTPSnippet', function () { + it('should not have URI encoding ON by default', function (done) { + var req = new HTTPSnippet(fixtures.requests.full).requests[0] + req.fullUrl.should.eql(decodeURI(req.fullUrl)) + req.url.should.equal(decodeURI(req.url)) + req.uriObj.path.should.equal(decodeURI(req.uriObj.path)) + req.uriObj.pathname.should.equal(decodeURI(req.uriObj.pathname)) + req.uriObj.href.should.equal(decodeURI(req.uriObj.href)) + done() + }) + + it('should have URI encoding ON when the flag is set', function (done) { + var req = new HTTPSnippet(fixtures.requests.full, true).requests[0] + req.fullUrl.should.eql(encodeURI(req.fullUrl)) + req.url.should.equal(encodeURI(req.url)) + req.uriObj.path.should.equal(encodeURI(req.uriObj.path)) + req.uriObj.pathname.should.equal(encodeURI(req.uriObj.pathname)) + req.uriObj.href.should.equal(encodeURI(req.uriObj.href)) + done() + }) + it('should return false if no matching target', function (done) { var snippet = new HTTPSnippet(fixtures.requests.short) From fc88bfc97bd97ac21c20f3472508df333b49a343 Mon Sep 17 00:00:00 2001 From: Pranavi Bajjuri Date: Mon, 21 Aug 2023 17:17:37 -0400 Subject: [PATCH 10/11] API-808: Fix URL Encoding Issue in API Reference Docs (#6) * changing the default value for encodeUri * lint fix * add test cases * decode url with search/query parameters * modify test --- src/index.js | 5 +++-- test/index.js | 14 ++++++++------ 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/index.js b/src/index.js index 14ef60a31..6382f9b17 100644 --- a/src/index.js +++ b/src/index.js @@ -237,11 +237,12 @@ HTTPSnippet.prototype.prepare = function (request, encodeUri = false) { request.fullUrl = url.format(request.uriObj) if (!encodeUri) { - request.fullUrl = decodeURI(request.fullUrl) + request.fullUrl = decodeURIComponent(request.fullUrl) request.url = decodeURI(request.url) - request.uriObj.path = decodeURI(request.uriObj.path) + request.uriObj.path = decodeURIComponent(request.uriObj.path) request.uriObj.pathname = decodeURI(request.uriObj.pathname) request.uriObj.href = decodeURI(request.uriObj.href) + request.uriObj.search = decodeURIComponent(request.uriObj.search) } return request diff --git a/test/index.js b/test/index.js index 5536e4036..00121725a 100644 --- a/test/index.js +++ b/test/index.js @@ -6,25 +6,27 @@ var fixtures = require('./fixtures') var HTTPSnippet = require('../src') var should = require('should') +var url = require('url') describe('HTTPSnippet', function () { it('should not have URI encoding ON by default', function (done) { - var req = new HTTPSnippet(fixtures.requests.full).requests[0] - req.fullUrl.should.eql(decodeURI(req.fullUrl)) + var req = new HTTPSnippet(fixtures.requests.query).requests[0] + req.fullUrl.should.eql(decodeURIComponent(req.fullUrl)) req.url.should.equal(decodeURI(req.url)) - req.uriObj.path.should.equal(decodeURI(req.uriObj.path)) + req.uriObj.path.should.equal(decodeURIComponent(req.uriObj.path)) req.uriObj.pathname.should.equal(decodeURI(req.uriObj.pathname)) req.uriObj.href.should.equal(decodeURI(req.uriObj.href)) + req.uriObj.search.should.equal(decodeURIComponent(req.uriObj.search)) done() }) it('should have URI encoding ON when the flag is set', function (done) { - var req = new HTTPSnippet(fixtures.requests.full, true).requests[0] - req.fullUrl.should.eql(encodeURI(req.fullUrl)) + var req = new HTTPSnippet(fixtures.requests.query, true).requests[0] req.url.should.equal(encodeURI(req.url)) - req.uriObj.path.should.equal(encodeURI(req.uriObj.path)) req.uriObj.pathname.should.equal(encodeURI(req.uriObj.pathname)) req.uriObj.href.should.equal(encodeURI(req.uriObj.href)) + req.uriObj.path.should.equal(encodeURI(req.uriObj.pathname) + '?' + req.uriObj.search) + req.fullUrl.should.equal(url.format(req.uriObj)) done() }) From b4e933e731c646fb9fc49832d059daadf8447332 Mon Sep 17 00:00:00 2001 From: "renovatebot-confluentinc[bot]" <169726756+renovatebot-confluentinc[bot]@users.noreply.github.com> Date: Thu, 15 May 2025 05:24:05 +0000 Subject: [PATCH 11/11] fix(deps): update minor+patch dependencies (#8) --- package-lock.json | 254 ++++++++++++++++++++++++++++++++++++---------- package.json | 4 +- 2 files changed, 205 insertions(+), 53 deletions(-) diff --git a/package-lock.json b/package-lock.json index c007145d1..bf82da79c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -33,17 +33,6 @@ } } }, - "ajv": { - "version": "6.10.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.0.tgz", - "integrity": "sha512-nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg==", - "requires": { - "fast-deep-equal": "^2.0.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" - } - }, "ajv-keywords": { "version": "1.5.1", "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-1.5.1.tgz", @@ -184,6 +173,22 @@ "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=", "dev": true }, + "call-bind-apply-helpers": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz", + "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==", + "requires": { + "es-errors": "^1.3.0", + "function-bind": "^1.1.2" + }, + "dependencies": { + "function-bind": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", + "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==" + } + } + }, "caller-path": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/caller-path/-/caller-path-0.1.0.tgz", @@ -355,9 +360,9 @@ } }, "commander": { - "version": "2.20.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.0.tgz", - "integrity": "sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==" + "version": "2.20.3", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", + "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==" }, "concat-map": { "version": "0.0.1", @@ -505,10 +510,20 @@ "integrity": "sha512-M3NhsLbV1i6HuGzBUH8vXrtxOk+tWmzWKDMbAVSUp3Zsjm7ywFeuwrUXhmhQyRK1q5B5GGy7hcXPbj3bnfZg2g==", "dev": true }, + "dunder-proto": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz", + "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==", + "requires": { + "call-bind-apply-helpers": "^1.0.1", + "es-errors": "^1.3.0", + "gopd": "^1.2.0" + } + }, "duplexer": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz", - "integrity": "sha1-rOb/gIwc5mtX0ev5eXessCM0z8E=" + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz", + "integrity": "sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==" }, "ecc-jsbn": { "version": "0.1.2", @@ -635,6 +650,35 @@ "object-keys": "^1.0.12" } }, + "es-define-property": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz", + "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==" + }, + "es-errors": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz", + "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==" + }, + "es-object-atoms": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz", + "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==", + "requires": { + "es-errors": "^1.3.0" + } + }, + "es-set-tostringtag": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz", + "integrity": "sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==", + "requires": { + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.6", + "has-tostringtag": "^1.0.2", + "hasown": "^2.0.2" + } + }, "es-to-primitive": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.0.tgz", @@ -1018,17 +1062,17 @@ } }, "event-stream": { - "version": "3.3.4", - "resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz", - "integrity": "sha1-SrTJoPWlTbkzi0w02Gv86PSzVXE=", + "version": "3.3.5", + "resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.3.5.tgz", + "integrity": "sha512-vyibDcu5JL20Me1fP734QBH/kenBGLZap2n0+XXM7mvuUPzJ20Ydqj1aKcIeMdri1p+PU+4yAKugjN8KCVst+g==", "requires": { - "duplexer": "~0.1.1", - "from": "~0", - "map-stream": "~0.1.0", - "pause-stream": "0.0.11", - "split": "0.3", - "stream-combiner": "~0.0.4", - "through": "~2.3.1" + "duplexer": "^0.1.1", + "from": "^0.1.7", + "map-stream": "0.0.7", + "pause-stream": "^0.0.11", + "split": "^1.0.1", + "stream-combiner": "^0.2.2", + "through": "^2.3.8" } }, "exit-hook": { @@ -1066,11 +1110,6 @@ "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=", "dev": true }, - "fast-deep-equal": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz", - "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=" - }, "fast-json-stable-stringify": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz", @@ -1145,13 +1184,14 @@ "dev": true }, "form-data": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.0.tgz", - "integrity": "sha512-CKMFDglpbMi6PyN+brwB9Q/GOw0eAnsrEZDgcsH5Krhz5Od/haKHAX0NmQfha2zPPz0JpWzA7GJHGSnvCRLWsg==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.3.tgz", + "integrity": "sha512-q5YBMeWy6E2Un0nMGWMgI65MAKtaylxfNJGJxpGh45YDciZB4epbWpaAfImil6CPAPTYB4sh0URQNDRIZG5F2w==", "requires": { "asynckit": "^0.4.0", "combined-stream": "^1.0.8", - "mime-types": "^2.1.12" + "es-set-tostringtag": "^2.1.0", + "mime-types": "^2.1.35" }, "dependencies": { "combined-stream": { @@ -1161,6 +1201,19 @@ "requires": { "delayed-stream": "~1.0.0" } + }, + "mime-db": { + "version": "1.52.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", + "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==" + }, + "mime-types": { + "version": "2.1.35", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", + "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", + "requires": { + "mime-db": "1.52.0" + } } } }, @@ -1232,11 +1285,49 @@ "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", "dev": true }, + "get-intrinsic": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz", + "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==", + "requires": { + "call-bind-apply-helpers": "^1.0.2", + "es-define-property": "^1.0.1", + "es-errors": "^1.3.0", + "es-object-atoms": "^1.1.1", + "function-bind": "^1.1.2", + "get-proto": "^1.0.1", + "gopd": "^1.2.0", + "has-symbols": "^1.1.0", + "hasown": "^2.0.2", + "math-intrinsics": "^1.1.0" + }, + "dependencies": { + "function-bind": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", + "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==" + }, + "has-symbols": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz", + "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==" + } + } + }, "get-own-enumerable-property-symbols": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.0.tgz", "integrity": "sha512-CIJYJC4GGF06TakLg8z4GQKvDsx9EMspVxOYih7LerEL/WosUnFIww45CGfxfeKHqlg3twgUrYRT1O3WQqjGCg==" }, + "get-proto": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz", + "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==", + "requires": { + "dunder-proto": "^1.0.1", + "es-object-atoms": "^1.0.0" + } + }, "get-stdin": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-5.0.1.tgz", @@ -1271,6 +1362,11 @@ "integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==", "dev": true }, + "gopd": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz", + "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==" + }, "graceful-fs": { "version": "4.1.15", "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz", @@ -1321,12 +1417,30 @@ "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=" }, "har-validator": { - "version": "5.1.3", - "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz", - "integrity": "sha1-HvievT5JllV2de7ZiTEQ3DUPoIA=", + "version": "5.1.5", + "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz", + "integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==", "requires": { - "ajv": "^6.5.5", + "ajv": "^6.12.3", "har-schema": "^2.0.0" + }, + "dependencies": { + "ajv": { + "version": "6.12.6", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", + "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", + "requires": { + "fast-deep-equal": "^3.1.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" + } + }, + "fast-deep-equal": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", + "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==" + } } }, "has": { @@ -1358,6 +1472,36 @@ "integrity": "sha1-uhqPGvKg/DllD1yFA2dwQSIGO0Q=", "dev": true }, + "has-tostringtag": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz", + "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==", + "requires": { + "has-symbols": "^1.0.3" + }, + "dependencies": { + "has-symbols": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz", + "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==" + } + } + }, + "hasown": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", + "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==", + "requires": { + "function-bind": "^1.1.2" + }, + "dependencies": { + "function-bind": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", + "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==" + } + } + }, "he": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz", @@ -1814,19 +1958,26 @@ } }, "map-stream": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz", - "integrity": "sha1-5WqpTEyAVaFkBKBnS3jyFffI4ZQ=" + "version": "0.0.7", + "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.0.7.tgz", + "integrity": "sha512-C0X0KQmGm3N2ftbTGBhSyuydQ+vV1LC3f3zPvT3RXHXNZrvfPZcoXp/N5DOa8vedX/rTMm2CjTtivFg2STJMRQ==" + }, + "math-intrinsics": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz", + "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==" }, "mime-db": { "version": "1.40.0", "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz", - "integrity": "sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA==" + "integrity": "sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA==", + "dev": true }, "mime-types": { "version": "2.1.24", "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz", "integrity": "sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==", + "dev": true, "requires": { "mime-db": "1.40.0" } @@ -2704,9 +2855,9 @@ } }, "split": { - "version": "0.3.3", - "resolved": "https://registry.npmjs.org/split/-/split-0.3.3.tgz", - "integrity": "sha1-zQ7qXmOiEd//frDwkcQTPi0N0o8=", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/split/-/split-1.0.1.tgz", + "integrity": "sha512-mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg==", "requires": { "through": "2" } @@ -2764,11 +2915,12 @@ } }, "stream-combiner": { - "version": "0.0.4", - "resolved": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz", - "integrity": "sha1-TV5DPBhSYd3mI8o/RMWGvPXErRQ=", + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.2.2.tgz", + "integrity": "sha512-6yHMqgLYDzQDcAkL+tjJDC5nSNuNIx0vZtRZeiPh7Saef7VHX9H5Ijn9l2VIol2zaNYlYEX6KyuT/237A58qEQ==", "requires": { - "duplexer": "~0.1.1" + "duplexer": "~0.1.1", + "through": "~2.3.4" } }, "string-width": { diff --git a/package.json b/package.json index c8db03587..f8177af8e 100644 --- a/package.json +++ b/package.json @@ -82,8 +82,8 @@ "chalk": "^1.1.1", "commander": "^2.9.0", "debug": "^2.2.0", - "event-stream": "3.3.4", - "form-data": "3.0.0", + "event-stream": "3.3.5", + "form-data": "3.0.3", "fs-readfile-promise": "^2.0.1", "fs-writefile-promise": "^1.0.3", "har-validator": "^5.0.0",