reachable-url 2.1.2 → 2.1.4

package/README.md

@@ -65,13 +65,7 @@ const response = await reachableUrl('https://example.com/video.mp4', { cache })
 response.body // => the whole entity, so it can be cached
 ```
 
-`cache` needs [@kikobeats/cacheable-request](https://github.com/Kikobeats/cacheable-request): the version [got](https://github.com/sindresorhus/got) pulls in never settles when the origin keeps the connection alive, and no timeout recovers from it. Declare the override, otherwise passing `cache` throws:
-
-```yaml
-# pnpm-workspace.yaml
-overrides:
-  got>cacheable-request: npm:@kikobeats/cacheable-request
-```
+`cache` needs [@kikobeats/cacheable-request](https://github.com/Kikobeats/cacheable-request): upstream [cacheable-request](https://github.com/jaredwray/cacheable/tree/main/packages/cacheable-request) never settles when the origin keeps the connection alive, and no timeout recovers from it. [@kikobeats/got](https://github.com/Kikobeats/got) depends on the fork since 11.8.9, so it works without any configuration. If something in your dependency tree still resolves the upstream package, passing `cache` throws instead of hanging.
 
 #### returns
 
@@ -79,7 +73,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

@@ -4,7 +4,7 @@ const { URL } = require('url')
 
 const RANGE_LENGTH = 1
 
-const got = require('got').extend({
+const got = require('@kikobeats/got').extend({
   decompress: false,
   responseType: 'buffer',
   retry: 1,
@@ -30,15 +30,14 @@ const toResponse = response => ({
 
 const CACHE_ERROR = `The \`cache\` option needs @kikobeats/cacheable-request.
 
-got resolved the unpatched cacheable-request@7, which never settles when the
-origin keeps the connection alive, and no timeout recovers from it. Add the
-override to your pnpm-workspace.yaml:
-
-  overrides:
-    got>cacheable-request: npm:@kikobeats/cacheable-request`
+@kikobeats/got resolved the unpatched cacheable-request@7, which never settles
+when the origin keeps the connection alive, and no timeout recovers from it.
+Upgrade @kikobeats/got to 11.8.9 or later, which depends on the patched fork.`
 
 const loadCacheableRequestManifest = () =>
-  require(require.resolve('cacheable-request/package.json', { paths: [require.resolve('got')] }))
+  require(require.resolve('cacheable-request/package.json', {
+    paths: [require.resolve('@kikobeats/got')]
+  }))
 
 // The override is an alias, which keeps the real package name, so the manifest says
 // which one got resolved. Only a positive match rejects: the lookup can legitimately
@@ -138,15 +137,17 @@ const reachableUrl = async (url, { maxBody = 0, ...opts } = {}) => {
 
   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
       }
     }
@@ -173,3 +174,4 @@ module.exports = async (url, opts) => {
 
 module.exports.isReachable = isReachable
 module.exports.assertCacheSupport = assertCacheSupport
+module.exports.loadCacheableRequestManifest = loadCacheableRequestManifest

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.2",
+  "version": "2.1.4",
   "main": "index.js",
   "author": {
     "email": "josefrancisco.verdu@gmail.com",
@@ -30,7 +30,7 @@
     "url"
   ],
   "dependencies": {
-    "got": "~11.8.0"
+    "@kikobeats/got": "~11.8.9"
   },
   "devDependencies": {
     "@commitlint/cli": "latest",