waibu-mpa 2.5.0 → 2.6.0

package/extend/dobo/model/session.json

@@ -1,8 +1,7 @@
 {
   "properties": [
     "id,,100,primary,true",
-    "session,object",
-    "expires,datetime"
+    "session,object"
   ],
   "features": ["dobo:createdAt", "dobo:updatedAt"],
   "attachment": false

package/index.js

@@ -57,7 +57,8 @@ async function factory (pkgName) {
             secure: 'auto',
             maxAge: 86400 * 7 * 1000
           },
-          saveUninitialized: false
+          saveUninitialized: false,
+          trashOldDur: '5m'
         },
         emoji: true,
         viewEngine: {

package/lib/class/component.js

@@ -206,9 +206,13 @@ async function componentFactory () {
      * @param {Object} params - The parameters containing options and values.
      * @returns {string} The generated `<option>` elements.
      */
-    buildOptions = (params) => {
-      const { isString, has, omit, find, isPlainObject, isArray, pick } = this.app.lib._
-      const { attrToArray, attrToObject } = this.app.waibu
+    buildOptions = async (params) => {
+      const { isString, has, omit, find, isPlainObject, isArray, pick, camelCase, get } = this.app.lib._
+      const { attrToArray } = this.app.waibu
+      const { getMethod, callHandler } = this.app.bajo
+      let prop = {}
+      const schema = get(this, 'locals.schema')
+      if (schema) prop = find(schema.properties, { name: params.attr.name }) ?? {}
       if (!has(params.attr, 'options')) return
       const items = []
       let input = params.attr.options
@@ -216,22 +220,29 @@ async function componentFactory () {
       if (!has(params.attr, 'multiple') && values.length > 0) values = [values[0]]
       let options = []
       if (isString(input)) {
-        if (input.includes(':')) input = attrToObject(input)
-        else input = attrToArray(input)
+        if (getMethod(input, false)) {
+          input = await callHandler(input)
+        } else {
+          input = attrToArray(input, ';').map(item => {
+            const [value, text] = item.split(':')
+            return { value, text }
+          })
+        }
       }
-      if (isPlainObject(params.attr.options)) {
-        for (const key in params.attr.options) {
-          options.push({ value: key, text: (params.attr.options[key] + '') })
+      if (isPlainObject(input)) {
+        for (const key in input) {
+          options.push({ value: key, text: (input[key] + '') })
         }
-      } else if (isArray(params.attr.options)) {
-        options = params.attr.options.map(item => {
+      } else if (isArray(input)) {
+        options = input.map(item => {
           if (isPlainObject(item)) return pick(item, ['value', 'text'])
           return { value: item, text: (item + '') }
         })
       }
       for (const opt of options) {
-        const sel = find(values, v => opt.val === v)
-        items.push(`<option value="${opt.val}"${sel ? ' selected' : ''}>${this.req.t(opt.text ?? opt.val)}</option>`)
+        const sel = find(values, v => opt.value === v)
+        const ttext = camelCase(`${prop.name} ${opt.text}`)
+        items.push(`<option value="${opt.value}"${sel ? ' selected' : ''}>${this.req.te(ttext) ? this.req.t(ttext) : (opt.text ?? opt.value)}</option>`)
       }
       params.attr = omit(params.attr, ['options'])
       return items.join('\n')
@@ -264,6 +275,7 @@ async function componentFactory () {
      * @returns {Promise<string>} The built sentence.
      */
     buildSentence = async (sentence, params = {}, extra = {}) => {
+      const { get } = this.app.lib._
       if (Array.isArray(sentence)) sentence = sentence.join(' ')
       const { minify, renderString } = this.app.waibuMpa
       if (extra.wrapped) sentence = '<w>' + sentence + '</w>'
@@ -272,8 +284,8 @@ async function componentFactory () {
         ext: params.ext ?? '.html',
         req: this.req,
         reply: this.reply,
-        theme: this.theme.name,
-        iconset: this.iconset.name
+        theme: get(this, 'theme.name', 'default'),
+        iconset: get(this, 'iconset.name', 'default')
       }
       let html = await renderString(sentence, params, opts)
       if (extra.wrapped) html = html.slice(3, html.length - 4)

package/lib/class/widget/datalist.js

@@ -4,7 +4,10 @@ async function datalistFactory () {
       super(options)
       this.component.normalizeAttr(this.params)
       this.params.tag = 'datalist'
-      if (this.params.attr.options) this.params.html = this.component.buildOptions(this.params)
+    }
+
+    build = async () => {
+      if (this.params.attr.options) this.params.html = await this.component.buildOptions(this.params)
     }
   }
 

package/lib/session/setup.js

@@ -1,11 +1,26 @@
 import Store from './store.js'
 
+async function trashOld () {
+  if (!this.app.dobo) return
+  const { get } = this.app.lib._
+  const { dayjs } = this.app.lib
+  const model = this.app.dobo.getModel('WmpaSession')
+  const recs = await model.findAllRecord({ sort: { createdAt: 1 } }, { noHook: true, noModelHook: true })
+  for (const rec of recs) {
+    let expires = get(rec, 'session.cookie.expires')
+    if (!expires) expires = dayjs(rec.createdAt).add(this.config.session.cookie.maxAge, 'ms').toISOString()
+    const diff = dayjs(expires).diff(dayjs())
+    if (diff < 0) await model.removeRecord(rec.id, { noReturn: true })
+  }
+}
+
 async function sessionSetup () {
   const { importPkg, runHook } = this.app.bajo
   const [cookie, session, flash] = await importPkg('waibu:@fastify/cookie',
     'waibu:@fastify/session', 'waibu:@fastify/flash')
   const cfg = this.getConfig('session')
   if (!cfg) return
+  delete cfg.trashOldDur
   await runHook(`${this.ns}:beforeSessionSetup`)
   if (this.app.dobo) {
     this.sessionStore = new Store(this)
@@ -15,6 +30,11 @@ async function sessionSetup () {
   this.webAppCtx.register(session, cfg)
   this.webAppCtx.register(flash)
   await runHook(`${this.ns}:afterSessionSetup`, this.webAppCtx)
+
+  trashOld.call(this)
+  setInterval(() => {
+    trashOld.call(this)
+  }, this.config.session.trashOldDur)
 }
 
 export default sessionSetup

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "waibu-mpa",
-  "version": "2.5.0",
+  "version": "2.6.0",
   "description": "MPA support for Waibu Framework",
   "main": "index.js",
   "scripts": {

package/wiki/CHANGES.md

@@ -2,8 +2,16 @@
 
 ## 2026-02-18
 
+- [2.6.0] Add auto trashing old session
+- [2.6.0] Remove unecessary ```expires``` field in ```WmpaSession```
+- [2.6.0] Change component's ```buildOptions()``` to async method to accomodate ```prop.values``` as a handler
+- [2.6.0] Bug fix on theme and iconset resolver
+
+## 2026-02-18
+
 - [2.5.0] Move ```attrTo*()``` and ```base64Json*()``` to ```waibu``` because they are sometimes needed outside the ```waibu-mpa```
 - [2.5.0] Bug fix on ```component.buildOptions()```
+- [2.5.1] Bug fix on ```component.buildOptions()```
 
 ## 2026-02-17