From c299b9376a00f19c6df99896ba5c387ca5c095bb Mon Sep 17 00:00:00 2001 From: Dave Richer Date: Wed, 30 Apr 2025 10:26:38 -0400 Subject: [PATCH] release/2025-04-25: revert body parser, remove DD --- package-lock.json | 86 --------------------------------------------- package.json | 1 - server.js | 20 +++++------ server/data/arms.js | 2 +- 4 files changed, 11 insertions(+), 98 deletions(-) diff --git a/package-lock.json b/package-lock.json index ec19d8ea3..94b14aa5b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -26,7 +26,6 @@ "bee-queue": "^1.7.1", "better-queue": "^3.8.12", "bluebird": "^3.7.2", - "body-parser": "^2.2.0", "bullmq": "^5.51.1", "chart.js": "^4.4.8", "cloudinary": "^2.6.0", @@ -4229,76 +4228,6 @@ "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==", "license": "MIT" }, - "node_modules/body-parser": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-2.2.0.tgz", - "integrity": "sha512-02qvAaxv8tp7fBa/mw1ga98OGm+eCbqzJOKoRt70sLmfEEi+jyBYVTDGfCL/k06/4EMk/z01gCe7HoCH/f2LTg==", - "license": "MIT", - "dependencies": { - "bytes": "^3.1.2", - "content-type": "^1.0.5", - "debug": "^4.4.0", - "http-errors": "^2.0.0", - "iconv-lite": "^0.6.3", - "on-finished": "^2.4.1", - "qs": "^6.14.0", - "raw-body": "^3.0.0", - "type-is": "^2.0.0" - }, - "engines": { - "node": ">=18" - } - }, - "node_modules/body-parser/node_modules/media-typer": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-1.1.0.tgz", - "integrity": "sha512-aisnrDP4GNe06UcKFnV5bfMNPBUw4jsLGaWwWfnH3v02GnBuXX2MCVn5RbrWo0j3pczUilYblq7fQ7Nw2t5XKw==", - "license": "MIT", - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/body-parser/node_modules/mime-types": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-3.0.1.tgz", - "integrity": "sha512-xRc4oEhT6eaBpU1XF7AjpOFD+xQmXNB5OVKwp4tqCuBpHLS/ZbBDrc07mYTDqVMg6PfxUjjNp85O6Cd2Z/5HWA==", - "license": "MIT", - "dependencies": { - "mime-db": "^1.54.0" - }, - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/body-parser/node_modules/qs": { - "version": "6.14.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.14.0.tgz", - "integrity": "sha512-YWWTjgABSKcvs/nWBi9PycY/JiPJqOD4JA6o9Sej2AtvSGarXxKC3OQSk4pAarbdQlKAh5D4FCQkJNkW+GAn3w==", - "license": "BSD-3-Clause", - "dependencies": { - "side-channel": "^1.1.0" - }, - "engines": { - "node": ">=0.6" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/body-parser/node_modules/type-is": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/type-is/-/type-is-2.0.1.tgz", - "integrity": "sha512-OZs6gsjF4vMp32qrCbiVSkrFmXtG/AZhY3t0iAMrMBiAZyV9oALtXO8hsrHbMXF9x6L3grlFuwW2oAz7cav+Gw==", - "license": "MIT", - "dependencies": { - "content-type": "^1.0.5", - "media-typer": "^1.1.0", - "mime-types": "^3.0.0" - }, - "engines": { - "node": ">= 0.6" - } - }, "node_modules/boolbase": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz", @@ -9950,21 +9879,6 @@ "node": ">= 0.6" } }, - "node_modules/raw-body": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-3.0.0.tgz", - "integrity": "sha512-RmkhL8CAyCRPXCE28MMH0z2PNWQBNk2Q09ZdxM9IOOXwxwZbN+qbWaatPkdkWIKL2ZVDImrN/pK5HTRz2PcS4g==", - "license": "MIT", - "dependencies": { - "bytes": "3.1.2", - "http-errors": "2.0.0", - "iconv-lite": "0.6.3", - "unpipe": "1.0.0" - }, - "engines": { - "node": ">= 0.8" - } - }, "node_modules/react-is": { "version": "16.13.1", "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", diff --git a/package.json b/package.json index 4385ef8b6..df3d73e8b 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,6 @@ "bee-queue": "^1.7.1", "better-queue": "^3.8.12", "bluebird": "^3.7.2", - "body-parser": "^2.2.0", "bullmq": "^5.51.1", "chart.js": "^4.4.8", "cloudinary": "^2.6.0", diff --git a/server.js b/server.js index 1333b1337..37b4ecdb2 100644 --- a/server.js +++ b/server.js @@ -4,19 +4,19 @@ require("dotenv").config({ path: path.resolve(process.cwd(), `.env.${process.env.NODE_ENV || "development"}`) }); -if (process.env.NODE_ENV) { - require("dd-trace").init({ - profiling: true, - env: process.env.NODE_ENV, - service: "bodyshop-api" - }); -} +// Commented out due to stability issues +// if (process.env.NODE_ENV) { +// require("dd-trace").init({ +// profiling: true, +// env: process.env.NODE_ENV, +// service: "bodyshop-api" +// }); +// } const cors = require("cors"); const http = require("http"); const Redis = require("ioredis"); const express = require("express"); -const bodyParser = require("body-parser"); const compression = require("compression"); const cookieParser = require("cookie-parser"); const { Server } = require("socket.io"); @@ -83,8 +83,8 @@ const SOCKETIO_CORS_ORIGIN_DEV = ["http://localhost:3333", "https://localhost:33 const applyMiddleware = ({ app }) => { app.use(compression()); app.use(cookieParser()); - app.use(bodyParser.json({ limit: "50mb" })); - app.use(bodyParser.urlencoded({ limit: "50mb", extended: true })); + app.use(express.json({ limit: "50mb" })); + app.use(express.urlencoded({ limit: "50mb", extended: true })); app.use(cors({ credentials: true, exposedHeaders: ["set-cookie"] })); // Helper middleware diff --git a/server/data/arms.js b/server/data/arms.js index 6dadc9364..cd86da6ae 100644 --- a/server/data/arms.js +++ b/server/data/arms.js @@ -68,7 +68,7 @@ exports.default = async (req, res) => { return; } - if (process.env.NODE_ENV === "PRODUCTION") { + if (process.env.NODE_ENV === "production") { res.sendStatus(200); return; }