@browserless/cli 9.9.8 → 9.10.1

package/README.md

@@ -1,6 +1,7 @@
 <div align="center">
   <br>
-  <img style="width: 500px; margin:3rem 0 1.5rem;" src="https://browserless.js.org/static/logo-banner.png" alt="browserless">
+  <img style="width: 500px; margin:3rem 0 1.5rem;" src="/static/logo-banner.png#gh-light-mode-only" alt="browserless">
+  <img style="width: 500px; margin:3rem 0 1.5rem;" src="/static/logo-banner-light.png#gh-dark-mode-only" alt="browserless">
   <br>
   <br>
   <p align="center"><strong>@browserless/cli</strong>: CLI to interact with Browserless capabilities.</p>

package/package.json

@@ -2,7 +2,7 @@
   "name": "@browserless/cli",
   "description": "CLI to interact with Browserless capabilities",
   "homepage": "https://browserless.js.org",
-  "version": "9.9.8",
+  "version": "9.10.1",
   "bin": {
     "browserless": "src/index.js"
   },
@@ -32,14 +32,15 @@
   ],
   "dependencies": {
     "beauty-error": "~1.2.15",
-    "browserless": "^9.9.8",
+    "browserless": "^9.10.1",
     "dark-mode": "~3.0.0",
-    "lodash": "~4.17.21",
-    "meow": "~9.0.0",
-    "ora": "~5.4.1",
+    "dset": "~3.1.2",
+    "mri": "~1.2.0",
+    "nanospinner": "~1.1.0",
     "picocolors": "~1.0.0",
     "pretty-bytes": "~5.6.0",
     "process-stats": "~3.7.0",
+    "restore-cursor": "~3.1.0",
     "signal-exit": "~4.0.1",
     "term-img": "~5.0.0",
     "unique-random-array": "~2.0.0"
@@ -55,5 +56,5 @@
     "test": "exit 0"
   },
   "license": "MIT",
-  "gitHead": "26bcbf5732cc81ca6b998f4a22060ca84225c0dd"
+  "gitHead": "0826317b9edda6f4d77b38d843e6087060876a00"
 }

package/src/commands/goto.js

@@ -1,9 +1,6 @@
 'use strict'
 
-const { setTimeout } = require('timers/promises')
-
 module.exports = async ({ url, browserless, opts }) => {
   const page = await browserless.page()
-  await browserless.goto(page, { url, ...opts })
-  await setTimeout(8.64e7)
+  return [await browserless.goto(page, { url, ...opts })]
 }

package/src/commands/html.js

@@ -1,6 +1,6 @@
 'use strict'
 
 module.exports = async ({ url, browserless, opts }) => {
-  const result = await browserless.html(url, opts)
-  return result
+  const html = await browserless.html(url, opts)
+  return [html]
 }

package/src/commands/lighthouse.js

@@ -1,9 +1,14 @@
 'use strict'
 
-const lighthouse = require('../../../lighthouse/src')
+const createLighthouse = require('../../../lighthouse/src')
 
 module.exports = async ({ url, browserless, opts }) => {
-  const getBrowserless = () => browserless
-  const report = await lighthouse(url, { getBrowserless, ...opts })
-  return JSON.stringify(report, null, 2)
+  const lighthouse = createLighthouse(async teardown => {
+    teardown(() => browserless.destroyContext())
+    return browserless
+  })
+
+  const report = await lighthouse(url)
+
+  return [JSON.stringify(report), JSON.stringify(report, null, 2)]
 }

package/src/commands/pdf.js

@@ -1,6 +1,3 @@
 'use strict'
 
-module.exports = async ({ url, browserless, opts }) => {
-  const result = await browserless.pdf(url, opts)
-  return result
-}
+module.exports = async ({ url, browserless, opts }) => [await browserless.pdf(url, opts)]

package/src/commands/ping.js

@@ -15,5 +15,5 @@ module.exports = async ({ url, browserless, opts }) => {
 
   const result = await ping(url, opts)
 
-  return result
+  return [JSON.stringify(result), JSON.stringify(result, null, 2)]
 }

package/src/commands/screenshot.js

@@ -3,7 +3,7 @@
 const uniqueRandomArray = require('unique-random-array')
 const darkMode = require('dark-mode')
 const termImg = require('term-img')
-const { set } = require('lodash')
+const { dset } = require('dset')
 
 const BACKGROUNDS = [
   'linear-gradient(225deg, #FF057C 0%, #8D0B93 50%, #321575 100%)',
@@ -29,15 +29,15 @@ const randBackground = uniqueRandomArray(BACKGROUNDS)
 
 module.exports = async ({ url, browserless, opts }) => {
   if (opts.background === 'unsplash') {
-    set(opts, 'overlay.background', 'https://source.unsplash.com/random/1920x1080')
+    dset(opts, 'overlay.background', 'https://source.unsplash.com/random/1920x1080')
   }
 
   if (opts.background === 'gradient') {
-    set(opts, 'overlay.background', randBackground())
+    dset(opts, 'overlay.background', randBackground())
   }
 
   if (opts.browser) {
-    set(opts, 'overlay.browser', opts.browser)
+    dset(opts, 'overlay.browser', opts.browser)
   }
 
   if (opts.codeScheme === 'ghcolors') {
@@ -56,5 +56,5 @@ module.exports = async ({ url, browserless, opts }) => {
 
   const screenshot = await browserless.screenshot(url, opts)
 
-  return termImg(screenshot, { width: '50%' })
+  return [screenshot, termImg(Buffer.from(screenshot), { width: '50%' })]
 }

package/src/commands/status.js

@@ -5,5 +5,5 @@ module.exports = async ({ url, browserless, opts }) => {
   const response = await page.goto(url, opts)
   const status = response.status()
   await page.close()
-  return status
+  return [JSON.stringify(status), JSON.stringify(status, null, 2)]
 }

package/src/commands/text.js

@@ -2,5 +2,5 @@
 
 module.exports = async ({ url, browserless, opts }) => {
   const result = await browserless.text(url, opts)
-  return result
+  return [result]
 }

package/src/index.js

@@ -2,65 +2,63 @@
 
 'use strict'
 
+const restoreCursor = require('restore-cursor')
 const createBrowser = require('browserless')
 const beautyError = require('beauty-error')
 const { onExit } = require('signal-exit')
 const path = require('path')
+const mri = require('mri')
 const fs = require('fs')
 
 const commands = fs.readdirSync(path.resolve(__dirname, 'commands'))
 
-const { HEADLESS } = process.env
-
-const cli = require('meow')({
-  pkg: require('../package.json'),
-  help: require('./help')(commands),
-  flags: {
-    headless: {
-      type: 'boolean',
-      default: HEADLESS !== undefined ? HEADLESS === 'true' : true
-    },
-    codeScheme: {
-      type: 'string',
-      default: 'ghcolors'
-    },
-    verbose: {
-      type: 'boolean',
-      default: true
-    }
+const { _, ...flags } = mri(process.argv.slice(2), {
+  boolean: ['headless', 'verbose'],
+  default: {
+    headless: 'new',
+    codeScheme: 'ghcolors'
   }
 })
 
+const cli = {
+  flags,
+  input: _,
+  showHelp: () => {
+    console.log(require('./help')(commands))
+    process.exit(0)
+  }
+}
+
 const { verbose, headless } = cli.flags
 
 const spinner = verbose ? require('./spinner') : { start: () => {}, stop: () => {} }
 
+process.on('SIGINT', () => {
+  spinner.stop({ force: true })
+  process.exit(1)
+})
+
 const run = async () => {
   if (cli.input.length === 0) return cli.showHelp()
   spinner.start()
   const [command, rawUrl] = cli.input
   const url = new URL(rawUrl).toString()
   const fn = require(`./commands/${command}`)
-
   const browser = createBrowser({ headless })
-  const browserless = await browser.createContext()
-
   onExit(browser.close)
-
-  const result = await fn({ url, browserless, opts: cli.flags })
-
-  return result
+  const browserless = await browser.createContext()
+  return fn({ url, browserless, opts: cli.flags })
 }
 
 run()
-  .then(result => {
-    const stats = spinner.stop(result)
-    if (result) console.log(result)
-    if (stats) console.error(`\n${stats}`)
+  .then(([result, preview = result]) => {
+    spinner.stop({ result })
+    if (typeof preview === 'string') console.log(preview)
     process.exit()
   })
   .catch(error => {
-    spinner.stop()
+    spinner.clear()
+    restoreCursor()
     console.error(beautyError(error))
     process.exit(1)
   })

package/src/spinner.js

@@ -1,11 +1,11 @@
 'use strict'
 
 const createProcStats = require('process-stats')
+const { createSpinner } = require('nanospinner')
 const prettyBytes = require('pretty-bytes')
 const { gray } = require('picocolors')
-const ora = require('ora')
 
-const TICK_INTERVAL = 100
+const TICK_INTERVAL = 50
 const procStats = createProcStats({ tick: TICK_INTERVAL })
 
 const stats = () => {
@@ -13,31 +13,32 @@ const stats = () => {
   const time = `time${gray(`=${uptime.pretty}`)}`
   const cpu = `cpu${gray(`=${cpuUsage.pretty}`)}`
   const memory = `memory${gray(`=${memUsed.pretty}`)}`
-
   return `${time} ${cpu} ${memory}`
 }
 
-const spinner = ora({
-  color: 'white'
-})
-let timer
+const spinner = createSpinner(stats(), { color: 'white' })
+let interval
 
 const start = () => {
   console.log()
-  spinner.start()
-
-  timer = setInterval(() => {
-    spinner.text = stats()
-  }, TICK_INTERVAL)
+  spinner.start({ text: stats() })
+  interval = setInterval(() => spinner.update({ text: stats() }), TICK_INTERVAL)
 }
 
-const stop = (str = '') => {
-  spinner.stop()
-  clearInterval(timer)
-  const sizeValue = `=${prettyBytes(Buffer.from(JSON.stringify(str)).byteLength)}`
-  const info = `${stats()} size=${gray(sizeValue)}`
+const stop = ({ result, force = false } = {}) => {
+  if (force) {
+    spinner.error({ text: stats() })
+  } else {
+    const sizeValue = `=${prettyBytes(Buffer.from(result).length)}`
+    const text = `${stats()} size=${gray(sizeValue)}\n`
+    spinner.success({ text })
+  }
   procStats.destroy()
-  return info
+  clearInterval(interval)
 }
 
-module.exports = { start, stop }
+module.exports = {
+  ...spinner,
+  start,
+  stop
+}