waibu 2.7.1 → 2.8.1

package/index.js

@@ -12,8 +12,8 @@ import handleFavicon from './lib/handle-favicon.js'
 import handleError from './lib/handle-error.js'
 import handleNotFound from './lib/handle-not-found.js'
 import handleHome from './lib/handle-home.js'
-import buildLocals from './lib/build-locals.js'
 import queryString from 'query-string'
+import handleBody from './lib/handle-body.js'
 
 /**
  * @typedef TEscapeChars
@@ -200,6 +200,7 @@ async function factory (pkgName) {
       await handleAppHook.call(this)
       await handleError.call(this)
       await routeHook.call(this, this.ns)
+      await handleBody.call(this)
       await webApp.call(this)
       await handleHome.call(this)
       await handleNotFound.call(this)
@@ -502,36 +503,6 @@ async function factory (pkgName) {
       return url
     }
 
-    /**
-     * Method to send mail through Masohi Messaging System. It is a thin wrapper
-     * for {@link https://github.com/ardhi/masohi-mail|masohi-mail} send method.
-     *
-     * If masohi is not loaded, nothing is delivered.
-     *
-     * @method
-     * @async
-     * @param {(string|Array)} tpl - Mail's template to use. If a string is given, the same template will be used for html & plaintext versions. Otherwise, the first template will be used for html mail, and the second one is for it's plaintext version
-     * @param {Object} [params={}] - {@link https://github.com/ardhi/masohi-mail|masohi-mail}'s params object.
-     * @returns
-     */
-    sendMail = async (tpl, { to, cc, bcc, from, subject, data = {}, conn, source, options = {} }) => {
-      conn = conn ?? 'masohiMail:default'
-      if (!this.app.masohi || !this.app.masohiMail) return
-      const { get, isString } = this.app.lib._
-      const { generateId } = this.app.lib.aneka
-      const { render } = this.app.bajoTemplate
-      if (isString(tpl)) tpl = [tpl]
-      const locals = await buildLocals.call(this, { tpl, params: data, opts: options })
-      const opts = {
-        lang: get(options, 'req.lang'),
-        groupId: get(options, 'req.id', generateId())
-      }
-      const message = await render(tpl[0], locals, opts)
-      if (tpl[1]) opts.messageText = await render(tpl[1], locals, opts)
-      const payload = { type: 'object', data: { to, cc, bcc, from, subject, message, options: opts } }
-      await this.app.masohi.send({ payload, source: source ?? this.ns, conn }) // mail sent through worker
-    }
-
     /**
      * Recursively unescape block of texts
      *

package/lib/handle-body.js

@@ -0,0 +1,32 @@
+export function normalizeValue (value) {
+  const { isSet } = this.app.lib.aneka
+  const { isArray, trim, isPlainObject } = this.app.lib._
+  if (!isSet(value)) return
+  if (value === 'null') value = null
+  else if (value === 'undefined') value = undefined
+  else {
+    const val = trim(value)
+    if (['{', '['].includes(val[0])) {
+      try {
+        const parsed = JSON.parse(val)
+        if (isPlainObject(parsed) || isArray(parsed)) value = parsed
+      } catch (err) {
+        value = val
+      }
+    } else value = val
+  }
+  return value
+}
+
+async function handleBody (options = {}) {
+  const me = this
+  this.instance.addHook('preValidation', async function (req, reply) {
+    if (req.body) {
+      for (const key in req.body) {
+        req.body[key] = normalizeValue.call(me, req.body[key])
+      }
+    }
+  })
+}
+
+export default handleBody

package/lib/webapp-scope/handle-multipart-body.js

@@ -1,6 +1,7 @@
 import multipart from '@fastify/multipart'
 import { promisify } from 'util'
 import { pipeline } from 'stream'
+import { normalizeValue } from '../handle-body.js'
 import path from 'path'
 const pump = promisify(pipeline)
 
@@ -17,34 +18,16 @@ async function onFileHandler () {
 }
 
 async function handleMultipartBody (options = {}) {
-  const { importPkg } = this.app.bajo
-  const { defaultsDeep, isSet } = this.app.lib.aneka
-  const { isArray, map, trim, isPlainObject, isEmpty } = this.app.lib._
-  const parseVar = await importPkg('bajo:dotenv-parse-variables')
+  const { defaultsDeep } = this.app.lib.aneka
+  const { isArray, map, isEmpty } = this.app.lib._
+  const me = this
+
   if (options === false) return this.log.warn('middlewareDisabled%s', 'multipart')
   const opts = defaultsDeep(options, this.app.waibu.config.multipart)
   const onFile = await onFileHandler.call(this)
   opts.onFile = onFile
   await this.webAppCtx.register(multipart, opts)
 
-  function normalizeValue (value) {
-    if (!isSet(value)) return
-    if (value === 'null') value = null
-    else if (value === 'undefined') value = undefined
-    else {
-      const val = trim(value)
-      if (['{', '['].includes(val[0])) {
-        try {
-          const parsed = JSON.parse(val)
-          if (isPlainObject(parsed) || isArray(parsed)) value = parsed
-        } catch (err) {
-          value = val
-        }
-      } else value = parseVar({ item: value }).item
-    }
-    return value
-  }
-
   this.webAppCtx.addHook('preValidation', async function (req, reply) {
     if (req.isMultipart() && opts.attachFieldsToBody === true) {
       const body = Object.fromEntries(
@@ -53,9 +36,9 @@ async function handleMultipartBody (options = {}) {
           let value
           if (key.endsWith('[]') && !isArray(item)) item = [item]
           if (isArray(item)) {
-            value = map(item, i => normalizeValue(i.value))
+            value = map(item, i => normalizeValue.call(me, i.value))
           } else {
-            value = normalizeValue(item.value)
+            value = normalizeValue.call(me, item.value)
           }
           key = key.replace('[]', '')
           return [key, value]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "waibu",
-  "version": "2.7.1",
+  "version": "2.8.1",
   "description": "Web Framework for Bajo",
   "main": "index.js",
   "scripts": {

package/wiki/CHANGES.md

@@ -1,5 +1,14 @@
 # Changes
 
+## 2026-03-06
+
+- [2.8.1] Bug fix on ```req.body``` parsing
+
+## 2026-03-02
+
+- [2.8.0] Remove ```sendMail()``` as from now on it will be using sumba's ```sendMail()```
+- [2.8.0] Remove mail templates
+
 ## 2026-02-21
 
 - [2.7.1] Bug fix on ```errorHandler```

package/extend/bajoTemplate/layout/email.html

@@ -1,17 +0,0 @@
-<!DOCTYPE html>
-<head lang="<%= _meta.lang %>">
-  <meta charset="UTF-8">
-  <title><%= page.fullTitle %></title>
-  <style type="text/css">
-  </style>
-</head>
-<body>
-  <% if (arguments[0].firstName && arguments[0].lastName) { %>
-  <p>Dear <%= firstName %> <%= lastName %>,</p>
-  <% } %>
-  <!-- body -->
-  <p>Sincerely,</p>
-
-  <p><%= _meta.site.title %></p>
-</body>
-</html>

package/extend/bajoTemplate/layout/email.id.html

@@ -1,18 +0,0 @@
-<!DOCTYPE html>
-<html lang="<%= _meta.lang %>">
-<head>
-  <meta charset="UTF-8">
-  <title><%= page.fullTitle %></title>
-  <style type="text/css">
-  </style>
-</head>
-<body>
-  <% if (arguments[0].firstName && arguments[0].lastName) { %>
-  <p>Yth <%= firstName %> <%= lastName %>,</p>
-  <% } %>
-  <!-- body -->
-  <p>Hormat kami,</p>
-
-  <p><%= _meta.site.title %></p>
-</body>
-</html>