zet-lib 1.2.20 → 1.2.22

package/lib/connection.js

@@ -1,13 +1,24 @@
-const { Pool } = require('pg')
+const { Pool } = require('postgres-pool')
 const config = require('dotenv').config()
 const Util = require('./Util')
 
-const pool = new Pool({
+const configPG = {
   user: process.env.PGUSER,
   host: process.env.PGHOST,
   database: process.env.PGDATABASE,
   password: process.env.PGPASSWORD,
   port: process.env.PGPORT,
+  max: 20, // set pool max size to 20
+  idleTimeoutMillis: 1000, // close idle clients after 1 second
+  connectionTimeoutMillis: 10000, // return an error after 10 second if connection could not be established
+  maxUses: 7500, // close (and replace) a connection after it has been used 7500 times (see below for discussion)
+  poolSize: 50, // Default is 10 connections
+}
+
+const pool = new Pool(configPG)
+
+pool.on('error', (err) => {
+  console.error('Unexpected error on idle client', err)
 })
 
 const connection = {}

package/lib/zCache.js

@@ -296,12 +296,18 @@ zCache.updateVersions = (name) => {
 }
 
 zCache.MODELS_RELATIONS = async () => {
-  if (myCache.has('MODELS_RELATIONS')) {
-    return myCache.get('MODELS_RELATIONS')
+  if (process.env.APP_IS_CACHE == 1) {
+    console.log('cache models')
+    if (myCache.has('MODELS_RELATIONS')) {
+      return myCache.get('MODELS_RELATIONS')
+    } else {
+      const obj = await zRoute.modelsCache()
+      myCache.set('MODELS_RELATIONS', obj)
+      return obj
+    }
   } else {
-    const obj = await zRoute.modelsCache()
-    myCache.set('MODELS_RELATIONS', obj)
-    return obj
+    console.log('not cache models')
+    return {}
   }
 }
 

package/lib/zRoute.js

@@ -3666,110 +3666,113 @@ cache models in so it's no need call database repeatly
  */
 
 zRoute.modelsCache = async () => {
-  let models = zRoute.MYMODELS() || {}
-  delete models.zrole
-  delete models.zuser_company
   let obj = {}
-  let companies
-  let mustCaches = ['relation', 'typeahead', 'multi_line_editor', 'dropdown_multi']
-  let nots = ['created_by', 'updated_by']
-  for (let keys in models) {
-    let widgets = models[keys].widgets
-    for (let key in widgets) {
-      if (Util.in_array(widgets[key].name, mustCaches)) {
-        let widget = widgets[key]
-        let table = widget.table
-        if (widget.fields[1] != undefined) {
-          if (!obj[table]) {
-            obj[table] = {}
-          }
-          if (!Util.in_array(key, nots)) {
-            obj[table][`${keys}___${key}`] = `${widgets[key].fields[1]} as ${key}`
+  if (process.env.APP_IS_CACHE == 1) {
+    let models = zRoute.MYMODELS() || {}
+    delete models.zrole
+    delete models.zuser_company
+    let companies
+    let mustCaches = ['relation', 'typeahead', 'multi_line_editor', 'dropdown_multi']
+    let nots = ['created_by', 'updated_by']
+    for (let keys in models) {
+      let widgets = models[keys].widgets
+      for (let key in widgets) {
+        if (Util.in_array(widgets[key].name, mustCaches)) {
+          let widget = widgets[key]
+          let table = widget.table
+          if (widget.fields[1] != undefined) {
+            if (!obj[table]) {
+              obj[table] = {}
+            }
+            if (!Util.in_array(key, nots)) {
+              obj[table][`${keys}___${key}`] = `${widgets[key].fields[1]} as ${key}`
+            }
           }
         }
       }
     }
-  }
-  companies = await connection.results({
-    table: 'zcompany',
-  })
-  obj.zuser = {}
-  obj.zuser = {
-    created_by: 'fullname as created_by',
-    updated_by: 'fullname as updated_by',
-  }
+    companies = await connection.results({
+      table: 'zcompany',
+    })
+    obj.zuser = {}
+    obj.zuser = {
+      created_by: 'fullname as created_by',
+      updated_by: 'fullname as updated_by',
+    }
 
-  try {
-    for (let keys in obj) {
-      let checks = await connection.query(`SELECT EXISTS ( SELECT 1 FROM pg_tables WHERE tablename = '${keys}') AS oke;`)
-      if (checks[0].oke) {
-        if (!Util.in_array(keys, zRoute.tableHasNoCompanyId)) {
-          let selects = ``
-          for (let key in obj[keys]) {
-            selects += `${obj[keys][key]},`
-          }
-          selects += `id, company_id`
-          for (const company of companies) {
-            const results = await connection.results({
-              table: keys,
-              select: selects,
-              where: {
-                company_id: company.id,
-              },
-            })
+    try {
+      for (let keys in obj) {
+        let checks = await connection.query(`SELECT EXISTS ( SELECT 1 FROM pg_tables WHERE tablename = '${keys}') AS oke;`)
+        if (checks[0].oke) {
+          if (!Util.in_array(keys, zRoute.tableHasNoCompanyId)) {
+            let selects = ``
             for (let key in obj[keys]) {
-              const splits = key.split('___') || []
-              let item = splits.length > 1 ? splits[1] : key
-              let arr = []
-              for (const result of results) {
-                arr.push({ id: result.id, zname: result[item] })
+              selects += `${obj[keys][key]},`
+            }
+            selects += `id, company_id`
+            for (const company of companies) {
+              const results = await connection.results({
+                table: keys,
+                select: selects,
+                where: {
+                  company_id: company.id,
+                },
+              })
+              for (let key in obj[keys]) {
+                const splits = key.split('___') || []
+                let item = splits.length > 1 ? splits[1] : key
+                let arr = []
+                for (const result of results) {
+                  arr.push({ id: result.id, zname: result[item] })
+                }
+                const myarray = Util.sortArray(arr, 'zname')
+                myCache.set(`${keys}_${key}_${company.id}`, myarray)
               }
-              const myarray = Util.sortArray(arr, 'zname')
-              myCache.set(`${keys}_${key}_${company.id}`, myarray)
             }
           }
         }
       }
+    } catch (e) {
+      //debug(req,res,e.toString());
+      console.log('modelsCache :', e + '')
     }
-  } catch (e) {
-    //debug(req,res,e.toString());
-    console.log('modelsCache :', e + '')
   }
-
   return obj
 }
 
 zRoute.modelsCacheRenew = (table, companyId) => {
-  if (myCache.has('MODELS_RELATIONS')) {
-    let MODELS = myCache.get('MODELS_RELATIONS')
-    let arr = Object.keys(MODELS) || []
-    let obj = MODELS[table] || {}
-    if (Util.in_array(table, arr)) {
-      let selects = ''
-      for (let key in obj) {
-        selects += `${obj[key]},`
-      }
-      selects += `id`
-      connection
-        .results({
-          select: selects,
-          table: table,
-          where: {
-            company_id: companyId,
-          },
-        })
-        .then(function (results) {
-          for (let key in obj) {
-            const splits = key.split('___') || []
-            let item = splits.length > 1 ? splits[1] : key
-            let arr = []
-            for (const result of results) {
-              arr.push({ id: result.id, zname: result[item] })
+  if (process.env.APP_IS_CACHE == 1) {
+    if (myCache.has('MODELS_RELATIONS')) {
+      let MODELS = myCache.get('MODELS_RELATIONS')
+      let arr = Object.keys(MODELS) || []
+      let obj = MODELS[table] || {}
+      if (Util.in_array(table, arr)) {
+        let selects = ''
+        for (let key in obj) {
+          selects += `${obj[key]},`
+        }
+        selects += `id`
+        connection
+          .results({
+            select: selects,
+            table: table,
+            where: {
+              company_id: companyId,
+            },
+          })
+          .then(function (results) {
+            for (let key in obj) {
+              const splits = key.split('___') || []
+              let item = splits.length > 1 ? splits[1] : key
+              let arr = []
+              for (const result of results) {
+                arr.push({ id: result.id, zname: result[item] })
+              }
+              const myarray = Util.sortArray(arr, 'zname')
+              myCache.set(`${table}_${key}_${companyId}`, myarray)
             }
-            const myarray = Util.sortArray(arr, 'zname')
-            myCache.set(`${table}_${key}_${companyId}`, myarray)
-          }
-        })
+          })
+      }
     }
   }
 }
@@ -3790,7 +3793,6 @@ module.exports = (req, res, next) => {`
   templateSystem += `  next();
 };
 `
-
   Util.writeFile(fileSystem, templateSystem)
   if (process.env.NODE_ENV === 'production') {
     setTimeout(function () {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zet-lib",
-  "version": "1.2.20",
+  "version": "1.2.22",
   "description": "zet is a library that part of zet generator.",
   "engines": {
     "node": ">=18"
@@ -41,6 +41,7 @@
     "nodemailer": "^6.9.4",
     "pg": "^8.11.2",
     "pm2": "^5.3.0",
+    "postgres-pool": "^8.1.4",
     "puppeteer": "^21.0.1",
     "qs": "^6.11.2",
     "randomstring": "^1.3.0",
@@ -49,4 +50,4 @@
     "uuid": "^9.0.0",
     "xlsx": "^0.18.5"
   }
-}
+}