improve: dont cache unnecessary content types (#4134)

fastify · Jul 12, 2022 · ed4f4c1 · ed4f4c1
1 parent d6e06c7
commit ed4f4c1
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 2 deletions.
diff --git a/lib/contentTypeParser.js b/lib/contentTypeParser.js
@@ -92,10 +92,18 @@ ContentTypeParser.prototype.existingParser = function (contentType) {
 }
 
 ContentTypeParser.prototype.getParser = function (contentType) {
+  if (contentType in this.customParsers) {
+    return this.customParsers[contentType]
+  }
+
+  if (this.cache.has(contentType)) {
+    return this.cache.get(contentType)
+  }
+
   // eslint-disable-next-line no-var
   for (var i = 0; i !== this.parserList.length; ++i) {
     const parserName = this.parserList[i]
-    if (contentType.indexOf(parserName) > -1) {
+    if (contentType.indexOf(parserName) !== -1) {
       const parser = this.customParsers[parserName]
       this.cache.set(contentType, parser)
       return parser
@@ -137,7 +145,7 @@ ContentTypeParser.prototype.remove = function (contentType) {
 }
 
 ContentTypeParser.prototype.run = function (contentType, handler, request, reply) {
-  const parser = this.cache.get(contentType) || this.getParser(contentType)
+  const parser = this.getParser(contentType)
   const resource = new AsyncResource('content-type-parser:run', request)
 
   if (parser === undefined) {

diff --git a/test/content-parser.test.js b/test/content-parser.test.js
@@ -58,6 +58,21 @@ test('getParser', t => {
     t.equal(fastify[keys.kContentTypeParser].getParser('text/html').fn, third)
   })
 
+  test('should return matching parser with caching', t => {
+    t.plan(6)
+
+    const fastify = Fastify()
+
+    fastify.addContentTypeParser('text/html', first)
+
+    t.equal(fastify[keys.kContentTypeParser].getParser('text/html').fn, first)
+    t.equal(fastify[keys.kContentTypeParser].cache.size, 0)
+    t.equal(fastify[keys.kContentTypeParser].getParser('text/html ').fn, first)
+    t.equal(fastify[keys.kContentTypeParser].cache.size, 1)
+    t.equal(fastify[keys.kContentTypeParser].getParser('text/html ').fn, first)
+    t.equal(fastify[keys.kContentTypeParser].cache.size, 1)
+  })
+
   test('should prefer content type parser with string value', t => {
     t.plan(2)