bajo-extra 0.3.2 → 0.3.4

package/bajo/helper/download.js

@@ -1,35 +1,36 @@
 import path from 'path'
+import { Readable } from 'node:stream'
 
-async function download (url, opts = {}) {
+async function download (url, opts = {}, extra = {}) {
   const { fs, getPluginDataDir, importPkg, error, generateId } = this.bajo.helper
   const { fetch, formatByte, formatPercentage } = this.bajoExtra.helper
-  const { isFunction } = this.bajo.helper._
-  if (typeof opts === 'string') opts = { dir: opts }
+  const { isFunction, merge } = this.bajo.helper._
+  if (typeof opts === 'string') extra = { dir: opts }
   const increment = await importPkg('add-filename-increment')
-  if (!opts.dir) {
-    opts.dir = `${getPluginDataDir('bajoExtra')}/download`
-    fs.ensureDirSync(opts.dir)
+  if (!extra.dir) {
+    extra.dir = `${getPluginDataDir('bajoExtra')}/download`
+    fs.ensureDirSync(extra.dir)
   }
-  const fetchOpts = opts.fetchOpts ?? {}
-  if (!fs.existsSync(opts.dir)) throw error('Download dir \'%s\' doesn\'t exists', opts.dir)
-  if (opts.randomFileName) {
+  if (!fs.existsSync(extra.dir)) throw error('Download dir \'%s\' doesn\'t exists', extra.dir)
+  if (extra.randomFileName) {
     const ext = path.extname(url)
-    opts.fileName = `${generateId()}${ext}`
+    extra.fileName = `${generateId()}${ext}`
   }
-  if (!opts.fileName) opts.fileName = path.basename(url)
-  const file = path.resolve(increment(`${opts.dir}/${opts.fileName}`, { fs: true }))
+  if (!extra.fileName) extra.fileName = path.basename(url)
+  const file = path.resolve(increment(`${extra.dir}/${extra.fileName}`, { fs: true }))
   const writer = fs.createWriteStream(file)
-  fetchOpts.responseType = 'stream'
-  const { headers, data } = await fetch(url, fetchOpts, { rawResponse: true })
+  const { headers, body, ok, status } = await fetch(url, opts, merge({}, extra, { rawResponse: true }))
+  if (!ok) throw error('Getting %s status', status)
   const total = headers['content-length'] ?? 0
+  const data = Readable.fromWeb(body)
   let length = 0
   data.on('data', chunk => {
     length += chunk.length
-    if (isFunction(opts.progressFn)) opts.progressFn.call(this, length, total)
-    else if (opts.spin) {
-      opts.spinText = opts.spinText ?? 'Downloading...'
-      if (total === 0) opts.spin.setText(`${opts.spinText} %s`, formatByte(length))
-      else opts.spin.setText(`${opts.spinText} %s of %s (%s)`, formatByte(length), formatByte(total), formatPercentage(length / total))
+    if (isFunction(extra.progressFn)) extra.progressFn.call(this, length, total)
+    else if (extra.spin) {
+      extra.spinText = extra.spinText ?? 'Downloading...'
+      if (total === 0) extra.spin.setText(`${extra.spinText} %s`, formatByte(length))
+      else extra.spin.setText(`${extra.spinText} %s of %s (%s)`, formatByte(length), formatByte(total), formatPercentage(length / total))
     }
   })
   data.pipe(writer)

package/bajo/helper/fetch.js

@@ -1,25 +1,46 @@
-import axios from 'axios'
-import http from 'http'
-import https from 'https'
+import path from 'path'
+import { fetch, Agent } from 'undici'
 
-async function fetch (url, opts = {}, ext = {}) {
-  const { getConfig } = this.bajo.helper
-  const { has, isPlainObject, cloneDeep, isEmpty } = this.bajo.helper._
+async function fetchUrl (url, opts = {}, extra = {}) {
+  const { getConfig, isSet, fs } = this.bajo.helper
+  const { has, isArray, isPlainObject, isString, cloneDeep, isEmpty, merge } = this.bajo.helper._
   const cfg = getConfig('bajoExtra')
   if (isPlainObject(url)) {
-    ext = cloneDeep(opts)
+    extra = cloneDeep(opts)
     opts = cloneDeep(url)
-  } else opts.url = url
-  opts.params = opts.params ?? {}
-  if (!has(ext, 'cacheBuster')) ext.cacheBuster = true
-  if (ext.cacheBuster) opts.params[ext.cacheBusterKey ?? '_'] = Date.now()
+    url = opts.url
+    delete opts.url
+  }
+  if (opts.method) opts.method = opts.method.toUpperCase()
+  if (opts.auth) {
+    opts.headers.Authorization = `Basic ${Buffer.from(`${opts.auth.username}:${opts.auth.password}`).toString('base64')}`
+    delete opts.auth
+  }
+  opts.query = merge({}, opts.query, opts.params ?? {})
+  delete opts.params
+  if (!has(extra, 'cacheBuster')) extra.cacheBuster = true
+  if (extra.cacheBuster) opts.query[extra.cacheBusterKey ?? '_'] = Date.now()
   if (!isEmpty(cfg.fetch.agent)) {
-    opts.httpAgent = opts.httpAgent ?? new http.Agent(cfg.fetch.agent)
-    opts.httpsAgent = opts.httpsAgent ?? new https.Agent(cfg.fetch.agent)
+    opts.dispatcher = new Agent(cfg.fetch.agent)
+  }
+  if (opts.body && extra.formData) {
+    const formData = new FormData()
+    for (const key in opts.body) {
+      let fname
+      let val = opts.body[key]
+      if (!isSet(val)) continue
+      if (isString(val) && val.startsWith('file:///')) {
+        fname = path.basename(val)
+        val = new Blob([fs.readFileSync(val.slice(8))])
+      } else if (isPlainObject(val) || isArray(val)) val = JSON.stringify(val)
+      if (fname) formData.append(key, val, fname)
+      else formData.append(key, val)
+    }
+    opts.body = formData
   }
-  const resp = await axios(opts)
-  if (ext.rawResponse) return resp
-  return resp.data
+  const resp = await fetch(url, opts)
+  if (extra.rawResponse) return resp
+  return await resp.json()
 }
 
-export default fetch
+export default fetchUrl

package/bajoCli/tool/download.js

@@ -7,7 +7,7 @@ async function download ({ path, args }) {
 
   let dest
   try {
-    dest = await download(url, { spin, spinText })
+    dest = await download(url, undefined, { spin, spinText })
   } catch (err) {
     spin.fatal('Error: %s', err.message)
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bajo-extra",
-  "version": "0.3.2",
+  "version": "0.3.4",
   "description": "Extra package for Bajo Framework",
   "main": "index.js",
   "scripts": {
@@ -27,13 +27,13 @@
   "homepage": "https://github.com/ardhi/bajo-extra#readme",
   "dependencies": {
     "async": "^3.2.4",
-    "axios": "^1.4.0",
     "bcrypt": "^5.1.1",
     "email-addresses": "^5.0.0",
     "fast-jwt": "^4.0.1",
     "fast-xml-parser": "^4.3.6",
     "numbro": "^2.5.0",
     "performant-array-to-tree": "^1.11.0",
-    "query-string": "^8.1.0"
+    "query-string": "^8.1.0",
+    "undici": "^6.16.1"
   }
 }