tesla-inventory 3.2.0-0 → 3.2.0-10

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-0",
+  "version": "3.2.0-10",
   "main": "src/index.js",
   "author": {
     "email": "josefrancisco.verdu@gmail.com",
@@ -35,13 +35,14 @@
     "teslamotors"
   ],
   "dependencies": {
-    "got": "11"
+    "p-retry": "4"
   },
   "devDependencies": {
     "@commitlint/cli": "latest",
     "@commitlint/config-conventional": "latest",
     "@ksmithut/prettier-standard": "latest",
     "ava": "latest",
+    "browserless": "latest",
     "c8": "latest",
     "ci-publish": "latest",
     "conventional-github-releaser": "latest",
@@ -55,6 +56,8 @@
     "markdown-tables-to-json": "latest",
     "nano-staged": "latest",
     "npm-check-updates": "latest",
+    "puppeteer": "latest",
+    "signal-exit": "latest",
     "simple-git-hooks": "latest",
     "standard": "latest",
     "standard-markdown": "latest",

package/src/codes.json

@@ -548,6 +548,7 @@
   "SU3C": "Coil Spring Suspension",
   "SWF0": "Model 3/Y",
   "SWF1": "Steering Wheel FW Enabled",
+  "T38Q": "Tires M3",
   "T3CA": "Tires M3",
   "T3HS": "Tires M3",
   "T3MA": "Tires M3",

package/src/index.js

@@ -1,75 +1,72 @@
 'use strict'
 
 const debug = require('debug-logfmt')('tesla-inventory')
+const pRetry = require('p-retry')
+
 const inventories = require('./inventories')
 
-const ITEMS_PER_PAGE = 50
+const timestamp =
+  (start = process.hrtime.bigint()) =>
+  () =>
+    Math.round(Number(process.hrtime.bigint() - start) / 1e6) + 'ms'
 
 const uniqBy = (arr, prop) =>
   arr.filter((x, i, self) => i === self.findIndex(y => x[prop] === y[prop]))
 
-const timestamp =
-  (start = process.hrtime.bigint()) =>
-    () =>
-      Math.round(Number(process.hrtime.bigint() - start) / 1e6) + 'ms'
-
-const defaults = {
-  url: 'https://www.tesla.com/inventory/api/v1/inventory-results',
-  responseType: 'json',
-  resolveBodyOnly: true,
-  headers: { 'user-agent': undefined }
-}
+const ITEMS_PER_PAGE = 50
 
-const create = opts => {
-  const got = require('got').extend({ ...defaults, ...opts })
-
-  return async (inventory, opts, gotOpts) => {
-    if (!inventories[inventory]) {
-      throw new TypeError(`Tesla inventory \`${inventory}\` not found!`)
-    }
-
-    if (opts.model && !opts.model.startsWith('m')) {
-      opts.model = `m${opts.model}`
-    }
-
-    const { country, ...query } = { ...inventories[inventory], ...opts }
-
-    const duration = timestamp()
-
-    const paginate = async (offset = 0) =>
-      got(
-        got.mergeOptions(
-          got.defaults.options,
-          {
-            searchParams: {
-              query: JSON.stringify({
-                query,
-                count: ITEMS_PER_PAGE,
-                offset,
-                outsideOffset: 0,
-                outsideSearch: false
-              })
-            }
-          },
-          gotOpts
-        )
-      ).then(({ results }) => ({ items: results }))
-
-    let offset = 0
-    let items = []
-    let page
-
-    do {
-      page = await paginate(offset)
-      items = uniqBy(items.concat(page.items), 'VIN')
-      offset = items.length
-      debug({ items: items.length, duration: duration() })
-    } while (page.items.length >= ITEMS_PER_PAGE)
-
-    return items.filter(item => item.Model === opts.model)
+module.exports = fetcher => async (inventory, opts, fetcherOpts) => {
+  if (!inventories[inventory]) {
+    throw new TypeError(`Tesla inventory \`${inventory}\` not found!`)
+  }
+
+  if (opts.model && !opts.model.startsWith('m')) {
+    opts.model = `m${opts.model}`
   }
-}
 
-module.exports = create()
+  const { country, ...query } = { ...inventories[inventory], ...opts }
+
+  const duration = timestamp()
+
+  const paginate = async (offset = 0) => {
+    const url = new URL(
+      `https://www.tesla.com/inventory/api/v1/inventory-results?${new URLSearchParams({
+        query: JSON.stringify({
+          query,
+          count: ITEMS_PER_PAGE,
+          offset,
+          outsideOffset: 0,
+          outsideSearch: false
+        })
+      }).toString()}`
+    ).toString()
+
+    debug({ url, ...query })
+
+    const result = await pRetry(
+      () =>
+        fetcher(url, fetcherOpts).then(async text => {
+          const body = JSON.parse(text)
+          return { items: body.results ?? [] }
+        }),
+      {
+        onFailedAttempt: debug.error
+      }
+    )
+
+    return result
+  }
 
-module.exports.create = create
+  let offset = 0
+  let items = []
+  let page
+
+  do {
+    page = await paginate(offset)
+    items = uniqBy(items.concat(page.items), 'VIN')
+    offset = items.length
+    debug.info({ ...opts, items: items.length, duration: duration() })
+  } while (page.items.length >= ITEMS_PER_PAGE)
+
+  return items.filter(item => item.Model === opts.model)
+}