@microlink/cli 2.1.4 → 2.1.5

package/package.json

@@ -2,7 +2,7 @@
   "name": "@microlink/cli",
   "description": "Interacting with Microlink API from your terminal.",
   "homepage": "https://nicedoc.io/microlinkhq/cli",
-  "version": "2.1.4",
+  "version": "2.1.5",
   "main": "src/index.js",
   "bin": {
     "microlink": "bin/microlink"
@@ -36,10 +36,11 @@
     "jsome": "~2.5.0",
     "localhost-url-regex": "~1.0.7",
     "meow": "~9.0.0",
-    "ora": "~5.4.0",
+    "nanospinner": "~1.1.0",
     "picocolors": "~1.0.0",
     "pretty-bytes": "~5.6.0",
     "pretty-ms": "~7.0.1",
+    "restore-cursor": "~3.1.0",
     "temperment": "~1.0.0",
     "term-img": "~5.0.0",
     "terminal-link": "~2.1.1",

package/src/api.js

@@ -42,7 +42,6 @@ const fetch = async (cli, gotOpts) => {
   const spinner = print.spinner()
 
   try {
-    console.log()
     spinner.start()
     const { body, response } = await mql.buffer(url, mqlOpts, {
       retry: 0,
@@ -109,19 +108,19 @@ const render = ({ body, response, flags }) => {
   const fetchTime = fetchMode && `(${headers['x-fetch-time']})`
   const size = Number(headers['content-length'] || Buffer.byteLength(body))
 
-  console.log()
-  console.log(
+  console.error()
+  console.error(
     print.label('success', 'green'),
     colors.gray(`${print.bytes(size)} in ${time}`)
   )
-  console.log()
+  console.error()
 
   if (serverTiming) {
-    console.log('  ', print.keyValue(colors.green('timing'), serverTiming))
+    console.error('  ', print.keyValue(colors.green('timing'), serverTiming))
   }
 
   if (cacheStatus) {
-    console.log(
+    console.error(
       '   ',
       print.keyValue(
         colors.green('cache'),
@@ -131,7 +130,7 @@ const render = ({ body, response, flags }) => {
   }
 
   if (fetchMode) {
-    console.log(
+    console.error(
       '    ',
       print.keyValue(
         colors.green('mode'),
@@ -140,8 +139,8 @@ const render = ({ body, response, flags }) => {
     )
   }
 
-  console.log('     ', print.keyValue(colors.green('uri'), uri))
-  console.log('      ', print.keyValue(colors.green('id'), id))
+  console.error('     ', print.keyValue(colors.green('uri'), uri))
+  console.error('      ', print.keyValue(colors.green('id'), id))
 
   if (flags.copy) {
     let copiedValue
@@ -151,7 +150,7 @@ const render = ({ body, response, flags }) => {
       copiedValue = body
     }
     clipboardy.writeSync(JSON.stringify(copiedValue, null, 2))
-    console.log(`\n   ${colors.gray('Copied to clipboard!')}`)
+    console.error(`\n   ${colors.gray('Copied to clipboard!')}`)
   }
 }
 

package/src/print.js

@@ -1,12 +1,15 @@
 'use strict'
 
+const { createSpinner } = require('nanospinner')
+const restoreCursor = require('restore-cursor')
 const terminalLink = require('terminal-link')
 const prettyBytes = require('pretty-bytes')
 const prettyMs = require('pretty-ms')
 const colors = require('picocolors')
 const termImg = require('term-img')
 const jsome = require('jsome')
-const ora = require('ora')
+
+const TICK_INTERVAL = 100
 
 jsome.colors = {
   num: 'cyan',
@@ -22,24 +25,25 @@ jsome.colors = {
 }
 
 module.exports = {
-  spinner: (text = '') => {
-    const spinner = ora({ color: 'white', text })
+  spinner: () => {
     const now = Date.now()
-    const elapsedTime = () => Date.now() - now
-    let interval
+    const elapsedTime = () => prettyMs(Date.now() - now)
+    const spinner = createSpinner(elapsedTime(), { color: 'white' })
+    let timer
 
     const start = () => {
-      interval = setInterval(() => {
-        const duration = elapsedTime()
-        if (duration > 500) spinner.text = `${prettyMs(duration)} ${text}`
-      }, 100)
-      spinner.start()
+      console.error()
+      spinner.start({ text: elapsedTime() })
+      timer = setInterval(
+        () => spinner.update({ text: elapsedTime() }),
+        TICK_INTERVAL
+      )
     }
 
     const stop = () => {
-      spinner.stop()
-      clearInterval(interval)
-      return elapsedTime()
+      clearInterval(timer)
+      spinner.clear()
+      restoreCursor()
     }
 
     return { start, stop }