소스 검색

@uppy/companion: remove dependency on `express-request-id` (#5176)

Antoine du Hamel 11 달 전
부모
커밋
5d5dab12ca
3개의 변경된 파일8개의 추가작업 그리고 13개의 파일을 삭제
  1. 0 1
      packages/@uppy/companion/package.json
  2. 8 2
      packages/@uppy/companion/src/standalone/index.js
  3. 0 10
      yarn.lock

+ 0 - 1
packages/@uppy/companion/package.json

@@ -45,7 +45,6 @@
     "express": "4.19.2",
     "express-interceptor": "1.2.0",
     "express-prom-bundle": "7.0.0",
-    "express-request-id": "1.4.1",
     "express-session": "1.17.3",
     "got": "^13.0.0",
     "grant": "5.4.22",

+ 8 - 2
packages/@uppy/companion/src/standalone/index.js

@@ -1,10 +1,10 @@
 const express = require('express')
 const qs = require('node:querystring')
+const { randomUUID } = require('node:crypto')
 const helmet = require('helmet')
 const morgan = require('morgan')
 const { URL } = require('node:url')
 const session = require('express-session')
-const addRequestId = require('express-request-id')()
 const RedisStore = require('connect-redis').default
 
 const logger = require('../server/logger')
@@ -71,7 +71,13 @@ module.exports = function server(inputCompanionOptions) {
     return { query, censored }
   }
 
-  router.use(addRequestId)
+  router.use((request, response, next) => {
+    const headerName = 'X-Request-Id'
+		const oldValue = request.get(headerName);
+    response.set(headerName, oldValue ?? randomUUID());
+
+		next();
+	})
   // log server requests.
   router.use(morgan('combined'))
   morgan.token('url', (req) => {

+ 0 - 10
yarn.lock

@@ -8902,7 +8902,6 @@ __metadata:
     express: "npm:4.19.2"
     express-interceptor: "npm:1.2.0"
     express-prom-bundle: "npm:7.0.0"
-    express-request-id: "npm:1.4.1"
     express-session: "npm:1.17.3"
     got: "npm:^13.0.0"
     grant: "npm:5.4.22"
@@ -15512,15 +15511,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"express-request-id@npm:1.4.1":
-  version: 1.4.1
-  resolution: "express-request-id@npm:1.4.1"
-  dependencies:
-    uuid: "npm:^3.3.2"
-  checksum: 10/32ca1fcaf5701f7348b6726720966c3a8c15228d52f79dbd4c4c54add0088f4debeedec3fd109024bb0577bdafe72d64a85bb28fb1e6c8e10473157e11652fae
-  languageName: node
-  linkType: hard
-
 "express-session@npm:1.17.3":
   version: 1.17.3
   resolution: "express-session@npm:1.17.3"