Use content-type package, instead of purpose-defined parseContentType…

… method.
digitalbazaar · Feb 17, 2020 · 84abcd8 · 84abcd8
1 parent 157c318
commit 84abcd8
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 41 deletions.
diff --git a/lib/documentLoaders/node.js b/lib/documentLoaders/node.js
@@ -3,10 +3,11 @@
  */
 'use strict';
 
+const contentType = require ('content-type');
+
 const {
   parseLinkHeader,
-  buildHeaders,
-  parseContentTypeHeader
+  buildHeaders
 } = require('../util');
 const {LINK_HEADER_CONTEXT} = require('../constants');
 const JsonLdError = require('../JsonLdError');
@@ -88,14 +89,14 @@ module.exports = ({
     }
 
     const {res, body} = result;
-    const {contentType, params} = parseContentTypeHeader(res.headers['content-type']);
+    const {type, parameters} = contentType.parse(res);
 
     doc = {
       contextUrl: null,
       documentUrl: url,
       document: body || null,
-      contentType: contentType,
-      profile: params.profile
+      contentType: type,
+      profile: parameters.profile
     };
 
     // separate profile from content-type

diff --git a/lib/documentLoaders/xhr.js b/lib/documentLoaders/xhr.js
@@ -3,10 +3,11 @@
  */
 'use strict';
 
+const contentType = require ('content-type');
+
 const {
   parseLinkHeader,
-  buildHeaders,
-  parseContentTypeHeader
+  buildHeaders
 } = require('../util');
 const {LINK_HEADER_CONTEXT} = require('../constants');
 const JsonLdError = require('../JsonLdError');
@@ -75,15 +76,14 @@ module.exports = ({
         });
     }
 
-    const {contentType, params} =
-      parseContentTypeHeader(req.getResponseHeader('Content-Type'));
+    const {type, parameters} = contentType.parse(req);
 
     const doc = {
       contextUrl: null,
       documentUrl: url,
       document: req.response,
-      contentType: contentType,
-      profile: params.profile
+      contentType: type,
+      profile: parameters.profile
     };
     let alternate = null;
 

diff --git a/lib/jsonld.js b/lib/jsonld.js
@@ -34,6 +34,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 const canonize = require('rdf-canonize');
+const contentType = require ('content-type');
 const util = require('./util');
 const ContextResolver = require('./ContextResolver');
 const IdentifierIssuer = util.IdentifierIssuer;
@@ -900,6 +901,10 @@ jsonld.get = async function(url, options) {
         for(let i = 0; i < scripts.length; i++) {
           const script = scripts[i];
           // only application/ld+json
+          const {type, parameters} = contentType.parse(script.getAttribute('type'));
+          if(type !== 'application/ld+json') {
+            continue;
+          }
           if(!script.getAttribute('type').startsWith('application/ld+json')) {
             continue;
           }

diff --git a/lib/util.js b/lib/util.js
@@ -143,36 +143,6 @@ api.parseLinkHeader = header => {
   return rval;
 };
 
-/**
- * Parses a content-type header.
- * The results will be key'd by the value of "rel".
- *
- * Accept: application/ld+json
- *
- * Parses as: ["application/ld+json", {}]
- *
- * Accept: application/ld+json;profile=http://www.w3.org/ns/json-ld#context
- *
- * Parses as: ["application/ld+json",
- *             {profile: "http://www.w3.org/ns/json-ld#context"}]
- *
- * If there is more than one
- *
- * @param header the content-type header to parse.
- */
-api.parseContentTypeHeader = header => {
-  const [type, ...rest] = header.split(';');
-  const params = {};
-  const rval = [type.trim(), params];
-
-  // assign parameters
-  for(const paramString of rest) {
-    const [param, value] = paramString.split('=');
-    params[param.trim().toLowerCase()] = value.trim();
-  }
-  return rval;
-};
-
 /**
  * Throws an exception if the given value is not a valid @type value.
  *

diff --git a/package.json b/package.json
@@ -31,6 +31,7 @@
   ],
   "dependencies": {
     "canonicalize": "^1.0.1",
+    "content-type": "^1.0.4",
     "lru-cache": "^5.1.1",
     "rdf-canonize": "^1.0.2",
     "request": "^2.88.0",