bajo-extra 1.1.2 → 1.1.4

package/bajo/intl/en-US.json

@@ -13,5 +13,8 @@
   "allDone": "All done!",
   "dlDirNotExists%s": "Download dir '%s' doesn't exist",
   "gettingStatus%s": "Getting %s status",
-  "downloading": "Downloading..."
+  "downloading": "Downloading...",
+  "encryption type": "encryption type",
+  "decryption type": "decryption type",
+  "fetching%s": "Fetching %s"
 }

package/bajo/intl/id.json

@@ -13,5 +13,8 @@
   "allDone": "Selesai semua!",
   "dlDirNotExists%s": "Dir unduh '%s' belum ada",
   "gettingStatus%s": "Mendapatkan status %s",
-  "downloading": "Pengunduhan..."
+  "downloading": "Pengunduhan...",
+  "encryption type": "Tipe enkripsi",
+  "decryption type": "Tipe dekripsi",
+  "fetching%s": "Fetching %s"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bajo-extra",
-  "version": "1.1.2",
+  "version": "1.1.4",
   "description": "Extra package for Bajo Framework",
   "main": "index.js",
   "scripts": {
@@ -32,6 +32,7 @@
     "fast-xml-parser": "^4.5.1",
     "numbro": "^2.5.0",
     "performant-array-to-tree": "^1.11.0",
+    "short-crypt": "^4.0.0",
     "undici": "^7.2.1"
   }
 }

package/plugin/factory.js

@@ -2,13 +2,14 @@ import bcrypt from 'bcrypt'
 import crypto from 'crypto'
 import { createGzip, createGunzip } from 'zlib'
 import path from 'path'
-import { fetch, Agent } from 'undici'
+import { fetch } from 'undici'
 import { Readable } from 'stream'
 import numbro from 'numbro'
+import { ShortCrypt } from 'short-crypt'
 
 async function fetching ({ url, opts, bulk, spin }) {
   const { setImmediate, print } = this.app.bajo
-  const { isEmpty, isFunction, has } = this.app.bajo.lib._
+  const { isEmpty, isFunction, has } = this.lib._
   const { validationErrorMessage } = this.app.bajoDb
   const resp = await this.fetch(url, opts ?? {})
   if (isEmpty(resp)) {
@@ -56,7 +57,7 @@ async function fetching ({ url, opts, bulk, spin }) {
 }
 
 async function handler (rec, bulk) {
-  const { isFunction, set } = this.app.bajo.lib._
+  const { isFunction, set } = this.lib._
   const { recordCreate, recordFind, recordUpdate } = this.app.bajoDb
   const save = bulk.save ?? {}
   const current = save.current ?? {}
@@ -115,6 +116,7 @@ async function factory (pkgName) {
       super(pkgName, me.app)
       this.alias = 'extra'
       this.config = {
+        secret: 'hxKY8Eh63Op9js6ovU25qmq2DmCE9dIB',
         fetch: {
           agent: {}
         }
@@ -150,7 +152,7 @@ async function factory (pkgName) {
 
     // taken from: https://stackoverflow.com/a/41439945
     countFileLines = async (file) => {
-      const { fs } = this.app.bajo.lib
+      const { fs } = this.lib
       return new Promise((resolve, reject) => {
         let lineCount = 0
         fs.createReadStream(file)
@@ -171,10 +173,10 @@ async function factory (pkgName) {
 
     download = async (url, opts = {}, extra = {}) => {
       const { getPluginDataDir, importPkg, generateId } = this.app.bajo
-      const { fs } = this.app.bajo.lib
-      const { isFunction, merge } = this.app.bajo.lib._
+      const { fs } = this.lib
+      const { isFunction, merge } = this.lib._
       if (typeof opts === 'string') extra = { dir: opts }
-      const increment = await importPkg('add-filename-increment')
+      const increment = await importPkg('bajo:add-filename-increment')
       if (!extra.dir) {
         extra.dir = `${getPluginDataDir('bajoExtra')}/download`
         fs.ensureDirSync(extra.dir)
@@ -250,8 +252,8 @@ async function factory (pkgName) {
 
     fetchUrl = async (url, opts = {}, extra = {}) => {
       const { isSet } = this.app.bajo
-      const { fs } = this.app.bajo.lib
-      const { has, isArray, isPlainObject, isString, cloneDeep, merge } = this.app.bajo.lib._
+      const { fs } = this.lib
+      const { isEmpty, has, isArray, isPlainObject, isString, cloneDeep, merge } = this.lib._
       if (isPlainObject(url)) {
         extra = cloneDeep(opts)
         opts = cloneDeep(url)
@@ -263,12 +265,13 @@ async function factory (pkgName) {
         opts.headers.Authorization = `Basic ${Buffer.from(`${opts.auth.username}:${opts.auth.password}`).toString('base64')}`
         delete opts.auth
       }
-      opts.query = merge({}, opts.query, opts.params ?? {})
+      const query = merge({}, opts.query, opts.params ?? {})
+      if (!isEmpty(query)) opts.query = query
       delete opts.params
       if (!has(extra, 'cacheBuster')) extra.cacheBuster = true
       if (extra.cacheBuster) opts.query[extra.cacheBusterKey ?? '_'] = Date.now()
       if (this.config.fetch.agent || extra.agent) {
-        opts.dispatcher = new Agent(extra.agent ?? this.config.fetch.agent)
+        // opts.dispatcher = new Agent(extra.agent ?? this.config.fetch.agent)
       }
       if (opts.body && extra.formData) {
         const formData = new FormData()
@@ -290,6 +293,8 @@ async function factory (pkgName) {
         const query = new URLSearchParams(opts.query)
         url += '?' + query
       }
+      opts.headers = opts.headers ?? {}
+      if (this.config.fetch.userAgent) opts.headers['User-Agent'] = this.config.fetch.userAgent
       const resp = await fetch(url, opts)
       if (extra.rawResponse) return resp
       return await resp.json()
@@ -300,7 +305,7 @@ async function factory (pkgName) {
     }
 
     gzip = async (file, deleteOld, expand) => {
-      const { fs } = this.app.bajo.lib
+      const { fs } = this.lib
       return new Promise((resolve, reject) => {
         const newFile = expand ? file.slice(0, file.length - 3) : (file + '.gz')
         const reader = fs.createReadStream(file)
@@ -336,6 +341,36 @@ async function factory (pkgName) {
     isMd5 = (text) => {
       return /^[a-f0-9]{32}$/i.test(text)
     }
+
+    encrypt = async (text, { type = 'short', subType = 'qr' } = {}) => {
+      const short = (item) => {
+        const sc = new ShortCrypt(this.config.secret)
+        const method = subType === 'qr' ? 'encryptToQRCodeAlphanumeric' : 'encryptToURLComponent'
+        return sc[method](item)
+      }
+      switch (type) {
+        case 'short': return short(text)
+      }
+      throw this.error('invalid%s%s', this.print.write('encryption type'), type)
+    }
+
+    decrypt = async (cipher, { type = 'short', subType = 'qr' } = {}) => {
+      const short = (item) => {
+        const sc = new ShortCrypt(this.config.secret)
+        const method = subType === 'qr' ? 'decryptToQRCodeAlphanumeric' : 'decryptToURLComponent'
+        return sc[method](item)
+      }
+      switch (type) {
+        case 'short': return short(cipher)
+      }
+      throw this.error('invalid%s%s', this.print.write('decryption type'), type)
+    }
+
+    randomRange = (min, max, alpha) => {
+      const num = Math.floor(Math.random() * (max - min + 1) + min)
+      if (!alpha) return num
+      return String.fromCharCode(96 + num)
+    }
   }
 }