@mixd-id/web-scaffold 0.2.240705 → 0.2.250801009

package/src/utils/helpers.js

@@ -1,11 +1,3 @@
-const md5 = require("md5");
-const fs = require("fs");
-const { Op } = require('sequelize')
-const axios = require('axios')
-const dayjs = require('dayjs')
-const { camelCase } = require('lodash')
-
-
 const ceil = (num, precision = 0) => {
   var p = Math.pow(10, precision)
   var n = (num * p) * (1 + Number.EPSILON)
@@ -33,6 +25,7 @@ const ftWildcard = (key) => {
 }
 
 const moveFile = function(oldPath, newPath, callback) {
+  const fs = require("fs");
 
   fs.rename(oldPath, newPath, function (err) {
     if (err) {
@@ -47,6 +40,8 @@ const moveFile = function(oldPath, newPath, callback) {
   });
 
   function copy() {
+    const fs = require("fs");
+
     var readStream = fs.createReadStream(oldPath);
     var writeStream = fs.createWriteStream(newPath);
 
@@ -97,6 +92,9 @@ const saveBase64 = async(data, dir = '/storage/files/images') => {
 
 const saveBuffer = async(buffer, dir = '/storage/files/images') => {
 
+  const fs = require("fs");
+  const md5 = require('md5')
+
   const { fileTypeFromBuffer } = await import('file-type')
 
   const type = await fileTypeFromBuffer(buffer)
@@ -112,6 +110,7 @@ const saveBuffer = async(buffer, dir = '/storage/files/images') => {
 }
 
 const saveFromUrl = async(url, dir = '/storage/files/images') => {
+  const axios = require('axios')
 
   const res = await axios({
     method: 'GET',
@@ -141,20 +140,21 @@ const strSlug = (title, separator) => {
   return title.replace(new RegExp('^[' + separator + '\\s]+|[' + separator + '\\s]+$', 'g'),'');
 }
 
-const strVars = (text, vars = {}, opt = { emptyUndefined:true }) => {
-  if(text){
-    (text.match(/\{.*?(?=\})\}/gi) ?? []).forEach((match) => {
-      const key = match.substring(1, match.length - 1)
-      const value = vars[key] ?? (opt?.emptyUndefined ? '' : `{${key}}`)
-      text = text.replace(match, value)
-    })
-  }
+const strVars = (text, vars, opt = { emptyUndefined:true }) => {
+
+  (text.match(/\{.*?(?=\})\}/gi) ?? []).forEach((match) => {
+    const key = match.substring(1, match.length - 1)
+    const value = vars[key] ?? (opt?.emptyUndefined ? '' : `{${key}}`)
+    text = text.replace(match, value)
+  })
 
   return text
 }
 
 const writeStorage = (path, content, append = false) => {
 
+  const fs = require("fs");
+
   if(path.startsWith('/')) path = path.substring(1)
 
   if(append){
@@ -197,6 +197,8 @@ const sequelizeChunk = async (model, opt, callback, chunkSize = 5000) => {
 
 const getPresetSortWhereParams = (order, afterItem) => {
 
+  const { Op } = require('sequelize')
+
   if(order.filter((_) => _[0] === 'id').length <= 0){
     order.push([ 'id', 'desc' ])
   }
@@ -262,7 +264,7 @@ const unflatten = (flatObject) => {
 }
 
 const accessNestedObject = function(obj, path) {
-  if(!obj || typeof path !== 'string') return
+  if(!obj || typeof path !== 'string') return undefined
 
   const keys = path.split('.');
   let nestedObj = obj;
@@ -279,43 +281,6 @@ const accessNestedObject = function(obj, path) {
   return nestedObj;
 }
 
-const accessNestedSequelize = async(obj, path, opt = { defaultValue:'' }) => {
-  if(!obj || typeof path !== 'string') return
-
-  const keys = path.split('.');
-  let value = obj;
-
-  for (let i in keys) {
-    const key = keys[i]
-    const hasNext = i < keys.length - 1
-
-    if(hasNext){
-
-      if(!value[key]){
-        try{
-          value = await value[camelCase(`get-${key}`)]()
-        }
-        catch(e){}
-      }
-      else{
-        value = value[key]
-      }
-
-      if(!value){
-        return
-      }
-    }
-
-    else{
-      value = key in value.dataValues ?
-                value[key] :
-                opt.defaultValue
-    }
-  }
-
-  return value;
-}
-
 const createObjectFromPath = (obj, path, value) => {
   const keys = path.split('.');
 
@@ -544,6 +509,7 @@ const datasourceLoad = async ({ datasource, Models }) => {
 }
 
 const dayTimeRange = (params, value) => {
+  const dayjs = require('dayjs')
 
   /*params = {
     '*': [ [ '08:00', '12:00' ], [ '13:00', '18:00' ] ],
@@ -564,11 +530,72 @@ const dayTimeRange = (params, value) => {
 }
 
 function capitalize(str) {
-  return (str ?? '')
-    .toString()
-    .split(' ')
-    .map(_ => _.charAt(0).toUpperCase() + _.slice(1).toLowerCase())
-    .join(' ')
+  return (str ?? '').toLowerCase().replace(/\b\w/g, function(char) {
+    return char.toUpperCase();
+  });
+}
+
+const removeUnderscoredKey = (obj) => {
+  if (Array.isArray(obj)) {
+    return obj.map(removeUnderscoredKey);
+  }
+  else if (obj !== null && typeof obj === 'object') {
+    for(let key in obj){
+      if(key.startsWith('_')){
+        delete obj[key]
+      }
+      else if(Array.isArray(obj[key]) || (obj[key] !== null && typeof obj[key] === 'object')){
+        removeUnderscoredKey(obj[key])
+      }
+    }
+  }
+  return obj;
+}
+
+const hashMake = async (text) => {
+  const bcrypt = require('bcrypt')
+
+  return bcrypt.hash(text + (process.env.APP_KEY ?? ''), 10)
+}
+
+const hashCheck = (text, hash) => {
+  const bcrypt = require('bcrypt')
+
+  return bcrypt.compare(text + (process.env.APP_KEY ?? ''), hash)
+}
+
+const transactionWithRetry = async (sequelize, callback, opt = {}) => {
+  const { maxRetries = 99, delay = 1000 } = opt
+
+  let retries = 0
+  while(retries < maxRetries){
+    try{
+      return await sequelize.transaction(callback)
+    }
+    catch(e){
+      if(e.name === 'SequelizeConnectionAcquireTimeoutError' ||
+        (e.name === 'SequelizeDatabaseError' && [ 'ER_LOCK_DEADLOCK', '40001' ].includes(e.original.code))){
+        retries++
+
+        if(retries >= maxRetries){
+          throw e
+        }
+
+        await new Promise((resolve) => setTimeout(resolve, delay))
+      }
+
+      else{
+        throw e
+      }
+    }
+  }
+}
+
+const groupBy = (arr, key) => {
+  return arr.reduce((acc, item) => {
+    (acc[item[key]] = acc[item[key]] || []).push(item);
+    return acc;
+  }, {});
 }
 
 module.exports = {
@@ -591,7 +618,6 @@ module.exports = {
   getPresetSortWhereParams,
   unflatten,
   accessNestedObject,
-  accessNestedSequelize,
   createObjectFromPath,
   generateStylesheet,
   hexToRgb,
@@ -601,4 +627,9 @@ module.exports = {
   datasourceGet,
   datasourceLoad,
   dayTimeRange,
+  removeUnderscoredKey,
+  hashMake,
+  hashCheck,
+  transactionWithRetry,
+  groupBy
 }

package/src/utils/helpers.mjs

@@ -80,8 +80,7 @@ const downsizeImage = async (url, targetWidth, imageType, quality, opt = {}) =>
 }
 
 const parseBoolean = function(exp){
-  return [ 'true', 1, true ].includes(typeof exp === 'string' ?
-      exp.toLowerCase() : exp)
+  return [ 'true', '1' ].includes(`${(exp ?? '')}`.toLowerCase())
 }
 
 const strVars = function(text, vars, opt = { emptyUndefined:true }){
@@ -319,6 +318,17 @@ function unslugAndCapitalize(slug) {
     .join(' ');
 }
 
+function slugify(text, separator = '-') {
+  return text
+    .toString() // Ensure the input is a string
+    .normalize('NFD') // Normalize to decompose diacritic marks
+    .replace(/[\u0300-\u036f]/g, '') // Remove diacritic marks
+    .replace(/[^a-zA-Z0-9\s-]/g, '') // Remove special characters
+    .trim() // Trim leading/trailing spaces
+    .replace(/\s+/g, separator) // Replace spaces with dashes
+    .toLowerCase(); // Convert to lowercase
+}
+
 const hexToRgb = (hex) => {
   var result = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(hex);
   return result ? {
@@ -361,7 +371,7 @@ function applyDatasourceReplacer(value, datasource){
 }
 
 function capitalize(str) {
-  return str.replace(/\b\w/g, function(char) {
+  return (str ?? '').toLowerCase().replace(/\b\w/g, function(char) {
     return char.toUpperCase();
   });
 }
@@ -372,24 +382,237 @@ const round = (num, precision = 0) => {
   return Math.round(n) / p
 }
 
-let invokeAfterIdleStore = []
-const invokeAfterIdle = (callback, delay = 1300) => {
+const invokeAfterIdle = (callback, opt) => {
+
   let timeoutId
+  const { delay = 500 } = opt ?? {}
 
   return function(){
-    if(invokeAfterIdleStore.includes(callback))
-      return
-
-    invokeAfterIdleStore.push(callback)
-
     window.clearTimeout(timeoutId)
     timeoutId = window.setTimeout(() => {
       callback.apply(this, arguments)
-      invokeAfterIdleStore.splice(invokeAfterIdleStore.indexOf(callback), 1)
     }, delay)
   }
 }
 
+const queueForLater = (params) => {
+
+  const instance = {
+    delay: 1200,
+    ...params,
+
+    items: [],
+    timeoutId: null,
+
+    run: () => {
+      const items = instance.items.splice(0, instance.items.length);
+      typeof instance.pop === 'function' ? instance.pop(items) : null;
+      instance.timeoutId = null
+    },
+
+    queue(item) {
+      if(Array.isArray(item))
+        instance.items.push(...item)
+      else
+        instance.items.push(item)
+
+      if(!instance.timeoutId)
+        instance.timeoutId = window.setTimeout(instance.run, instance.delay);
+    }
+  }
+
+  return instance.queue
+}
+
+const queueForLaterWithKey = (params) => {
+
+  const instance = {
+    delay: 1200,
+    ...params,
+
+    items: {},
+    timeoutId: {},
+
+    run: (key) => {
+      const items = instance.items[key].splice(0, instance.items[key].length);
+      //console.log('run', key, items)
+      typeof instance.pop === 'function' ? instance.pop(items) : null;
+      instance.timeoutId[key] = false
+    },
+
+    queue(key, item) {
+      if(!instance.items[key]){
+        instance.items[key] = []
+      }
+
+      if(Array.isArray(item))
+        instance.items[key].push(...item)
+      else
+        instance.items[key].push(item)
+
+      //console.log('queue', key, item, instance.items[key])
+
+      if(!instance.timeoutId[key])
+        instance.timeoutId[key] = window.setTimeout(() => instance.run(key), instance.delay);
+    }
+  }
+
+  return instance.queue
+}
+
+const transactionWithRetry = async (sequelize, callback, opt = {}) => {
+  const { maxRetries = 99, delay = 1000, rollback = false } = opt
+
+  let retries = 0
+  while(retries < maxRetries){
+    try{
+      const transaction = await sequelize.transaction()
+      const res = await callback(transaction)
+
+      if(rollback)
+        await transaction.rollback()
+      else
+        await transaction.commit()
+
+      return res
+    }
+    catch(e){
+      if(e.name === 'SequelizeConnectionAcquireTimeoutError' ||
+        (e.name === 'SequelizeDatabaseError' && [ 'ER_LOCK_DEADLOCK', '40001' ].includes(e.original.code))){
+        retries++
+
+        if(retries >= maxRetries){
+          throw e
+        }
+
+        await new Promise((resolve) => setTimeout(resolve, delay))
+      }
+
+      else{
+        throw e
+      }
+    }
+  }
+}
+
+const groupBy = (arr, key) => {
+  return arr.reduce((acc, item) => {
+    (acc[item[key]] = acc[item[key]] || []).push(item);
+    return acc;
+  }, {});
+}
+
+const arrayPush = (arr, items, opt = { update:true }) => {
+  if(!Array.isArray(arr)) return
+  if(!Array.isArray(items)) items = [ items ]
+  if(!opt.key){
+    opt.key = items[0] && items[0].uid ? 'uid' : 'id'
+  }
+
+  if(!Array.isArray(opt.key)){
+    opt.key = [ opt.key ]
+  }
+
+  for(let item of items){
+    if(!item) continue
+
+    const index = arr.findIndex((_) => {
+      for(let key of opt.key){
+        if(_[key] !== item[key]){
+          return false
+        }
+      }
+      return true
+    })
+
+    if(index >= 0){
+      if(opt.update !== false){
+        Object.assign(arr[index], item)
+      }
+    }
+    else{
+      arr.push(item)
+    }
+  }
+}
+
+const arrayRemove = (arr, items, opt = {}) => {
+  if(!Array.isArray(arr)) return
+  if(!Array.isArray(items)) items = [ items ]
+  if(!opt.key){
+    opt.key = items[0] && items[0].uid ? 'uid' : 'id'
+  }
+
+  items = groupBy(items, opt.key)
+
+  for(let i = arr.length - 1 ; i >= 0 ; i--){
+    if(!arr[i]) continue
+
+    if(arr[i][opt.key] in items){
+      arr.splice(i, 1)
+    }
+  }
+}
+
+const arrayUnshift = (arr, items, opt = { update:true }) => {
+  if(!Array.isArray(arr)) return
+  if(!Array.isArray(items)) items = [ items ]
+  if(!opt.key){
+    opt.key = items[0] && items[0].uid ? 'uid' : 'id'
+  }
+
+  if(!Array.isArray(opt.key)){
+    opt.key = [ opt.key ]
+  }
+
+  for(let item of items){
+    if(!item) continue
+
+    const index = arr.findIndex((_) => {
+      for(let key of opt.key){
+        if(_[key] !== item[key]){
+          return false
+        }
+      }
+      return true
+    })
+
+    if(index >= 0){
+      if(opt.update !== false){
+        Object.assign(arr[index], item)
+      }
+    }
+    else{
+      arr.unshift(item)
+    }
+  }
+}
+
+function addHash(hash, newHash, prefix = '_'){
+  const cleaned = hash.split('#')
+    .filter(_=>_).map(_ => `#${_}`)
+    .filter(_ => !_.startsWith(prefix))
+
+  cleaned.push(newHash)
+
+  return cleaned.join('')
+}
+
+const downloadUrl = (url, as) => {
+  url = url + (url.indexOf('?') >= 0 ? '&' : '?') + 'nocache=' + new Date().getTime()
+
+  const downloader = document.createElement('a')
+  downloader.setAttribute('href', url)
+  downloader.target = '_blank'
+  if(as) downloader.download = as
+  document.body.appendChild(downloader)
+
+  downloader.click()
+
+  window.setTimeout(() => {
+    document.body.removeChild(downloader)
+  }, 100)
+}
 
 export {
   capitalize,
@@ -414,9 +637,19 @@ export {
   removeStyleFromTag,
   createFormData,
   unslugAndCapitalize,
+  slugify,
   applyDatasourceReplacer,
   strVars,
-  invokeAfterIdle
+  invokeAfterIdle,
+  queueForLater,
+  queueForLaterWithKey,
+  transactionWithRetry,
+  groupBy,
+  arrayPush,
+  arrayRemove,
+  arrayUnshift,
+  addHash,
+  downloadUrl
 }
 
 function observeInit(){

package/src/utils/importer.js

@@ -5,6 +5,27 @@ const glob = require("glob");
 const Exceljs = require("exceljs")
 const { saveBuffer, unflatten } = require('./helpers.js')
 
+const getCellText = (cell) => {
+  if(!cell) return ''
+
+  let value = ''
+  if(cell.formulaType === 1){
+    value = cell.result
+  }
+  else if(cell.value?.error){
+    value = '#ERR'
+  }
+  else if(cell.value?.hyperlink){
+    value = cell.value.hyperlink
+  }
+  else{
+    value = cell.value
+  }
+
+  return value
+
+}
+
 const analyseRequest = async(req) => {
 
   const file = req.files[0]
@@ -161,9 +182,7 @@ const importRequest = async(req) => {
         const key = keys[idx]
         if(key.value && columnAddress[key.value]){
           const cell = row.getCell(columnAddress[key.value])
-          let value = cell.formulaType === 1 ? cell.result : cell.value
-          if(value && value.error) value = ''
-          obj[key.key] = value
+          obj[key.key] = getCellText(cell)
         }
       }