@lark-apaas/fullstack-nestjs-core 1.1.1-alpha.12 → 1.1.1-alpha.14

package/dist/index.cjs

@@ -52,7 +52,6 @@ var import_nestjs_observable = require("@lark-apaas/nestjs-observable");
 var import_nestjs_logger = require("@lark-apaas/nestjs-logger");
 var import_nestjs_datapaas = require("@lark-apaas/nestjs-datapaas");
 var import_nestjs_authnpaas = require("@lark-apaas/nestjs-authnpaas");
-var import_nestjs_trigger = require("@lark-apaas/nestjs-trigger");
 
 // src/middlewares/user-context/index.ts
 var import_common = require("@nestjs/common");
@@ -94,7 +93,12 @@ var UserContextMiddleware = class {
       userId: webUser?.user_id,
       tenantId: webUser?.tenant_id,
       appId: webUser?.app_id ?? "",
-      loginUrl: webUser?.login_url ?? ""
+      loginUrl: webUser?.login_url ?? "",
+      userType: webUser?.user_type ?? "",
+      env: webUser?.env ?? "runtime",
+      userName: webUser?.user_name?.zh_cn ?? "",
+      userNameEn: webUser?.user_name?.en_us ?? "",
+      userNameI18n: webUser?.user_name ?? {}
     };
     next();
   }
@@ -247,7 +251,7 @@ var CsrfTokenMiddleware = class _CsrfTokenMiddleware {
       res.cookie(cookieKey, token, {
         maxAge: cookieMaxAge,
         path: cookiePath,
-        httpOnly: true,
+        httpOnly: false,
         secure: true,
         sameSite: "none",
         partitioned: true
@@ -260,6 +264,38 @@ CsrfTokenMiddleware = _ts_decorate4([
   (0, import_common4.Injectable)()
 ], CsrfTokenMiddleware);
 
+// src/middlewares/api-fallback/index.ts
+function createApiNotFoundResponse(req) {
+  return {
+    code: 404,
+    message: `Cannot ${req.method} ${req.path}`,
+    error: "Not Found",
+    path: req.path,
+    timestamp: (/* @__PURE__ */ new Date()).toISOString()
+  };
+}
+__name(createApiNotFoundResponse, "createApiNotFoundResponse");
+function getApiPathPrefix() {
+  const globalPrefix = process.env.CLIENT_BASE_PATH ?? "";
+  if (!globalPrefix) {
+    return "/api/";
+  }
+  const normalizedPrefix = globalPrefix.replace(/\/+$/, "");
+  return `${normalizedPrefix}/api/`;
+}
+__name(getApiPathPrefix, "getApiPathPrefix");
+function apiResponseInterceptor(req, res, next) {
+  const apiPrefix = getApiPathPrefix();
+  if (!req.baseUrl.startsWith(apiPrefix)) {
+    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";
@@ -330,12 +366,7 @@ var PlatformModule = class _PlatformModule {
             };
           }, "useFactory")
         }),
-        import_nestjs_authnpaas.AuthNPaasModule.forRoot(),
-        import_nestjs_trigger.AutomationModule.forRoot({
-          imports: [
-            import_nestjs_logger.LoggerModule
-          ]
-        })
+        import_nestjs_authnpaas.AuthNPaasModule.forRoot()
       ],
       providers: [
         {
@@ -363,7 +394,8 @@ var PlatformModule = class _PlatformModule {
   */
   configure(consumer) {
     const options = _PlatformModule.moduleOptions;
-    consumer.apply(UserContextMiddleware, import_nestjs_logger.LoggerContextMiddleware, import_nestjs_datapaas.SqlExecutionContextMiddleware).forRoutes("/*");
+    consumer.apply(apiResponseInterceptor).forRoutes("/api/*");
+    consumer.apply(UserContextMiddleware, import_nestjs_logger.LoggerContextMiddleware, import_nestjs_observable.ObservableTraceMiddleware, import_nestjs_datapaas.SqlExecutionContextMiddleware).forRoutes("/*");
     consumer.apply(CsrfTokenMiddleware, ViewContextMiddleware).exclude("/api/(.*)").forRoutes("*");
     if (options.enableCsrf !== false) {
       const csrfRoutes = options.csrfRoutes || "/api/*";
@@ -412,7 +444,7 @@ __name(configureApp, "configureApp");
 var import_nestjs_openapi_devtools2 = require("@lark-apaas/nestjs-openapi-devtools");
 __reExport(index_exports, require("@lark-apaas/nestjs-authnpaas"), module.exports);
 __reExport(index_exports, require("@lark-apaas/nestjs-datapaas"), module.exports);
-__reExport(index_exports, require("@lark-apaas/nestjs-trigger"), module.exports);
+__reExport(index_exports, require("@lark-apaas/nestjs-observable"), module.exports);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   CsrfMiddleware,
@@ -425,5 +457,5 @@ __reExport(index_exports, require("@lark-apaas/nestjs-trigger"), module.exports)
   configureApp,
   ...require("@lark-apaas/nestjs-authnpaas"),
   ...require("@lark-apaas/nestjs-datapaas"),
-  ...require("@lark-apaas/nestjs-trigger")
+  ...require("@lark-apaas/nestjs-observable")
 });

package/dist/index.d.cts

@@ -4,7 +4,7 @@ export { DevToolsModule, DevToolsOptions, DevToolsV2Module, DevToolsV2Options }
 import { Request, Response, NextFunction } from 'express';
 export * from '@lark-apaas/nestjs-authnpaas';
 export * from '@lark-apaas/nestjs-datapaas';
-export * from '@lark-apaas/nestjs-trigger';
+export * from '@lark-apaas/nestjs-observable';
 
 declare global {
   namespace Express {
@@ -20,6 +20,11 @@ declare global {
         tenantId?: number;
         appId?: string;
         loginUrl?: string;
+        userType?: string;
+        env?: 'preview' | 'runtime';
+        userName?: string; // 默认中文名
+        userNameEn?: string; // 冗余一份英文名
+        userNameI18n?: Record<string, string>; // 带多语的用户名
       },
       csrfToken?: string;
     }
@@ -93,4 +98,15 @@ 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 {
+    code: number;
+    message: string;
+    error: string;
+    path: string;
+    timestamp: string;
+}
+
+export { type ApiNotFoundResponse, CsrfMiddleware, CsrfTokenMiddleware, PlatformModule, type PlatformModuleOptions, UserContextMiddleware, ViewContextMiddleware, configureApp };

package/dist/index.d.ts

@@ -4,7 +4,7 @@ export { DevToolsModule, DevToolsOptions, DevToolsV2Module, DevToolsV2Options }
 import { Request, Response, NextFunction } from 'express';
 export * from '@lark-apaas/nestjs-authnpaas';
 export * from '@lark-apaas/nestjs-datapaas';
-export * from '@lark-apaas/nestjs-trigger';
+export * from '@lark-apaas/nestjs-observable';
 
 declare global {
   namespace Express {
@@ -20,6 +20,11 @@ declare global {
         tenantId?: number;
         appId?: string;
         loginUrl?: string;
+        userType?: string;
+        env?: 'preview' | 'runtime';
+        userName?: string; // 默认中文名
+        userNameEn?: string; // 冗余一份英文名
+        userNameI18n?: Record<string, string>; // 带多语的用户名
       },
       csrfToken?: string;
     }
@@ -93,4 +98,15 @@ 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 {
+    code: number;
+    message: string;
+    error: string;
+    path: string;
+    timestamp: string;
+}
+
+export { type ApiNotFoundResponse, CsrfMiddleware, CsrfTokenMiddleware, PlatformModule, type PlatformModuleOptions, UserContextMiddleware, ViewContextMiddleware, configureApp };

package/dist/index.js

@@ -6,11 +6,10 @@ import { Global, Module, ValidationPipe } from "@nestjs/common";
 import { APP_PIPE } from "@nestjs/core";
 import { CommonModule } from "@lark-apaas/nestjs-common";
 import { ConfigModule, ConfigService } from "@nestjs/config";
-import { NestjsObservableModule as ObservableModule } from "@lark-apaas/nestjs-observable";
+import { NestjsObservableModule as ObservableModule, ObservableTraceMiddleware } from "@lark-apaas/nestjs-observable";
 import { LoggerModule, AppLogger, LoggerContextMiddleware } from "@lark-apaas/nestjs-logger";
 import { DataPaasModule, SqlExecutionContextMiddleware } from "@lark-apaas/nestjs-datapaas";
 import { AuthNPaasModule } from "@lark-apaas/nestjs-authnpaas";
-import { AutomationModule } from "@lark-apaas/nestjs-trigger";
 
 // src/middlewares/user-context/index.ts
 import { Injectable } from "@nestjs/common";
@@ -52,7 +51,12 @@ var UserContextMiddleware = class {
       userId: webUser?.user_id,
       tenantId: webUser?.tenant_id,
       appId: webUser?.app_id ?? "",
-      loginUrl: webUser?.login_url ?? ""
+      loginUrl: webUser?.login_url ?? "",
+      userType: webUser?.user_type ?? "",
+      env: webUser?.env ?? "runtime",
+      userName: webUser?.user_name?.zh_cn ?? "",
+      userNameEn: webUser?.user_name?.en_us ?? "",
+      userNameI18n: webUser?.user_name ?? {}
     };
     next();
   }
@@ -205,7 +209,7 @@ var CsrfTokenMiddleware = class _CsrfTokenMiddleware {
       res.cookie(cookieKey, token, {
         maxAge: cookieMaxAge,
         path: cookiePath,
-        httpOnly: true,
+        httpOnly: false,
         secure: true,
         sameSite: "none",
         partitioned: true
@@ -218,6 +222,38 @@ CsrfTokenMiddleware = _ts_decorate4([
   Injectable4()
 ], CsrfTokenMiddleware);
 
+// src/middlewares/api-fallback/index.ts
+function createApiNotFoundResponse(req) {
+  return {
+    code: 404,
+    message: `Cannot ${req.method} ${req.path}`,
+    error: "Not Found",
+    path: req.path,
+    timestamp: (/* @__PURE__ */ new Date()).toISOString()
+  };
+}
+__name(createApiNotFoundResponse, "createApiNotFoundResponse");
+function getApiPathPrefix() {
+  const globalPrefix = process.env.CLIENT_BASE_PATH ?? "";
+  if (!globalPrefix) {
+    return "/api/";
+  }
+  const normalizedPrefix = globalPrefix.replace(/\/+$/, "");
+  return `${normalizedPrefix}/api/`;
+}
+__name(getApiPathPrefix, "getApiPathPrefix");
+function apiResponseInterceptor(req, res, next) {
+  const apiPrefix = getApiPathPrefix();
+  if (!req.baseUrl.startsWith(apiPrefix)) {
+    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";
@@ -288,12 +324,7 @@ var PlatformModule = class _PlatformModule {
             };
           }, "useFactory")
         }),
-        AuthNPaasModule.forRoot(),
-        AutomationModule.forRoot({
-          imports: [
-            LoggerModule
-          ]
-        })
+        AuthNPaasModule.forRoot()
       ],
       providers: [
         {
@@ -321,7 +352,8 @@ var PlatformModule = class _PlatformModule {
   */
   configure(consumer) {
     const options = _PlatformModule.moduleOptions;
-    consumer.apply(UserContextMiddleware, LoggerContextMiddleware, SqlExecutionContextMiddleware).forRoutes("/*");
+    consumer.apply(apiResponseInterceptor).forRoutes("/api/*");
+    consumer.apply(UserContextMiddleware, LoggerContextMiddleware, ObservableTraceMiddleware, SqlExecutionContextMiddleware).forRoutes("/*");
     consumer.apply(CsrfTokenMiddleware, ViewContextMiddleware).exclude("/api/(.*)").forRoutes("*");
     if (options.enableCsrf !== false) {
       const csrfRoutes = options.csrfRoutes || "/api/*";
@@ -370,7 +402,7 @@ __name(configureApp, "configureApp");
 import { DevToolsModule, DevToolsV2Module as DevToolsV2Module2 } from "@lark-apaas/nestjs-openapi-devtools";
 export * from "@lark-apaas/nestjs-authnpaas";
 export * from "@lark-apaas/nestjs-datapaas";
-export * from "@lark-apaas/nestjs-trigger";
+export * from "@lark-apaas/nestjs-observable";
 export {
   CsrfMiddleware,
   CsrfTokenMiddleware,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lark-apaas/fullstack-nestjs-core",
-  "version": "1.1.1-alpha.12",
+  "version": "1.1.1-alpha.14",
   "description": "FullStack Nestjs Core",
   "type": "module",
   "main": "./dist/index.js",
@@ -35,16 +35,16 @@
     "test": "vitest run",
     "test:watch": "vitest",
     "lint": "echo 'ESLint skipped for TypeScript files'",
-    "lint:fix": "eslint src --ext .ts --fix"
+    "lint:fix": "eslint src --ext .ts --fix",
+    "prepublishOnly": "npm run build"
   },
   "dependencies": {
     "@lark-apaas/nestjs-authnpaas": "^1.0.1",
     "@lark-apaas/nestjs-common": "0.0.1-alpha.1",
     "@lark-apaas/nestjs-datapaas": "^1.0.5",
-    "@lark-apaas/nestjs-logger": "1.0.2-alpha.13",
-    "@lark-apaas/nestjs-observable": "0.0.1-alpha.8",
-    "@lark-apaas/nestjs-openapi-devtools": "^1.0.7",
-    "@lark-apaas/nestjs-trigger": "0.0.1-alpha.0",
+    "@lark-apaas/nestjs-logger": "1.0.2-alpha.15",
+    "@lark-apaas/nestjs-observable": "0.0.1-alpha.10",
+    "@lark-apaas/nestjs-openapi-devtools": "^1.0.9",
     "cookie-parser": "^1.4.7"
   },
   "devDependencies": {