Get content type from request (#516)

Author: drwpow

bin/loaders/index.js

@@ -9,8 +9,7 @@ async function load(pathToSpec, { auth }) {
   // option 1: remote URL
   if (/^https?:\/\//.test(pathToSpec)) {
     try {
-      const rawSpec = await loadFromHttp(pathToSpec, { auth });
-      return rawSpec;
+      return loadFromHttp(pathToSpec, { auth });
     } catch (e) {
       if (e.code === "ENOTFOUND") {
         throw new Error(
@@ -22,35 +21,48 @@ async function load(pathToSpec, { auth }) {
   }
 
   // option 2: local file
-  return loadFromFs(pathToSpec);
+  return {
+    body: loadFromFs(pathToSpec),
+    contentType: mime.getType(pathToSpec),
+  };
 }
 
 async function loadSpec(pathToSpec, { auth, log = true }) {
   if (log === true) {
     console.log(yellow(`🔭 Loading spec from ${bold(pathToSpec)}…`)); // only log if not writing to stdout
   }
 
-  const contentType = mime.getType(pathToSpec);
-  const rawSpec = await load(pathToSpec, { auth });
+  const { body, contentType } = await load(pathToSpec, { auth });
 
   switch (contentType) {
+    case "application/openapi+yaml":
     case "text/yaml": {
       try {
-        return yaml.load(rawSpec);
+        return yaml.load(body);
       } catch (err) {
         throw new Error(`YAML: ${err.toString()}`);
       }
     }
     case "application/json":
-    case "application/json5": {
+    case "application/json5":
+    case "application/openapi+json": {
       try {
-        return JSON.parse(rawSpec);
+        return JSON.parse(body);
       } catch (err) {
         throw new Error(`JSON: ${err.toString()}`);
       }
     }
     default: {
-      throw new Error(`Unknown format${contentType ? `: "${contentType}"` : ""}. Only YAML or JSON supported.`);
+      try {
+        return JSON.parse(body); // unknown attempt 1: JSON
+      } catch (err1) {
+        try {
+          return yaml.load(body); // unknown attempt 2: YAML
+        } catch (err2) {
+          // give up: unknown type
+          throw new Error(`Unknown format${contentType ? `: "${contentType}"` : ""}. Only YAML or JSON supported.`);
+        }
+      }
     }
   }
 }

bin/loaders/loadFromHttp.js

@@ -23,7 +23,10 @@ function fetch(url, opts, { redirectCount = 0 } = {}) {
       res.on("end", () => {
         // 2xx: OK
         if (res.statusCode >= 200 && res.statusCode < 300) {
-          return resolve(rawData);
+          return resolve({
+            body: rawData,
+            contentType: res.headers["content-type"].split(";")[0].trim(),
+          });
         }
 
         // 3xx: follow redirect (if given)