diff --git a/endPoint/h2HttpHostEndPoint.js b/endPoint/h2HttpHostEndPoint.js index a5de512..3408305 100644 --- a/endPoint/h2HttpHostEndPoint.js +++ b/endPoint/h2HttpHostEndPoint.js @@ -62,6 +62,7 @@ export default class H2HttpHostEndPoint extends SecureHttpHostEndPoint { return http2 .createSecureServer(this.#options) .on("stream", async (stream, headers) => { + let bodyFields = {}; /** @type {Request} */ let cms = null; /**@type {BinaryContent[]} */ @@ -73,13 +74,28 @@ export default class H2HttpHostEndPoint extends SecureHttpHostEndPoint { const method = headers[":method"]; const url = headers[":path"]; const createCmsAndCreateResponseAsync = async () => { + let date = new Date(); + console.log( + "HTTP2" + + " => " + + date.getHours() + + ":" + + date.getMinutes() + + ":" + + date.getSeconds() + + ") " + + method + + "::" + + url + ); cms = await this._createCmsObjectAsync( url, method, headers, formFields, jsonHeaders, - stream.session.socket + stream.session.socket, + bodyFields ); const result = await this.#service.processAsync(cms, fileContents); const [code, headerList, body] = await result.getResultAsync(); @@ -94,7 +110,10 @@ export default class H2HttpHostEndPoint extends SecureHttpHostEndPoint { stream.destroy(ex); }); try { - if (method === "POST") { + if ( + method === "POST" && + headers["content-type"] == "multipart/form-data" + ) { /**@type {Array}*/ const bb = busboy({ headers: headers }); bb.on("file", (name, file, info) => { @@ -117,6 +136,16 @@ export default class H2HttpHostEndPoint extends SecureHttpHostEndPoint { }); bb.on("close", createCmsAndCreateResponseAsync); stream.pipe(bb); + } else if (method === "POST") { + let raw_body = ""; + stream.on("data", (chunk) => { + raw_body += chunk.toString(); + }); + + stream.on("end", () => { + bodyFields = JSON.stringify(raw_body); + console.log("body" + bodyFields); + }); } else { createCmsAndCreateResponseAsync(); } diff --git a/endPoint/httpHostEndPoint.js b/endPoint/httpHostEndPoint.js index 1bb3218..c942105 100644 --- a/endPoint/httpHostEndPoint.js +++ b/endPoint/httpHostEndPoint.js @@ -43,7 +43,8 @@ class HttpHostEndPoint extends HostEndPoint { headers, formFields, jsonHeaders, - socket + socket, + bodyFields ) { const rawUrl = urlStr.substring(1); const urlObject = url.parse(rawUrl, true); @@ -58,7 +59,7 @@ class HttpHostEndPoint extends HostEndPoint { if (Object.keys(jsonHeaders).length > 0) { headers["json"] = ObjectUtil.convertObjectToNestedStructure(jsonHeaders); } else { - headers["json"] = {}; + headers["json"] = bodyFields; } const now = dayjs(); const request = new Request(); @@ -82,6 +83,7 @@ class HttpHostEndPoint extends HostEndPoint { } } request["Form"] = formFields; + request["form"] = bodyFields; return request; } } diff --git a/endPoint/nonSecureHttpHostEndPoint.js b/endPoint/nonSecureHttpHostEndPoint.js index 8f7c286..b266c44 100644 --- a/endPoint/nonSecureHttpHostEndPoint.js +++ b/endPoint/nonSecureHttpHostEndPoint.js @@ -4,7 +4,7 @@ import { StatusCodes } from "http-status-codes"; import HttpHostEndPoint from "./HttpHostEndPoint.js"; import { HostService } from "../services/hostServices.js"; import BinaryContent from "../fileStreamer/Models/BinaryContent.js"; - +import bodyParser from "body-parser" export default class NonSecureHttpHostEndPoint extends HttpHostEndPoint { /** @type {HostService} */ #service; @@ -22,60 +22,70 @@ export default class NonSecureHttpHostEndPoint extends HttpHostEndPoint { _createServer() { return http.createServer(async (req, res) => { - try { - /** @type {Request} */ - let cms = null; - /**@type {BinaryContent[]} */ - const fileContents = []; - /**@type {NodeJS.Dict} */ - const formFields = {}; - /**@type {NodeJS.Dict} */ - const jsonHeaders = {}; - const createCmsAndCreateResponseAsync = async () => { - cms = await this._createCmsObjectAsync( - req.url, - req.method, - req.headers, - formFields, - jsonHeaders, - req.socket - ); - const result = await this.#service.processAsync(cms, fileContents); - const [code, headers, body] = await result.getResultAsync(); - res.writeHead(code, headers); - res.end(body); - }; - if (req.method === "POST") { - /**@type {Array}*/ - const bb = busboy({ headers: req.headers }); - bb.on("file", (name, file, info) => { - const ContentParts = []; - file.on("data", (x) => ContentParts.push(x)); - file.on("end", async () => { - const content = new BinaryContent(); - content.url = `${req.headers["host"]}${req.url}`; - content.mime = info.mimeType.toLowerCase(); - content.name = info.filename; - content.payload = Buffer.concat(ContentParts); - fileContents.push(content); + bodyParser.json()(req, res, (err) => { + if (err) { + throw err; + } + try { + /** @type {Request} */ + let cms = null; + /**@type {BinaryContent[]} */ + const fileContents = []; + /**@type {NodeJS.Dict} */ + const formFields = {}; + /**@type {NodeJS.Dict} */ + const jsonHeaders = {}; + const createCmsAndCreateResponseAsync = async () => { + let date = new Date(); + cms = await this._createCmsObjectAsync( + req.url, + req.method, + req.headers, + formFields, + jsonHeaders, + req.socket, + req.body + ); + const result = await this.#service.processAsync(cms, fileContents); + const [code, headers, body] = await result.getResultAsync(); + res.writeHead(code, headers); + res.end(body); + }; + if ( + req.method === "POST" && + req.headers["content-type"] == "multipart/form-data" + ) { + /**@type {Array}*/ + const bb = busboy({ headers: req.headers }); + bb.on("file", (name, file, info) => { + const ContentParts = []; + file.on("data", (x) => ContentParts.push(x)); + file.on("end", async () => { + const content = new BinaryContent(); + content.url = `${req.headers["host"]}${req.url}`; + content.mime = info.mimeType.toLowerCase(); + content.name = info.filename; + content.payload = Buffer.concat(ContentParts); + fileContents.push(content); + }); + }); + bb.on("field", (name, val, info) => { + formFields[name] = val; + if (name.startsWith("_")) { + jsonHeaders[name] = val; + } }); - }); - bb.on("field", (name, val, info) => { - formFields[name] = val; - if (name.startsWith("_")) { - jsonHeaders[name] = val; - } - }); - bb.on("close", createCmsAndCreateResponseAsync); - req.pipe(bb); - } else { - createCmsAndCreateResponseAsync(); + bb.on("close", createCmsAndCreateResponseAsync); + req.pipe(bb); + } else { + createCmsAndCreateResponseAsync(); + } + } catch (ex) { + console.error(ex); + res.writeHead(StatusCodes.INTERNAL_SERVER_ERROR); + res.end(ex.toString()); } - } catch (ex) { - console.error(ex); - res.writeHead(StatusCodes.INTERNAL_SERVER_ERROR); - res.end(ex.toString()); - } + }); }); } } diff --git a/endPoint/secureHttpHostEndPoint.js b/endPoint/secureHttpHostEndPoint.js index 64d2beb..e8eaeae 100644 --- a/endPoint/secureHttpHostEndPoint.js +++ b/endPoint/secureHttpHostEndPoint.js @@ -4,6 +4,7 @@ import { StatusCodes } from "http-status-codes"; import HttpHostEndPoint from "./HttpHostEndPoint.js"; import { HostService } from "../services/hostServices.js"; import BinaryContent from "../fileStreamer/Models/BinaryContent.js"; +import bodyParser from "body-parser"; export default class SecureHttpHostEndPoint extends HttpHostEndPoint { /** @type {HostService} */ @@ -26,60 +27,70 @@ export default class SecureHttpHostEndPoint extends HttpHostEndPoint { _createServer() { return https .createServer(this.#options, async (req, res) => { - /** @type {Request} */ - let cms = null; - /**@type {BinaryContent[]} */ - const fileContents = []; - /**@type {NodeJS.Dict} */ - const formFields = {}; - /**@type {NodeJS.Dict} */ - const jsonHeaders = {}; - const createCmsAndCreateResponseAsync = async () => { - cms = await this._createCmsObjectAsync( - req.url, - req.method, - req.headers, - formFields, - jsonHeaders, - req.socket - ); - const result = await this.#service.processAsync(cms, fileContents); - const [code, headers, body] = await result.getResultAsync(); - res.writeHead(code, headers); - res.end(body); - }; - try { - if (req.method === "POST") { - /**@type {Array}*/ - const bb = busboy({ headers: req.headers }); - bb.on("file", (name, file, info) => { - const ContentParts = []; - file.on("data", (x) => ContentParts.push(x)); - file.on("end", async () => { - const content = new BinaryContent(); - content.url = `${req.headers["host"]}${req.url}`; - content.mime = info.mimeType.toLowerCase(); - content.name = info.filename; - content.payload = Buffer.concat(ContentParts); - fileContents.push(content); + bodyParser.json()(req, res, (err) => { + if (err) { + throw err; + } + /** @type {Request} */ + let cms = null; + /**@type {BinaryContent[]} */ + const fileContents = []; + /**@type {NodeJS.Dict} */ + const formFields = {}; + /**@type {NodeJS.Dict} */ + const jsonHeaders = {}; + const createCmsAndCreateResponseAsync = async () => { + let date = new Date(); + cms = await this._createCmsObjectAsync( + req.url, + req.method, + req.headers, + formFields, + jsonHeaders, + req.socket, + req.body + ); + const result = await this.#service.processAsync(cms, fileContents); + const [code, headers, body] = await result.getResultAsync(); + res.writeHead(code, headers); + res.end(body); + }; + try { + if ( + req.method === "POST" && + req.headers["content-type"] == "multipart/form-data" + ) { + /**@type {Array}*/ + const bb = busboy({ headers: req.headers }); + bb.on("file", (name, file, info) => { + const ContentParts = []; + file.on("data", (x) => ContentParts.push(x)); + file.on("end", async () => { + const content = new BinaryContent(); + content.url = `${req.headers["host"]}${req.url}`; + content.mime = info.mimeType.toLowerCase(); + content.name = info.filename; + content.payload = Buffer.concat(ContentParts); + fileContents.push(content); + }); + }); + bb.on("field", (name, val, info) => { + formFields[name] = val; + if (name.startsWith("_")) { + jsonHeaders[name] = val; + } }); - }); - bb.on("field", (name, val, info) => { - formFields[name] = val; - if (name.startsWith("_")) { - jsonHeaders[name] = val; - } - }); - bb.on("close", createCmsAndCreateResponseAsync); - req.pipe(bb); - } else { - createCmsAndCreateResponseAsync(); + bb.on("close", createCmsAndCreateResponseAsync); + req.pipe(bb); + } else { + createCmsAndCreateResponseAsync(); + } + } catch (ex) { + console.error(ex); + res.writeHead(StatusCodes.INTERNAL_SERVER_ERROR); + res.end(ex.toString()); } - } catch (ex) { - console.error(ex); - res.writeHead(StatusCodes.INTERNAL_SERVER_ERROR); - res.end(ex.toString()); - } + }); }) .on("error", (er) => console.error(er)) .on("clientError", (er) => console.error(er)) diff --git a/package-lock.json b/package-lock.json index b341e58..9c020ca 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,6 +11,7 @@ "dependencies": { "alasql": "^4.1.9", "axios": "^1.6.2", + "body-parser": "^1.20.2", "busboy": "^1.6.0", "dayjs": "^1.11.6", "fast-xml-parser": "^4.3.2", @@ -1899,6 +1900,67 @@ "readable-stream": "^3.4.0" } }, + "node_modules/body-parser": { + "version": "1.20.2", + "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.2.tgz", + "integrity": "sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==", + "dependencies": { + "bytes": "3.1.2", + "content-type": "~1.0.5", + "debug": "2.6.9", + "depd": "2.0.0", + "destroy": "1.2.0", + "http-errors": "2.0.0", + "iconv-lite": "0.4.24", + "on-finished": "2.4.1", + "qs": "6.11.0", + "raw-body": "2.5.2", + "type-is": "~1.6.18", + "unpipe": "1.0.0" + }, + "engines": { + "node": ">= 0.8", + "npm": "1.2.8000 || >= 1.4.16" + } + }, + "node_modules/body-parser/node_modules/debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dependencies": { + "ms": "2.0.0" + } + }, + "node_modules/body-parser/node_modules/iconv-lite": { + "version": "0.4.24", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", + "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", + "dependencies": { + "safer-buffer": ">= 2.1.2 < 3" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/body-parser/node_modules/ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" + }, + "node_modules/body-parser/node_modules/qs": { + "version": "6.11.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz", + "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==", + "dependencies": { + "side-channel": "^1.0.4" + }, + "engines": { + "node": ">=0.6" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", @@ -2014,6 +2076,14 @@ "node": ">=10.16.0" } }, + "node_modules/bytes": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz", + "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==", + "engines": { + "node": ">= 0.8" + } + }, "node_modules/cacache": { "version": "15.3.0", "resolved": "https://registry.npmjs.org/cacache/-/cacache-15.3.0.tgz", @@ -2287,6 +2357,14 @@ "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", "integrity": "sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==" }, + "node_modules/content-type": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz", + "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==", + "engines": { + "node": ">= 0.6" + } + }, "node_modules/convert-source-map": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz", @@ -2463,6 +2541,23 @@ "node": ">=0.10" } }, + "node_modules/depd": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", + "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/destroy": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz", + "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==", + "engines": { + "node": ">= 0.8", + "npm": "1.2.8000 || >= 1.4.16" + } + }, "node_modules/detect-libc": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.2.tgz", @@ -2507,6 +2602,11 @@ "safe-buffer": "^5.0.1" } }, + "node_modules/ee-first": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", + "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==" + }, "node_modules/electron-to-chromium": { "version": "1.4.601", "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.601.tgz", @@ -3170,6 +3270,21 @@ "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz", "integrity": "sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==" }, + "node_modules/http-errors": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz", + "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==", + "dependencies": { + "depd": "2.0.0", + "inherits": "2.0.4", + "setprototypeof": "1.2.0", + "statuses": "2.0.1", + "toidentifier": "1.0.1" + }, + "engines": { + "node": ">= 0.8" + } + }, "node_modules/http-proxy-agent": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz", @@ -4660,6 +4775,14 @@ "tmpl": "1.0.5" } }, + "node_modules/media-typer": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", + "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==", + "engines": { + "node": ">= 0.6" + } + }, "node_modules/memory-pager": { "version": "1.5.0", "resolved": "https://registry.npmjs.org/memory-pager/-/memory-pager-1.5.0.tgz", @@ -5307,6 +5430,17 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/on-finished": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz", + "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==", + "dependencies": { + "ee-first": "1.1.1" + }, + "engines": { + "node": ">= 0.8" + } + }, "node_modules/once": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", @@ -5635,6 +5769,31 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/raw-body": { + "version": "2.5.2", + "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.2.tgz", + "integrity": "sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==", + "dependencies": { + "bytes": "3.1.2", + "http-errors": "2.0.0", + "iconv-lite": "0.4.24", + "unpipe": "1.0.0" + }, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/raw-body/node_modules/iconv-lite": { + "version": "0.4.24", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", + "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", + "dependencies": { + "safer-buffer": ">= 2.1.2 < 3" + }, + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/react-is": { "version": "18.2.0", "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz", @@ -5827,6 +5986,11 @@ "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==" }, + "node_modules/setprototypeof": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz", + "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==" + }, "node_modules/shebang-command": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", @@ -6005,6 +6169,14 @@ "node": ">=10" } }, + "node_modules/statuses": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz", + "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==", + "engines": { + "node": ">= 0.8" + } + }, "node_modules/stoppable": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/stoppable/-/stoppable-1.1.0.tgz", @@ -6319,6 +6491,14 @@ "node": ">=8.0" } }, + "node_modules/toidentifier": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz", + "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==", + "engines": { + "node": ">=0.6" + } + }, "node_modules/tr46": { "version": "0.0.3", "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", @@ -6350,6 +6530,18 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/type-is": { + "version": "1.6.18", + "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz", + "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==", + "dependencies": { + "media-typer": "0.3.0", + "mime-types": "~2.1.24" + }, + "engines": { + "node": ">= 0.6" + } + }, "node_modules/unbox-primitive": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz", @@ -6388,6 +6580,14 @@ "imurmurhash": "^0.1.4" } }, + "node_modules/unpipe": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", + "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==", + "engines": { + "node": ">= 0.8" + } + }, "node_modules/update-browserslist-db": { "version": "1.0.13", "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz", @@ -8077,6 +8277,56 @@ "readable-stream": "^3.4.0" } }, + "body-parser": { + "version": "1.20.2", + "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.2.tgz", + "integrity": "sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==", + "requires": { + "bytes": "3.1.2", + "content-type": "~1.0.5", + "debug": "2.6.9", + "depd": "2.0.0", + "destroy": "1.2.0", + "http-errors": "2.0.0", + "iconv-lite": "0.4.24", + "on-finished": "2.4.1", + "qs": "6.11.0", + "raw-body": "2.5.2", + "type-is": "~1.6.18", + "unpipe": "1.0.0" + }, + "dependencies": { + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "requires": { + "ms": "2.0.0" + } + }, + "iconv-lite": { + "version": "0.4.24", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", + "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", + "requires": { + "safer-buffer": ">= 2.1.2 < 3" + } + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" + }, + "qs": { + "version": "6.11.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz", + "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==", + "requires": { + "side-channel": "^1.0.4" + } + } + } + }, "brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", @@ -8149,6 +8399,11 @@ "streamsearch": "^1.1.0" } }, + "bytes": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz", + "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==" + }, "cacache": { "version": "15.3.0", "resolved": "https://registry.npmjs.org/cacache/-/cacache-15.3.0.tgz", @@ -8346,6 +8601,11 @@ "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", "integrity": "sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==" }, + "content-type": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz", + "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==" + }, "convert-source-map": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz", @@ -8467,6 +8727,16 @@ "resolved": "https://registry.npmjs.org/denque/-/denque-2.1.0.tgz", "integrity": "sha512-HVQE3AAb/pxF8fQAoiqpvg9i3evqug3hoiwakOyZAwJm+6vZehbkYXZ0l4JxS+I3QxM97v5aaRNhj8v5oBhekw==" }, + "depd": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", + "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==" + }, + "destroy": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz", + "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==" + }, "detect-libc": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.2.tgz", @@ -8502,6 +8772,11 @@ "safe-buffer": "^5.0.1" } }, + "ee-first": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", + "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==" + }, "electron-to-chromium": { "version": "1.4.601", "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.601.tgz", @@ -8972,6 +9247,18 @@ "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz", "integrity": "sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==" }, + "http-errors": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz", + "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==", + "requires": { + "depd": "2.0.0", + "inherits": "2.0.4", + "setprototypeof": "1.2.0", + "statuses": "2.0.1", + "toidentifier": "1.0.1" + } + }, "http-proxy-agent": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz", @@ -10108,6 +10395,11 @@ "tmpl": "1.0.5" } }, + "media-typer": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", + "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==" + }, "memory-pager": { "version": "1.5.0", "resolved": "https://registry.npmjs.org/memory-pager/-/memory-pager-1.5.0.tgz", @@ -10559,6 +10851,14 @@ "object-keys": "^1.1.1" } }, + "on-finished": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz", + "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==", + "requires": { + "ee-first": "1.1.1" + } + }, "once": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", @@ -10783,6 +11083,27 @@ "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz", "integrity": "sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==" }, + "raw-body": { + "version": "2.5.2", + "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.2.tgz", + "integrity": "sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==", + "requires": { + "bytes": "3.1.2", + "http-errors": "2.0.0", + "iconv-lite": "0.4.24", + "unpipe": "1.0.0" + }, + "dependencies": { + "iconv-lite": { + "version": "0.4.24", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", + "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", + "requires": { + "safer-buffer": ">= 2.1.2 < 3" + } + } + } + }, "react-is": { "version": "18.2.0", "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz", @@ -10913,6 +11234,11 @@ "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==" }, + "setprototypeof": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz", + "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==" + }, "shebang-command": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", @@ -11045,6 +11371,11 @@ "escape-string-regexp": "^2.0.0" } }, + "statuses": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz", + "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==" + }, "stoppable": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/stoppable/-/stoppable-1.1.0.tgz", @@ -11284,6 +11615,11 @@ "is-number": "^7.0.0" } }, + "toidentifier": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz", + "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==" + }, "tr46": { "version": "0.0.3", "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", @@ -11306,6 +11642,15 @@ "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==", "dev": true }, + "type-is": { + "version": "1.6.18", + "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz", + "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==", + "requires": { + "media-typer": "0.3.0", + "mime-types": "~2.1.24" + } + }, "unbox-primitive": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz", @@ -11341,6 +11686,11 @@ "imurmurhash": "^0.1.4" } }, + "unpipe": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", + "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==" + }, "update-browserslist-db": { "version": "1.0.13", "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz", diff --git a/package.json b/package.json index 70954b8..97653b9 100644 --- a/package.json +++ b/package.json @@ -56,6 +56,7 @@ "dependencies": { "alasql": "^4.1.9", "axios": "^1.6.2", + "body-parser": "^1.20.2", "busboy": "^1.6.0", "dayjs": "^1.11.6", "fast-xml-parser": "^4.3.2",