refactor: use @kikobeats/time-span (#664)

microlinkhq · Oct 8, 2023 · a15a5b4 · a15a5b4
1 parent 233b4a6
commit a15a5b4
Show file tree

Hide file tree

Showing 12 changed files with 17 additions and 69 deletions.
diff --git a/package.json b/package.json
@@ -170,7 +170,7 @@
     ]
   },
   "nano-staged": {
-    "*.js,!*.min.js": [
+    "*.js": [
       "prettier-standard",
       "standard --fix"
     ],

diff --git a/packages/metascraper-audio/test/providers.js b/packages/metascraper-audio/test/providers.js
@@ -135,6 +135,6 @@ test('transistor.fm (twitter:player)', async t => {
 
   t.is(
     metadata.audio,
-    'https://media.transistor.fm/e83b42d0/9e93424b.mp3?src=player'
+    'https://chrt.fm/track/637E/2.gum.fm/op3.dev/e/dts.podtrac.com/redirect.mp3/media.transistor.fm/e83b42d0/9e93424b.mp3?src=player'
   )
 })
diff --git a/packages/metascraper-audio/test/snapshots/providers.js.md b/packages/metascraper-audio/test/snapshots/providers.js.md
diff --git a/packages/metascraper-audio/test/snapshots/providers.js.snap b/packages/metascraper-audio/test/snapshots/providers.js.snap
diff --git a/packages/metascraper-helpers/index.js b/packages/metascraper-helpers/index.js
@@ -340,11 +340,10 @@ memoizeOne.EqualityUrlAndHtmlDom = (newArgs, oldArgs) =>
 const jsonld = memoizeOne(
   $ =>
     $('script[type="application/ld+json"]')
-      .map(function () {
+      .map((_, element) => {
         try {
-          const el = $(this)
+          const el = $(element)
           const json = JSON.parse($(el).contents().text())
-
           const { '@graph': graph, ...props } = json
           if (!graph) return json
           return graph.map(item => ({ ...props, ...item }))

diff --git a/packages/metascraper-media-provider/bench/provider/generic.js b/packages/metascraper-media-provider/bench/provider/generic.js
@@ -1,10 +1,11 @@
 'use strict'
 
+const timeSpan = require('@kikobeats/time-span')({
+  format: require('pretty-ms')
+})
 const debug = require('debug-logfmt')(
   'metascraper-media-provider:bench:generic'
 )
-const timeSpan = require('time-span')
-const prettyMs = require('pretty-ms')
 
 const createFromGeneric = require('../../src/get-media/provider/generic')
 const { getUrl, ...opts } = require('../constants')
@@ -17,12 +18,12 @@ const mainLoop = async () => {
   let error = false
   while (!error) {
     try {
-      const end = timeSpan()
+      const duration = timeSpan()
       const url = getUrl()
       const media = await fromGeneric(getUrl())
       const hasMedia = !!media && !!media.extractor
 
-      debug({ n: n++, hasMedia, time: prettyMs(end()) })
+      debug({ n: n++, hasMedia, duration: duration() })
 
       if (!hasMedia) {
         const err = new Error(`No media detected for '${url}'`)

diff --git a/packages/metascraper-media-provider/bench/provider/twitter/index.js b/packages/metascraper-media-provider/bench/provider/twitter/index.js
@@ -1,10 +1,11 @@
 'use strict'
 
+const timeSpan = require('@kikobeats/time-span')({
+  format: require('pretty-ms')
+})
 const debug = require('debug-logfmt')(
   'metascraper-media-provider:bench:twitter'
 )
-const prettyMs = require('pretty-ms')
-const timeSpan = require('time-span')
 
 const {
   createGuestToken,
@@ -21,11 +22,11 @@ const mainLoop = async () => {
   let error = false
   while (!error) {
     try {
-      const end = timeSpan()
+      const duration = timeSpan()
       const data = await twitterVideo(getUrl())
       const hasVideo = data && data.formats && data.formats.length > 0
 
-      debug({ n: n++, hasVideo, time: prettyMs(end()) })
+      debug({ n: n++, hasVideo, duration: duration() })
 
       if (!hasVideo) {
         const err = new Error('No video detected!')

diff --git a/packages/metascraper-media-provider/package.json b/packages/metascraper-media-provider/package.json
@@ -35,10 +35,10 @@
     "youtube-dl-exec": "~2.4.12"
   },
   "devDependencies": {
+    "@kikobeats/time-span": "latest",
     "ava": "latest",
     "parse-proxy-uri": "latest",
     "pretty-ms": "latest",
-    "time-span": "4",
     "unique-random-array": "2"
   },
   "engines": {

diff --git a/packages/metascraper-spotify/test/snapshots/index.js.md b/packages/metascraper-spotify/test/snapshots/index.js.md
@@ -317,7 +317,7 @@ Generated by [AVA](https://avajs.dev).
       author: 'Syntax - Tasty Web Development Treats',
       date: '2020-01-06T14:00:00.000Z',
       description: 'In this Hasty Treat, Scott and Wes talk about modules in Node — what are they, how they’re different from browser modules, and more! Sentry - Sponsor If you want to know what’s happening with your errors, track them with Sentry. Sentry is open-source error tracking that helps developers monitor and…',
-      image: 'https://i.scdn.co/image/28df6337d6538a093fa1092a979a1f0f95f70992',
+      image: 'https://i.scdn.co/image/ab6765630000ba8a6c0e28e162c68d0e67bc10d5',
       lang: 'en',
       publisher: 'Spotify',
       title: 'Hasty Treat - Modules in Node',

diff --git a/packages/metascraper-spotify/test/snapshots/index.js.snap b/packages/metascraper-spotify/test/snapshots/index.js.snap
diff --git a/packages/metascraper-youtube/test/snapshots/index.js.md b/packages/metascraper-youtube/test/snapshots/index.js.md
@@ -11,7 +11,7 @@ Generated by [AVA](https://avajs.dev).
     {
       author: 'Elon Musk Viral Videos',
       description: 'Subscribe for daily Elon Musk videos.',
-      image: 'https://img.youtube.com/vi/rXyKq7izYCQ/sddefault.jpg',
+      image: 'https://i.ytimg.com/vi/rXyKq7izYCQ/hqdefault.jpg',
       lang: 'es',
       logo: 'https://www.youtube.com/yts/img/favicon_144-vfliLAfaB.png',
       publisher: 'YouTube',

diff --git a/packages/metascraper-youtube/test/snapshots/index.js.snap b/packages/metascraper-youtube/test/snapshots/index.js.snap