@unavatar/core 3.25.4 → 3.25.6

package/README.md

@@ -319,8 +319,7 @@ If explicit type is not provided, it defaults to `id`.
 
 Available inputs:
 
-- `id` (default): [unavatar.io/apple-store/id:529479190](https://unavatar.io/apple-store/id:529479190)
-- `id`: [unavatar.io/apple-store/id:6474323148@es](https://unavatar.io/apple-store/id:6474323148@es)
+- `id` (default): [unavatar.io/apple-store/id:529479190](https://unavatar.io/apple-store/id:529479190) or [unavatar.io/apple-store/id:6474323148@es](https://unavatar.io/apple-store/id:6474323148@es)
 - `name`: [unavatar.io/apple-store/name:pokemon%20go](https://unavatar.io/apple-store/name:pokemon%20go)
 
 ### Behance

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.25.4",
+  "version": "3.25.6",
   "main": "src/index.js",
   "exports": {
     ".": "./src/index.js",
@@ -206,6 +206,7 @@
   },
   "nano-staged": {
     "*.js": [
+      "npx -y @kikobeats/prettier-standard",
       "standard --fix"
     ],
     "package.json": [

package/src/index.js

@@ -2,7 +2,12 @@
 
 const DEFAULTS = require('./constant')
 
-module.exports = ({ constants: userConstants, redis, onFetchHTML } = {}) => {
+module.exports = ({
+  constants: userConstants,
+  redis,
+  onFetchHTML,
+  userAgent
+} = {}) => {
   const constants = { ...DEFAULTS, ...userConstants }
 
   if (userConstants?.REQUEST_TIMEOUT && !userConstants?.PROXY_TIMEOUT) {
@@ -33,7 +38,8 @@ module.exports = ({ constants: userConstants, redis, onFetchHTML } = {}) => {
     require('./util/html-provider')({
       ...constants,
       getHTML,
-      onFetchHTML
+      onFetchHTML,
+      userAgent
     })
 
   const providerCtx = {
@@ -61,7 +67,8 @@ module.exports = ({ constants: userConstants, redis, onFetchHTML } = {}) => {
     unavatar[name] = input => getAvatar(providers[name], name, input, {})
   })
 
-  const createTypedAutoResolver = inputType => input => auto(inputType)(input, {})
+  const createTypedAutoResolver = inputType => input =>
+    auto(inputType)(input, {})
 
   unavatar.email = createTypedAutoResolver('email')
   unavatar.domain = createTypedAutoResolver('domain')

package/src/util/html-provider.js

@@ -4,7 +4,6 @@ const { normalizeUrl } = require('@metascraper/helpers')
 const debug = require('debug-logfmt')('html-provider')
 const isAntibot = require('is-antibot')
 
-const randomCrawlerAgent = require('./crawler-agent')
 const getOgImage = require('./get-og-image')
 const httpStatus = require('./http-status')
 const ExtendableError = require('./error')
@@ -34,7 +33,12 @@ const createErrorCause = ({ html, headers, statusCode }) => ({
   statusCode
 })
 
-module.exports = ({ PROXY_TIMEOUT, getHTML, onFetchHTML }) => {
+module.exports = ({
+  PROXY_TIMEOUT,
+  getHTML,
+  onFetchHTML,
+  userAgent = require('./crawler-agent')
+}) => {
   /**
    * @param {object} opts
    * @param {string} opts.name - Provider identifier used in logs and metrics.
@@ -55,13 +59,13 @@ module.exports = ({ PROXY_TIMEOUT, getHTML, onFetchHTML }) => {
         const defaultOpts = {
           ...providerOpts,
           headers: {
-            'user-agent': randomCrawlerAgent(),
+            'user-agent': userAgent({ provider: name }),
             ...providerOpts.headers
           },
           timeout: PROXY_TIMEOUT
         }
         const fetchOpts = { ...defaultOpts, ...gotOpts }
-        const userAgent = fetchOpts.headers['user-agent']
+        const resolvedUserAgent = fetchOpts.headers['user-agent']
         const tier = fetchOpts.tier ?? 'origin'
 
         const log = debug.duration({ provider: name, input, providerUrl, tier })
@@ -151,7 +155,7 @@ module.exports = ({ PROXY_TIMEOUT, getHTML, onFetchHTML }) => {
             statusCode,
             status: 'blocked',
             antibot: antibotProvider ?? undefined,
-            userAgent
+            userAgent: resolvedUserAgent
           })
 
           throw error
@@ -167,7 +171,7 @@ module.exports = ({ PROXY_TIMEOUT, getHTML, onFetchHTML }) => {
         log.error({
           statusCode,
           antibot: antibotProvider ?? undefined,
-          userAgent
+          userAgent: resolvedUserAgent
         })
 
         throw error