@unavatar/core 3.47.0 → 3.48.1

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.47.0",
+  "version": "3.48.1",
   "main": "src/index.js",
   "exports": {
     ".": "./src/index.js",
@@ -144,7 +144,7 @@
     "ms": "~2.1.3",
     "p-any": "~3.0.0",
     "p-timeout": "~4.1.0",
-    "puppeteer": "~25.8.0",
+    "puppeteer": "~25.9.0",
     "re2": "~1.26.0",
     "srcset": "~4.0.0",
     "stable-regex": "~1.0.1",

package/src/providers/bluesky.js

@@ -1,10 +1,25 @@
 'use strict'
 
-const { $jsonld } = require('@metascraper/helpers')
-
-module.exports = ({ createHtmlProvider }) =>
-  createHtmlProvider({
-    name: 'bluesky',
-    url: input => `https://bsky.app/profile/${input}`,
-    getter: $ => $jsonld('mainEntity.image')($)
-  })
+const API_URL = 'https://public.api.bsky.app/xrpc/app.bsky.actor.getProfile'
+
+const getAvatarUrl = input => `${API_URL}?actor=${encodeURIComponent(input)}`
+
+const getAvatar = body => {
+  const pic = body?.avatar
+  return typeof pic === 'string' && pic ? pic : undefined
+}
+
+module.exports = ({ got }) =>
+  async function bluesky (input) {
+    const { body, statusCode } = await got(getAvatarUrl(input), {
+      responseType: 'json',
+      throwHttpErrors: false
+    })
+
+    if (statusCode >= 400) return
+
+    return getAvatar(body)
+  }
+
+module.exports.getAvatarUrl = getAvatarUrl
+module.exports.getAvatar = getAvatar

package/src/providers/deezer.js

@@ -1,32 +1,44 @@
 'use strict'
 
+const API_URL = 'https://api.deezer.com'
+
 // Entities without artwork keep an empty image hash
 // (cdn-images.dzcdn.net/images/artist//500x500.jpg), which resolves to a
 // generic placeholder, so any empty hash segment is treated as a miss.
 const isArtwork = url => !/\/images\/[^/]+\/\/\d/.test(url)
 
-const getAvatarUrl = input => {
+const parseInput = input => {
   const [first, second] = input.split(':')
-  const type = second ? first : 'artist'
-  const id = second ?? first
-  return `https://www.deezer.com/en/${type}/${id}`
+  return {
+    type: second ? first : 'artist',
+    id: second ?? first
+  }
 }
 
-// Deezer server-renders og:image for missing entities as well, so the empty
-// placeholder is filtered out and everything else is returned as-is.
-const getAvatar = ({ $, getOgImage, NOT_FOUND }) => {
-  const image = getOgImage($)
-  return image && isArtwork(image) ? image : NOT_FOUND
+const getAvatarUrl = input => {
+  const { type, id } = parseInput(input)
+  return `${API_URL}/${encodeURIComponent(type)}/${encodeURIComponent(id)}`
 }
 
-const factory = ({ createHtmlProvider, getOgImage, NOT_FOUND }) =>
-  createHtmlProvider({
-    name: 'deezer',
-    url: getAvatarUrl,
-    getter: $ => getAvatar({ $, getOgImage, NOT_FOUND })
-  })
+const getAvatar = body => {
+  if (body?.error) return
+
+  const pic = body?.picture_xl || body?.cover_xl || body?.album?.cover_xl
+  return typeof pic === 'string' && pic && isArtwork(pic) ? pic : undefined
+}
+
+module.exports = ({ got }) =>
+  async function deezer (input) {
+    const { body, statusCode } = await got(getAvatarUrl(input), {
+      responseType: 'json',
+      throwHttpErrors: false
+    })
+
+    if (statusCode >= 400) return
 
-factory.getAvatarUrl = getAvatarUrl
-factory.getAvatar = getAvatar
+    return getAvatar(body)
+  }
 
-module.exports = factory
+module.exports.parseInput = parseInput
+module.exports.getAvatarUrl = getAvatarUrl
+module.exports.getAvatar = getAvatar

package/src/providers/gitlab.js

@@ -1,8 +1,43 @@
 'use strict'
 
-module.exports = ({ createHtmlProvider, getOgImage }) =>
-  createHtmlProvider({
-    name: 'gitlab',
-    url: input => `https://gitlab.com/${input}`,
-    getter: getOgImage
+const GITLAB_API_URL = 'https://gitlab.com/api/v4'
+
+const getUserAvatarUrl = input =>
+  `${GITLAB_API_URL}/users?username=${encodeURIComponent(input)}`
+
+const getGroupAvatarUrl = input =>
+  `${GITLAB_API_URL}/groups/${encodeURIComponent(input)}`
+
+const getAvatar = body => {
+  const pic = Array.isArray(body) ? body[0]?.avatar_url : body?.avatar_url
+  return typeof pic === 'string' && pic ? pic : undefined
+}
+
+const fetchAvatarUrl = async ({ got, url }) => {
+  const { statusCode, body } = await got(url, {
+    responseType: 'json',
+    throwHttpErrors: false
   })
+
+  if (statusCode >= 400) return
+
+  return getAvatar(body)
+}
+
+module.exports = ({ got }) =>
+  async function gitlab (input) {
+    const userAvatarUrl = await fetchAvatarUrl({
+      got,
+      url: getUserAvatarUrl(input)
+    })
+    if (userAvatarUrl) return userAvatarUrl
+
+    return fetchAvatarUrl({
+      got,
+      url: getGroupAvatarUrl(input)
+    })
+  }
+
+module.exports.getUserAvatarUrl = getUserAvatarUrl
+module.exports.getGroupAvatarUrl = getGroupAvatarUrl
+module.exports.getAvatar = getAvatar