@lark-apaas/fullstack-nestjs-core 1.1.2-alpha.0 → 1.1.2-alpha.11

package/dist/index.cjs

@@ -39,6 +39,7 @@ __export(index_exports, {
   PlatformModule: () => PlatformModule,
   UserContextMiddleware: () => UserContextMiddleware,
   ViewContextMiddleware: () => ViewContextMiddleware,
+  apiResponseInterceptor: () => apiResponseInterceptor,
   configureApp: () => configureApp
 });
 module.exports = __toCommonJS(index_exports);
@@ -91,7 +92,11 @@ var UserContextMiddleware = class {
       userId: webUser?.user_id,
       tenantId: webUser?.tenant_id,
       appId: webUser?.app_id ?? "",
-      loginUrl: webUser?.login_url ?? ""
+      loginUrl: webUser?.login_url ?? "",
+      env: webUser?.env ?? "runtime",
+      userName: webUser?.user_name?.zh_cn ?? "",
+      userNameEn: webUser?.user_name?.en_us ?? "",
+      userNameI18n: webUser?.user_name ?? {}
     };
     next();
   }
@@ -244,7 +249,7 @@ var CsrfTokenMiddleware = class _CsrfTokenMiddleware {
       res.cookie(cookieKey, token, {
         maxAge: cookieMaxAge,
         path: cookiePath,
-        httpOnly: true,
+        httpOnly: false,
         secure: true,
         sameSite: "none",
         partitioned: true
@@ -257,6 +262,28 @@ CsrfTokenMiddleware = _ts_decorate4([
   (0, import_common4.Injectable)()
 ], CsrfTokenMiddleware);
 
+// src/middlewares/api-fallback/index.ts
+function createApiNotFoundResponse(req) {
+  return {
+    statusCode: 404,
+    message: `Cannot ${req.method} ${req.path}`,
+    error: "Not Found",
+    path: req.path,
+    timestamp: (/* @__PURE__ */ new Date()).toISOString()
+  };
+}
+__name(createApiNotFoundResponse, "createApiNotFoundResponse");
+function apiResponseInterceptor(req, res, next) {
+  if (!req.path.startsWith("/api/")) {
+    return next();
+  }
+  res.render = function() {
+    return res.status(404).json(createApiNotFoundResponse(req));
+  };
+  next();
+}
+__name(apiResponseInterceptor, "apiResponseInterceptor");
+
 // src/modules/platform/config/app.config.ts
 var import_config = require("@nestjs/config");
 var NAMESPACE = "app";
@@ -353,6 +380,7 @@ var PlatformModule = class _PlatformModule {
   */
   configure(consumer) {
     const options = _PlatformModule.moduleOptions;
+    consumer.apply(apiResponseInterceptor).forRoutes("/api/*");
     consumer.apply(UserContextMiddleware, import_nestjs_logger.LoggerContextMiddleware, import_nestjs_datapaas.SqlExecutionContextMiddleware).forRoutes("/*");
     consumer.apply(CsrfTokenMiddleware, ViewContextMiddleware).exclude("/api/(.*)").forRoutes("*");
     if (options.enableCsrf !== false) {
@@ -411,6 +439,7 @@ __reExport(index_exports, require("@lark-apaas/nestjs-datapaas"), module.exports
   PlatformModule,
   UserContextMiddleware,
   ViewContextMiddleware,
+  apiResponseInterceptor,
   configureApp,
   ...require("@lark-apaas/nestjs-authnpaas"),
   ...require("@lark-apaas/nestjs-datapaas")

package/dist/index.d.cts

@@ -19,6 +19,10 @@ declare global {
         tenantId?: number;
         appId?: string;
         loginUrl?: string;
+        env?: 'preview' | 'runtime';
+        userName?: string; // 默认中文名
+        userNameEn?: string; // 冗余一份英文名
+        userNameI18n?: Record<string, string>; // 带多语的用户名
       },
       csrfToken?: string;
     }
@@ -92,4 +96,27 @@ declare class ViewContextMiddleware implements NestMiddleware {
     use(req: Request, res: Response, next: NextFunction): void;
 }
 
-export { CsrfMiddleware, CsrfTokenMiddleware, PlatformModule, type PlatformModuleOptions, UserContextMiddleware, ViewContextMiddleware, configureApp };
+/**
+ * API 404 响应格式
+ */
+interface ApiNotFoundResponse {
+    statusCode: number;
+    message: string;
+    error: string;
+    path: string;
+    timestamp: string;
+}
+/**
+ * API 响应拦截中间件
+ *
+ * 拦截 ViewModule 的 /* 路由，当其尝试返回 HTML 时
+ * 如果请求路径是 /api/*，改为返回 JSON 404
+ *
+ * 工作原理：
+ * 1. 包装 res.render() 和 res.send()
+ * 2. render() 直接返回 JSON（肯定是要渲染 HTML）
+ * 3. send() 检查 Content-Type 判断是否是 HTML
+ */
+declare function apiResponseInterceptor(req: Request, res: Response, next: NextFunction): void;
+
+export { type ApiNotFoundResponse, CsrfMiddleware, CsrfTokenMiddleware, PlatformModule, type PlatformModuleOptions, UserContextMiddleware, ViewContextMiddleware, apiResponseInterceptor, configureApp };

package/dist/index.d.ts

@@ -19,6 +19,10 @@ declare global {
         tenantId?: number;
         appId?: string;
         loginUrl?: string;
+        env?: 'preview' | 'runtime';
+        userName?: string; // 默认中文名
+        userNameEn?: string; // 冗余一份英文名
+        userNameI18n?: Record<string, string>; // 带多语的用户名
       },
       csrfToken?: string;
     }
@@ -92,4 +96,27 @@ declare class ViewContextMiddleware implements NestMiddleware {
     use(req: Request, res: Response, next: NextFunction): void;
 }
 
-export { CsrfMiddleware, CsrfTokenMiddleware, PlatformModule, type PlatformModuleOptions, UserContextMiddleware, ViewContextMiddleware, configureApp };
+/**
+ * API 404 响应格式
+ */
+interface ApiNotFoundResponse {
+    statusCode: number;
+    message: string;
+    error: string;
+    path: string;
+    timestamp: string;
+}
+/**
+ * API 响应拦截中间件
+ *
+ * 拦截 ViewModule 的 /* 路由，当其尝试返回 HTML 时
+ * 如果请求路径是 /api/*，改为返回 JSON 404
+ *
+ * 工作原理：
+ * 1. 包装 res.render() 和 res.send()
+ * 2. render() 直接返回 JSON（肯定是要渲染 HTML）
+ * 3. send() 检查 Content-Type 判断是否是 HTML
+ */
+declare function apiResponseInterceptor(req: Request, res: Response, next: NextFunction): void;
+
+export { type ApiNotFoundResponse, CsrfMiddleware, CsrfTokenMiddleware, PlatformModule, type PlatformModuleOptions, UserContextMiddleware, ViewContextMiddleware, apiResponseInterceptor, configureApp };

package/dist/index.js

@@ -49,7 +49,11 @@ var UserContextMiddleware = class {
       userId: webUser?.user_id,
       tenantId: webUser?.tenant_id,
       appId: webUser?.app_id ?? "",
-      loginUrl: webUser?.login_url ?? ""
+      loginUrl: webUser?.login_url ?? "",
+      env: webUser?.env ?? "runtime",
+      userName: webUser?.user_name?.zh_cn ?? "",
+      userNameEn: webUser?.user_name?.en_us ?? "",
+      userNameI18n: webUser?.user_name ?? {}
     };
     next();
   }
@@ -202,7 +206,7 @@ var CsrfTokenMiddleware = class _CsrfTokenMiddleware {
       res.cookie(cookieKey, token, {
         maxAge: cookieMaxAge,
         path: cookiePath,
-        httpOnly: true,
+        httpOnly: false,
         secure: true,
         sameSite: "none",
         partitioned: true
@@ -215,6 +219,28 @@ CsrfTokenMiddleware = _ts_decorate4([
   Injectable4()
 ], CsrfTokenMiddleware);
 
+// src/middlewares/api-fallback/index.ts
+function createApiNotFoundResponse(req) {
+  return {
+    statusCode: 404,
+    message: `Cannot ${req.method} ${req.path}`,
+    error: "Not Found",
+    path: req.path,
+    timestamp: (/* @__PURE__ */ new Date()).toISOString()
+  };
+}
+__name(createApiNotFoundResponse, "createApiNotFoundResponse");
+function apiResponseInterceptor(req, res, next) {
+  if (!req.path.startsWith("/api/")) {
+    return next();
+  }
+  res.render = function() {
+    return res.status(404).json(createApiNotFoundResponse(req));
+  };
+  next();
+}
+__name(apiResponseInterceptor, "apiResponseInterceptor");
+
 // src/modules/platform/config/app.config.ts
 import { registerAs } from "@nestjs/config";
 var NAMESPACE = "app";
@@ -311,6 +337,7 @@ var PlatformModule = class _PlatformModule {
   */
   configure(consumer) {
     const options = _PlatformModule.moduleOptions;
+    consumer.apply(apiResponseInterceptor).forRoutes("/api/*");
     consumer.apply(UserContextMiddleware, LoggerContextMiddleware, SqlExecutionContextMiddleware).forRoutes("/*");
     consumer.apply(CsrfTokenMiddleware, ViewContextMiddleware).exclude("/api/(.*)").forRoutes("*");
     if (options.enableCsrf !== false) {
@@ -368,5 +395,6 @@ export {
   PlatformModule,
   UserContextMiddleware,
   ViewContextMiddleware,
+  apiResponseInterceptor,
   configureApp
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lark-apaas/fullstack-nestjs-core",
-  "version": "1.1.2-alpha.0",
+  "version": "1.1.2-alpha.11",
   "description": "FullStack Nestjs Core",
   "type": "module",
   "main": "./dist/index.js",
@@ -39,7 +39,7 @@
     "prepublishOnly": "npm run build"
   },
   "dependencies": {
-    "@lark-apaas/nestjs-authnpaas": "1.0.2-alpha.0",
+    "@lark-apaas/nestjs-authnpaas": "^1.0.1",
     "@lark-apaas/nestjs-datapaas": "^1.0.5",
     "@lark-apaas/nestjs-logger": "^1.0.2",
     "@lark-apaas/nestjs-openapi-devtools": "^1.0.9",