From 5f462422a348a98d7bcdcf4c97acf34eac04ac38 Mon Sep 17 00:00:00 2001
From: npmrun <kk1549469775@gmail.com>
Date: Wed, 14 Jun 2023 00:11:30 +0800
Subject: [PATCH] add

---
 data/data.db                | Bin 32768 -> 32768 bytes
 docs/a.md                   |   1 +
 package.json                |   1 +
 pnpm-lock.yaml              |   3 +++
 route.txt                   |   4 +---
 source/log4js_config.ts     |   5 +++--
 source/plugins/index.ts     |  12 ++++++------
 source/run.ts               |  26 +++++++++++++++++++-------
 source/util/index.ts        |   2 ++
 template/403.pug            |  10 ++++++++++
 template/404.pug            |   2 +-
 template/layout/layout.pug  |   1 +
 template/views/register.pug |   1 -
 13 files changed, 48 insertions(+), 20 deletions(-)
 create mode 100644 docs/a.md
 create mode 100644 template/403.pug

diff --git a/data/data.db b/data/data.db
index c7a5199bc2078f5d7c2ec6dc3607d09cdd3e2bf5..373287bc2d6fc95cbf268aad787dd571fefb6792 100644
GIT binary patch
delta 722
zcmZo@U}|V!njp<MVWNyP<AjX~3;9*~7BcX2Ix+CK@NVK$=ey7A%H79P&HbBOk!uUj
zH?CC9Z=7>Eoi-~9$Z*z23UDw;OG|rtGAO43fq?-kWn^GvtZQJVYiO)sXl7+#W@T!m
zXJ}!hplx7aWnh3`Hk_Y>K~h>0X!P@4i(YhY0-9_91P~5XYdykb6JtFKV-s8^qsZp+
zaWIIA3VV8b7NshrKyV70V+^f~jrGh7EU_C1ldZ=oZKh{oU<Q@-<>g=y76#hKP?QR^
z4up_xGqo}>w=y-=Gc`BGVjQMyHaFBb&!WjQr3E)%kWyn}@#W!QnEXpdO3TpL$^;nH
zhI$5usK%M<8d@kI%Wk%lT_(gRu=%OJq5#)g27YV4F5a~aOq&H2I(X~9GKe>_it0Bq
z0KrQro3$~DnFqqoR|fhfF(o%MPsJ!n#n3<{*C`|*%cMNrJuS>DCn7&9Eu_dKBGn+m
z+&>`Q#my+p*Dcv7GBLG0G{~da$il_gAT!D@I5If1$k5cp(!|Wt+}zZmuuv~KKUcq?
zG%05?j~}nJfk8YdoZ=14;th@C4b3df%*-q-O-xKpj3(Rr84E(vm8q4frIn$%o|&oH
J=4QWILjW)LuUh~B

delta 263
zcmZo@U}|V!njp>CK2gS*v3+C0LVjtUZwy>qTNwCTcsKE>^WEol<?iFD=KjsC$hBp&
zpu!9;rflxX6Qrd!UyxE`V&PlJ;6M47jMU^yQihvdW#<bqa&LaBuPDH^kb&QtuZwpf
z0~1hF2XE9@2JuE#QT;}S#x!PLD4SK;(~}`FB{wrq#VAR|&_Ja;xggg!P%k3L(Am#D
zJj|%jval+rG`-Ta+{dW2AU7}Fz1*-g$ipPr*f1>9&DgX&E8R75@?T$dHA4$s69aQY
zOAAYLL&JC@10&;j1Jigz^LRru3ln1_6EhPNGh^e)_I}2b@5!)D=9gw=Gd9sPH#FJY
I>{n|D0PH<X5C8xG

diff --git a/docs/a.md b/docs/a.md
new file mode 100644
index 0000000..9720664
--- /dev/null
+++ b/docs/a.md
@@ -0,0 +1 @@
+ffff
\ No newline at end of file
diff --git a/package.json b/package.json
index bd47405..832932b 100644
--- a/package.json
+++ b/package.json
@@ -20,6 +20,7 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
+    "@hapi/boom": "^10.0.1",
     "@hapi/cookie": "^12.0.1",
     "@hapi/crumb": "^9.0.1",
     "@hapi/hapi": "^21.3.2",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 91661a1..e7aba46 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -6,6 +6,9 @@ patchedDependencies:
     path: patches/hapi-sequelizejs@4.6.1.patch
 
 dependencies:
+  '@hapi/boom':
+    specifier: ^10.0.1
+    version: 10.0.1
   '@hapi/cookie':
     specifier: ^12.0.1
     version: 12.0.1
diff --git a/route.txt b/route.txt
index 207fde4..a21678c 100644
--- a/route.txt
+++ b/route.txt
@@ -1,6 +1,4 @@
-D:\1XYX\pro\hapi-demo\source\route\htmx对应路径：
- 不需权限(提供无需验证try)：  GET        /htmx/path/{path*}
-D:\1XYX\pro\hapi-demo\source\route\views对应路径：
+/home/topuser/Code/@project/hapi-demo/source/route/views对应路径：
  不需权限(提供无需验证try)：  GET        /404
  不需权限(提供即需验证optional)：  GET        /
  不需权限(提供无需验证try)：  GET        /about
diff --git a/source/log4js_config.ts b/source/log4js_config.ts
index 484b4f3..2da3c3d 100644
--- a/source/log4js_config.ts
+++ b/source/log4js_config.ts
@@ -1,15 +1,16 @@
 import path from "path"
+import { logsDir } from "./util"
 
 export default function () {
     return {
         appenders: {
             file: {
                 type: "file",
-                filename: path.resolve(__dirname, "../", "./logs", "./Site.log"),
+                filename: path.resolve(logsDir, "./Site.log"),
             },
             SQL: {
                 type: "file",
-                filename: path.resolve(__dirname, "../", "./logs", "./SQL.log"),
+                filename: path.resolve(logsDir, "./SQL.log"),
             },
             console: {
                 type: "console",
diff --git a/source/plugins/index.ts b/source/plugins/index.ts
index f9cfa60..f29468f 100644
--- a/source/plugins/index.ts
+++ b/source/plugins/index.ts
@@ -1,6 +1,6 @@
 import filePlugin from "./file-plugin"
 import path from "path"
-import { baseDir, sourceDir } from "@/util"
+import { logsDir, sourceDir } from "@/util"
 import { plugin as routePlugin } from "@noderun/hapi-router"
 import { ServerRegisterPluginObject, Plugin, Server, Request, ResponseObject } from "@hapi/hapi"
 import Hoek from "@hapi/hoek"
@@ -23,7 +23,7 @@ const transport = pino.transport({
             target: "pino-pretty",
             level: "trace",
             options: {
-                destination: path.resolve(baseDir, "./log/pino.log"),
+                destination: path.resolve(logsDir, "./pino.log"),
                 colorize: true,
                 translateTime: 'HH:MM:ss.l mmmm dS yyyy "UTC"',
                 mkdir: true,
@@ -69,10 +69,10 @@ export default [
                 //     dir: path.resolve(sourceDir, "route/api"),
                 //     prefix: "api"
                 //   },
-                {
-                    dir: path.resolve(sourceDir, "route/htmx"),
-                    prefix: "htmx",
-                },
+                // {
+                //     dir: path.resolve(sourceDir, "route/htmx"),
+                //     prefix: "htmx",
+                // },
                 {
                     dir: path.resolve(sourceDir, "route/views"),
                     prefix: "",
diff --git a/source/run.ts b/source/run.ts
index 77e4516..6a8f669 100644
--- a/source/run.ts
+++ b/source/run.ts
@@ -5,9 +5,10 @@ import { baseDir, isDev, publicDir, sourceDir, templateDir } from "@/util"
 import { validateJwt, validateSession } from "./auth"
 import Hapi, { Server } from "@hapi/hapi"
 import { Sequelize } from "sequelize"
-import { Req } from "#/global"
+import { Req, Res } from "#/global"
 import { sequelize } from "./plugins/sequelize"
 import fs from "fs-extra"
+import { Boom } from "@hapi/boom"
 // const Hapi = require("@hapi/hapi");
 // const HapiSwagger = require("hapi-swagger");
 // const HapiSwagger = require("hapi-swaggered-ui"); // swagger v2版本
@@ -25,16 +26,16 @@ const run = async (): Promise<Server> => {
     server.events.on('request', (request, event, tags) => {
         if (tags.error) {
             loggerSite.error(request.path, "\n", event);
-          } else {
+        } else {
             loggerSite.info(request.path, "\n", event);
-          }
+        }
     });
     server.events.on('log', (event, tags) => {
         if (tags.error) {
             loggerSite.error(event);
-          } else {
+        } else {
             loggerSite.info(event);
-          }
+        }
     });
     await server.register([
         {
@@ -42,7 +43,7 @@ const run = async (): Promise<Server> => {
             options: [
                 {
                     name: "data", // identifier
-                    models: isDev?["source/models/**/*.ts"]:["dist/models/**/*.js"], // paths/globs to model files
+                    models: isDev ? ["source/models/**/*.ts"] : ["dist/models/**/*.js"], // paths/globs to model files
                     //   ignoredModels: [__dirname + "/server/models/**/*.js"], // OPTIONAL: paths/globs to ignore files
                     sequelize: sequelize, // sequelize instance
                     sync: true, // sync models - default false
@@ -96,7 +97,7 @@ const run = async (): Promise<Server> => {
     const Pug = require("pug")
     Pug.filters.public = function (text, options) {
         const p = path.resolve(publicDir, text)
-        if(fs.pathExistsSync(p)) {
+        if (fs.pathExistsSync(p)) {
             return fs.readFileSync(p, "utf-8")
         }
         return ""
@@ -160,6 +161,17 @@ const run = async (): Promise<Server> => {
             },
         },
     ])
+
+    server.ext('onPreResponse', (request, h) => {
+        const { response } = request
+        
+        // 如果状态码为403，则调用自定义错误处理程序
+        if (response instanceof Boom && (response.output.statusCode < 200 || response.output.statusCode > 299)) {
+            return h.view('403.pug', { error: response})
+        }
+        return h.continue;
+    });
+
     await server.start()
     logger.trace("Server running on %s", server.info.uri.replace("0.0.0.0", "localhost"))
     return server
diff --git a/source/util/index.ts b/source/util/index.ts
index 56b8e27..c2364df 100644
--- a/source/util/index.ts
+++ b/source/util/index.ts
@@ -6,6 +6,8 @@ export const isProd = process.env.NODE_ENV === "production"
 
 export const baseDir = path.resolve(__dirname, "../../")
 
+export const logsDir = path.resolve(__dirname, "../../logs")
+
 export const sourceDir = isProd ? path.resolve(__dirname, "../../dist") : path.resolve(__dirname, "../../source")
 export const publicDir = path.resolve(__dirname, "../../public")
 export const uploadDir = path.resolve(publicDir, "upload")
diff --git a/template/403.pug b/template/403.pug
new file mode 100644
index 0000000..7c8542e
--- /dev/null
+++ b/template/403.pug
@@ -0,0 +1,10 @@
+extends layout/layout
+
+block head
+    link(rel="stylesheet", href="/public/css/views/404.css")
+
+block content
+    include @/helper/flush.pug
+    div(style="text-align: center")
+        span.text404 403
+        div #{error}
\ No newline at end of file
diff --git a/template/404.pug b/template/404.pug
index 2318a13..8d761b1 100644
--- a/template/404.pug
+++ b/template/404.pug
@@ -1,10 +1,10 @@
 extends layout/layout
-include @/helper/flush.pug
 
 block head
     link(rel="stylesheet", href="/public/css/views/404.css")
 
 block content
+    include @/helper/flush.pug
     div(style="text-align: center")
         span.text404 404
         div 重定向回：#{rollback}
diff --git a/template/layout/layout.pug b/template/layout/layout.pug
index 9441af6..b095f31 100644
--- a/template/layout/layout.pug
+++ b/template/layout/layout.pug
@@ -1,5 +1,6 @@
 doctype html
 include @/helper/helper.pug
+include @/helper/flush.pug
 
 block var
 html(lang="zh-cn" class=hideHeader?"":"has-navbar-fixed-top")
diff --git a/template/views/register.pug b/template/views/register.pug
index c49e38f..ef3a334 100644
--- a/template/views/register.pug
+++ b/template/views/register.pug
@@ -1,5 +1,4 @@
 extends @/layout/layout
-include @/helper/flush.pug
 
 block var
     -title="注册" // 网页标题