feat: add .extend and buffer/arrayBuffer methods

microlinkhq · Nov 29, 2023 · 44bf208 · 44bf208
1 parent e0b81ab
commit 44bf208
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/src/factory.js b/src/factory.js
@@ -113,13 +113,13 @@ const factory = ({ VERSION, MicrolinkError, urlHttp, got, flatten }) => {
   }
 
   const mql = createMql()
+  mql.extend = createMql
   mql.MicrolinkError = MicrolinkError
   mql.getApiUrl = getApiUrl
   mql.fetchFromApi = fetchFromApi
   mql.mapRules = mapRules
   mql.version = VERSION
   mql.stream = got.stream
-  mql.buffer = createMql({ responseType: 'buffer' })
 
   return mql
 }

diff --git a/src/lightweight.js b/src/lightweight.js
@@ -17,12 +17,12 @@ class MicrolinkError extends Error {
   }
 }
 
-const got = async (url, opts) => {
+const got = async (url, { responseType, ...opts }) => {
   try {
     if (opts.retry > 0) opts.retry = opts.retry + 1
     if (opts.timeout === undefined) opts.timeout = false
     const response = await ky(url, opts)
-    const body = await response.json()
+    const body = await response[responseType]()
     const { headers, status: statusCode } = response
     return { url: response.url, body, headers, statusCode }
   } catch (err) {
@@ -54,6 +54,8 @@ const mql = factory({
 })
 
 module.exports = mql
+module.exports.arrayBuffer = mql.extend({ responseType: 'arrayBuffer' })
+module.exports.extend = mql.extend
 module.exports.fetchFromApi = mql.fetchFromApi
 module.exports.getApiUrl = mql.getApiUrl
 module.exports.mapRules = mql.mapRules

diff --git a/src/node.js b/src/node.js
@@ -1,11 +1,13 @@
-module.exports = require('./factory')({
+const mql = require('./factory')({
   MicrolinkError: require('whoops')('MicrolinkError'),
   urlHttp: require('url-http/lightweight'),
   got: require('got').extend({ headers: { 'user-agent': undefined } }),
   flatten: require('flattie').flattie,
   VERSION: require('../package.json').version
 })
 
+module.exports = mql
+module.exports.buffer = mql.extend({ responseType: 'buffer' })
 module.exports.render = (input, { width = '650px' } = {}) => {
   if (input && input.url && input.type) {
     return `<img width="${width}" src="${input.url}" />`

diff --git a/test/build.mjs b/test/build.mjs
@@ -17,6 +17,7 @@ test('cjs', async t => {
   t.deepEqual(methods,
     [
       'buffer',
+      'extend',
       'fetchFromApi',
       'getApiUrl',
       'mapRules',
@@ -35,14 +36,14 @@ test('esm', async t => {
 
   t.deepEqual(methods,
     [
+      'arrayBuffer',
       'default',
+      'extend',
       'fetchFromApi',
       'getApiUrl',
       'mapRules',
       'MicrolinkError',
       'version'
-      // render
-      // sstream
     ]
   )
 })