Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@
"microlink"
],
"dependencies": {
"@kikobeats/content-type": "~1.0.1",
"@kikobeats/content-type": "~1.0.4",
"@microlink/mql": "~0.16.0",
"clipboardy": "~2.3.0",
"is-local-address": "~2.3.0",
"is-local-address": "~2.3.4",
"jsome": "~2.5.0",
"mri": "~1.2.0",
"nanospinner": "~1.2.2",
Expand Down
6 changes: 5 additions & 1 deletion src/api.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,13 @@ const fetch = async (cli, gotOpts) => {
const mqlOpts = { endpoint, ...queryParams, ...flags }
const spinner = print.spinner()

const mergedGotOpts = Object.keys(cli.headers).length > 0
? { ...gotOpts, headers: { ...gotOpts.headers, ...cli.headers } }
: gotOpts

try {
spinner.start()
const response = await mql.buffer(url, mqlOpts, gotOpts)
const response = await mql.buffer(url, mqlOpts, mergedGotOpts)
spinner.stop()
return { response, flags: { copy, pretty } }
} catch (error) {
Expand Down
21 changes: 20 additions & 1 deletion src/cli.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,10 @@

const mri = require('mri')

const { _, ...flags } = mri(process.argv.slice(2), {
const { _, header, ...flags } = mri(process.argv.slice(2), {
alias: { H: 'header' },
boolean: ['color', 'copy', 'pretty'],
string: ['header'],
default: {
apiKey: process.env.MICROLINK_API_KEY,
pretty: true,
Expand All @@ -12,11 +14,28 @@ const { _, ...flags } = mri(process.argv.slice(2), {
}
})

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 headers = parseHeaders(header)

module.exports = {
flags,
headers,
input: _,
showHelp: () => {
console.log(require('./help'))
process.exit(0)
}
}

module.exports.parseHeaders = parseHeaders
2 changes: 2 additions & 0 deletions src/help.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,12 @@ Flags
white('true')
)}).`
)}
${gray('-H <header> pass custom HTTP header to the request (repeatable).')}


Examples
${gray('microlink https://microlink.io&palette')}
${gray('microlink https://microlink.io&palette --no-pretty')}
${gray('microlink https://microlink.io&palette --api-key=MyApiKey')}
${gray("microlink https://example.com -H 'x-user-cookie: 1'")}
`
38 changes: 38 additions & 0 deletions test/parse-headers.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
'use strict'

const test = require('ava')

const { parseHeaders } = require('../src/cli')

test('single header', t => {
t.deepEqual(parseHeaders('x-user-cookie: 1'), { 'x-user-cookie': '1' })
})

test('multiple headers as array', t => {
t.deepEqual(
parseHeaders(['x-user-cookie: 1', 'authorization: Bearer token123']),
{ 'x-user-cookie': '1', authorization: 'Bearer token123' }
)
})

test('header with colons in value', t => {
t.deepEqual(parseHeaders('authorization: Bearer a:b:c'), {
authorization: 'Bearer a:b:c'
})
})

test('trims whitespace', t => {
t.deepEqual(parseHeaders(' X-Custom : value '), { 'x-custom': 'value' })
})

test('skips entries without colon', t => {
t.deepEqual(parseHeaders(['valid: yes', 'nocolon']), { valid: 'yes' })
})

test('returns empty object for undefined', t => {
t.deepEqual(parseHeaders(undefined), {})
})

test('returns empty object for empty string', t => {
t.deepEqual(parseHeaders(''), {})
})