Merge a7a7a3c into 66d3aad

README.md

@@ -47,15 +47,9 @@ extract(url).then((oembed) => {
 })
 ```
 
-##### Note:
-
-> Since Node.js v14, ECMAScript modules [have became the official standard format](https://nodejs.org/docs/latest-v14.x/api/esm.html#esm_modules_ecmascript_modules).
-> Just ensure that you are [using module system](https://nodejs.org/api/packages.html#determining-module-system) and enjoy with ES6 import/export syntax.
-
-
 ## APIs
 
-#### .extract(String url [, Object params])
+### `.extract(String url [, Object params])`
 
 Load and extract oembed data.
 
@@ -90,7 +84,7 @@ Here are several popular params:
 Note that some params are supported by these providers but not by the others.
 Please see the provider's oEmbed API docs carefully for exact information.
 
-#### .hasProvider(String URL)
+### `.hasProvider(String URL)`
 
 Check if a URL matches with any provider in the list.
 
@@ -103,7 +97,7 @@ hasProvider('https://www.youtube.com/watch?v=ciS8aCrX-9s') // return true
 hasProvider('https://trello.com/b/BO3bg7yn/notes') // return false
 ```
 
-#### .findProvider(String URL)
+### `.findProvider(String URL)`
 
 Get the provider which is relevant to given URL.
 
@@ -125,7 +119,7 @@ Result looks like below:
 }
 ```
 
-#### .setProviderList(Array providers)
+### `.setProviderList(Array providers)`
 
 Apply a list of providers to use, overriding the [default](https://raw.githubusercontent.com/ndaidong/oembed-parser/master/src/utils/providers.json).
 
@@ -159,26 +153,17 @@ const providers = [
 setProviderList(providers)
 ```
 
-#### .setRequestOptions(Object requestOptions)
+### `.setRequestOptions(Object requestOptions)`
+
 Define options to call oembed HTTP request.
 
 `oembed-parser` is using [axios](https://github.com/axios/axios) to send HTTP requests. Please refer [axios' request config](https://axios-http.com/docs/req_config) for more info.
 
-Default option:
+### `.getRequestOptions()`
 
-```js
-{
-  headers: {
-    'user-agent': 'Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Firefox/102.0',
-    accept: 'application/json; charset=utf-8'
-  },
-  responseType: 'json',
-  responseEncoding: 'utf8',
-  timeout: 6e4,
-  maxRedirects: 3
-}
-```
+Return current request options.
 
+Default values can be found [here](https://github.com/ndaidong/oembed-parser/blob/main/src/config.js#L5).
 
 ## Facebook and Instagram
 

dist/cjs/package.json

@@ -1,5 +1,5 @@
 {
   "name": "oembed-parser-cjs",
-  "version": "3.0.7",
+  "version": "3.0.8",
   "main": "./oembed-parser.js"
 }

dist/cjs/providers.latest.js

@@ -1,4 +1,4 @@
-// provider data, synchronized at 2022-07-24T14:03:37.993Z
+// provider data, synchronized at 2022-07-28T14:44:04.385Z
 
 /* eslint-disable */ 
 

package.json

@@ -1,5 +1,5 @@
 {
-  "version": "3.0.7",
+  "version": "3.0.8",
   "name": "oembed-parser",
   "description": "Get oEmbed data from given URL.",
   "homepage": "https://www.npmjs.com/package/oembed-parser",
@@ -17,9 +17,9 @@
   "scripts": {
     "lint": "standard .",
     "pretest": "npm run lint",
-    "test": " NODE_OPTIONS=--experimental-vm-modules jest --verbose --coverage=true --unhandled-rejections=strict --detectOpenHandles",
-    "eval": "DEBUG=oembed-parser:* node eval",
-    "eval:cjs": "DEBUG=oembed-parser:* node cjs-eval",
+    "test": "NODE_OPTIONS=--experimental-vm-modules jest --verbose --coverage=true",
+    "eval": "node eval",
+    "eval:cjs": "node cjs-eval",
     "sync": "node sync",
     "tsc": "tsc --init",
     "build-ts": "tsc",
@@ -29,15 +29,15 @@
   "dependencies": {
     "axios": "^0.27.2",
     "bellajs": "^11.0.3",
-    "debug": "^4.3.4"
+    "tldts": "^5.7.84"
   },
   "standard": {
     "ignore": [
       "/dist"
     ]
   },
   "devDependencies": {
-    "esbuild": "^0.14.49",
+    "esbuild": "^0.14.50",
     "jest": "^28.1.3",
     "nock": "^13.2.9"
   },

src/main.js

@@ -20,7 +20,10 @@ export const extract = async (url, params = {}) => {
   return data
 }
 
-export { setRequestOptions } from './config.js'
+export {
+  setRequestOptions,
+  getRequestOptions
+} from './config.js'
 
 export {
   find as findProvider,

src/main.test.js

@@ -196,7 +196,7 @@ describe('test if extract() with some popular providers', () => {
 
   cases.forEach(({ input, expected, checkFn }) => {
     const { url, file, params = {} } = input
-    test(`  check fetchEmbed("${url}")`, async () => {
+    test(`check fetchEmbed("${url}")`, async () => {
       const provider = findProvider(url)
       const { baseUrl, path } = parseUrl(provider.fetchEndpoint)
 
@@ -228,6 +228,7 @@ describe('test if extract() with some popular providers', () => {
       if (maxheight > 0) {
         expect(result.height).toBeLessThanOrEqual(expected.maxheight)
       }
+      nock.cleanAll()
     })
   })
 })

src/utils/fetchEmbed.js

@@ -1,7 +1,6 @@
 // utils -> fetchEmbed
 
 import retrieve from './retrieve.js'
-import { warning } from './logger.js'
 
 const isFacebookGraphDependent = (url) => {
   return url.includes('facebook.com') || url.includes('instagram.com')
@@ -11,9 +10,6 @@ const getFacebookGraphToken = () => {
   const env = process.env || {}
   const appId = env.FACEBOOK_APP_ID
   const clientToken = env.FACEBOOK_CLIENT_TOKEN
-  if (!appId || !clientToken) {
-    warning('Working with Facebook Graph requires `FACEBOOK_APP_ID` and `FACEBOOK_CLIENT_TOKEN`')
-  }
   return `${appId}|${clientToken}`
 }
 

src/utils/fetchEmbed.test.js

@@ -91,7 +91,7 @@ describe('test if fetchEmbed() works correctly', () => {
 
   cases.forEach(({ input, expected }) => {
     const { url, file, params = {} } = input
-    test(`  check fetchEmbed("${url}")`, async () => {
+    test(`check fetchEmbed("${url}")`, async () => {
       const provider = findProvider(url)
       const { baseUrl, path } = parseUrl(provider.fetchEndpoint)
 
@@ -122,6 +122,7 @@ describe('test if fetchEmbed() works correctly', () => {
       if (maxheight > 0) {
         expect(result.height).toBeLessThanOrEqual(expected.maxheight)
       }
+      nock.cleanAll()
     })
   })
 })

src/utils/isValidURL.test.js

@@ -39,7 +39,7 @@ describe('test isValidURL()', () => {
     }
   ]
   cases.forEach(({ url, expected }) => {
-    test(`  isValidURL("${url}") must return "${expected}"`, () => {
+    test(`isValidURL("${url}") must return "${expected}"`, () => {
       const result = isValidURL(url)
       expect(result).toEqual(expected)
     })

src/utils/provider.js

@@ -1,7 +1,8 @@
 // utils / provider
 
+import { getDomain } from 'tldts'
+
 import isValidURL from './isValidURL.js'
-import getDomain from './getDomain.js'
 
 import { providers as defaultProviderList } from './providers.latest.js'
 

src/utils/provider.test.js

@@ -36,21 +36,21 @@ describe('test if provider.find() works correctly', () => {
   ]
 
   cases.forEach(({ url, fetchEndpoint }) => {
-    test(`  provider.find("${url}") must return "${fetchEndpoint}"`, () => {
+    test(`provider.find("${url}") must return "${fetchEndpoint}"`, () => {
       const foundedProvider = provider.find(url)
       expect(foundedProvider.fetchEndpoint).toEqual(fetchEndpoint)
     })
   })
 
-  test('  provider.find("{}") must return null', () => {
+  test('provider.find("{}") must return null', () => {
     expect(provider.find({})).toEqual(null)
   })
 
-  test('  provider.find("abcdef") must return null', () => {
+  test('provider.find("abcdef") must return null', () => {
     expect(provider.find('abcdef')).toEqual(null)
   })
 
-  test('  provider.find("https://somethingdoesnotexist.com") must return null', () => {
+  test('provider.find("https://somethingdoesnotexist.com") must return null', () => {
     expect(provider.find('https://somethingdoesnotexist.com')).toEqual(null)
   })
 })
@@ -68,10 +68,10 @@ describe('test if provider set/get works correctly', () => {
       endpoints: []
     }
   ]
-  test('  provider.set()', () => {
+  test('provider.set()', () => {
     expect(provider.set(providerList)).toEqual(providerList.length)
   })
-  test('  provider.get()', () => {
+  test('provider.get()', () => {
     expect(provider.get()).toEqual(providerList)
   })
 })

src/utils/providers.latest.js

@@ -1,4 +1,4 @@
-// provider data, synchronized at 2022-07-24T14:03:37.993Z
+// provider data, synchronized at 2022-07-28T14:44:04.385Z
 
 /* eslint-disable */ 
 

src/utils/providers.prev.js

@@ -1,4 +1,4 @@
-// provider data, synchronized at 2022-07-04T04:38:20.547Z
+// provider data, synchronized at 2022-07-24T14:03:37.993Z
 
 /* eslint-disable */ 
 
@@ -227,9 +227,13 @@ export const providers = [
         "schemes": [
           "https://audioboom.com/channels/*",
           "https://audioboom.com/channel/*",
-          "https://audioboom.com/posts/*"
+          "https://audioboom.com/playlists/*",
+          "https://audioboom.com/podcasts/*",
+          "https://audioboom.com/podcast/*",
+          "https://audioboom.com/posts/*",
+          "https://audioboom.com/episodes/*"
         ],
-        "url": "https://audioboom.com/publishing/oembed/v4.{format}",
+        "url": "https://audioboom.com/publishing/oembed.{format}",
         "formats": [
           "json",
           "xml"
@@ -3259,6 +3263,7 @@ export const providers = [
         "schemes": [
           "http://soundcloud.com/*",
           "https://soundcloud.com/*",
+          "https://on.soundcloud.com/*",
           "https://soundcloud.app.goog.gl/*"
         ],
         "url": "https://soundcloud.com/oembed"

src/utils/retrieve.js

@@ -3,11 +3,11 @@
 import axios from 'axios'
 
 import { getRequestOptions } from '../config.js'
-import { error } from './logger.js'
 
 const isValidContentType = (ctype) => {
   return [
     'application/json',
+    'application/javascript',
     'text/javascript'
   ].some((item) => {
     return ctype.includes(item)
@@ -19,12 +19,10 @@ export default async (url) => {
     const res = await axios.get(url, getRequestOptions())
     const contentType = res.headers['content-type'] || ''
     if (!isValidContentType(contentType)) {
-      error(`Invalid content type! (${contentType})`)
-      return null
+      throw new Error(`Invalid content type: "${contentType}"`)
     }
     return res.data
   } catch (err) {
-    error(err.message)
-    return null
+    throw new Error(`${err.name}: ${err.message}`)
   }
 }