@unavatar/core 3.7.50 → 3.7.52

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.7.50",
+  "version": "3.7.52",
   "main": "src/index.js",
   "exports": {
     ".": "./src/index.js",

package/src/avatar/auto.js

@@ -23,6 +23,12 @@ const getInputType = input => {
 
 const factory = ({ constants, providers, providersBy, reachableUrl }) => {
   const { REQUEST_TIMEOUT } = constants
+  const providerEntriesByType = Object.fromEntries(
+    Object.entries(providersBy).map(([inputType, providerNames]) => [
+      inputType,
+      providerNames.map(provider => [provider, providers[provider]])
+    ])
+  )
 
   const getAvatarContent = provider => async output => {
     if (typeof output !== 'string' || output === '') {
@@ -78,10 +84,14 @@ const factory = ({ constants, providers, providersBy, reachableUrl }) => {
   }
 
   const resolveAutoByType = async (inputType, args) => {
-    const collection = providersBy[inputType]
-    const promises = collection.map(provider =>
-      pTimeout(getAvatar(providers[provider], provider, args), REQUEST_TIMEOUT)
-    )
+    const collection = providerEntriesByType[inputType]
+    const promises = new Array(collection.length)
+
+    for (let index = 0; index < collection.length; index++) {
+      const [provider, fn] = collection[index]
+      promises[index] = getAvatar(fn, provider, args)
+    }
+
     return pAny(promises)
   }
 

package/src/util/got.js

@@ -5,15 +5,25 @@ const tlsHook = require('https-tls/hook')
 const uaHints = require('ua-hints')
 const got = require('got')
 
-const randomUserAgent = uniqueRandomArray(require('top-user-agents'))
+const topUserAgents = require('top-user-agents')
+const randomUserAgent = uniqueRandomArray(topUserAgents)
+const precomputedUaHints = new Map(topUserAgents.map(userAgent => [userAgent, uaHints(userAgent)]))
+
+const getUaHints = userAgent => {
+  const precomputed = precomputedUaHints.get(userAgent)
+  if (precomputed !== undefined) return precomputed
+
+  return uaHints(userAgent)
+}
 
 const userAgentHook = options => {
-  if (options.headers['user-agent'] === 'got (https://github.com/sindresorhus/got)') {
-    const userAgent = randomUserAgent()
+  let userAgent = options.headers['user-agent']
+  if (userAgent === 'got (https://github.com/sindresorhus/got)') {
+    userAgent = randomUserAgent()
     options.headers['user-agent'] = userAgent
   }
 
-  for (const [key, value] of Object.entries(uaHints(options.headers['user-agent']))) {
+  for (const [key, value] of Object.entries(getUaHints(userAgent))) {
     options.headers[key] = value
   }
 }