@unavatar/core 3.7.68 → 3.7.70

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

package/src/providers/index.js

@@ -15,6 +15,7 @@ const providersBy = {
     'onlyfans',
     'openstreetmap',
     'patreon',
+    'printables',
     'reddit',
     'soundcloud',
     'spotify',
@@ -47,6 +48,7 @@ module.exports = ctx => {
     onlyfans: require('./onlyfans')(ctx),
     openstreetmap: require('./openstreetmap')(ctx),
     patreon: require('./patreon')(ctx),
+    printables: require('./printables')(ctx),
     reddit: require('./reddit')(ctx),
     soundcloud: require('./soundcloud')(ctx),
     spotify: require('./spotify')(ctx),

package/src/providers/instagram.js

@@ -2,10 +2,12 @@
 
 const randomCrawlerAgent = require('../util/crawler-agent')
 
+const isBlocked = $ => $('title').text().includes('Login')
+
 module.exports = ({ createHtmlProvider, getOgImage }) =>
   createHtmlProvider({
     name: 'instagram',
     url: input => `https://www.instagram.com/${input}`,
-    getter: getOgImage,
+    getter: $ => !isBlocked($) && getOgImage($),
     htmlOpts: () => ({ headers: { 'user-agent': randomCrawlerAgent() } })
   })

package/src/providers/printables.js

@@ -0,0 +1,14 @@
+'use strict'
+
+const randomCrawlerAgent = require('../util/crawler-agent')
+
+module.exports = ({ createHtmlProvider, getOgImage }) =>
+  createHtmlProvider({
+    name: 'printables',
+    url: input =>
+      `https://www.printables.com/${
+        input.startsWith('@') ? input : `@${input}`
+      }`,
+    getter: getOgImage,
+    htmlOpts: () => ({ headers: { 'user-agent': randomCrawlerAgent() } })
+  })

package/src/util/html-provider.js

@@ -18,9 +18,23 @@ const createEmptyProviderValueError = ({ provider, statusCode }) =>
     message: 'Empty value returned by the provider.'
   })
 
-const getOgImage = $ => $('meta[property="og:image"]').attr('content')
+
+const getOgImage = $ =>
+  $('meta[property="og:image"]').attr('content') ||
+  $('meta[name="og:image"]').attr('content')
 
 module.exports = ({ PROXY_TIMEOUT, getHTML, onFetchHTML }) => {
+  /**
+   * @param {object} opts
+   * @param {string} opts.name - Provider identifier used in logs and metrics.
+   * @param {(input: string) => string | Promise<string>} opts.url - Builds the URL to fetch for a given input.
+   * @param {($: cheerio.CheerioAPI) => string | false | undefined} opts.getter
+   *   Extracts the avatar URL from the fetched HTML.
+   *   - `string`    — avatar URL found (success).
+   *   - `undefined`  — avatar not found (normal failure, no retry).
+   *   - `false`     — page is blocked; error.blocked will be set to true.
+   * @param {() => object} [opts.htmlOpts] - Returns extra options merged into the fetch call.
+   */
   const createHtmlProvider = ({ name, url, getter, htmlOpts }) => {
     const provider = async function ({ input, req = {}, res = {} }) {
       const providerUrl = await url(input)
@@ -57,8 +71,9 @@ module.exports = ({ PROXY_TIMEOUT, getHTML, onFetchHTML }) => {
             statusCode
           })
           error.html = attempt.lastHtml
+          if (result === false) error.blocked = true
 
-          log.error({ statusCode })
+          log.error({ statusCode, status: result === false ? 'blocked' : undefined })
 
           throw error
         }