@bleedingdev/modern-js-plugin-bff 3.4.0-ultramodern.2 → 3.4.0-ultramodern.20

package/dist/cjs/runtime/effect/adapter.js

@@ -39,7 +39,6 @@ __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
     EffectAdapter: ()=>EffectAdapter
 });
-const bff_core_namespaceObject = require("@modern-js/bff-core");
 const utils_namespaceObject = require("@modern-js/utils");
 const httpapi_namespaceObject = require("effect/unstable/httpapi");
 const external_path_namespaceObject = require("path");
@@ -94,43 +93,12 @@ class EffectAdapter {
         const { appDirectory, apiDirectory } = this.api.getServerContext();
         const bffConfig = this.api.getServerConfig()?.bff;
         const configuredEntry = bffConfig?.effect?.entry;
-        const defaultEntry = external_path_default().resolve(appDirectory || process.cwd(), apiDirectory || utils_namespaceObject.API_DIR, 'effect', 'index');
-        const entryWithoutExt = configuredEntry ? external_path_default().isAbsolute(configuredEntry) ? configuredEntry : external_path_default().resolve(appDirectory || process.cwd(), configuredEntry) : defaultEntry;
-        return resolveJsOrTsEntry(entryWithoutExt);
-    }
-    isApiRequestPath(requestPath, prefix, enableHandleWeb) {
-        if (!enableHandleWeb) return true;
-        const normalized = normalizePrefix(prefix);
-        if (!normalized) return true;
-        return requestPath === normalized || requestPath.startsWith(`${normalized}/`);
-    }
-    async collectLambdaContractSources() {
-        try {
-            const serverContext = this.api.getServerContext();
-            const appDir = serverContext.distDirectory || serverContext.appDirectory;
-            if (!appDir) return [];
-            const apiDir = 'string' == typeof serverContext.apiDirectory ? serverContext.apiDirectory : external_path_default().resolve(appDir, utils_namespaceObject.API_DIR);
-            const lambdaDir = 'string' == typeof serverContext.lambdaDirectory ? serverContext.lambdaDirectory : external_path_default().join(apiDir, 'lambda');
-            if (!await utils_namespaceObject.fs.pathExists(lambdaDir)) return [];
-            const apiRouter = new bff_core_namespaceObject.ApiRouter({
-                appDir,
-                apiDir,
-                lambdaDir,
-                prefix: this.prefix,
-                httpMethodDecider: this.api.getServerConfig()?.bff?.httpMethodDecider
-            });
-            const handlerInfos = await apiRouter.getApiHandlers();
-            return handlerInfos.map((info)=>({
-                    name: info.name,
-                    httpMethod: info.httpMethod,
-                    routePath: info.routePath,
-                    filename: info.filename,
-                    handler: info.handler
-                }));
-        } catch (error) {
-            utils_namespaceObject.logger.warn(`[BFF][Effect] Failed to derive lambda operation contracts for the cross-project policy: ${String(error)}`);
-            return [];
+        if (configuredEntry) {
+            const entryWithoutExt = external_path_default().isAbsolute(configuredEntry) ? configuredEntry : external_path_default().resolve(appDirectory || process.cwd(), configuredEntry);
+            return resolveJsOrTsEntry(entryWithoutExt);
         }
+        const apiRoot = external_path_default().resolve(appDirectory || process.cwd(), apiDirectory || utils_namespaceObject.API_DIR);
+        return resolveJsOrTsEntry(external_path_default().resolve(apiRoot, 'index'));
     }
     async refreshCrossProjectPolicy(mod) {
         let contractSources = [];
@@ -146,24 +114,15 @@ class EffectAdapter {
         } catch (error) {
             utils_namespaceObject.logger.warn(`[BFF][Effect] Failed to reflect HttpApi endpoints for the cross-project policy: ${String(error)}`);
         }
-        let policy = (0, crossProjectServerPolicy_js_namespaceObject.resolveAdapterCrossProjectPolicy)(this.api, contractSources);
-        if (policy?.enabled) {
-            const lambdaSources = await this.collectLambdaContractSources();
-            if (lambdaSources.length > 0) {
-                contractSources = [
-                    ...contractSources,
-                    ...lambdaSources
-                ];
-                policy = (0, crossProjectServerPolicy_js_namespaceObject.resolveAdapterCrossProjectPolicy)(this.api, contractSources);
-            }
-        }
+        const policy = (0, crossProjectServerPolicy_js_namespaceObject.resolveAdapterCrossProjectPolicy)(this.api, contractSources);
         this.crossProjectPolicy = policy;
         if (this.crossProjectPolicy?.enabled && 0 === contractSources.length) utils_namespaceObject.logger.warn('[BFF][Effect] Cross-project policy is enabled but no HttpApi endpoints could be reflected; operation-contract matching is disabled for this server (envelope and operation-context checks still apply).');
     }
     async loadEffectHandlerFromModule(mod) {
+        const effectConfig = this.api.getServerConfig()?.bff?.effect;
         return (0, external_module_js_namespaceObject.resolveEffectBffModuleHandler)(mod, {
-            openapi: this.api.getServerConfig()?.bff?.effect?.openapi,
-            dataPlatform: this.api.getServerConfig()?.bff?.effect?.dataPlatform,
+            openapi: effectConfig?.openapi,
+            dataPlatform: effectConfig?.dataPlatform,
             validateRequest: (request)=>(0, crossProjectServerPolicy_js_namespaceObject.checkCrossProjectPolicyForRequest)(request, this.crossProjectPolicy),
             onWarning: (message)=>{
                 utils_namespaceObject.logger.warn(message);
@@ -197,13 +156,12 @@ class EffectAdapter {
         await this.refreshCrossProjectPolicy(mod);
         const loaded = await this.loadEffectHandlerFromModule(mod);
         if (!loaded) {
-            utils_namespaceObject.logger.warn(`[BFF][Effect] Invalid Effect entry module: ${entryFile}. Export { api, layer } or handler.`);
+            utils_namespaceObject.logger.warn(`[BFF][Effect] Invalid Effect entry module: ${entryFile}. Export defineEffectBff(...) or a { api, layer } HttpApi module.`);
             this.handler = null;
             return;
         }
         this.handler = loaded.handler;
         this.dispose = loaded.dispose || null;
-        this.policyEnforcedInMiddleware = !loaded.appliesRequestValidator;
     }
     async disposeCurrentHandler() {
         if (!this.dispose) return;
@@ -255,7 +213,6 @@ class EffectAdapter {
         this.handler = null;
         this.dispose = null;
         this.prefix = '/api';
-        this.policyEnforcedInMiddleware = false;
         this.registerMiddleware = async (options)=>{
             const { prefix, enableHandleWeb } = options;
             const { bffRuntimeFramework, middlewares: globalMiddlewares } = this.api.getServerContext();
@@ -266,7 +223,7 @@ class EffectAdapter {
             this.prefix = prefix || this.prefix;
             await this.reloadHandler();
             this.effectMiddleware = {
-                name: 'effect-bff-handler',
+                name: 'effect-api-handler',
                 path: enableHandleWeb ? '*' : `${prefix}/*`,
                 method: 'all',
                 order: 'post',
@@ -274,11 +231,7 @@ class EffectAdapter {
                 handler: async (c, next)=>{
                     if (!this.handler) {
                         if (enableHandleWeb) return void await next();
-                        return this.handleRuntimeError(new Error('[BFF][Effect] Missing Effect entry. Define api/effect/index or configure bff.effect.entry.'), c);
-                    }
-                    if (this.crossProjectPolicy?.enabled && this.policyEnforcedInMiddleware && this.isApiRequestPath(c.req.path, prefix, enableHandleWeb)) {
-                        const denial = (0, crossProjectServerPolicy_js_namespaceObject.checkCrossProjectPolicyForRequest)(c.req.raw, this.crossProjectPolicy);
-                        if (denial) return denial;
+                        return this.handleRuntimeError(new Error('[BFF][Effect] Missing Effect entry. Define api/index or configure bff.effect.entry.'), c);
                     }
                     let response;
                     try {

package/dist/cjs/runtime/effect/edge.js

@@ -138,7 +138,7 @@ var __webpack_exports__ = {};
             dataPlatform: options.dataPlatform,
             onWarning: options.onWarning
         });
-        if (!loaded) throw new Error('[BFF][Effect] Invalid Effect edge module. Export { api, layer }, createHandler, or handler.');
+        if (!loaded) throw new Error('[BFF][Effect] Invalid Effect edge module. Export defineEffectBff(...) or a { api, layer } HttpApi module.');
         return {
             handler: (request, dispatchOptions = {})=>dispatchEffectBffRequest(loaded.handler, request, {
                     ...dispatchOptions,

package/dist/cjs/runtime/effect/handler.js

@@ -202,6 +202,41 @@ var __webpack_exports__ = {};
             }
         });
     }
+    function createJsonValidationResponse(message, status = 400) {
+        return new Response(JSON.stringify({
+            message
+        }), {
+            status,
+            headers: {
+                'content-type': 'application/json; charset=utf-8'
+            }
+        });
+    }
+    function cloneWithoutJsonBodyHeaders(request) {
+        const headers = new Headers(request.headers);
+        headers.delete('content-type');
+        headers.delete('content-length');
+        return new Request(request.url, {
+            method: request.method,
+            headers,
+            signal: request.signal
+        });
+    }
+    async function prepareJsonRequestBody(request) {
+        const method = normalizeItemMethod(request.method);
+        if ('GET' === method || 'HEAD' === method) return request;
+        const contentType = (request.headers.get('content-type') || '').toLowerCase();
+        if (!contentType.includes('application/json')) return request;
+        if (null === request.body) return cloneWithoutJsonBodyHeaders(request);
+        try {
+            const bodyText = await request.clone().text();
+            if ('' === bodyText) return cloneWithoutJsonBodyHeaders(request);
+            JSON.parse(bodyText);
+        } catch  {
+            return createJsonValidationResponse('Invalid JSON request body');
+        }
+        return request;
+    }
     function toBatchItemError(id, status, message) {
         return {
             id,
@@ -422,7 +457,7 @@ var __webpack_exports__ = {};
     ]);
     function createLoaderMaterializedClientPlaceholder() {
         const explain = (property)=>{
-            throw new Error(`[BFF][Effect] effectBff.client.${String(property)} is not available here: the typed client only exists when this module is imported through the "@api/effect/*" transformed path (the BFF loader replaces it with generated client code). On the server, use HttpApiClient or call the Effect layer directly.`);
+            throw new Error(`[BFF][Effect] client.${String(property)} is not available here: the typed client only exists when the API entry is imported through the "@api/index" transformed path (the BFF loader replaces it with generated client code). On the server, use HttpApiClient or call the Effect layer directly.`);
         };
         return new Proxy(Object.create(null), {
             get (_target, property) {
@@ -459,9 +494,11 @@ var __webpack_exports__ = {};
         const withDataPlatformValidation = async (request, context)=>{
             const policyDenial = options.validateRequest?.(request);
             if (policyDenial) return policyDenial;
-            const validationError = validateDataPlatformRequestEnvelope(request, options.dataPlatform);
+            const preparedRequest = await prepareJsonRequestBody(request);
+            if (preparedRequest instanceof Response) return preparedRequest;
+            const validationError = validateDataPlatformRequestEnvelope(preparedRequest, options.dataPlatform);
             if (validationError) return validationError;
-            return httpApiHandler.handler(request, context ?? emptyEffectServiceContext);
+            return httpApiHandler.handler(preparedRequest, context ?? emptyEffectServiceContext);
         };
         const handleBatchRequest = async (request, context)=>{
             const mountedPrefix = getMountedPrefixFromContext(request, context);

package/dist/cjs/runtime/effect/module.js

@@ -49,16 +49,18 @@ function isEffectServiceContext(context) {
     return 'object' == typeof context && null !== context && 'mapUnsafe' in context;
 }
 const emptyEffectServiceContext = Context_namespaceObject.empty();
+const strictEffectApproachMessage = '[BFF][Effect] strictEffectApproach is enforced: Effect API entries must export defineEffectBff(...) or a { api, layer } HttpApi module. Raw handler exports, default request handlers, and unbranded custom createHandler factories are not valid Effect API entries.';
+function rejectLegacyEffectModuleShape(options, shape) {
+    options.onWarning?.(`${strictEffectApproachMessage} Rejected ${shape}.`);
+    return true;
+}
 function callEffectBffRequestHandler(handler, request, context) {
     return void 0 === context ? handler(request) : handler(request, context);
 }
-function createLoadedHandler(webHandler, appliesRequestValidator) {
+function createLoadedHandler(webHandler) {
     return {
         handler: (request, context)=>callEffectBffRequestHandler(webHandler.handler, request, context),
-        dispose: webHandler.dispose,
-        ...appliesRequestValidator ? {
-            appliesRequestValidator: true
-        } : {}
+        dispose: webHandler.dispose
     };
 }
 function createLoadedHttpApiHandler(webHandler) {
@@ -67,18 +69,23 @@ function createLoadedHttpApiHandler(webHandler) {
             const effectContext = isEffectServiceContext(context) ? context : emptyEffectServiceContext;
             return webHandler.handler(request, effectContext);
         },
-        dispose: webHandler.dispose,
-        appliesRequestValidator: true
+        dispose: webHandler.dispose
     };
 }
 function resolveNormalizedEffectBffModuleHandler(normalizedModule, options = {}) {
-    if (isRequestHandler(normalizedModule.handler)) return {
-        handler: normalizedModule.handler
-    };
+    if (isRequestHandler(normalizedModule.handler)) {
+        if (rejectLegacyEffectModuleShape(options, '`handler` export')) return null;
+        return {
+            handler: normalizedModule.handler
+        };
+    }
     const entry = normalizedModule.default;
-    if (isRequestHandler(entry)) return {
-        handler: entry
-    };
+    if (isRequestHandler(entry)) {
+        if (rejectLegacyEffectModuleShape(options, 'default request handler')) return null;
+        return {
+            handler: entry
+        };
+    }
     if (isRecord(entry)) normalizedModule = {
         ...normalizedModule,
         ...entry
@@ -90,19 +97,22 @@ function resolveNormalizedEffectBffModuleHandler(normalizedModule, options = {})
             handler: maybeHandler
         };
     }
-    if (isRequestHandler(normalizedModule.handler)) return {
-        handler: normalizedModule.handler
-    };
+    if (isRequestHandler(normalizedModule.handler)) {
+        if (rejectLegacyEffectModuleShape(options, '`handler` export')) return null;
+        return {
+            handler: normalizedModule.handler
+        };
+    }
     if ('function' == typeof normalizedModule.createHandler) {
         const factory = normalizedModule.createHandler;
         const validatorAware = (0, external_handler_js_namespaceObject.isValidatorAwareHandlerFactory)(factory);
-        if (!validatorAware && void 0 !== options.validateRequest) options.onWarning?.('[BFF][Effect] Custom createHandler export detected: it cannot be verified to apply validateRequest (cross-project policy), so the policy is enforced by the adapter middleware on the outer request. Batched calls will be denied at the batch POST (it carries no per-operation contract); export defineEffectBff(...) to get per-batch-item enforcement.');
+        if (!validatorAware && rejectLegacyEffectModuleShape(options, 'unbranded `createHandler` export')) return null;
         const webHandler = factory({
             openapi: options.openapi,
             dataPlatform: options.dataPlatform,
             validateRequest: options.validateRequest
         });
-        return createLoadedHandler(webHandler, validatorAware);
+        return createLoadedHandler(webHandler);
     }
     if (isEffectApiDefinition(normalizedModule)) {
         options.onWarning?.('[BFF][Effect] Detected { api, layer } export without createHandler. Prefer `defineEffectBff(...)` from @modern-js/plugin-bff/server to avoid module instance mismatch.');
@@ -126,17 +136,26 @@ function resolveEffectBffModuleHandler(mod, options = {}) {
             ...value
         };
     };
-    if (isRequestHandler(normalizedModule.handler)) return Promise.resolve({
-        handler: normalizedModule.handler
-    });
+    if (isRequestHandler(normalizedModule.handler)) {
+        if (rejectLegacyEffectModuleShape(options, '`handler` export')) return Promise.resolve(null);
+        return Promise.resolve({
+            handler: normalizedModule.handler
+        });
+    }
     const entry = normalizedModule.default;
-    if (isRequestHandler(entry)) return Promise.resolve({
-        handler: entry
-    });
+    if (isRequestHandler(entry)) {
+        if (rejectLegacyEffectModuleShape(options, 'default request handler')) return Promise.resolve(null);
+        return Promise.resolve({
+            handler: entry
+        });
+    }
     if ('function' == typeof entry && 0 === entry.length) return Promise.resolve(entry()).then((out)=>{
-        if (isRequestHandler(out)) return {
-            handler: out
-        };
+        if (isRequestHandler(out)) {
+            if (rejectLegacyEffectModuleShape(options, 'default factory returning a request handler')) return null;
+            return {
+                handler: out
+            };
+        }
         mergeRuntimeExports(out);
         return resolveNormalizedEffectBffModuleHandler(normalizedModule, options);
     });

package/dist/cjs/runtime/effect-client/index.js

@@ -35,6 +35,7 @@ __webpack_require__.d(__webpack_exports__, {
     HttpApiEndpoint: ()=>httpapi_namespaceObject.HttpApiEndpoint,
     HttpApiGroup: ()=>httpapi_namespaceObject.HttpApiGroup,
     HttpApiSchema: ()=>httpapi_namespaceObject.HttpApiSchema,
+    HttpClientError: ()=>HttpClientError_namespaceObject,
     Layer: ()=>Layer_namespaceObject,
     Rpc: ()=>rpc_namespaceObject.Rpc,
     RpcClient: ()=>rpc_namespaceObject.RpcClient,
@@ -60,6 +61,7 @@ const http_namespaceObject = require("effect/unstable/http");
 const httpapi_namespaceObject = require("effect/unstable/httpapi");
 const rpc_namespaceObject = require("effect/unstable/rpc");
 const Schema_namespaceObject = require("effect/Schema");
+const HttpClientError_namespaceObject = require("effect/unstable/http/HttpClientError");
 class EffectRpcClientError extends Data_namespaceObject.TaggedError('EffectRpcClientError') {
 }
 function isRecord(value) {
@@ -162,6 +164,7 @@ exports.HttpApiClient = __webpack_exports__.HttpApiClient;
 exports.HttpApiEndpoint = __webpack_exports__.HttpApiEndpoint;
 exports.HttpApiGroup = __webpack_exports__.HttpApiGroup;
 exports.HttpApiSchema = __webpack_exports__.HttpApiSchema;
+exports.HttpClientError = __webpack_exports__.HttpClientError;
 exports.Layer = __webpack_exports__.Layer;
 exports.Rpc = __webpack_exports__.Rpc;
 exports.RpcClient = __webpack_exports__.RpcClient;
@@ -183,6 +186,7 @@ for(var __rspack_i in __webpack_exports__)if (-1 === [
     "HttpApiEndpoint",
     "HttpApiGroup",
     "HttpApiSchema",
+    "HttpClientError",
     "Layer",
     "Rpc",
     "RpcClient",

package/dist/cjs/utils/effectClientGenerator.js

@@ -172,14 +172,14 @@ const __generated = createGeneratedEffectClient(__manifest, __config, __requestR
 const client = __generated.client;
 const operationManifest = __generated.operationManifest;
 const createEffectRequestContext = __generated.createEffectRequestContext;
-const effectBffModule = {
+const apiModule = {
   client,
   operationManifest,
   createEffectRequestContext,
 };
 
 export { client, createEffectRequestContext, operationManifest };
-export default effectBffModule;
+export default apiModule;
 `;
 }
 function renderClientShape(endpoints, valueType) {
@@ -252,13 +252,13 @@ export declare const createEffectRequestContext: (
   requestContext: Record<string, unknown>,
 ) => EffectRequestContext;
 export declare const operationManifest: GeneratedEffectOperationManifest;
-declare const effectBffModule: {
+declare const apiModule: {
   client: GeneratedEffectClient;
   createEffectRequestContext: typeof createEffectRequestContext;
   operationManifest: GeneratedEffectOperationManifest;
 };
 
-export default effectBffModule;
+export default apiModule;
 `;
 }
 async function generateEffectClient(options) {
@@ -281,10 +281,15 @@ async function generateEffectClientCode(options) {
 }
 function resolveEffectEntryFile(options) {
     const { appDir, apiDir, effectEntry } = options;
-    const defaultEntry = external_path_default().resolve(apiDir, 'effect', 'index');
-    const entryWithoutExt = effectEntry ? external_path_default().isAbsolute(effectEntry) ? effectEntry : external_path_default().resolve(appDir, effectEntry) : defaultEntry;
-    if (external_path_default().extname(entryWithoutExt)) return utils_namespaceObject.fs.existsSync(entryWithoutExt) ? entryWithoutExt : void 0;
-    return (0, utils_namespaceObject.findExists)(JS_OR_TS_EXTS.map((ext)=>`${entryWithoutExt}${ext}`));
+    const resolveEntry = (entryWithoutExt)=>{
+        if (external_path_default().extname(entryWithoutExt)) return utils_namespaceObject.fs.existsSync(entryWithoutExt) ? entryWithoutExt : void 0;
+        return (0, utils_namespaceObject.findExists)(JS_OR_TS_EXTS.map((ext)=>`${entryWithoutExt}${ext}`));
+    };
+    if (effectEntry) {
+        const entryWithoutExt = external_path_default().isAbsolute(effectEntry) ? effectEntry : external_path_default().resolve(appDir, effectEntry);
+        return resolveEntry(entryWithoutExt);
+    }
+    return resolveEntry(external_path_default().resolve(apiDir, 'index'));
 }
 exports.generateEffectClient = __webpack_exports__.generateEffectClient;
 exports.generateEffectClientCode = __webpack_exports__.generateEffectClientCode;

package/dist/esm/runtime/effect/adapter.mjs

@@ -1,4 +1,3 @@
-import { ApiRouter } from "@modern-js/bff-core";
 import { API_DIR, compatibleRequire, findExists, fs, isProd, logger } from "@modern-js/utils";
 import { HttpApi } from "effect/unstable/httpapi";
 import path from "path";
@@ -52,43 +51,12 @@ class EffectAdapter {
         const { appDirectory, apiDirectory } = this.api.getServerContext();
         const bffConfig = this.api.getServerConfig()?.bff;
         const configuredEntry = bffConfig?.effect?.entry;
-        const defaultEntry = path.resolve(appDirectory || process.cwd(), apiDirectory || API_DIR, 'effect', 'index');
-        const entryWithoutExt = configuredEntry ? path.isAbsolute(configuredEntry) ? configuredEntry : path.resolve(appDirectory || process.cwd(), configuredEntry) : defaultEntry;
-        return resolveJsOrTsEntry(entryWithoutExt);
-    }
-    isApiRequestPath(requestPath, prefix, enableHandleWeb) {
-        if (!enableHandleWeb) return true;
-        const normalized = normalizePrefix(prefix);
-        if (!normalized) return true;
-        return requestPath === normalized || requestPath.startsWith(`${normalized}/`);
-    }
-    async collectLambdaContractSources() {
-        try {
-            const serverContext = this.api.getServerContext();
-            const appDir = serverContext.distDirectory || serverContext.appDirectory;
-            if (!appDir) return [];
-            const apiDir = 'string' == typeof serverContext.apiDirectory ? serverContext.apiDirectory : path.resolve(appDir, API_DIR);
-            const lambdaDir = 'string' == typeof serverContext.lambdaDirectory ? serverContext.lambdaDirectory : path.join(apiDir, 'lambda');
-            if (!await fs.pathExists(lambdaDir)) return [];
-            const apiRouter = new ApiRouter({
-                appDir,
-                apiDir,
-                lambdaDir,
-                prefix: this.prefix,
-                httpMethodDecider: this.api.getServerConfig()?.bff?.httpMethodDecider
-            });
-            const handlerInfos = await apiRouter.getApiHandlers();
-            return handlerInfos.map((info)=>({
-                    name: info.name,
-                    httpMethod: info.httpMethod,
-                    routePath: info.routePath,
-                    filename: info.filename,
-                    handler: info.handler
-                }));
-        } catch (error) {
-            logger.warn(`[BFF][Effect] Failed to derive lambda operation contracts for the cross-project policy: ${String(error)}`);
-            return [];
+        if (configuredEntry) {
+            const entryWithoutExt = path.isAbsolute(configuredEntry) ? configuredEntry : path.resolve(appDirectory || process.cwd(), configuredEntry);
+            return resolveJsOrTsEntry(entryWithoutExt);
         }
+        const apiRoot = path.resolve(appDirectory || process.cwd(), apiDirectory || API_DIR);
+        return resolveJsOrTsEntry(path.resolve(apiRoot, 'index'));
     }
     async refreshCrossProjectPolicy(mod) {
         let contractSources = [];
@@ -104,24 +72,15 @@ class EffectAdapter {
         } catch (error) {
             logger.warn(`[BFF][Effect] Failed to reflect HttpApi endpoints for the cross-project policy: ${String(error)}`);
         }
-        let policy = resolveAdapterCrossProjectPolicy(this.api, contractSources);
-        if (policy?.enabled) {
-            const lambdaSources = await this.collectLambdaContractSources();
-            if (lambdaSources.length > 0) {
-                contractSources = [
-                    ...contractSources,
-                    ...lambdaSources
-                ];
-                policy = resolveAdapterCrossProjectPolicy(this.api, contractSources);
-            }
-        }
+        const policy = resolveAdapterCrossProjectPolicy(this.api, contractSources);
         this.crossProjectPolicy = policy;
         if (this.crossProjectPolicy?.enabled && 0 === contractSources.length) logger.warn('[BFF][Effect] Cross-project policy is enabled but no HttpApi endpoints could be reflected; operation-contract matching is disabled for this server (envelope and operation-context checks still apply).');
     }
     async loadEffectHandlerFromModule(mod) {
+        const effectConfig = this.api.getServerConfig()?.bff?.effect;
         return resolveEffectBffModuleHandler(mod, {
-            openapi: this.api.getServerConfig()?.bff?.effect?.openapi,
-            dataPlatform: this.api.getServerConfig()?.bff?.effect?.dataPlatform,
+            openapi: effectConfig?.openapi,
+            dataPlatform: effectConfig?.dataPlatform,
             validateRequest: (request)=>checkCrossProjectPolicyForRequest(request, this.crossProjectPolicy),
             onWarning: (message)=>{
                 logger.warn(message);
@@ -155,13 +114,12 @@ class EffectAdapter {
         await this.refreshCrossProjectPolicy(mod);
         const loaded = await this.loadEffectHandlerFromModule(mod);
         if (!loaded) {
-            logger.warn(`[BFF][Effect] Invalid Effect entry module: ${entryFile}. Export { api, layer } or handler.`);
+            logger.warn(`[BFF][Effect] Invalid Effect entry module: ${entryFile}. Export defineEffectBff(...) or a { api, layer } HttpApi module.`);
             this.handler = null;
             return;
         }
         this.handler = loaded.handler;
         this.dispose = loaded.dispose || null;
-        this.policyEnforcedInMiddleware = !loaded.appliesRequestValidator;
     }
     async disposeCurrentHandler() {
         if (!this.dispose) return;
@@ -213,7 +171,6 @@ class EffectAdapter {
         this.handler = null;
         this.dispose = null;
         this.prefix = '/api';
-        this.policyEnforcedInMiddleware = false;
         this.registerMiddleware = async (options)=>{
             const { prefix, enableHandleWeb } = options;
             const { bffRuntimeFramework, middlewares: globalMiddlewares } = this.api.getServerContext();
@@ -224,7 +181,7 @@ class EffectAdapter {
             this.prefix = prefix || this.prefix;
             await this.reloadHandler();
             this.effectMiddleware = {
-                name: 'effect-bff-handler',
+                name: 'effect-api-handler',
                 path: enableHandleWeb ? '*' : `${prefix}/*`,
                 method: 'all',
                 order: 'post',
@@ -232,11 +189,7 @@ class EffectAdapter {
                 handler: async (c, next)=>{
                     if (!this.handler) {
                         if (enableHandleWeb) return void await next();
-                        return this.handleRuntimeError(new Error('[BFF][Effect] Missing Effect entry. Define api/effect/index or configure bff.effect.entry.'), c);
-                    }
-                    if (this.crossProjectPolicy?.enabled && this.policyEnforcedInMiddleware && this.isApiRequestPath(c.req.path, prefix, enableHandleWeb)) {
-                        const denial = checkCrossProjectPolicyForRequest(c.req.raw, this.crossProjectPolicy);
-                        if (denial) return denial;
+                        return this.handleRuntimeError(new Error('[BFF][Effect] Missing Effect entry. Define api/index or configure bff.effect.entry.'), c);
                     }
                     let response;
                     try {

package/dist/esm/runtime/effect/edge.mjs

@@ -68,7 +68,7 @@ async function createEffectBffEdgeHandler(options) {
         dataPlatform: options.dataPlatform,
         onWarning: options.onWarning
     });
-    if (!loaded) throw new Error('[BFF][Effect] Invalid Effect edge module. Export { api, layer }, createHandler, or handler.');
+    if (!loaded) throw new Error('[BFF][Effect] Invalid Effect edge module. Export defineEffectBff(...) or a { api, layer } HttpApi module.');
     return {
         handler: (request, dispatchOptions = {})=>dispatchEffectBffRequest(loaded.handler, request, {
                 ...dispatchOptions,

package/dist/esm/runtime/effect/handler.mjs

@@ -74,6 +74,41 @@ function createBatchValidationResponse(message, status = 400) {
         }
     });
 }
+function createJsonValidationResponse(message, status = 400) {
+    return new Response(JSON.stringify({
+        message
+    }), {
+        status,
+        headers: {
+            'content-type': 'application/json; charset=utf-8'
+        }
+    });
+}
+function cloneWithoutJsonBodyHeaders(request) {
+    const headers = new Headers(request.headers);
+    headers.delete('content-type');
+    headers.delete('content-length');
+    return new Request(request.url, {
+        method: request.method,
+        headers,
+        signal: request.signal
+    });
+}
+async function prepareJsonRequestBody(request) {
+    const method = normalizeItemMethod(request.method);
+    if ('GET' === method || 'HEAD' === method) return request;
+    const contentType = (request.headers.get('content-type') || '').toLowerCase();
+    if (!contentType.includes('application/json')) return request;
+    if (null === request.body) return cloneWithoutJsonBodyHeaders(request);
+    try {
+        const bodyText = await request.clone().text();
+        if ('' === bodyText) return cloneWithoutJsonBodyHeaders(request);
+        JSON.parse(bodyText);
+    } catch  {
+        return createJsonValidationResponse('Invalid JSON request body');
+    }
+    return request;
+}
 function toBatchItemError(id, status, message) {
     return {
         id,
@@ -294,7 +329,7 @@ const LOADER_CLIENT_IGNORED_KEYS = new Set([
 ]);
 function createLoaderMaterializedClientPlaceholder() {
     const explain = (property)=>{
-        throw new Error(`[BFF][Effect] effectBff.client.${String(property)} is not available here: the typed client only exists when this module is imported through the "@api/effect/*" transformed path (the BFF loader replaces it with generated client code). On the server, use HttpApiClient or call the Effect layer directly.`);
+        throw new Error(`[BFF][Effect] client.${String(property)} is not available here: the typed client only exists when the API entry is imported through the "@api/index" transformed path (the BFF loader replaces it with generated client code). On the server, use HttpApiClient or call the Effect layer directly.`);
     };
     return new Proxy(Object.create(null), {
         get (_target, property) {
@@ -331,9 +366,11 @@ function createHttpApiHandler(options) {
     const withDataPlatformValidation = async (request, context)=>{
         const policyDenial = options.validateRequest?.(request);
         if (policyDenial) return policyDenial;
-        const validationError = validateDataPlatformRequestEnvelope(request, options.dataPlatform);
+        const preparedRequest = await prepareJsonRequestBody(request);
+        if (preparedRequest instanceof Response) return preparedRequest;
+        const validationError = validateDataPlatformRequestEnvelope(preparedRequest, options.dataPlatform);
         if (validationError) return validationError;
-        return httpApiHandler.handler(request, context ?? emptyEffectServiceContext);
+        return httpApiHandler.handler(preparedRequest, context ?? emptyEffectServiceContext);
     };
     const handleBatchRequest = async (request, context)=>{
         const mountedPrefix = getMountedPrefixFromContext(request, context);