tesla-inventory 3.2.0-7 → 3.2.0-9

package/package.json

@@ -2,7 +2,7 @@
   "name": "tesla-inventory",
   "description": "Retrieve real-time data from Tesla Inventory.",
   "homepage": "https://github.com/Kikobeats/tesla-inventory",
-  "version": "3.2.0-7",
+  "version": "3.2.0-9",
   "main": "src/index.js",
   "author": {
     "email": "josefrancisco.verdu@gmail.com",
@@ -34,6 +34,9 @@
     "teslaapi",
     "teslamotors"
   ],
+  "dependencies": {
+    "p-retry": "4"
+  },
   "devDependencies": {
     "@commitlint/cli": "latest",
     "@commitlint/config-conventional": "latest",
@@ -103,7 +106,8 @@
   },
   "nano-staged": {
     "*.js": [
-      "prettier-standard"
+      "prettier-standard",
+      "standard --fix"
     ],
     "*.md": [
       "standard-markdown"

package/src/index.js

@@ -1,6 +1,8 @@
 'use strict'
 
 const debug = require('debug-logfmt')('tesla-inventory')
+const pRetry = require('p-retry')
+
 const inventories = require('./inventories')
 
 const timestamp =
@@ -13,14 +15,11 @@ const uniqBy = (arr, prop) =>
 
 const ITEMS_PER_PAGE = 50
 
-module.exports = getBrowserless => async (inventory, opts, gotoOpts) => {
+module.exports = fetcher => async (inventory, opts, fetcherOpts) => {
   if (!inventories[inventory]) {
     throw new TypeError(`Tesla inventory \`${inventory}\` not found!`)
   }
 
-  let teardown
-  const browserless = await getBrowserless(fn => (teardown = fn))
-
   if (opts.model && !opts.model.startsWith('m')) {
     opts.model = `m${opts.model}`
   }
@@ -30,14 +29,6 @@ module.exports = getBrowserless => async (inventory, opts, gotoOpts) => {
   const duration = timestamp()
 
   const paginate = async (offset = 0) => {
-    const fn = browserless.evaluate(async (page, response) => response.text(), {
-      abortTypes: ['image', 'stylesheet', 'font', 'other'],
-      adblock: false,
-      waitUntil: 'networkidle0',
-      animations: true,
-      ...gotoOpts
-    })
-
     const url = new URL(
       `https://www.tesla.com/inventory/api/v1/inventory-results?${new URLSearchParams({
         query: JSON.stringify({
@@ -52,17 +43,16 @@ module.exports = getBrowserless => async (inventory, opts, gotoOpts) => {
 
     debug({ url, ...query })
 
-    const result = await fn(url).then(async text => {
-      try {
-        const body = JSON.parse(text)
-        return { items: body.results }
-      } catch (error) {
-        debug.error({ text, error })
-        const delay = ms => new Promise(resolve => setTimeout(resolve, ms))
-        await delay(10000)
-        return paginate(offset)
+    const result = await pRetry(
+      () =>
+        fetcher(url, fetcherOpts).then(async text => {
+          const body = JSON.parse(text)
+          return { items: body.results }
+        }),
+      {
+        onFailedAttempt: debug.error
       }
-    })
+    )
 
     return result
   }
@@ -78,7 +68,5 @@ module.exports = getBrowserless => async (inventory, opts, gotoOpts) => {
     debug.info({ ...opts, items: items.length, duration: duration() })
   } while (page.items.length >= ITEMS_PER_PAGE)
 
-  const result = items.filter(item => item.Model === opts.model)
-  if (teardown) await teardown()
-  return result
+  return items.filter(item => item.Model === opts.model)
 }