bajo-extra 0.3.7 → 1.0.2

package/README.md

@@ -1 +1,23 @@
-# bajo-extra
+# bajo-extra
+
+Plugin name: **bajoExtra**, alias: **extra**
+
+![GitHub package.json version](https://img.shields.io/github/package-json/v/ardhi/bajo-extra) ![NPM Version](https://img.shields.io/npm/v/bajo-extra)
+
+> <br />**Attention**: I do NOT accept any pull request at the moment, thanks!<br /><br />
+
+Extra tools & support for [Bajo](https://github.com/ardhi/bajo)
+
+## Installation
+
+Goto your ```<bajo-base-dir>``` and type:
+
+```bash
+$ npm install bajo-extra
+```
+
+Now open your ```<bajo-data-dir>/config/.plugins``` and put ```bajo-extra``` in it
+
+## License
+
+[MIT](LICENSE)

package/bajo/.alias

@@ -0,0 +1 @@
+extra

package/bajo/config.json

@@ -1,5 +1,4 @@
 {
-  "alias": "x",
   "fetch": {
     "agent": {}
   }

package/bajo/intl/en-US.json

@@ -0,0 +1,17 @@
+{
+  "downloading%s": "Downloading %s...",
+  "noServerResponse": "No response from server",
+  "noRecordToProcess": "No record to process",
+  "gotRecordsProcessing": "Got %d records, processing...",
+  "rec%d%d": "Record %d/%d...",
+  "recProcessed%s%d%d": "[%s] %d/%d records processed",
+  "createdUpdatedSkipped%s%d%d%d": "[%s] Created: %d, Updated: %d, Skipped: %d",
+  "handlerMustBeProvided": "A function handler must be provided",
+  "bulkFetchStarting": "Bulk fetch starting",
+  "fetchingStarts": "Fetching starts...",
+  "batch%s%d": "[%s] Batch #%d",
+  "allDone": "All done!",
+  "dlDirNotExists%s": "Download dir '%s' doesn't exist",
+  "gettingStatus%s": "Getting %s status",
+  "downloading": "Downloading..."
+}

package/bajo/intl/id.json

@@ -0,0 +1,17 @@
+{
+  "downloading%s": "Pengunduhan %s...",
+  "noServerResponse": "Tidak ada respon dari server",
+  "noRecordToProcess": "Tidak ada data yang perlu diproses",
+  "gotRecordsProcessing": "Mendapatkan %d data, diproses...",
+  "rec%d%d": "Data %d/%d...",
+  "recProcessed%s%d%d": "[%s] %d/%d data diproses",
+  "createdUpdatedSkipped%s%d%d%d": "[%s] Dibuat: %d, Diubah: %d, Lompati: %d",
+  "handlerMustBeProvided": "Sebuah fungsi harus diberikan",
+  "bulkFetchStarting": "Bulk fetch dimulai",
+  "fetchingStarts": "Fetching dimulai...",
+  "batch%s%d": "[%s] Batch #%d",
+  "allDone": "Selesai semua!",
+  "dlDirNotExists%s": "Dir unduh '%s' belum ada",
+  "gettingStatus%s": "Mendapatkan status %s",
+  "downloading": "Pengunduhan..."
+}

package/bajo/{helper → method}/count-file-lines.js

@@ -1,7 +1,6 @@
 // taken from: https://stackoverflow.com/a/41439945
-import fs from 'fs'
-
 function countFileLines (file) {
+  const { fs } = this.app.bajo.lib
   return new Promise((resolve, reject) => {
     let lineCount = 0
     fs.createReadStream(file)

package/bajo/{helper → method}/download.js

@@ -2,16 +2,16 @@ import path from 'path'
 import { Readable } from 'node:stream'
 
 async function download (url, opts = {}, extra = {}) {
-  const { fs, getPluginDataDir, importPkg, error, generateId } = this.bajo.helper
-  const { fetch, formatByte, formatPercentage } = this.bajoExtra.helper
-  const { isFunction, merge } = this.bajo.helper._
+  const { getPluginDataDir, importPkg, generateId } = this.app.bajo
+  const { fs } = this.app.bajo.lib
+  const { isFunction, merge } = this.app.bajo.lib._
   if (typeof opts === 'string') extra = { dir: opts }
   const increment = await importPkg('add-filename-increment')
   if (!extra.dir) {
     extra.dir = `${getPluginDataDir('bajoExtra')}/download`
     fs.ensureDirSync(extra.dir)
   }
-  if (!fs.existsSync(extra.dir)) throw error('Download dir \'%s\' doesn\'t exists', extra.dir)
+  if (!fs.existsSync(extra.dir)) throw this.error('dlDirNotExists%s', extra.dir)
   if (extra.randomFileName) {
     const ext = path.extname(url)
     extra.fileName = `${generateId()}${ext}`
@@ -22,7 +22,7 @@ async function download (url, opts = {}, extra = {}) {
   const { headers, body, ok, status } = await fetch(url, opts, merge({}, extra, { rawResponse: true }))
   if (!ok) {
     fs.removeSync(file)
-    throw error('Getting %s status', status)
+    throw this.error('gettingStatus%s', status)
   }
   const total = headers['content-length'] ?? 0
   const data = Readable.fromWeb(body)
@@ -31,9 +31,9 @@ async function download (url, opts = {}, extra = {}) {
     length += chunk.length
     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))
+      extra.spinText = extra.spinText ?? 'downloading'
+      if (total === 0) extra.spin.setText(`${extra.spinText} %s`, this.formatByte(length))
+      else extra.spin.setText(`${extra.spinText} %s of %s (%s)`, this.formatByte(length), this.formatByte(total), this.formatPercentage(length / total))
     }
   })
   data.pipe(writer)

package/bajo/{helper → method}/fetch-and-save.js

@@ -1,6 +1,6 @@
 async function handler (rec, bulk) {
-  const { isFunction, set } = this.bajo.helper._
-  const { recordCreate, recordFind, recordUpdate } = this.bajoDb.helper
+  const { isFunction, set } = this.app.bajo.lib._
+  const { recordCreate, recordFind, recordUpdate } = this.app.bajoDb
   const save = bulk.save ?? {}
   const current = save.current ?? {}
   let existing
@@ -51,13 +51,12 @@ async function handler (rec, bulk) {
 }
 
 async function fetchAndSave ({ url, bulk, save = {}, opts = {} } = {}) {
-  const { startPlugin } = this.bajo.helper
-  const { fetchBulk } = this.bajoExtra.helper
-  const { merge } = this.bajo.helper._
+  const { startPlugin } = this.bajo
+  const { merge } = this.bajo.lib._
   merge(bulk, { handler, save })
   await startPlugin('bajoDb')
 
-  await fetchBulk(url, bulk, opts)
+  await this.fetchBulk(url, bulk, opts)
 }
 
 export default fetchAndSave

package/bajo/{helper → method}/fetch-bulk.js

@@ -1,11 +1,10 @@
 async function fetching ({ url, opts, bulk, spin }) {
-  const { setImmediate, print } = this.bajo.helper
-  const { isEmpty, isFunction, has } = this.bajo.helper._
-  const { validationErrorMessage } = this.bajoDb.helper
-  const { fetch } = this.bajoExtra.helper
-  const resp = await fetch(url, opts ?? {})
+  const { setImmediate, print } = this.app.bajo
+  const { isEmpty, isFunction, has } = this.app.bajo.lib._
+  const { validationErrorMessage } = this.app.bajoDb
+  const resp = await this.fetch(url, opts ?? {})
   if (isEmpty(resp)) {
-    spin.fatal('No result from server, aborted!')
+    spin.fatal('noServerResponse')
     return -1
   }
   if (bulk.abort) {
@@ -21,10 +20,10 @@ async function fetching ({ url, opts, bulk, spin }) {
   if (bulk.printCount === true) bulk.printCount = 100
   const data = isFunction(bulk.dataKey) ? await bulk.dataKey.call(this, resp) : resp[bulk.dataKey]
   if (data.length === 0) {
-    print.warn('No records to process, abort')
+    print.warn('noRecordToProcess')
     return 0
   }
-  spin.setText('Got %d records, processing...', data.length)
+  spin.setText('gotRecordsProcessing%d', data.length)
   for (let r of data) {
     await setImmediate()
     if (bulk.converter) r = await bulk.converter.call(this, r, bulk)
@@ -36,41 +35,40 @@ async function fetching ({ url, opts, bulk, spin }) {
       const result = await bulk.handler.call(this, r, bulk)
       if (result && has(stat, result)) stat[result]++
       if (bulk.printCount && bulk.printCount < count && (count % bulk.printCount === 0)) print.succeed('[%s] Processed %d/%d', spin.getElapsed(), count, data.length)
-      else if (!spin.opts.isLog) spin.setText('Record %d/%d...', count, data.length)
+      else if (!spin.opts.isLog) spin.setText('rec%d%d', count, data.length)
       count++
     } catch (err) {
       console.log(err)
       spin.setText(validationErrorMessage(err) + ', continue')
     }
   }
-  print.succeed('[%s] %d/%d records processed', spin.getElapsed(), count, data.length)
-  if (!bulk.noStat) print.succeed('[%s] Created: %d, Updated: %d, Skipped: %d', spin.getElapsed(), stat.created, stat.updated, stat.skipped)
+  print.succeed('recProcessed%s%d%d', spin.getElapsed(), count, data.length)
+  if (!bulk.noStat) print.succeed('createdUpdatedSkipped%s%d%d%d', spin.getElapsed(), stat.created, stat.updated, stat.skipped)
   return data.length
 }
 
 async function fetchBulk (url, bulk = {}, opts = {}) {
-  const { print, spinner, error } = this.bajo.helper
-  const { isFunction } = this.bajo.helper._
+  const { isFunction } = this.bajo.lib._
   opts.params = opts.params ?? {}
   bulk.maxStep = bulk.maxStep ?? 0
-  if (!isFunction(bulk.handler)) throw error('A function handler must be provided')
+  if (!isFunction(bulk.handler)) throw this.error('handlerMustBeProvided')
   if (isFunction(bulk.paramsIncFn)) {
-    print.info('Bulk fetch starting')
-    const spin = spinner({ showCounter: true }).start('Fetching starts...')
+    this.print.info('bulkFetchStarting')
+    const spin = this.print.spinner({ showCounter: true }).start('fetchingStarts')
     let step = 1
     for (;;) {
-      print.info('[%s] Batch #%d', spin.getElapsed(), step)
+      this.print.info('batch%s%d', spin.getElapsed(), step)
       const newOpts = await bulk.paramsIncFn.call(this, { url, bulk, opts })
       if (newOpts) opts = newOpts
       const length = await fetching.call(this, { url, bulk, opts, spin })
       if (length === 0 || (bulk.maxStep > 0 && step >= bulk.maxStep)) {
-        print.info('All done!')
+        this.print.info('allDone')
         break
       }
       step++
     }
   } else {
-    const spin = spinner({ showCounter: true }).start('Fetching starts...')
+    const spin = this.print.spinner({ showCounter: true }).start('fetchingStarts')
     await fetching.call(this, { url, bulk, opts, spin })
   }
 }

package/bajo/{helper → method}/fetch.js

@@ -2,9 +2,9 @@ import path from 'path'
 import { fetch, Agent } from 'undici'
 
 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')
+  const { isSet } = this.app.bajo
+  const { fs } = this.app.bajo.lib
+  const { has, isArray, isPlainObject, isString, cloneDeep, merge } = this.app.bajo.lib._
   if (isPlainObject(url)) {
     extra = cloneDeep(opts)
     opts = cloneDeep(url)
@@ -20,8 +20,8 @@ async function fetchUrl (url, opts = {}, extra = {}) {
   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.dispatcher = new Agent(cfg.fetch.agent)
+  if (this.config.fetch.agent || extra.agent) {
+    opts.dispatcher = new Agent(extra.agent ?? this.config.fetch.agent)
   }
   if (opts.body && extra.formData) {
     const formData = new FormData()

package/bajo/{helper → method}/gzip.js

@@ -1,7 +1,7 @@
 import { createGzip, createGunzip } from 'zlib'
 
 function gzip (file, deleteOld, expand) {
-  const { fs } = this.bajo.helper
+  const { fs } = this.app.bajo.lib
   return new Promise((resolve, reject) => {
     const newFile = expand ? file.slice(0, file.length - 3) : (file + '.gz')
     const reader = fs.createReadStream(file)

package/bajoCli/applet/download.js

@@ -0,0 +1,15 @@
+async function download (...args) {
+  const [url] = args
+  const spinText = this.print.write('downloading%s', this.print.write('file'))
+  const spin = this.print.spinner({ showCounter: true }).start(spinText)
+
+  let dest
+  try {
+    dest = await this.download(url, undefined, { spin, spinText })
+  } catch (err) {
+    spin.fatal('error%s', err.message)
+  }
+  spin.succeed('savedAs%s%s', this.print.write('file'), dest)
+}
+
+export default download

package/bajoCli/applet.js

@@ -0,0 +1 @@
+export default 'default'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bajo-extra",
-  "version": "0.3.7",
+  "version": "1.0.2",
   "description": "Extra package for Bajo Framework",
   "main": "index.js",
   "scripts": {
@@ -26,12 +26,12 @@
   },
   "homepage": "https://github.com/ardhi/bajo-extra#readme",
   "dependencies": {
-    "async": "^3.2.4",
+    "async": "^3.2.6",
     "bcrypt": "^5.1.1",
-    "fast-jwt": "^4.0.1",
-    "fast-xml-parser": "^4.3.6",
+    "fast-jwt": "^5.0.2",
+    "fast-xml-parser": "^4.5.1",
     "numbro": "^2.5.0",
     "performant-array-to-tree": "^1.11.0",
-    "undici": "^6.16.1"
+    "undici": "^7.2.1"
   }
 }

package/bajoCli/tool/download.js

@@ -1,17 +0,0 @@
-async function download ({ path, args }) {
-  const { spinner } = this.bajo.helper
-  const { download } = this.bajoExtra.helper
-  const url = args[0]
-  const spinText = 'Downloading file...'
-  const spin = spinner({ showCounter: true }).start(spinText)
-
-  let dest
-  try {
-    dest = await download(url, undefined, { spin, spinText })
-  } catch (err) {
-    spin.fatal('Error: %s', err.message)
-  }
-  spin.succeed('File saved as \'%s\'', dest)
-}
-
-export default download

package/bajoCli/tool.js

@@ -1 +0,0 @@
-export default 'defCliHandler'