freight-club 0.0.3 → 0.0.4

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.0.4
+
+- Check the content type before the status. 0.0.3 only checked a 200, so an HTML error page served at a 404 still reached `HttpError` and came back as `err.text`.
+
 ## 0.0.3
 
 - Refuse a 200 that is not JSON, naming the content type and the URL that answered. Error pages arrive with a 200, and a whole marketing page was once printed as the reason there were no freight quotes.

package/index.js

@@ -10,15 +10,15 @@ const HttpError = require('@stores.com/http-error');
  * @throws {HttpError} If the response status is not 200.
  */
 async function parseResponse(res) {
-    if (res.status !== 200) {
-        throw await HttpError.from(res);
-    }
-
-    // Error pages, WAF challenges and marketing sites all arrive with a 200, and res.json() on one throws a parse error naming a character offset
+    // Before the status, or HttpError puts a whole error page in err.text. Freight Club's own 401s declare no type and belong to HttpError.
     const contentType = res.headers.get('content-type');
 
-    if (!contentType?.includes('json')) {
-        throw new Error(`Freight Club answered ${res.url} with ${contentType || 'no content type'} rather than JSON.`);
+    if (contentType && !contentType.includes('json')) {
+        throw new Error(`Freight Club answered with ${contentType} rather than JSON.`);
+    }
+
+    if (res.status !== 200) {
+        throw await HttpError.from(res);
     }
 
     return await res.json();

package/package.json

@@ -32,5 +32,5 @@
         "test": "node --test --test-force-exit test",
         "test:only": "node --test --test-force-exit --test-only test"
     },
-    "version": "0.0.3"
+    "version": "0.0.4"
 }