Merge pull request #189 from extractus/4.0.7

v4.0.7

Author: ndaidong

package.json

@@ -31,15 +31,16 @@
     "reset": "node reset"
   },
   "dependencies": {
-    "cross-fetch": "^4.0.0",
-    "linkedom": "^0.16.11"
+    "cross-fetch": "^4.1.0",
+    "linkedom": "^0.18.9"
   },
   "devDependencies": {
-    "eslint": "^9.2.0",
-    "globals": "^15.1.0",
-    "https-proxy-agent": "^7.0.4",
+    "@eslint/js": "^9.24.0",
+    "eslint": "^9.24.0",
+    "globals": "^16.0.0",
+    "https-proxy-agent": "^7.0.6",
     "jest": "^29.7.0",
-    "nock": "^13.5.4"
+    "nock": "^14.0.3"
   },
   "keywords": [
     "oembed",

src/main.test.js

@@ -72,7 +72,7 @@ const hasPhotoKeys = (o) => {
   })
 }
 
-const hasInstagramKeys = (o) => {
+export const hasInstagramKeys = (o) => {
   return InstagramKeys.every((k) => {
     return hasProperty(o, k)
   })
@@ -138,34 +138,6 @@ describe('test if extract() with some popular providers', () => {
       },
       checkFn: hasRichKeys,
     },
-    {
-      input: {
-        url: 'https://www.instagram.com/p/ic7kRDqOlt/',
-        params: {
-          access_token: '845078789498971|8ff3ab4ddd45b8f018b35c4fb7edac62',
-        },
-        file: './test-data/instagram_ic7kRDqOlt.json',
-      },
-      expected: {
-        provider_name: 'Instagram',
-        type: 'rich',
-      },
-      checkFn: hasInstagramKeys,
-    },
-    {
-      input: {
-        url: 'https://www.facebook.com/facebook/videos/10153231379946729/',
-        params: {
-          access_token: '845078789498971|8ff3ab4ddd45b8f018b35c4fb7edac62',
-        },
-        file: './test-data/facebook.json',
-      },
-      expected: {
-        provider_name: 'Facebook',
-        type: 'video',
-      },
-      checkFn: hasRichKeys,
-    },
     {
       input: {
         url: 'https://flic.kr/p/2iYctUr',

src/utils/fetchEmbed.test.js

@@ -46,19 +46,19 @@ describe('test if fetchEmbed() works correctly', () => {
         type: 'rich',
       },
     },
-    {
-      input: {
-        url: 'https://www.facebook.com/facebook/videos/10153231379946729/',
-        params: {
-          access_token: '845078789498971|8ff3ab4ddd45b8f018b35c4fb7edac62',
-        },
-        file: './test-data/facebook.json',
-      },
-      expected: {
-        provider_name: 'Facebook',
-        type: 'video',
-      },
-    },
+    // {
+    //   input: {
+    //     url: 'https://www.facebook.com/facebook/videos/10153231379946729/',
+    //     params: {
+    //       access_token: '845078789498971|8ff3ab4ddd45b8f018b35c4fb7edac62',
+    //     },
+    //     file: './test-data/facebook.json',
+    //   },
+    //   expected: {
+    //     provider_name: 'Facebook',
+    //     type: 'video',
+    //   },
+    // },
     {
       input: {
         url: 'http://farm4.static.flickr.com/3123/2341623661_7c99f48bbf_m.jpg',

src/utils/provider.js

@@ -17,7 +17,7 @@ const undotted = (scheme = '') => {
 }
 
 const removeProtocol = (url) => {
-  return url.replace('https://', '').replace('http://', '')
+  return url.replace('https://', '//').replace('http://', '//')
 }
 
 export const simplify = (providers = []) => {
@@ -43,7 +43,7 @@ const providersFromList = (providers = []) => {
   return providers.map((provider) => {
     const { e: endpoint, s: schemes } = provider
     return {
-      endpoint: `https://${endpoint}`,
+      endpoint: `https:${endpoint}`,
       schemes: schemes.map(toRegExp),
     }
   })

src/utils/provider.test.js

@@ -5,22 +5,6 @@ import provider from './provider.js'
 
 describe('test if provider.find() works correctly', () => {
   const cases = [
-    {
-      url: 'https://www.facebook.com/video.php?v=999999999',
-      fetchEndpoint: 'https://graph.facebook.com/v16.0/oembed_video',
-    },
-    {
-      url: 'https://www.facebook.com/someone/photos/somephoto',
-      fetchEndpoint: 'https://graph.facebook.com/v16.0/oembed_post',
-    },
-    {
-      url: 'https://www.facebook.com/someone/page',
-      fetchEndpoint: 'https://graph.facebook.com/v16.0/oembed_page',
-    },
-    {
-      url: 'http://instagram.com/someone/p/somepage',
-      fetchEndpoint: 'https://graph.facebook.com/v16.0/instagram_oembed',
-    },
     {
       url: 'https://www.edumedia-sciences.com/en/media/558-heredity',
       fetchEndpoint: 'https://www.edumedia-sciences.com/oembed.json',
@@ -86,6 +70,6 @@ describe('test if provider set/get works correctly', () => {
     expect(provider.set(providerList)).toEqual(providerList.length)
     const newList = provider.get()
     expect(newList.length).toEqual(providerList.length)
-    expect(newList[0].schemes[0]).toEqual(/store.alpha.com\/(.*)/i)
+    expect(newList[0].schemes[0]).toEqual(/\/\/store.alpha.com\/(.*)/i)
   })
 })