wildpig 1.3.19 → 1.3.20

package/build/built-api-routes.ts

@@ -1,24 +1,28 @@
 import { middleware } from "@/api/middleware" 
 import {
-	GET as GET1,
 	POST as POST1,
-} from "#/src/api/hello/index";
+} from "#/src/api/add/index";
 import {
 	GET as GET2,
-} from "#/src/api/server-data/hello/[id]/index";
+} from "#/src/api/say-hello/index";
 import {
 	GET as GET3,
-} from "#/src/api/server-data/home/index";
+} from "#/src/api/server-data/404/index";
+import {
+	GET as GET4,
+} from "#/src/api/server-data/welcome/index";
 
 export default {
-	"/api/hello": {
-		GET: (req: any) => middleware(req, GET1),
+	"/api/add": {
 		POST: (req: any) => middleware(req, POST1),
 	},
-	"/api/server-data/hello/:id": {
+	"/api/say-hello": {
 		GET: (req: any) => middleware(req, GET2),
 	},
-	"/api/server-data/home": {
+	"/api/server-data/404": {
 		GET: (req: any) => middleware(req, GET3),
 	},
+	"/api/server-data/welcome": {
+		GET: (req: any) => middleware(req, GET4),
+	},
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wildpig",
-  "version": "1.3.19",
+  "version": "1.3.20",
   "author": "eriktse",
   "main": "index.ts",
   "bin":{

package/router/ServerDataGuard.tsx

@@ -10,8 +10,8 @@ export const ServerDataGuard = () => {
         // serverData清空
         serverDataStore.set(undefined);
 
-        const url = location.pathname;
-        const matches = matchRoutes(pageRoutes, url);
+        const pathname = location.pathname;
+        const matches = matchRoutes(pageRoutes, pathname);
         const lastMatch = matches?.at(-1);
         if(!lastMatch) {
             // 404
@@ -26,6 +26,16 @@ export const ServerDataGuard = () => {
         for(const [key, value] of Object.entries(lastMatch.params)){
             if(value)serverDataApi = serverDataApi.replace(":" + key, value);
         }
+
+        // 合并当前页面和serverDataApi的参数
+        const searchParams = new URLSearchParams(location.search);
+        for(const [key, value] of searchParams.entries()){
+            // 跳过已有参数
+            if(serverDataApi.includes(key + "="))continue;
+            serverDataApi += (serverDataApi.includes("?") ? "&" : "?") + key + "=" + value;
+        }
+        
+
         fetch(serverDataApi).then(res => res.json()).then(data => {
             serverDataStore.set(data);
             if(data.title){

package/scripts/WildPig.tsx

@@ -76,13 +76,23 @@ export const startServer = async () => {
                 let serverDataApi = matchRoute.route.serverDataApi;
                 const getServerData = async () => {
                     if(!serverDataApi)return undefined;
+                    const prefixUrl = request.url.split("/")[0] + "//" + request.url.split("/")[2];
                     // 需要请求服务端数据， 替换动态参数
                     for(const [key, value] of Object.entries(matchRoute.params)){
                         if(value)serverDataApi = serverDataApi.replace(":" + key, value);
                     }
+                    // 加上当前request的query参数
+                    for(const [key, value] of new URLSearchParams(request.url.split("?")[1]).entries()){
+                        if(serverDataApi.includes(key + "="))continue; // 已经有这个参数了
+                        serverDataApi += (serverDataApi.includes("?") ? "&" : "?") + key + "=" + value;
+                    }
+                    const serverRequest = new Request({
+                        ...request.clone(),
+                        url: prefixUrl + serverDataApi, // 替换url
+                    });
+                    serverRequest.headers.set("wildpig-server-data-api", serverDataApi);
                     const pathname = serverDataApi.split("?")[0]; // 获取路径
-                    const handleUrl = "http://" + hostname + ":" + port + pathname;
-                    const serverData = await fetch(handleUrl).then(r => r.json());
+                    const serverData = await apiModules[pathname].GET(serverRequest).then((r: Response) => r.json());
                     return serverData;
                 };
                 let serverData = await getServerData();