@unavatar/core 0.0.8 → 3.7.49

package/LICENSE.md

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright © 2018 Kiko Beats <josefrancisco.verdu@gmail.com> (kikobeats.com)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

package/README.md

@@ -55,7 +55,7 @@ It's proudly powered by [microlink.io](https://microlink.io), the headless brows
 
 The service is exposed in **unavatar.io** via provider endpoints:
 
-- an **email**: [unavatar.io/gravatar/sindresorhus@gmail.com](https://unavatar.io/gravatar/sindresorhus@gmail.com)
+- an **email**: [unavatar.io/gravatar/hello@microlink.io](https://unavatar.io/gravatar/hello@microlink.io)
 - an **username**: [unavatar.io/github/kikobeats](https://unavatar.io/github/kikobeats)
 - a **domain**: [unavatar.io/google/reddit.com](https://unavatar.io/google/reddit.com)
 
@@ -215,7 +215,7 @@ e.g., [unavatar.io/google/netflix.com](https://unavatar.io/google/netflix.com)
 
 It resolves user avatar against **gravatar.com**.
 
-e.g., [unavatar.io/gravatar/sindresorhus@gmail.com](https://unavatar.io/gravatar/sindresorhus@gmail.com)
+e.g., [unavatar.io/gravatar/hello@microlink.io](https://unavatar.io/gravatar/hello@microlink.io)
 
 ### Instagram
 

package/bin/index.js

@@ -15,7 +15,7 @@ module.exports = ({ baseUrl }) => {
   if (!input) {
     console.error('Usage: unavatar <input> | unavatar <provider>/<key> | unavatar ping')
     console.error(
-      'Examples: unavatar reddit.com | unavatar sindresorhus@gmail.com | unavatar x/kikobeats | unavatar ping'
+      'Examples: unavatar reddit.com | unavatar hello@microlink.io | unavatar x/kikobeats | unavatar ping'
     )
     process.exit(1)
   }
@@ -44,7 +44,7 @@ module.exports = ({ baseUrl }) => {
           if (!provider || !key) {
             console.error('Invalid input format. Expected: <input>, <provider>/<key>, or "ping"')
             console.error(
-              'Examples: unavatar reddit.com | unavatar sindresorhus@gmail.com | unavatar x/kikobeats | unavatar ping'
+              'Examples: unavatar reddit.com | unavatar hello@microlink.io | unavatar x/kikobeats | unavatar ping'
             )
             process.exit(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": "0.0.8",
+  "version": "3.7.49",
   "main": "src/index.js",
   "exports": {
     ".": "./src/index.js",
@@ -66,6 +66,10 @@
       "name": "Jahir Fiquitiva",
       "email": "jahir.fiquitiva@gmail.com"
     },
+    {
+      "name": "Joseba Legarreta",
+      "email": "josebalega@gmail.com"
+    },
     {
       "name": "Mads Hougesen",
       "email": "mads@mhouge.dk"
@@ -103,18 +107,16 @@
     "youtube"
   ],
   "dependencies": {
-    "@keyvhq/compress": "~2.1.15",
+    "@keyvhq/compress": "~2.2.0",
     "@keyvhq/core": "~2.1.15",
     "@keyvhq/memoize": "~2.1.16",
     "@keyvhq/multi": "~2.1.15",
     "@keyvhq/redis": "~2.1.15",
-    "@kikobeats/got-scraping": "~4.2.0",
     "@metascraper/helpers": "~5.49.24",
     "@microlink/mql": "~0.14.2",
     "@microlink/ping-url": "~1.4.16",
-    "browserless": "~10.10.0",
+    "browserless": "~10.12.0",
     "cacheable-lookup": "~6.1.0",
-    "cheerio": "~1.2.0",
     "data-uri-regex": "~0.1.4",
     "debug-logfmt": "~1.4.7",
     "got": "~11.8.6",
@@ -128,33 +130,36 @@
     "p-cancelable": "2.1.1",
     "p-timeout": "~4.1.0",
     "puppeteer": "~24.37.5",
+    "re2": "~1.23.3",
     "srcset": "~4.0.0",
+    "stable-regex": "~1.0.0",
     "tangerine": "~2.0.2",
     "top-crawler-agents": "~1.0.34",
     "top-user-agents": "~2.1.95",
     "ua-hints": "~1.0.1",
     "unique-random-array": "~2.0.0",
-    "url-regex": "~5.0.0"
+    "url-regex-safe": "~4.0.0"
   },
   "devDependencies": {
-    "mri": "latest",
-    "term-img": "latest",
     "@commitlint/cli": "latest",
     "@commitlint/config-conventional": "latest",
     "@ksmithut/prettier-standard": "latest",
     "ava": "latest",
     "c8": "latest",
+    "cheerio": "latest",
     "ci-publish": "latest",
     "conventional-changelog-cli": "latest",
     "finepack": "latest",
     "git-authors-cli": "latest",
     "github-generate-release": "latest",
+    "mri": "latest",
     "nano-staged": "latest",
     "proxyquire": "latest",
     "simple-git-hooks": "latest",
     "sinon": "latest",
     "standard": "latest",
-    "standard-version": "latest"
+    "standard-version": "latest",
+    "term-img": "latest"
   },
   "engines": {
     "node": "24"
@@ -163,6 +168,18 @@
     "bin",
     "src"
   ],
+  "scripts": {
+    "contributors": "(git-authors-cli && finepack && git add package.json && git commit -m 'build: contributors' --no-verify) || true",
+    "postrelease": "pnpm release:tags && pnpm release:github && (ci-publish || pnpm publish --access=public)",
+    "release": "pnpm release:version && pnpm release:changelog && pnpm release:commit && pnpm release:tag",
+    "release:changelog": "conventional-changelog -p conventionalcommits -i CHANGELOG.md -s",
+    "release:commit": "git add package.json CHANGELOG.md && git commit -m \"chore(release): $(node -p \"require('./package.json').version\")\"",
+    "release:github": "github-generate-release",
+    "release:tag": "git tag -a v$(node -p \"require('./package.json').version\") -m \"v$(node -p \"require('./package.json').version\")\"",
+    "release:tags": "git push origin HEAD:master --follow-tags",
+    "release:version": "standard-version --skip.changelog --skip.commit --skip.tag",
+    "test": "c8 ava"
+  },
   "license": "MIT",
   "commitlint": {
     "extends": [
@@ -183,20 +200,11 @@
       "finepack"
     ]
   },
+  "pnpm": {
+    "neverBuiltDependencies": []
+  },
   "simple-git-hooks": {
     "commit-msg": "npx commitlint --edit",
     "pre-commit": "npx nano-staged"
-  },
-  "scripts": {
-    "contributors": "(git-authors-cli && finepack && git add package.json && git commit -m 'build: contributors' --no-verify) || true",
-    "postrelease": "pnpm release:tags && pnpm release:github && (ci-publish || pnpm publish --access=public)",
-    "release": "pnpm release:version && pnpm release:changelog && pnpm release:commit && pnpm release:tag",
-    "release:changelog": "conventional-changelog -p conventionalcommits -i CHANGELOG.md -s",
-    "release:commit": "git add package.json CHANGELOG.md && git commit -m \"chore(release): $(node -p \"require('./package.json').version\")\"",
-    "release:github": "github-generate-release",
-    "release:tag": "git tag -a v$(node -p \"require('./package.json').version\") -m \"v$(node -p \"require('./package.json').version\")\"",
-    "release:tags": "git push origin HEAD:master --follow-tags",
-    "release:version": "standard-version --skip.changelog --skip.commit --skip.tag",
-    "test": "c8 ava"
   }
-}
+}

package/src/avatar/auto.js

@@ -2,18 +2,22 @@
 
 const isAbsoluteUrl = require('is-absolute-url')
 const dataUriRegex = require('data-uri-regex')
+const stableRegex = require('stable-regex')
+const urlRegex = require('url-regex-safe')
 const isEmail = require('is-email-like')
 const pTimeout = require('p-timeout')
-const urlRegex = require('url-regex')
 const pAny = require('p-any')
 
 const httpStatus = require('../util/http-status')
 const isIterable = require('../util/is-iterable')
 const ExtendableError = require('../util/error')
 
+const DATA_URI_REGEX = dataUriRegex()
+const DOMAIN_REGEX = urlRegex({ strict: false })
+
 const getInputType = input => {
   if (isEmail(input)) return 'email'
-  if (urlRegex({ strict: false }).test(input)) return 'domain'
+  if (stableRegex(DOMAIN_REGEX, input)) return 'domain'
   return 'username'
 }
 
@@ -22,12 +26,16 @@ const factory = ({ constants, providers, providersBy, reachableUrl }) => {
 
   const getAvatarContent = provider => async output => {
     if (typeof output !== 'string' || output === '') {
-      const message = output === undefined ? 'not found' : `\`${output}\` is invalid`
-      const statusCode = output === undefined ? httpStatus.NOT_FOUND : httpStatus.UNPROCESSABLE_ENTITY
+      const message =
+        output === undefined ? 'not found' : `\`${output}\` is invalid`
+      const statusCode =
+        output === undefined
+          ? httpStatus.NOT_FOUND
+          : httpStatus.UNPROCESSABLE_ENTITY
       throw new ExtendableError({ provider, message, statusCode })
     }
 
-    if (dataUriRegex().test(output)) {
+    if (stableRegex(DATA_URI_REGEX, output)) {
       return { type: 'buffer', data: output }
     }
 

package/src/constant.js

@@ -7,8 +7,9 @@ const DEFAULTS = {
   AVATAR_SIZE: 400,
   REQUEST_TIMEOUT: 25000,
   TTL_DEFAULT: ms('28d'),
+  DNS_SERVERS: ['1.1.1.1', '8.8.8.8'],
   TMP_FOLDER: existsSync('/dev/shm') ? '/dev/shm' : '/tmp',
-  DEBUG_HTML_TO_FILE: false,
+  DEBUG_HTML_TO_FILE: false
 }
 
 DEFAULTS.PROXY_TIMEOUT = Math.floor(DEFAULTS.REQUEST_TIMEOUT * (1 / 3))

package/src/util/cacheable-lookup.js

@@ -3,7 +3,7 @@
 const CacheableLookup = require('cacheable-lookup')
 const Tangerine = require('tangerine')
 
-module.exports = ({ TTL_DEFAULT, DNS_TIMEOUT, createMemoryCache }) =>
+module.exports = ({ TTL_DEFAULT, DNS_TIMEOUT, DNS_SERVERS, createMemoryCache }) =>
   new CacheableLookup({
     maxTtl: TTL_DEFAULT,
     cache: createMemoryCache({ namespace: 'dns' }),
@@ -11,7 +11,7 @@ module.exports = ({ TTL_DEFAULT, DNS_TIMEOUT, createMemoryCache }) =>
       {
         cache: false,
         timeout: DNS_TIMEOUT,
-        servers: ['1.1.1.1', '8.8.8.8']
+        servers: DNS_SERVERS
       },
       require('got').extend({
         responseType: 'buffer',