@unavatar/core 3.46.3 → 3.46.4

package/package.json

@@ -2,7 +2,7 @@
   "name": "@unavatar/core",
   "description": "Get unified user avatar from social networks, including Instagram, SoundCloud, Telegram, Twitter, YouTube & more.",
   "homepage": "https://unavatar.io",
-  "version": "3.46.3",
+  "version": "3.46.4",
   "main": "src/index.js",
   "exports": {
     ".": "./src/index.js",
@@ -127,7 +127,7 @@
     "@keyvhq/redis": "~2.2.3",
     "@metascraper/helpers": "~5.53.0",
     "@microlink/mql": "~0.17.0",
-    "@microlink/ping-url": "~1.4.16",
+    "@microlink/ping-url": "~1.5.0",
     "bimi-url": "~1.0.0",
     "browserless": "~13.6.0",
     "cacheable-lookup": "~6.1.0",

package/src/util/reachable-url.js

@@ -2,6 +2,8 @@
 
 const createPingUrl = require('@microlink/ping-url')
 
+const isRedirectStatus = statusCode => statusCode >= 300 && statusCode < 400
+
 module.exports = ({ got, pingCache }) => {
   const pingUrl = createPingUrl(pingCache, {
     value: ({ url, statusCode }) => ({ url, statusCode })
@@ -11,7 +13,17 @@ module.exports = ({ got, pingCache }) => {
     const context = {}
     const response = await pingUrl(url, { ...got.gotOpts, ...opts, context })
     const { reservedAddress } = context
-    return reservedAddress ? { ...response, reservedAddress } : response
+
+    // reachable-url leaves the redirect hop as the status when a beforeRedirect
+    // hook aborts, and the ping cache only memoizes {url, statusCode} — so a
+    // later hit would replay that hop without the reserved-address refusal.
+    const statusCode = isRedirectStatus(response.statusCode)
+      ? 404
+      : response.statusCode
+
+    if (reservedAddress) return { ...response, statusCode, reservedAddress }
+    if (statusCode === response.statusCode) return response
+    return { ...response, statusCode }
   }
 
   reachableUrl.isReachable = createPingUrl.isReachable