waibu 2.7.0 → 2.8.0

package/extend/bajo/intl/en-US.json

@@ -15,5 +15,7 @@
   "middlewareDisabled%s": "Middleware '%s' is disabled",
   "httpResp%s%s%s%s%s": "%s %s%s with a %s-status took %sms",
   "httpReq%s%s%s%s": "%s %s%s from IP %s",
-  "httpReqExt%s": ", content length: %s"
+  "httpReqExt%s": ", content length: %s",
+  "internalServerError": "Internal Server Error",
+  "pageNotFound": "Page Not Found"
 }

package/extend/bajo/intl/id.json

@@ -15,5 +15,7 @@
   "middlewareDisabled%s": "Middleware '%s' dimatikan",
   "httpResp%s%s%s%s%s": "%s %s:%s dengan status %s selama %sms",
   "httpReq%s%s%s%s": "%s %s:%s dari IP %s",
-  "httpReqExt%s": ", panjang konten: %s"
+  "httpReqExt%s": ", panjang konten: %s",
+  "internalServerError": "Kesalahan Internal Server",
+  "pageNotFound": "Halaman Tidak Ditemukan"
 }

package/index.js

@@ -12,7 +12,6 @@ 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'
 
 /**
@@ -502,36 +501,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-error.js

@@ -5,7 +5,11 @@ async function error (err, req, reply) {
   this.log.error(err)
   const resp = await interceptor.call(this, 'errorHandler', err, req, reply)
   if (resp) return resp
-  return writeHtml.call(this, req, reply, `${this.ns}:/extend/bajoTemplate/template/500.html`, { text: this.app.log.getErrorMessage(err) })
+  const payload = {
+    text: this.app.log.getErrorMessage(err),
+    title: req.t('internalServerError')
+  }
+  return writeHtml.call(this, req, reply, `${this.ns}:/lib/template/500.html`, payload)
 }
 
 async function handleError () {

package/lib/handle-not-found.js

@@ -5,7 +5,7 @@ export function writeHtml (req, reply, tpl, payload) {
   reply.header('Content-Type', 'text/html')
   reply.header('Content-Language', req.lang)
   const file = getPluginFile(tpl)
-  const content = fs.readFileSync(file)
+  const content = fs.readFileSync(file, 'utf8')
   const compiled = template(content)
   return compiled(payload)
 }
@@ -14,9 +14,14 @@ export async function interceptor (name, err, req, reply) {
   const { get, trim } = this.app.lib._
   let webApp = get(req, 'routeOptions.config.webApp')
   if (!webApp) {
-    const [prefix] = trim(req.url, '/').split('/')
+    const url = req.url ?? req.raw.url
+    const [prefix] = trim(url, '/').split('/')
     webApp = this.getPluginByPrefix(prefix, true)
   }
+  if (!webApp) {
+    const wa = this.webApps.find(item => item.prefix === '')
+    if (wa) webApp = wa.ns
+  }
   if (webApp) {
     const plugin = this.app[webApp]
     const handler = get(plugin, `webAppFactory.${name}`)
@@ -59,8 +64,11 @@ export async function notFound (err, req, reply) {
   reply.code(404)
   const resp = await interceptor.call(this, 'notFoundHandler', err, req, reply)
   if (resp) return resp
-  const text = req.t('notFound%s%s', req.t('route'), req.url)
-  return writeHtml.call(this, req, reply, `${this.ns}:/extend/bajoTemplate/template/400.html`, { text })
+  const payload = {
+    text: req.t('notFound%s%s', req.t('route'), req.url),
+    title: req.t('pageNotFound')
+  }
+  return writeHtml.call(this, req, reply, `${this.ns}:/lib/template/404.html`, payload)
 }
 
 async function handleNotFound () {

package/lib/template/404.html

@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title><%= title %></title>
+  </head>
+  <body>
+    <%= text %>
+  </body>
+</html>

package/lib/template/500.html

@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title><%= title %></title>
+  </head>
+  <body>
+    <%= text %>
+  </body>
+</html>

package/package.json

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

package/wiki/CHANGES.md

@@ -1,5 +1,17 @@
 # Changes
 
+## 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```
+- [2.7.1] Bug fix on ```notFoundHandler```
+- [2.7.1] Add fallback template for both handlers above
+
+
 ## 2026-02-20
 
 - [2.7.0] Add ```req.te()``` decorator

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>