reachable-url 2.1.1 → 2.1.3

package/README.md

@@ -79,7 +79,7 @@ The [got response](https://github.com/sindresorhus/got#response), plus `requestU
 
 By default the request asks for a single byte (`Range: bytes=0-0`, which [`maxBody`](#maxbody) drops when it wants more). When a server ignores that and starts sending the whole entity, the download is cancelled: the status and headers already say whether the URL is reachable, so `body` is `undefined` on those responses unless [`maxBody`](#maxbody) asked for some of it.
 
-A `206` that did answer the range is reported as the `200` it stands for, with `content-length` taken from `content-range`.
+A `206` that did answer the range is reported as the `200` it stands for, with `content-length` taken from a numeric `content-range` total. An unknown total (`bytes 0-0/*`) is left as a `206`.
 
 ### reachableUrl.isReachable(response)
 

package/index.js

@@ -126,27 +126,29 @@ const reachableUrl = async (url, { maxBody = 0, ...opts } = {}) => {
     redirectStatusCodes.push(res.statusCode)
   })
 
+  // An `afterResponse` retry resolves with the final response without emitting
+  // another outer `response` event, so the promise result supersedes the
+  // listener's. The error carries one when nothing else did, as MaxRedirects does.
   let errorResponse
   try {
-    await req
+    response = await req
   } catch (error) {
     errorResponse = error.response
   }
 
-  // A retried or cancelled request settles with the attempt before it, whose body
-  // is not this response's, so a response we saw outranks the error's. The error
-  // still carries one when nothing else did, as MaxRedirects does.
   const resolvedResponse = toResponse(response ?? errorResponse)
 
+  // A satisfied range stands for the whole entity only when the total size is
+  // known. `bytes 0-0/*` (or any non-numeric total) must not become
+  // `content-length: *`, which is not a length and replaces a valid partial one.
   if (resolvedResponse.statusCode === 206) {
     const contentRange = resolvedResponse.headers['content-range']
     if (typeof contentRange === 'string') {
-      let contentLength = contentRange.split('/')
-      if (contentLength.length > 1) {
-        contentLength = contentLength[contentLength.length - 1]
+      const total = contentRange.split('/').pop()
+      if (/^\d+$/.test(total)) {
         resolvedResponse.statusCode = 200
         resolvedResponse.statusMessage = 'OK'
-        resolvedResponse.headers['content-length'] = contentLength
+        resolvedResponse.headers['content-length'] = total
         resolvedResponse.headers['content-range'] = undefined
       }
     }

package/package.json

@@ -2,7 +2,7 @@
   "name": "reachable-url",
   "description": "Resolve a URL as fast as possible and report whether the destination is reachable over HTTP.",
   "homepage": "https://github.com/Kikobeats/reachable-url",
-  "version": "2.1.1",
+  "version": "2.1.3",
   "main": "index.js",
   "author": {
     "email": "josefrancisco.verdu@gmail.com",