dobo 2.11.1 → 2.11.2

package/index.js

@@ -153,6 +153,9 @@ async function factory (pkgName) {
             hardLimit: 10000,
             maxPage: 50,
             sort: ['dt:-1', 'updatedAt:-1', 'updated_at:-1', 'createdAt:-1', 'createdAt:-1', 'ts:-1', 'username', 'name']
+          },
+          cache: {
+            ttlDur: '10s'
           }
         },
         memDb: {

package/lib/collect-models.js

@@ -245,6 +245,8 @@ async function createSchema (item) {
   item.hooks = item.hooks ?? []
   item.disabled = item.disabled ?? []
   item.scanables = item.scanables ?? []
+  item.cache = item.cache ?? this.config.default.cache
+  if (item.cache === true) item.cache = this.config.default.cache
   if (item.disabled === 'all') item.disabled = ['find', 'get', 'create', 'update', 'remove']
   else if (item.disabled === 'readonly') item.disabled = ['create', 'update', 'remove']
   // Is there any overwritten connection?

package/lib/factory/model/find-all-record.js

@@ -1,21 +1,28 @@
 import { getMultiRefs, execHook, execModelHook, execDynHook, getFilterAndOptions, cloneOptions } from './_util.js'
 const action = 'findAllRecord'
 
-async function native (filter, options, dataOnly) {
+async function native (...args) {
   const { isSet } = this.app.lib.aneka
-  const { get, set } = this.plugin.cache ?? {}
+  const { cloneDeep } = this.app.lib._
+  const [params = {}, opts = {}] = args
+  const { dataOnly = true } = opts
+  const { get: getCache, set: setCache } = this.app.bajoCache
+  const { filter, options } = await getFilterAndOptions.call(this, params, opts, action)
   if (dataOnly) options.count = false
   let { noResultSanitizer, noCache } = options
-  if (!this.cacheable) noCache = true
   await execHook.call(this, 'beforeFindRecord', filter, options)
   await execModelHook.call(this, 'beforeFindRecord', filter, options)
   await execDynHook.call(this, 'beforeFindRecord', filter, options)
-  if (get && !noCache && !options.record) {
-    const cachedResult = await get({ model: this.name, filter, options })
-    if (cachedResult) {
-      cachedResult.cached = true
-      await execModelHook.call(this, 'afterFindRecord', filter, cachedResult, options)
-      return dataOnly ? cachedResult.data : cachedResult
+  if (this.cache.ttlDur === 0 || options.record) noCache = true
+  const cacheFilter = cloneDeep(filter)
+  if (!noCache && getCache) {
+    const result = await getCache({ model: this, filter: cacheFilter, options })
+    if (result) {
+      for (const idx in result.data) {
+        result.data[idx] = await this.sanitizeRecord(result.data[idx], options)
+      }
+      result.cached = true
+      return dataOnly ? result.data : result
     }
   }
   const result = options.record ?? (await this.driver._findAllRecord(this, filter, options)) ?? {}
@@ -28,12 +35,17 @@ async function native (filter, options, dataOnly) {
   await execDynHook.call(this, 'afterFindRecord', filter, result, options)
   await execModelHook.call(this, 'afterFindRecord', filter, result, options)
   await execHook.call(this, 'afterFindRecord', filter, result, options)
-  if (set && !noCache) await set({ model: this.name, filter, options, result })
+  if (!noCache && setCache) {
+    await setCache({ model: this, filter: cacheFilter, result, options })
+    result.cached = false
+  }
   return dataOnly ? result.data : result
 }
 
-async function loop (params, opts, dataOnly) {
+async function loop (...args) {
   const { cloneDeep } = this.app.lib._
+  const [params = {}, opts = {}] = args
+  const { dataOnly = true } = opts
   const { filter, options } = await getFilterAndOptions.call(this, params, opts, action)
   const { maxLimit, hardLimit } = this.app.dobo.config.default.filter
   const nFilter = cloneDeep(filter || {})
@@ -64,13 +76,10 @@ async function loop (params, opts, dataOnly) {
 async function findAllRecord (...args) {
   // can't use action here, because people tends to use is without arguments
   // if (args.length === 0) return this.action(action, ...args)
-  const [params = {}, opts = {}] = args
-  const { dataOnly = true } = opts
   if (this.driver.findAllRecord) {
-    const { filter, options } = await getFilterAndOptions.call(this, params, opts, action)
-    return await native.call(this, filter, options, dataOnly)
+    return await native.call(this, ...args)
   }
-  return await loop.call(this, params, opts, dataOnly)
+  return await loop.call(this, ...args)
 }
 
 export default findAllRecord

package/lib/factory/model/find-one-record.js

@@ -15,7 +15,7 @@ async function findOneRecord (...args) {
   nFilter.limit = 1
   const result = await this.findRecord(nFilter, nOptions)
   const data = result.data[0]
-  return dataOnly ? data : { data }
+  return dataOnly ? data : { data, cached: result.cached, warnings: result.warnings }
 }
 
 export default findOneRecord

package/lib/factory/model/find-record.js

@@ -68,26 +68,27 @@ async function findRecord (...args) {
   if (args.length === 0) return this.action(action, ...args)
   const [params = {}, opts = {}] = args
   const { isSet } = this.app.lib.aneka
-  const { runHook } = this.app.bajo
+  const { cloneDeep } = this.app.lib._
   const { dataOnly = true } = opts
+  const { get: getCache, set: setCache } = this.app.bajoCache
   const { filter, options } = await getFilterAndOptions.call(this, params, opts, action)
   if (dataOnly) options.count = false
   let { noResultSanitizer, noCache } = options
-  if (!this.cacheable || !options.record) noCache = true
-  if (!noCache) {
-    try {
-      await runHook('cache:getByFilter', this, filter)
-    } catch (err) {
-      if (err.code === 'CACHED_RESULT') {
-        const result = err.payload
-        result.cache = true
-        return dataOnly ? result.data : result
-      }
-    }
-  }
   await execHook.call(this, 'beforeFindRecord', filter, options)
   await execModelHook.call(this, 'beforeFindRecord', filter, options)
   await execDynHook.call(this, 'beforeFindRecord', filter, options)
+  if (this.cache.ttlDur === 0 || options.record) noCache = true
+  const cacheFilter = cloneDeep(filter)
+  if (!noCache && getCache) {
+    const result = await getCache({ model: this, filter: cacheFilter, options })
+    if (result) {
+      for (const idx in result.data) {
+        result.data[idx] = await this.sanitizeRecord(result.data[idx], options)
+      }
+      result.cached = true
+      return dataOnly ? result.data : result
+    }
+  }
   const result = options.record ?? (await this.driver._findRecord(this, filter, options)) ?? {}
   if (!noResultSanitizer) {
     for (const idx in result.data) {
@@ -98,7 +99,10 @@ async function findRecord (...args) {
   await execDynHook.call(this, 'afterFindRecord', filter, result, options)
   await execModelHook.call(this, 'afterFindRecord', filter, result, options)
   await execHook.call(this, 'afterFindRecord', filter, result, options)
-  if (!noCache) await runHook('cache:setByFilter', this, filter, result, options)
+  if (!noCache && setCache) {
+    await setCache({ model: this, filter: cacheFilter, result, options })
+    result.cached = false
+  }
   return dataOnly ? result.data : result
 }
 

package/lib/factory/model/get-record.js

@@ -47,7 +47,7 @@ async function getRecord (...args) {
   let [id, opts = {}] = args
   const { isEmpty } = this.app.lib._
   const { isSet } = this.app.lib.aneka
-  const { runHook } = this.app.bajo
+  const { get: getCache, set: setCache } = this.app.bajoCache
   const { dataOnly = true } = opts
   const { options } = await getFilterAndOptions.call(this, null, opts, action)
   let { noResultSanitizer, noCache } = options
@@ -56,15 +56,13 @@ async function getRecord (...args) {
   await execHook.call(this, 'beforeGetRecord', id, options)
   await execModelHook.call(this, 'beforeGetRecord', id, options)
   await execDynHook.call(this, 'beforeGetRecord', id, options)
-  if (!noCache) {
-    try {
-      await runHook('cache:getById', this, id)
-    } catch (err) {
-      if (err.code === 'CACHED_RESULT') {
-        const result = err.payload
-        result.cache = true
-        return dataOnly ? result.data : result
-      }
+  if (this.cache.ttlDur === 0 || options.record) noCache = true
+  if (!noCache && getCache) {
+    const result = await getCache({ model: this, id, options })
+    if (result) {
+      result.data = await this.sanitizeRecord(result.data, options)
+      result.cached = true
+      return dataOnly ? result.data : result
     }
   }
   const result = options.record ?? (await this.driver._getRecord(this, id, options)) ?? {}
@@ -74,7 +72,10 @@ async function getRecord (...args) {
   await execDynHook.call(this, 'afterGetRecord', id, result, options)
   await execModelHook.call(this, 'afterGetRecord', id, result, options)
   await execHook.call(this, 'afterGetRecord', id, result, options)
-  if (!noCache) await runHook('cache:setById', this, id, result, options)
+  if (!noCache && setCache) {
+    await setCache({ model: this, id, result, options })
+    result.cached = false
+  }
   return dataOnly ? result.data : result
 }
 

package/lib/factory/model.js

@@ -72,7 +72,6 @@ async function modelFactory () {
       super(plugin)
       defaults(this, options)
       this.driver = this.connection.driver
-      this.cacheable = this.cacheable ?? this.driver.cacheable ?? true
     }
 
     action = (name, ...args) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dobo",
-  "version": "2.11.1",
+  "version": "2.11.2",
   "description": "DBMS for Bajo Framework",
   "main": "index.js",
   "scripts": {

package/wiki/CHANGES.md

@@ -1,5 +1,9 @@
 # Changes
 
+## 2026-03-25
+
+- [2.11.2] Bug fix in result sets cache
+
 ## 2026-03-17
 
 - [2.11.1] Bug fix on ```model.validate()```: if ```partial``` is true, set ```fields``` from ```body``` keys