@microlink/cli 2.0.13 → 2.1.0

package/README.md

@@ -12,7 +12,7 @@ npm install @microlink/cli --global
 
 ## License
 
-**microlink** © [Microlink](https://microlink.io), Released under the [MIT](https://github.com/microlinkhq/cli/blob/master/LICENSE.md) License.<br>
+**microlink** © [Microlink](https://microlink.io), released under the [MIT](https://github.com/microlinkhq/cli/blob/master/LICENSE.md) License.<br>
 Authored and maintained by [Kiko Beats](https://kikobeats.com) with help from [contributors](https://github.com/microlinkhq/cli/contributors).
 
 > [microlink.io](https://microlink.io) · GitHub [microlinkhq](https://github.com/microlinkhq) · Twitter [@microlinkhq](https://twitter.com/microlinkhq)

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.0.13",
+  "version": "2.1.0",
   "main": "src/index.js",
   "bin": {
     "microlink": "bin/microlink"
@@ -31,14 +31,14 @@
     "microlink"
   ],
   "dependencies": {
-    "@microlink/mql": "~0.10.10",
+    "@microlink/mql": "~0.10.26",
     "clipboardy": "~2.3.0",
     "escape-string-regexp": "~4.0.0",
-    "got": "~11.8.3",
+    "got": "~11.8.5",
     "jsome": "~2.5.0",
     "meow": "~9.0.0",
     "ora": "~5.4.0",
-    "picocolors": "~0.2.1",
+    "picocolors": "~1.0.0",
     "pretty-bytes": "~5.6.0",
     "pretty-ms": "~7.0.1",
     "temperment": "~1.0.0",

package/src/api.js

@@ -90,9 +90,12 @@ const fetch = async (cli, gotOpts) => {
 const render = ({ body, response, flags }) => {
   const { headers, timings, requestUrl: uri } = response
   if (!flags.pretty) return console.log(body.toString())
-  const time = prettyMs(timings.end - timings.start)
+
   const contentType = headers['content-type'].toLowerCase()
+  const time = prettyMs(timings.end - timings.start)
+  const serverTiming = headers['server-timing']
   const id = headers['x-request-id']
+
   const printMode = (() => {
     if (body.toString().startsWith('data:')) return 'base64'
     if (!contentType.includes('utf')) return 'image'
@@ -112,7 +115,8 @@ const render = ({ body, response, flags }) => {
       break
     default: {
       const isText = contentType.includes('text/plain')
-      const output = isText ? body.toString() : JSON.parse(body)
+      const isHtml = contentType.includes('text/html')
+      const output = isText || isHtml ? body.toString() : JSON.parse(body)
       print.json(output, flags)
       break
     }
@@ -134,6 +138,7 @@ const render = ({ body, response, flags }) => {
   const fetchMode = headers['x-fetch-mode']
   const fetchTime = fetchMode && `(${headers['x-fetch-time']})`
   const size = Number(headers['content-length'] || Buffer.byteLength(body))
+
   console.log()
   console.log(
     print.label('success', 'green'),
@@ -141,28 +146,32 @@ const render = ({ body, response, flags }) => {
   )
   console.log()
 
+  if (serverTiming) {
+    console.log('  ', print.keyValue(colors.green('timing'), serverTiming))
+  }
+
   if (cacheStatus) {
     console.log(
-      '',
+      '   ',
       print.keyValue(
         colors.green('cache'),
-        `${cacheStatus || '-'} ${colors.gray(expiredAt)}`
+        `${cacheStatus} ${colors.gray(expiredAt)}`
       )
     )
   }
 
   if (fetchMode) {
     console.log(
-      '',
+      '    ',
       print.keyValue(
-        colors.green(' mode'),
+        colors.green('mode'),
         `${fetchMode} ${colors.gray(fetchTime)}`
       )
     )
   }
 
-  console.log(cacheStatus ? '  ' : '', print.keyValue(colors.green('uri'), uri))
-  console.log(cacheStatus ? '   ' : ' ', print.keyValue(colors.green('id'), id))
+  console.log('     ', print.keyValue(colors.green('uri'), uri))
+  console.log('      ', print.keyValue(colors.green('id'), id))
 
   if (flags.copy) {
     let copiedValue