@microlink/cli 2.1.2 → 2.1.3

package/bin/microlink-beta

@@ -0,0 +1,11 @@
+#!/usr/bin/env node
+
+const cli = require('../src/cli')
+cli.flags.endpoint = 'https://beta.microlink.io'
+delete cli.flags.apiKey
+
+require('../src/api')(cli, {
+  headers: {
+    authorization: require('../../api/src/constant').MICROLINK_API_AUTHORIZATION
+  }
+})

package/bin/microlink-dev

@@ -0,0 +1,12 @@
+#!/usr/bin/env node
+
+const cli = require('../src/cli')
+cli.flags.endpoint = 'http://localhost:3000'
+delete cli.flags.apiKey
+
+require('../src/api')(cli, {
+  retry: 0,
+  headers: {
+    authorization: require('../../api/src/constant').MICROLINK_API_AUTHORIZATION
+  }
+})

package/bin/microlink-next

@@ -0,0 +1,11 @@
+#!/usr/bin/env node
+
+const cli = require('../src/cli')
+cli.flags.endpoint = 'https://next.microlink.io'
+delete cli.flags.apiKey
+
+require('../src/api')(cli, {
+  headers: {
+    authorization: require('../../api/src/constant').MICROLINK_API_AUTHORIZATION
+  }
+})

package/bin/microlink-vercel

@@ -0,0 +1,5 @@
+#!/usr/bin/env node
+
+const cli = require('../src/cli')
+cli.flags.endpoint = 'https://vercel.microlink.io'
+require('../src/api')(cli)

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.2",
+  "version": "2.1.3",
   "main": "src/index.js",
   "bin": {
     "microlink": "bin/microlink"
@@ -33,9 +33,8 @@
   "dependencies": {
     "@microlink/mql": "~0.10.26",
     "clipboardy": "~2.3.0",
-    "escape-string-regexp": "~4.0.0",
-    "got": "~11.8.5",
     "jsome": "~2.5.0",
+    "localhost-url-regex": "~1.0.4",
     "meow": "~9.0.0",
     "ora": "~5.4.0",
     "picocolors": "~1.0.0",
@@ -49,11 +48,12 @@
   "devDependencies": {
     "@commitlint/cli": "latest",
     "@commitlint/config-conventional": "latest",
+    "ava": "latest",
+    "c8": "latest",
     "ci-publish": "latest",
     "conventional-github-releaser": "latest",
     "finepack": "latest",
     "git-authors-cli": "latest",
-    "git-dirty": "latest",
     "nano-staged": "latest",
     "npm-check-updates": "latest",
     "prettier-standard": "latest",
@@ -74,12 +74,12 @@
     "contributors": "(npx git-authors-cli && npx finepack && git add package.json && git commit -m 'build: contributors' --no-verify) || true",
     "lint": "standard-markdown README.md && standard",
     "postrelease": "npm run release:tags && npm run release:github && (ci-publish || npm publish --access=public)",
-    "prerelease": "npm run update:check && npm run contributors",
+    "prerelease": "npm run update:check",
     "pretest": "npm run lint",
     "release": "standard-version -a",
     "release:github": "conventional-github-releaser -p angular",
     "release:tags": "git push --follow-tags origin HEAD:master",
-    "test": "exit 0",
+    "test": "c8 ava",
     "update": "ncu -u",
     "update:check": "ncu -- --error-level 2"
   },

package/src/api.js

@@ -4,48 +4,27 @@
 
 require('update-notifier')({ pkg: require('../package.json') }).notify()
 
-const escapeStringRegexp = require('escape-string-regexp')
+const localhostUrl = require('localhost-url-regex')
 const { URLSearchParams } = require('url')
 const clipboardy = require('clipboardy')
 const mql = require('@microlink/mql')
 const prettyMs = require('pretty-ms')
 const colors = require('picocolors')
 const temp = require('temperment')
-const got = require('got')
 const fs = require('fs')
 const os = require('os')
 
 const print = require('./print')
 const exit = require('./exit')
 
-const ALL_ENDPOINTS = [
-  'api.microlink.io',
-  'next.microlink.io',
-  'pro.microlink.io',
-  'localhost:3000'
-].reduce(
-  (acc, endpoint) => [
-    ...acc,
-    escapeStringRegexp(`http://${endpoint}`),
-    escapeStringRegexp(`https://${endpoint}`)
-  ],
-  []
-)
-
-const createEndpointRegex = endpoints =>
-  new RegExp(`^(${endpoints.map(endpoint => endpoint).join('|')})`, 'i')
-
-const sanetizeInput = (input, endpoint) => {
-  if (!input) return input
-  const difference = ALL_ENDPOINTS.filter(elem => ![endpoint].includes(elem))
-  const endpointRegex = createEndpointRegex(difference)
-  return input.replace(/^url=/, '').replace(endpointRegex, endpoint)
-}
+const microlinkUrl = () => /^https?.*\.microlink\.io/gi
 
-const prefixInput = (input, endpoint) => {
-  if (input.includes(endpoint)) return input
-  if (input.includes('url=')) return input
-  return `url=${input}`
+const normalizeInput = input => {
+  if (!input) return input
+  ;[microlinkUrl, localhostUrl].forEach(
+    regex => (input = input.replace(regex(), ''))
+  )
+  return input.replace(/^\??url=/, '')
 }
 
 const getInput = input => {
@@ -53,31 +32,22 @@ const getInput = input => {
   return collection.reduce((acc, item) => acc + item.trim(), '')
 }
 
-const toHeaders = input => Object.fromEntries(new URLSearchParams(input))
+const toPlainObject = input => Object.fromEntries(new URLSearchParams(input))
 
 const fetch = async (cli, gotOpts) => {
   const { pretty, color, copy, endpoint, ...flags } = cli.flags
   const input = getInput(cli.input, endpoint)
-  const sanetizedInput = sanetizeInput(input, endpoint)
-  const prefixedInput = prefixInput(sanetizedInput, endpoint)
-  const { url, ...queryParams } = toHeaders(prefixedInput)
+  const { url, ...queryParams } = toPlainObject(`url=${normalizeInput(input)}`)
   const mqlOpts = { endpoint, ...queryParams, ...flags }
   const spinner = print.spinner()
 
   try {
     console.log()
     spinner.start()
-
-    const { body, response } = await (async () => {
-      if (url) {
-        const { response, body } = await mql.buffer(url, mqlOpts, gotOpts)
-        return { body, response }
-      }
-
-      const response = await got(endpoint, mqlOpts)
-      return { response, body: response.body }
-    })()
-
+    const { body, response } = await mql.buffer(url, mqlOpts, {
+      retry: 0,
+      ...gotOpts
+    })
     spinner.stop()
     return { body, response, flags: { copy, pretty } }
   } catch (error) {
@@ -93,7 +63,7 @@ const render = ({ body, response, flags }) => {
 
   const contentType = headers['content-type'].toLowerCase()
   const time = prettyMs(timings.phases.total)
-  const serverTiming = headers['x-server-timing']
+  const serverTiming = headers['server-timing']
   const id = headers['x-request-id']
 
   const printMode = (() => {
@@ -187,3 +157,5 @@ const render = ({ body, response, flags }) => {
 
 module.exports = (cli, gotOpts = {}) =>
   exit(fetch(cli, gotOpts).then(render), cli)
+
+module.exports.normalizeInput = normalizeInput