@microlink/cli 2.1.54 → 2.1.56

package/package.json

@@ -2,7 +2,7 @@
   "name": "@microlink/cli",
   "description": "Interacting with Microlink API from your terminal.",
   "homepage": "https://github.com/microlinkhq/cli",
-  "version": "2.1.54",
+  "version": "2.1.56",
   "main": "src/index.js",
   "bin": {
     "microlink": "bin/microlink",
@@ -51,7 +51,7 @@
   "devDependencies": {
     "@commitlint/cli": "latest",
     "@commitlint/config-conventional": "latest",
-    "ava": "latest",
+    "ava": "7",
     "c8": "latest",
     "ci-publish": "latest",
     "finepack": "latest",
@@ -95,6 +95,7 @@
   },
   "nano-staged": {
     "*.js": [
+      "npx @kikobeats/prettier-standard",
       "standard --fix"
     ],
     "*.md": [

package/src/api.js

@@ -6,15 +6,16 @@ require('update-notifier')({ pkg: require('../package.json') }).notify()
 
 const getContentType = require('@kikobeats/content-type')
 const { URLSearchParams } = require('url')
-const clipboardy = require('clipboardy')
 const mql = require('@microlink/mql')
 const prettyMs = require('pretty-ms')
 const temp = require('temperment')
 const fs = require('fs')
 const os = require('os')
 
+const { toClipboard, toPlainHeaders } = require('./util')
 const { gray, green } = require('./colors')
-const print = require('./print')
+const printJson = require('./print-json')
+const printText = require('./print-text')
 const exit = require('./exit')
 
 const microlinkUrl = () =>
@@ -22,134 +23,172 @@ const microlinkUrl = () =>
 
 const normalizeInput = input => {
   if (!input) return input
-  ;[
+  let normalized = input
+  const sanitizers = [
     microlinkUrl,
     () => require('is-local-address/ipv4').regex,
     () => require('is-local-address/ipv6').regex
-  ].forEach(regex => {
-    return (input = input.replace(regex(), ''))
-  })
-  return input.replace(/^\??url=/, '')
+  ]
+
+  for (const createRegex of sanitizers) {
+    normalized = normalized.replace(createRegex(), '')
+  }
+
+  return normalized.replace(/^\??url=/, '')
 }
 
 const getInput = input => {
   const collection = input.length === 1 ? input[0].split(os.EOL) : input
-  return collection.reduce((acc, item) => acc + item.trim(), '')
+  return collection.map(item => item.trim()).join('')
 }
 
 const toPlainObject = input => Object.fromEntries(new URLSearchParams(input))
 
 const fetch = async (cli, gotOpts) => {
-  const { pretty, color, copy, endpoint, ...flags } = cli.flags
+  const {
+    pretty,
+    copy,
+    json,
+    'json-full': jsonFull,
+    endpoint,
+    ...flags
+  } = cli.flags
+  const isJson = json || jsonFull
   const input = getInput(cli.input, endpoint)
   const { url, ...queryParams } = toPlainObject(`url=${normalizeInput(input)}`)
   const mqlOpts = { endpoint, ...queryParams, ...flags }
-  const spinner = print.spinner()
+  const spinner = printText.spinner()
+  const shouldSpin = !isJson && pretty
+
+  let mergedGotOpts = gotOpts
+  if (Object.keys(cli.headers).length > 0) {
+    mergedGotOpts = {
+      ...gotOpts,
+      headers: { ...gotOpts.headers, ...cli.headers }
+    }
+  }
 
-  const mergedGotOpts = Object.keys(cli.headers).length > 0
-    ? { ...gotOpts, headers: { ...gotOpts.headers, ...cli.headers } }
-    : gotOpts
+  const [requestUrl, requestOptions] = mql.getApiUrl(
+    url,
+    mqlOpts,
+    mergedGotOpts
+  )
 
   try {
-    spinner.start()
-    const response = await mql.buffer(url, mqlOpts, mergedGotOpts)
-    spinner.stop()
-    return { response, flags: { copy, pretty } }
+    if (shouldSpin) spinner.start()
+
+    const start = Date.now()
+    const request = isJson ? mql : mql.buffer
+    const mqlResponse = await request(url, mqlOpts, mergedGotOpts)
+    const duration = Date.now() - start
+
+    let response = mqlResponse
+    if (isJson) {
+      response = printJson({
+        requestUrl,
+        requestOptions,
+        response: mqlResponse.response,
+        full: jsonFull,
+        pretty
+      })
+    }
+
+    return { response, duration, flags: { copy, pretty, json: isJson } }
   } catch (error) {
-    spinner.stop()
     error.flags = cli.flags
     throw error
+  } finally {
+    if (shouldSpin) spinner.stop()
   }
 }
 
-const render = ({ response, flags }) => {
-  const { headers, timings, requestUrl: uri, body } = response
-  if (!flags.pretty) return console.log(body.toString())
-
-  const contentType = getContentType(headers['content-type'])
-  const time = prettyMs(timings.phases.total)
-  const serverTiming = headers['server-timing']
-  const id = headers['x-request-id']
-
-  const printMode = (() => {
-    if (body.toString().startsWith('data:')) return 'base64'
-    if (contentType !== 'application/json') return 'image'
-  })()
-
-  switch (printMode) {
-    case 'base64': {
-      const extension = contentType.split('/')[1].split(';')[0]
-      const filepath = temp.file({ extension })
-      fs.writeFileSync(filepath, body.toString().split(',')[1], 'base64')
-      print.image(filepath)
-      break
-    }
-    case 'image':
-      print.image(body)
-      console.log()
-      break
-    default: {
-      const isText = contentType === 'text/plain'
-      const isHtml = contentType === 'text/html'
-      const output = isText || isHtml ? body.toString() : JSON.parse(body)
-      print.json(output, flags)
-      break
-    }
+const render = ({ response, duration, flags }) => {
+  const { headers, requestUrl, url: responseUrl, body } = response
+
+  if (flags.json) {
+    if (flags.copy) toClipboard(JSON.parse(response), flags)
+    if (!flags.pretty) return console.log(response)
+
+    return printText.json(JSON.parse(response), { color: true })
   }
 
-  const edgeCacheStatus = headers['cf-cache-status']
-  const unifiedCacheStatus = headers['x-cache-status']
+  const plainHeaders = toPlainHeaders(headers)
+
+  const bodyBuffer = Buffer.isBuffer(body) ? body : Buffer.from(body)
+  const bodyText = bodyBuffer.toString()
+
+  if (!flags.pretty) return console.log(bodyText)
+
+  const contentType = getContentType(plainHeaders['content-type'])
+  const time = Number.isFinite(duration) ? prettyMs(duration) : 'unknown'
+  const serverTiming = plainHeaders['server-timing']
+  const id = plainHeaders['x-request-id']
+
+  if (bodyText.startsWith('data:')) {
+    const extension = contentType
+      ? contentType.split('/')[1].split(';')[0]
+      : 'png'
+    const filepath = temp.file({ extension })
+    fs.writeFileSync(filepath, bodyText.split(',')[1], 'base64')
+    printText.image(filepath)
+  } else if (contentType !== 'application/json') {
+    printText.image(bodyBuffer)
+    console.log()
+  } else {
+    const isText = contentType === 'text/plain'
+    const isHtml = contentType === 'text/html'
+    const output = isText || isHtml ? bodyText : JSON.parse(bodyText)
+    printText.json(output, flags)
+  }
+
+  const edgeCacheStatus = plainHeaders['cf-cache-status']
+  const unifiedCacheStatus = plainHeaders['x-cache-status']
 
   const cacheStatus =
     unifiedCacheStatus === 'MISS' && edgeCacheStatus === 'HIT'
       ? edgeCacheStatus
       : unifiedCacheStatus
 
-  const timestamp = Number(headers['x-timestamp'])
-  const ttl = Number(headers['x-cache-ttl'])
+  const timestamp = Number(plainHeaders['x-timestamp'])
+  const ttl = Number(plainHeaders['x-cache-ttl'])
   const expires = timestamp + ttl - Date.now()
   const expiration = prettyMs(expires)
   const expiredAt = cacheStatus === 'HIT' ? `(${expiration})` : ''
-  const fetchMode = headers['x-fetch-mode']
-  const fetchTime = fetchMode && `(${headers['x-fetch-time']})`
-  const size = Number(headers['content-length'] || Buffer.byteLength(body))
+  const fetchMode = plainHeaders['x-fetch-mode']
+  const fetchTime = fetchMode && `(${plainHeaders['x-fetch-time']})`
+  const size = Number(plainHeaders['content-length'] || bodyBuffer.length)
+  const uri = requestUrl || responseUrl
 
   console.error()
   console.error(
-    print.label('success', 'green'),
-    gray(`${print.bytes(size)} in ${time}`)
+    printText.label('success', 'green'),
+    gray(`${printText.bytes(size)} in ${time}`)
   )
   console.error()
 
   if (serverTiming) {
-    console.error('  ', print.keyValue(green('timing'), serverTiming))
+    console.error('  ', printText.keyValue(green('timing'), serverTiming))
   }
 
   if (cacheStatus) {
     console.error(
       '   ',
-      print.keyValue(green('cache'), `${cacheStatus} ${gray(expiredAt)}`)
+      printText.keyValue(green('cache'), `${cacheStatus} ${gray(expiredAt)}`)
     )
   }
 
   if (fetchMode) {
     console.error(
       '    ',
-      print.keyValue(green('mode'), `${fetchMode} ${gray(fetchTime)}`)
+      printText.keyValue(green('mode'), `${fetchMode} ${gray(fetchTime)}`)
     )
   }
 
-  console.error('     ', print.keyValue(green('uri'), uri))
-  console.error('      ', print.keyValue(green('id'), id))
+  console.error('     ', printText.keyValue(green('uri'), uri))
+  console.error('      ', printText.keyValue(green('id'), id))
 
   if (flags.copy) {
-    let copiedValue
-    try {
-      copiedValue = JSON.parse(body)
-    } catch (err) {
-      copiedValue = body
-    }
-    clipboardy.writeSync(JSON.stringify(copiedValue, null, 2))
+    toClipboard(JSON.parse(bodyText), flags)
     console.error(`\n   ${gray('Copied to clipboard!')}`)
   }
 }

package/src/cli.js

@@ -1,30 +1,24 @@
 'use strict'
 
 const mri = require('mri')
+const { hasColorizedOutput, parseHeaders } = require('./util')
 
-const { _, header, ...flags } = mri(process.argv.slice(2), {
+const parsed = mri(process.argv.slice(2), {
   alias: { H: 'header' },
-  boolean: ['color', 'copy', 'pretty'],
+  boolean: ['copy', 'json', 'json-full', 'pretty'],
   string: ['header'],
   default: {
     apiKey: process.env.MICROLINK_API_KEY,
-    pretty: true,
-    color: true,
-    copy: false
+    pretty: hasColorizedOutput(),
+    copy: false,
+    json: false,
+    'json-full': false
   }
 })
 
-const parseHeaders = raw => {
-  if (!raw) return {}
-  const entries = Array.isArray(raw) ? raw : [raw]
-  const headers = {}
-  for (const entry of entries) {
-    const idx = entry.indexOf(':')
-    if (idx === -1) continue
-    headers[entry.slice(0, idx).trim().toLowerCase()] = entry.slice(idx + 1).trim()
-  }
-  return headers
-}
+const { _, header, 'api-key': apiKey, ...flags } = parsed
+
+if (apiKey !== undefined) flags.apiKey = apiKey
 
 const headers = parseHeaders(header)
 

package/src/exit.js

@@ -2,7 +2,7 @@
 
 const { gray, red } = require('./colors')
 
-const print = require('./print')
+const print = require('./print-text')
 
 module.exports = async (promise, { flags }) => {
   try {

package/src/help.js

@@ -13,12 +13,21 @@ Flags
       white('$MICROLINK_API_KEY')
     )}`
   )}
-  ${gray(`--colors       colorize output (default is ${code(white('true'))}`)}
   ${gray(
     `--copy         copy output to clipboard (default is ${code(
       white('false')
     )}).`
   )}
+  ${gray(
+    `--json         print request & response payload as JSON (API key masked, default is ${code(
+      white('false')
+    )}).`
+  )}
+  ${gray(
+    `--json-full    print request & response payload as JSON including full API key (default is ${code(
+      white('false')
+    )}).`
+  )}
   ${gray(
     `--pretty       beauty response payload (default is ${code(
       white('true')
@@ -30,6 +39,8 @@ Flags
 Examples
   ${gray('microlink https://microlink.io&palette')}
   ${gray('microlink https://microlink.io&palette --no-pretty')}
+  ${gray('microlink https://microlink.io&palette --json')}
+  ${gray('microlink https://microlink.io&palette --json-full')}
   ${gray('microlink https://microlink.io&palette --api-key=MyApiKey')}
   ${gray("microlink https://example.com -H 'x-user-cookie: 1'")}
 `

package/src/index.js

@@ -3,6 +3,5 @@
 module.exports = {
   cli: require('./cli'),
   api: require('./api'),
-  exit: require('./exit'),
-  print: require('./print')
+  exit: require('./exit')
 }

package/src/print-json.js

@@ -0,0 +1,33 @@
+'use strict'
+
+const { humanizeApiKey, toPlainHeaders, stringify } = require('./util')
+
+module.exports = ({
+  requestUrl,
+  requestOptions,
+  response,
+  full = false,
+  pretty = true
+}) => {
+  const { responseType, ...requestOptionsWithoutResponseType } = requestOptions
+  const headers = { ...requestOptionsWithoutResponseType.headers }
+
+  if (!full && headers['x-api-key']) {
+    headers['x-api-key'] = humanizeApiKey(headers['x-api-key'])
+  }
+
+  return stringify(
+    {
+      request: {
+        url: requestUrl,
+        ...requestOptionsWithoutResponseType,
+        headers
+      },
+      response: {
+        ...response,
+        headers: toPlainHeaders(response.headers)
+      }
+    },
+    { pretty }
+  )
+}

package/src/util.js

@@ -0,0 +1,44 @@
+'use strict'
+
+const clipboardy = require('clipboardy')
+
+const toPlainHeaders = headers => Object.fromEntries(headers.entries())
+
+const humanizeApiKey = apiKey => `${apiKey.substring(0, 5)}…`
+
+const stringify = (value, { pretty }) =>
+  JSON.stringify(value, null, pretty ? 2 : 0)
+
+const toClipboard = (value, flags) =>
+  clipboardy.writeSync(stringify(value, flags))
+
+const hasColorizedOutput = () =>
+  !process.env.NO_COLOR &&
+  process.env.FORCE_COLOR !== '0' &&
+  Boolean(process.stdout?.hasColors?.())
+
+const parseHeaders = raw => {
+  if (!raw) return {}
+
+  const entries = Array.isArray(raw) ? raw : [raw]
+  const headers = {}
+
+  for (const entry of entries) {
+    const idx = entry.indexOf(':')
+    if (idx === -1) continue
+    headers[entry.slice(0, idx).trim().toLowerCase()] = entry
+      .slice(idx + 1)
+      .trim()
+  }
+
+  return headers
+}
+
+module.exports = {
+  hasColorizedOutput,
+  humanizeApiKey,
+  parseHeaders,
+  stringify,
+  toClipboard,
+  toPlainHeaders
+}