pug-site-core 2.0.16 → 2.0.18

package/lib/devServer.js

@@ -3,6 +3,7 @@ import useragent from "express-useragent";
 import ip from "ip";
 import fse from "fs-extra";
 import _ from "lodash";
+import { createProxyMiddleware } from "http-proxy-middleware";
 import {
   getCompilePugFilter,
   getIdleProt,
@@ -48,6 +49,69 @@ function setupMiddleware(app) {
   app.use("/static", express.static(paths.template.static));
   app.use(express.static(paths.public));
   app.locals.basedir = paths.template.root;
+
+  // 设置代理
+  setupProxy(app);
+}
+
+// 配置代理中间件
+function setupProxy(app) {
+  const proxyConfig = config.devServer.proxy || {};
+
+  // 如果没有配置proxy或配置为空对象，则不执行代理设置
+  if (!proxyConfig || Object.keys(proxyConfig).length === 0) {
+    return;
+  }
+
+  // 遍历代理配置
+  Object.keys(proxyConfig).forEach((context) => {
+    let options = proxyConfig[context];
+
+    // 如果配置是字符串，转换为对象格式
+    if (typeof options === "string") {
+      options = {
+        target: options,
+        changeOrigin: true,
+      };
+    }
+
+    // 检查是否有target配置
+    if (!options || !options.target) {
+      console.error(`错误: 代理配置路径 "${context}" 缺少必要的 "target" 选项`);
+      return; // 跳过此配置
+    }
+
+    try {
+      // 创建代理中间件
+      const proxy = createProxyMiddleware({
+        target: options.target,
+        changeOrigin: options.changeOrigin !== false,
+        pathRewrite: options.pathRewrite || {},
+        secure: options.secure !== false,
+        ws: options.ws !== false,
+        logLevel: options.logLevel || "warn",
+        onProxyReq: (proxyReq, req, res) => {
+          if (options.onProxyReq) {
+            options.onProxyReq(proxyReq, req, res);
+          }
+          console.log(`代理请求: ${req.method} ${req.path} -> ${options.target}`);
+        },
+        onError: (err, req, res) => {
+          console.error("代理错误:", err);
+          res.writeHead(500, {
+            "Content-Type": "text/plain",
+          });
+          res.end("代理请求错误: " + err);
+        },
+      });
+
+      // 应用代理中间件到应用
+      app.use(context, proxy);
+      console.log(`代理已配置: ${context} -> ${options.target}`);
+    } catch (error) {
+      console.error(`配置代理 ${context} 时出错:`, error.message);
+    }
+  });
 }
 
 function setupRoutes(app, wss) {

package/lib/generate.js

@@ -103,7 +103,7 @@ export async function generateGetDataFn() {
   try {
     const getDataPath = paths.resolveRoot("getData.js");
     const getDataFile = await fse.readFile(getDataPath, "utf8");
-    const pagesPugFilePathArr = await getPagesPugFilePathArr(true);
+    const pagesPugFilePathArr = await getPagesPugFilePathArr();
 
     // 使用正则表达式检查init函数是否存在
     const initFunctionRegex = /export\s+async\s+function\s+init\s*\(\s*\)/;

package/lib/translate.js

@@ -47,7 +47,7 @@ const countryLanguageMap = {
   tw: "zh-TW",
   gb: "en",
   br: "pt",
-  in: "hi"
+  in: "hi",
 };
 
 async function translateStr(str, targetLanguage) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pug-site-core",
-  "version": "2.0.16",
+  "version": "2.0.18",
   "main": "index.js",
   "type": "module",
   "scripts": {
@@ -25,6 +25,13 @@
     "express": "^4.19.2",
     "express-useragent": "^1.0.15",
     "fs-extra": "^11.2.0",
+    "glob": "^10.3.10",
+    "http-proxy-middleware": "^3.0.5",
+    "imagemin": "^8.0.1",
+    "imagemin-gifsicle": "^7.0.0",
+    "imagemin-mozjpeg": "^10.0.0",
+    "imagemin-pngquant": "^9.0.2",
+    "imagemin-svgo": "^10.0.1",
     "ip": "^2.0.1",
     "javascript-obfuscator": "^4.1.1",
     "jstransformer-autoprefixer": "^2.0.0",
@@ -36,22 +43,15 @@
     "pug": "^3.0.3",
     "tcp-port-used": "^1.0.2",
     "uglify-js": "^3.19.3",
-    "ws": "^8.18.0",
-    "glob": "^10.3.10",
-    "imagemin": "^8.0.1",
-    "imagemin-gifsicle": "^7.0.0",
-    "imagemin-mozjpeg": "^10.0.0",
-    "imagemin-pngquant": "^9.0.2",
-    "imagemin-svgo": "^10.0.1"
+    "ws": "^8.18.0"
   },
   "license": "ISC",
-  "description": "修复带getData排除函数参数时无法删掉以前json文件问题、优化代码",
+  "description": "增加本地server的代理功能",
   "files": [
     "lib/",
     "index.js"
   ],
   "exports": {
     ".": "./index.js"
-  },
-  "devDependencies": {}
+  }
 }