@_tc/template-core 0.0.1-bate.55 → 0.0.1-bate.57

package/cjs/app/controller/project.js

@@ -1 +1 @@
-const e=require(`./base.js`);var t=(t=>{let n=e(t);return class extends n{getModelList=async e=>{let t=(await this.service.project.getModelList()).reduce((e,t)=>{let{model:n,project:r}=t,{key:i,name:a,desc:o}=n,s={key:i,name:a,desc:o},c=Object.keys(r).reduce((e,t)=>{let{key:n,name:i,desc:a,homePage:o}=r[t];return e[t]={key:n,name:i,desc:a,homePage:o},e},{});return e.push({model:s,project:c}),e},[]);this.success(e,t)};getProjectList=async e=>{let{projk:t}=e.query,n=(await this.service.project.getList(t))?.map(e=>{let{modelKey:t,key:n,name:r,desc:i,homePage:a}=e;return{modelKey:t,key:n,name:r,desc:i,homePage:a}});this.success(e,n)};getProject=async e=>{let{key:t}=e.params,n=this.service.project.getProject(t);if(!n){this.fail(e,10001,`获取项目异常`);return}this.success(e,n)}}});module.exports=t;
+const e=require(`./base.js`);var t=(t=>{let n=e(t);return class extends n{getModelList=async e=>{let t=(await this.service.project.getModelList()).reduce((e,t)=>{let{model:n,project:r}=t,{key:i,name:a,desc:o}=n,s={key:i,name:a,desc:o},c=Object.keys(r).reduce((e,t)=>{let{key:n,name:i,desc:a,homePage:o}=r[t];return e[t]={key:n,name:i,desc:a,homePage:o},e},{});return e.push({model:s,project:c}),e},[]);this.success(e,t)};getProjectList=async e=>{let t=e.reqData?.data.projk,n=(await this.service.project.getList(t))?.map(e=>{let{modelKey:t,key:n,name:r,desc:i,homePage:a}=e;return{modelKey:t,key:n,name:r,desc:i,homePage:a}});this.success(e,n)};getProject=async e=>{let{key:t}=e.params;if(!t){this.fail(e,10001,`获取项目异常`);return}let n=this.service.project.getProject(t);if(!n){this.fail(e,10001,`获取项目异常`);return}this.success(e,n)}}});module.exports=t;

package/cjs/app/middleware/error-handle.js

@@ -1 +1 @@
-var e={},t=t=>async(n,r)=>{try{await r()}catch(r){let{status:i=200,message:a,detail:o,code:s=5e4,returnError:c}=r;if(t.extends.logger?.info(`error info -> ${JSON.stringify(r)}`),t.extends.logger?.error(`-- [excption] --`,r),t.extends.logger?.error(`-- [excption] info --`,i,a,o),a?.includes(`template not found`)){let r=n.req.url;if(e[r]===void 0?e[r]=0:e[r]+=1,e[r]<t.config.notFoundRedirectCount){n.status=302,n.redirect(t.options?.homePage??`/`);return}else e[r]=0}c?(n.status=i,n.body={code:s,message:a}):(n.status=200,n.body={code:5e4,message:`网络错误`})}};module.exports=t;
+var e={},t=t=>async(n,r)=>{try{await r()}catch(r){let{status:i=200,message:a,detail:o,code:s=5e4,returnError:c}=r;if(t.extends.logger?.info(`error info -> ${JSON.stringify(r)}`),t.extends.logger?.error(`-- [excption] --`,r),t.extends.logger?.error(`-- [excption] info --`,i,a,o),a?.includes(`template not found`)){let r=n.path??n.req.url??n.url;if(e[r]===void 0?e[r]=0:e[r]+=1,e[r]<t.config.notFoundRedirectCount){n.status=302,n.redirect(t.options?.homePage??`/`);return}else e[r]=0}c?(n.status=i,n.body={code:s,message:a}):(n.status=200,n.body={code:5e4,message:`网络错误`})}};module.exports=t;

package/cjs/app/middleware/request-parameter-parsing.js

@@ -0,0 +1 @@
+var e=e=>typeof e==`object`&&!!e&&!Array.isArray(e),t=(t=>async(n,r)=>{if(n.path.includes(`${t.options.apiPrefix}/`)){let{query:t,headers:r}=n,i=n.request.body;n.reqData={query:t,body:i,headers:r,data:{...t,...e(i)?i:{}}}}await r()});module.exports=t;

package/cjs/app/middleware.js

@@ -1 +1 @@
-const e=require(`../_virtual/_rolldown/runtime.js`),t=require(`../packages/core/paths.js`);let n=require(`koa-compress`);n=e.__toESM(n);let r=require(`path`),i=require(`koa-bodyparser`);i=e.__toESM(i);let a=require(`koa-static`);a=e.__toESM(a);var o=(0,i.default)({formLimit:`1000mb`,enableTypes:[`form`,`json`,`text`]}),s=e=>{let i=e.envs.isLocal()?{maxage:0,setHeaders(e){e.setHeader(`Cache-Control`,`no-store, no-cache, must-revalidate, proxy-revalidate`),e.setHeader(`Pragma`,`no-cache`),e.setHeader(`Expires`,`0`)}}:{maxage:365*24*60*60*1e3};e.use(e.middlewares.errorHandle),e.use((0,n.default)({threshold:2048}));let s=(0,r.resolve)(t.getAppPath(e,`business`),`./public`),c=(0,r.resolve)(t.getAppPath(e,`frame`),`./public`),l=e.options.additionalPublicPaths??[];l=Array.isArray(l)?l:[l],e.use((0,a.default)(c,i)),e.use((0,a.default)(s,i)),l.forEach(t=>e.use((0,a.default)(t,i))),e.use(o),e.use(e.middlewares.projectHandler),!e.envs.isLocal()&&e.use(e.middlewares.apiSignVerify),e.use(e.middlewares.apiParamsVerify)};module.exports=s;
+const e=require(`../_virtual/_rolldown/runtime.js`),t=require(`../packages/core/paths.js`);let n=require(`koa-compress`);n=e.__toESM(n);let r=require(`path`),i=require(`koa-bodyparser`);i=e.__toESM(i);let a=require(`koa-static`);a=e.__toESM(a);var o=(0,i.default)({formLimit:`1000mb`,enableTypes:[`form`,`json`,`text`]}),s=e=>{let i=e.envs.isLocal()?{maxage:0,setHeaders(e){e.setHeader(`Cache-Control`,`no-store, no-cache, must-revalidate, proxy-revalidate`),e.setHeader(`Pragma`,`no-cache`),e.setHeader(`Expires`,`0`)}}:{maxage:365*24*60*60*1e3};e.use(e.middlewares.errorHandle),e.use((0,n.default)({threshold:2048}));let s=(0,r.resolve)(t.getAppPath(e,`business`),`./public`),c=(0,r.resolve)(t.getAppPath(e,`frame`),`./public`),l=e.options.additionalPublicPaths??[];l=Array.isArray(l)?l:[l],e.use((0,a.default)(c,i)),e.use((0,a.default)(s,i)),l.forEach(t=>e.use((0,a.default)(t,i))),e.use(o),e.use(e.middlewares.requestParameterParsing),e.use(e.middlewares.projectHandler),!e.envs.isLocal()&&e.use(e.middlewares.apiSignVerify),e.use(e.middlewares.apiParamsVerify)};module.exports=s;

package/esm/app/controller/project.js

@@ -26,7 +26,7 @@ var t = ((t) => {
 			this.success(e, t);
 		};
 		getProjectList = async (e) => {
-			let { projk: t } = e.query, n = (await this.service.project.getList(t))?.map((e) => {
+			let t = e.reqData?.data.projk, n = (await this.service.project.getList(t))?.map((e) => {
 				let { modelKey: t, key: n, name: r, desc: i, homePage: a } = e;
 				return {
 					modelKey: t,
@@ -39,7 +39,12 @@ var t = ((t) => {
 			this.success(e, n);
 		};
 		getProject = async (e) => {
-			let { key: t } = e.params, n = this.service.project.getProject(t);
+			let { key: t } = e.params;
+			if (!t) {
+				this.fail(e, 10001, "获取项目异常");
+				return;
+			}
+			let n = this.service.project.getProject(t);
 			if (!n) {
 				this.fail(e, 10001, "获取项目异常");
 				return;

package/esm/app/middleware/error-handle.js

@@ -5,7 +5,7 @@ var e = {}, t = (t) => async (n, r) => {
 	} catch (r) {
 		let { status: i = 200, message: a, detail: o, code: s = 5e4, returnError: c } = r;
 		if (t.extends.logger?.info(`error info -> ${JSON.stringify(r)}`), t.extends.logger?.error("-- [excption] --", r), t.extends.logger?.error("-- [excption] info --", i, a, o), a?.includes("template not found")) {
-			let r = n.req.url;
+			let r = n.path ?? n.req.url ?? n.url;
 			if (e[r] === void 0 ? e[r] = 0 : e[r] += 1, e[r] < t.config.notFoundRedirectCount) {
 				n.status = 302, n.redirect(t.options?.homePage ?? "/");
 				return;

package/esm/app/middleware/request-parameter-parsing.js

@@ -0,0 +1,18 @@
+//#region app/middleware/request-parameter-parsing.ts
+var e = (e) => typeof e == "object" && !!e && !Array.isArray(e), t = ((t) => async (n, r) => {
+	if (n.path.includes(`${t.options.apiPrefix}/`)) {
+		let { query: t, headers: r } = n, i = n.request.body;
+		n.reqData = {
+			query: t,
+			body: i,
+			headers: r,
+			data: {
+				...t,
+				...e(i) ? i : {}
+			}
+		};
+	}
+	await r();
+});
+//#endregion
+export { t as default };

package/esm/app/middleware.js

@@ -20,7 +20,7 @@ var a = r({
 	} : { maxage: 365 * 24 * 60 * 60 * 1e3 };
 	r.use(r.middlewares.errorHandle), r.use(t({ threshold: 2048 }));
 	let s = n(e(r, "business"), "./public"), c = n(e(r, "frame"), "./public"), l = r.options.additionalPublicPaths ?? [];
-	l = Array.isArray(l) ? l : [l], r.use(i(c, o)), r.use(i(s, o)), l.forEach((e) => r.use(i(e, o))), r.use(a), r.use(r.middlewares.projectHandler), !r.envs.isLocal() && r.use(r.middlewares.apiSignVerify), r.use(r.middlewares.apiParamsVerify);
+	l = Array.isArray(l) ? l : [l], r.use(i(c, o)), r.use(i(s, o)), l.forEach((e) => r.use(i(e, o))), r.use(a), r.use(r.middlewares.requestParameterParsing), r.use(r.middlewares.projectHandler), !r.envs.isLocal() && r.use(r.middlewares.apiSignVerify), r.use(r.middlewares.apiParamsVerify);
 };
 //#endregion
 export { o as default };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@_tc/template-core",
-  "version": "0.0.1-bate.55",
+  "version": "0.0.1-bate.57",
   "description": "A full-stack TypeScript admin framework powered by Koa, React, and Vite - monorepo root",
   "types": "./types/index.d.ts",
   "exports": {

package/types/app/middleware/request-parameter-parsing.d.ts

@@ -0,0 +1,7 @@
+/**
+ * - 统一处理请求参数获取
+ * - 除了params  因为params 必须经过router才会有
+ * - 而当前中间件是在 router之前追加，router params 仍然从 ctx.params 获取
+ */
+declare const requestParameterParsing: (app: import("../../packages/core/index").KoaApp) => (ctx: import("app/type").Ctx, next: import("koa").Next) => Promise<void>;
+export default requestParameterParsing;

package/types/app/type.d.ts

@@ -1,6 +1,34 @@
+import type Koa from "koa";
+import type Router from "koa-router";
+import type { IncomingHttpHeaders } from "http";
+import type { ParsedUrlQuery } from "querystring";
 export type KoaApp = import('./typings').KoaApp;
 export type KoaRouter = import('./typings').KoaRouter;
-export type Ctx = KoaApp['context'];
+export type CtxParams = Router.IRouterParamContext['params'];
+export interface CtxReqData {
+    /**
+     * URL query 参数。
+     */
+    query: ParsedUrlQuery;
+    /**
+     * bodyparser 解析后的请求 body。
+     */
+    body: unknown;
+    /**
+     * 原始请求 headers。
+     */
+    headers: IncomingHttpHeaders;
+    /**
+     * 便捷合并层：当前中间件会按 query -> body 的顺序合并。
+     * 字段有冲突时，后面的来源会覆盖前面的来源；需要精确来源时请使用 query/body/headers。
+     */
+    data: Record<string, unknown>;
+}
+export type Ctx = Router.RouterContext<Koa.DefaultState, Koa.DefaultContext> & {
+    params: CtxParams;
+    reqData?: CtxReqData;
+};
+export type MiddlewareFN = (app: KoaApp) => (ctx: Ctx, next: Koa.Next) => Promise<void>;
+export type RouterFN = (app: KoaApp, router: KoaRouter) => void;
 export type ControllerFN<T extends object = object> = (app: KoaApp) => new () => T;
 export type ServiceFN<T extends object = object> = (app: KoaApp) => new () => T;
-export type RouterFN = (app: KoaApp, router: KoaRouter) => void;

package/types/app/typings.d.ts

@@ -35,6 +35,7 @@ declare module '../packages/core/index' {
             errorHandle: import('koa').Middleware;
             apiSignVerify: import('koa').Middleware;
             apiParamsVerify: import('koa').Middleware;
+            requestParameterParsing: import('koa').Middleware;
             projectHandler: import('koa').Middleware;
         }
         interface AppConfigAugmented extends Partial<DefaultAppConfig> {

package/types/index.d.ts

@@ -3,9 +3,9 @@ import type Router from "koa-router";
 import "./app/typings";
 import { MOmit } from "./typings/type";
 export type { FrameworkAugment, KoaApp } from "./packages/core/index";
-export type { ControllerFN, Ctx, ServiceFN } from "./app/type";
 export type { CryptoExtend, CryptoHashAlgorithm, HmacSignOptions, SignedPayloadOptions, VerifySignedPayloadOptions, } from "./app/extend/crypto";
 export type { DB, DBDataOptions, DBDataRecord, DBFactory, DBRunResult, FrameworkDB, ListDBDataOptions, SQLiteParams, SQLiteValue, } from "./app/extend/db";
+export type { ControllerFN, Ctx, MiddlewareFN, RouterFN, ServiceFN } from "./app/type";
 export type { Router };
 export declare const serverStart: (options?: MOmit<StartOptions, "frameBaseDir">) => Promise<import("./packages/core/index").KoaApp>;
 export declare const baseFn: {