@bleedingdev/modern-js-plugin-bff 3.8.3-ultramodern.1 → 3.8.3-ultramodern.2

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

@@ -39,11 +39,11 @@ __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
     HonoAdapter: ()=>HonoAdapter
 });
+const cross_project_policy_namespaceObject = require("@modern-js/plugin-bff-extensions/cross-project-policy");
+const hono_namespaceObject = require("@modern-js/plugin-bff-extensions/hono");
 const utils_namespaceObject = require("@modern-js/utils");
 const createHonoRoutes_js_namespaceObject = require("../../utils/createHonoRoutes.js");
 var createHonoRoutes_js_default = /*#__PURE__*/ __webpack_require__.n(createHonoRoutes_js_namespaceObject);
-const crossProjectServerPolicy_js_namespaceObject = require("../../utils/crossProjectServerPolicy.js");
-const external_safe_failure_js_namespaceObject = require("../safe-failure.js");
 const before = [
     'custom-server-hook',
     'custom-server-middleware',
@@ -53,78 +53,37 @@ class HonoAdapter {
     constructor(api){
         this.apiMiddleware = [];
         this.isHono = true;
-        this.prefix = '/api';
         this.setHandlers = async ()=>{
             if (!this.isHono) return;
             const { apiHandlerInfos } = this.api.getServerContext();
-            const honoHandlers = createHonoRoutes_js_default()(apiHandlerInfos);
+            const handlers = apiHandlerInfos ?? [];
+            const honoHandlers = createHonoRoutes_js_default()(handlers);
+            const policy = (0, cross_project_policy_namespaceObject.resolveAdapterCrossProjectPolicy)(this.api, handlers);
             this.apiMiddleware = honoHandlers.map(({ path, method, handler })=>({
                     name: 'hono-bff-api',
                     path,
                     method,
-                    handler: this.withErrorBoundary(handler),
+                    handler: (0, hono_namespaceObject.bindHonoRouteHandlers)({
+                        handler,
+                        policy,
+                        routePath: path,
+                        onError: this.api.getServerConfig()?.onError,
+                        reportError: (error)=>utils_namespaceObject.logger.error(error)
+                    }),
                     order: 'post',
                     before
                 }));
-            this.crossProjectPolicy = (0, crossProjectServerPolicy_js_namespaceObject.resolveAdapterCrossProjectPolicy)(this.api, apiHandlerInfos || []);
-            if (this.crossProjectPolicy) {
-                const policyMiddleware = async (c, next)=>{
-                    const denial = (0, crossProjectServerPolicy_js_namespaceObject.checkCrossProjectPolicyResponse)(c.req.header(), this.crossProjectPolicy);
-                    if (denial) return denial;
-                    await next();
-                };
-                this.apiMiddleware.unshift({
-                    name: 'bff-cross-project-policy',
-                    path: `${this.prefix}/*`,
-                    method: 'all',
-                    handler: policyMiddleware,
-                    order: 'post',
-                    before
-                });
-            }
         };
-        this.registerMiddleware = async (options = {})=>{
+        this.registerMiddleware = async (_options)=>{
             const { bffRuntimeFramework } = this.api.getServerContext();
             if ('hono' !== bffRuntimeFramework) {
                 this.isHono = false;
                 return;
             }
-            const { prefix } = options;
-            this.prefix = prefix || this.prefix;
             const { middlewares: globalMiddlewares } = this.api.getServerContext();
             await this.setHandlers();
             globalMiddlewares.push(...this.apiMiddleware);
         };
-        this.handleRouteError = async (error, c)=>{
-            try {
-                const onErrorHandler = this.api.getServerConfig()?.onError;
-                if (onErrorHandler) {
-                    const result = await onErrorHandler(error, c);
-                    if (result instanceof Response) return result;
-                } else utils_namespaceObject.logger.error(error);
-            } catch (configError) {
-                utils_namespaceObject.logger.error(`Error in serverConfig.onError handler: ${configError}`);
-            }
-            return (0, external_safe_failure_js_namespaceObject.createSafeFailureResponse)(error);
-        };
-        this.withErrorBoundary = (handler)=>{
-            const handlers = Array.isArray(handler) ? handler : [
-                handler
-            ];
-            const [firstHandler, ...restHandlers] = handlers;
-            if (!firstHandler) return handler;
-            const boundary = async (c, next)=>{
-                try {
-                    return await firstHandler(c, next);
-                } catch (error) {
-                    return this.handleRouteError(error, c);
-                }
-            };
-            return Array.isArray(handler) ? [
-                boundary,
-                ...restHandlers
-            ] : boundary;
-        };
         this.api = api;
     }
 }

package/dist/cjs/server.js

@@ -49,7 +49,7 @@ const RUNTIME_ADAPTER_LOADERS = {
             new adapter_js_namespaceObject.HonoAdapter(api)
         ],
     effect: async (api)=>{
-        const { EffectAdapter } = await import("./runtime/effect/adapter.js");
+        const { EffectAdapter } = await import("@modern-js/plugin-bff-extensions/effect-adapter");
         return [
             new EffectAdapter(api)
         ];
@@ -124,7 +124,7 @@ const server = ()=>({
                 }
                 const runtimeAdapters = await RUNTIME_ADAPTER_LOADERS[runtimeFramework](api);
                 await Promise.all(runtimeAdapters.map((adapter)=>adapter.registerMiddleware({
-                        prefix,
+                        prefix: 'effect' === runtimeFramework ? prefixList : prefix,
                         enableHandleWeb
                     })));
             });

package/dist/cjs/utils/client-generator/generate.js

@@ -44,7 +44,6 @@ const bff_core_namespaceObject = require("@modern-js/bff-core");
 const utils_namespaceObject = require("@modern-js/utils");
 const external_path_namespaceObject = require("path");
 var external_path_default = /*#__PURE__*/ __webpack_require__.n(external_path_namespaceObject);
-const external_effectClientGenerator_js_namespaceObject = require("../effectClientGenerator.js");
 const external_files_js_namespaceObject = require("./files.js");
 const external_package_json_js_namespaceObject = require("./package-json.js");
 const external_type_facade_js_namespaceObject = require("./type-facade.js");
@@ -57,6 +56,7 @@ async function clientGenerator(draftOptions) {
     const generatedSourceList = [
         ...lambdaSourceList
     ];
+    let generatedEffectClient = null;
     const getClitentCode = async (resourcePath, source)=>{
         const warning = `The file ${resourcePath} is not allowed to be imported in src directory, only API definition files are allowed.`;
         if (!draftOptions.existLambda) return void utils_namespaceObject.logger.warn(warning);
@@ -92,7 +92,8 @@ async function clientGenerator(draftOptions) {
             }
         }
         if ('effect' === draftOptions.bffRuntimeFramework) {
-            const effectEntryFile = (0, external_effectClientGenerator_js_namespaceObject.resolveEffectEntryFile)({
+            const { generateEffectClient, resolveEffectEntryFile } = await import("@modern-js/plugin-bff-extensions/client-generator");
+            const effectEntryFile = resolveEffectEntryFile({
                 appDir: draftOptions.appDir,
                 apiDir: draftOptions.apiDir,
                 effectEntry: draftOptions.effectEntry
@@ -106,21 +107,22 @@ async function clientGenerator(draftOptions) {
                     source: effectSource,
                     relativeDistPath: draftOptions.relativeDistPath
                 });
-                const effectClientArtifacts = await (0, external_effectClientGenerator_js_namespaceObject.generateEffectClient)({
+                generatedEffectClient = await generateEffectClient({
                     appDir: draftOptions.appDir,
                     apiDir: draftOptions.apiDir,
                     resourcePath: effectEntryFile,
                     prefix: Array.isArray(draftOptions.prefix) ? draftOptions.prefix[0] : draftOptions.prefix,
                     port: Number(draftOptions.port),
                     target: 'bundle',
+                    requestId: draftOptions.requestId,
                     requestCreator: draftOptions.requestCreator,
                     httpMethodDecider: draftOptions.httpMethodDecider,
                     dataPlatformBatch: draftOptions.effectDataPlatformBatch
                 });
-                if (effectClientArtifacts) {
+                if (generatedEffectClient) {
                     const targetTypeFile = effectFileDetails.targetDir.replace(/\.js$/, '.d.ts');
-                    await (0, external_files_js_namespaceObject.writeTargetFile)(effectFileDetails.absTargetDir, effectClientArtifacts.code);
-                    await (0, external_files_js_namespaceObject.writeTargetFile)(external_path_default().resolve(targetTypeFile), effectClientArtifacts.declaration);
+                    await (0, external_files_js_namespaceObject.writeTargetFile)(effectFileDetails.absTargetDir, generatedEffectClient.code);
+                    await (0, external_files_js_namespaceObject.writeTargetFile)(external_path_default().resolve(targetTypeFile), generatedEffectClient.declaration);
                     generatedSourceList.push(effectFileDetails);
                 }
             }
@@ -132,6 +134,7 @@ async function clientGenerator(draftOptions) {
     }
     if (generatedSourceList.length > 0) await (0, external_write_package_js_namespaceObject.writeClientModuleBoundary)(draftOptions.appDir, draftOptions.relativeDistPath);
     await (0, external_write_package_js_namespaceObject.setPackage)(generatedSourceList, draftOptions.appDir, draftOptions.relativeDistPath);
+    return generatedEffectClient;
 }
 const generate = clientGenerator;
 exports.clientGenerator = __webpack_exports__.clientGenerator;

package/dist/cjs/utils/crossProjectApiPlugin.js

@@ -44,6 +44,7 @@ __webpack_require__.d(__webpack_exports__, {
     OPERATION_CONTRACTS_JSON: ()=>OPERATION_CONTRACTS_JSON,
     PACKAGE_NAME: ()=>PACKAGE_NAME,
     PREFIX: ()=>PREFIX,
+    REQUEST_ID: ()=>REQUEST_ID,
     RUNTIME_FRAMEWORK: ()=>RUNTIME_FRAMEWORK,
     crossProjectApiPlugin: ()=>crossProjectApiPlugin,
     default: ()=>utils_crossProjectApiPlugin
@@ -51,6 +52,7 @@ __webpack_require__.d(__webpack_exports__, {
 const external_path_namespaceObject = require("path");
 var external_path_default = /*#__PURE__*/ __webpack_require__.n(external_path_namespaceObject);
 const PACKAGE_NAME = '{packageName}';
+const REQUEST_ID = '{requestId}';
 const PREFIX = '{prefix}';
 const API_DIR = '{apiDirectory}';
 const LAMBDA_DIR = '{lambdaDirectory}';
@@ -93,7 +95,7 @@ const crossProjectApiPlugin = ()=>({
                     entry: effectEntry
                 };
                 resolvedConfig.bff.isCrossProjectServer = true;
-                resolvedConfig.bff.requestId = resolvedConfig.bff.requestId || config?.bff?.requestId || PACKAGE_NAME || 'default';
+                resolvedConfig.bff.requestId = resolvedConfig.bff.requestId || config?.bff?.requestId || REQUEST_ID || PACKAGE_NAME || 'default';
                 const generatedOperationContracts = "{operationContracts}" === OPERATION_CONTRACTS_JSON ? {} : JSON.parse(OPERATION_CONTRACTS_JSON);
                 resolvedConfig.bff.crossProjectPolicy = {
                     ...resolvedConfig.bff.crossProjectPolicy || {},
@@ -121,6 +123,7 @@ exports.LAMBDA_DIR = __webpack_exports__.LAMBDA_DIR;
 exports.OPERATION_CONTRACTS_JSON = __webpack_exports__.OPERATION_CONTRACTS_JSON;
 exports.PACKAGE_NAME = __webpack_exports__.PACKAGE_NAME;
 exports.PREFIX = __webpack_exports__.PREFIX;
+exports.REQUEST_ID = __webpack_exports__.REQUEST_ID;
 exports.RUNTIME_FRAMEWORK = __webpack_exports__.RUNTIME_FRAMEWORK;
 exports.crossProjectApiPlugin = __webpack_exports__.crossProjectApiPlugin;
 exports["default"] = __webpack_exports__["default"];
@@ -132,6 +135,7 @@ for(var __rspack_i in __webpack_exports__)if (-1 === [
     "OPERATION_CONTRACTS_JSON",
     "PACKAGE_NAME",
     "PREFIX",
+    "REQUEST_ID",
     "RUNTIME_FRAMEWORK",
     "crossProjectApiPlugin",
     "default"

package/dist/cjs/utils/pluginGenerator.js

@@ -43,18 +43,18 @@ const utils_namespaceObject = require("@modern-js/utils");
 const external_path_namespaceObject = require("path");
 var external_path_default = /*#__PURE__*/ __webpack_require__.n(external_path_namespaceObject);
 const external_crossProjectApiPlugin_js_namespaceObject = require("./crossProjectApiPlugin.js");
-function replaceContent(source, packageName, prefix, relativeDistPath, relativeApiPath, relativeLambdaPath, runtimeFramework, relativeEffectEntry, operationContracts) {
-    const updatedSource = source.replace(new RegExp(external_crossProjectApiPlugin_js_namespaceObject.PACKAGE_NAME, 'g'), packageName).replace(new RegExp(external_crossProjectApiPlugin_js_namespaceObject.PREFIX, 'g'), prefix).replace(new RegExp(external_crossProjectApiPlugin_js_namespaceObject.DIST_DIR, 'g'), (0, utils_namespaceObject.normalizeToPosixPath)(relativeDistPath)).replace(new RegExp(external_crossProjectApiPlugin_js_namespaceObject.API_DIR, 'g'), (0, utils_namespaceObject.normalizeToPosixPath)(relativeApiPath)).replace(new RegExp(external_crossProjectApiPlugin_js_namespaceObject.LAMBDA_DIR, 'g'), (0, utils_namespaceObject.normalizeToPosixPath)(relativeLambdaPath)).replace(new RegExp(external_crossProjectApiPlugin_js_namespaceObject.RUNTIME_FRAMEWORK, 'g'), runtimeFramework).replace(new RegExp(external_crossProjectApiPlugin_js_namespaceObject.EFFECT_ENTRY, 'g'), (0, utils_namespaceObject.normalizeToPosixPath)(relativeEffectEntry)).replace(`'${external_crossProjectApiPlugin_js_namespaceObject.OPERATION_CONTRACTS_JSON}'`, ()=>JSON.stringify(JSON.stringify(operationContracts)));
+function replaceContent(source, packageName, requestId, prefix, relativeDistPath, relativeApiPath, relativeLambdaPath, runtimeFramework, relativeEffectEntry, operationContracts) {
+    const updatedSource = source.replace(new RegExp(external_crossProjectApiPlugin_js_namespaceObject.PACKAGE_NAME, 'g'), packageName).replace(new RegExp(external_crossProjectApiPlugin_js_namespaceObject.REQUEST_ID, 'g'), requestId).replace(new RegExp(external_crossProjectApiPlugin_js_namespaceObject.PREFIX, 'g'), prefix).replace(new RegExp(external_crossProjectApiPlugin_js_namespaceObject.DIST_DIR, 'g'), (0, utils_namespaceObject.normalizeToPosixPath)(relativeDistPath)).replace(new RegExp(external_crossProjectApiPlugin_js_namespaceObject.API_DIR, 'g'), (0, utils_namespaceObject.normalizeToPosixPath)(relativeApiPath)).replace(new RegExp(external_crossProjectApiPlugin_js_namespaceObject.LAMBDA_DIR, 'g'), (0, utils_namespaceObject.normalizeToPosixPath)(relativeLambdaPath)).replace(new RegExp(external_crossProjectApiPlugin_js_namespaceObject.RUNTIME_FRAMEWORK, 'g'), runtimeFramework).replace(new RegExp(external_crossProjectApiPlugin_js_namespaceObject.EFFECT_ENTRY, 'g'), (0, utils_namespaceObject.normalizeToPosixPath)(relativeEffectEntry)).replace(`'${external_crossProjectApiPlugin_js_namespaceObject.OPERATION_CONTRACTS_JSON}'`, ()=>JSON.stringify(JSON.stringify(operationContracts)));
     return updatedSource;
 }
-async function pluginGenerator({ prefix, appDirectory, relativeDistPath, relativeApiPath, relativeLambdaPath, runtimeFramework, relativeEffectEntry, operationContracts }) {
+async function pluginGenerator({ prefix, appDirectory, requestId, relativeDistPath, relativeApiPath, relativeLambdaPath, runtimeFramework, relativeEffectEntry, operationContracts }) {
     try {
         const packageContent = await utils_namespaceObject.fs.readFile(external_path_default().resolve(appDirectory, './package.json'), 'utf8');
         const packageJson = JSON.parse(packageContent);
         const pluginDir = external_path_default().resolve(appDirectory, `./${relativeDistPath}`, 'plugin');
         const pluginPath = external_path_default().join(pluginDir, 'index.js');
         const pluginTemplate = await utils_namespaceObject.fs.readFile(external_path_default().resolve(__dirname, 'crossProjectApiPlugin.js'), 'utf8');
-        const updatedPlugin = replaceContent(pluginTemplate, packageJson.name, prefix, relativeDistPath, relativeApiPath, relativeLambdaPath, runtimeFramework, relativeEffectEntry, operationContracts);
+        const updatedPlugin = replaceContent(pluginTemplate, packageJson.name, requestId, prefix, relativeDistPath, relativeApiPath, relativeLambdaPath, runtimeFramework, relativeEffectEntry, operationContracts);
         await utils_namespaceObject.fs.ensureFile(pluginPath);
         await utils_namespaceObject.fs.writeFile(pluginPath, updatedPlugin);
         const typeContent = `import type { AppTools, CliPlugin } from '@modern-js/app-tools';

package/dist/cjs/utils/runtimeGenerator.js

@@ -39,6 +39,7 @@ __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
     default: ()=>utils_runtimeGenerator
 });
+const cross_project_generation_namespaceObject = require("@modern-js/plugin-bff-extensions/cross-project-generation");
 const utils_namespaceObject = require("@modern-js/utils");
 const external_path_namespaceObject = require("path");
 var external_path_default = /*#__PURE__*/ __webpack_require__.n(external_path_namespaceObject);
@@ -56,21 +57,8 @@ async function runtimeGenerator({ runtime, appDirectory, relativeDistPath, packa
     const requestId = packageName || getPackageName(appDirectory) || process.env.npm_package_name || 'default';
     const runtimeImportPath = JSON.stringify(runtime);
     const requestIdValue = JSON.stringify(requestId);
-    const source = `const { configure: _configure } = require(${runtimeImportPath});
-    const defaultSecureOptions = {
-      requestId: ${requestIdValue},
-      requireEnvelope: true,
-      identityBinding: {
-        enabled: true,
-        strict: true,
-      },
-      operationContract: {
-        enabled: true,
-        strict: true,
-        requireSchemaHash: true,
-        requireOperationVersion: true,
-      },
-    };
+    const source = `'use strict'; const { configure: _configure } = require(${runtimeImportPath});
+    const defaultSecureOptions = ${(0, cross_project_generation_namespaceObject.renderProducerRuntimeDefaults)(requestIdValue)};
     const initProducerClient = (options) => {
       return _configure({
         ...defaultSecureOptions,
@@ -121,7 +109,7 @@ async function runtimeGenerator({ runtime, appDirectory, relativeDistPath, packa
         }) => string;
         requestId?: string;
       };
-  export declare const initProducerClient: (options: ProducerClientOptions) => void;
+  export declare const initProducerClient: (options?: ProducerClientOptions) => ReturnType<ProducerRuntimeModule['configure']>;
   export declare const configure: typeof initProducerClient;`;
     const pluginTypePath = external_path_default().join(pluginDir, 'index.d.ts');
     await utils_namespaceObject.fs.ensureFile(pluginTypePath);

package/dist/esm/cli/generator.mjs

@@ -2,33 +2,11 @@ import { ApiRouter, buildOperationContractMap, deriveOperationVersion } from "@m
 import { compile } from "@modern-js/server-utils";
 import { API_DIR, SHARED_DIR, fs, resolveServerTsconfig, upath } from "@modern-js/utils";
 import clientGenerator from "../utils/clientGenerator.mjs";
-import { bundleEffectEntryForNode } from "../utils/effectSourceLoader.mjs";
 import pluginGenerator from "../utils/pluginGenerator.mjs";
 import runtimeGenerator from "../utils/runtimeGenerator.mjs";
 import { getPrimaryPrefix } from "./prefix.mjs";
 import { serializeServerGlobalVars, transformServerGlobalVars } from "./serverGlobalVars.mjs";
 const RUNTIME_CREATE_REQUEST = '@modern-js/plugin-bff/client';
-const effectEntryExtensions = [
-    '.js',
-    '.jsx',
-    '.ts',
-    '.tsx',
-    '.mjs',
-    '.mts',
-    '.cjs',
-    '.cts'
-];
-function resolveEffectSourceEntry(appDirectory, apiDirectory, configuredEntry) {
-    const entry = void 0 !== configuredEntry && configuredEntry.length > 0 ? upath.isAbsolute(configuredEntry) ? configuredEntry : upath.resolve(appDirectory, configuredEntry) : upath.resolve(apiDirectory, 'index');
-    return upath.extname(entry).length > 0 ? entry : effectEntryExtensions.map((extension)=>`${entry}${extension}`).find((candidate)=>fs.existsSync(candidate));
-}
-function resolveBuiltEffectEntry(appDirectory, distDirectory, sourceEntry) {
-    if (void 0 === sourceEntry || 0 === sourceEntry.length) return;
-    const relativeEntry = upath.relative(appDirectory, sourceEntry);
-    if ('..' === relativeEntry || relativeEntry.startsWith(`..${upath.sep}`)) throw new Error(`Effect BFF entry must be inside the application directory: ${sourceEntry}`);
-    const builtEntry = upath.resolve(distDirectory, relativeEntry).replace(/\.(?:[cm]?ts|tsx|jsx)$/u, '.js');
-    return fs.existsSync(builtEntry) ? builtEntry : void 0;
-}
 const createBffGenerator = (api)=>{
     const compileApi = ()=>Promise.resolve().then(()=>{
             const { appDirectory, distDirectory, apiDirectory, bffRuntimeFramework, sharedDirectory, moduleType } = api.getAppContext();
@@ -56,20 +34,20 @@ const createBffGenerator = (api)=>{
                     tsconfigPath,
                     moduleType,
                     throwErrorInsteadOfExit: true
-                }).then(()=>transformServerGlobalVars(sourceDirs.map((sourceDir)=>upath.resolve(distDir, upath.relative(appDirectory, sourceDir))), serializedGlobalVars)).then(()=>{
+                }).then(()=>transformServerGlobalVars(sourceDirs.map((sourceDir)=>upath.resolve(distDir, upath.relative(appDirectory, sourceDir))), serializedGlobalVars)).then(async ()=>{
                     if ('effect' !== bffRuntimeFramework) return;
-                    const sourceEntry = resolveEffectSourceEntry(appDirectory, apiDir, modernConfig.bff?.effect?.entry);
-                    const builtEntry = resolveBuiltEffectEntry(appDirectory, distDir, sourceEntry);
-                    if (void 0 === builtEntry || 0 === builtEntry.length) throw new Error(`Effect BFF entry was not emitted into ${distDir}: ${sourceEntry ?? upath.resolve(apiDir, 'index')}`);
-                    return bundleEffectEntryForNode({
+                    const { bundleBuiltEffectEntryForNode } = await import("@modern-js/plugin-bff-extensions/client-generator");
+                    return bundleBuiltEffectEntryForNode({
                         appDir: appDirectory,
-                        entryPath: builtEntry,
+                        apiDir,
+                        distDir,
+                        effectEntry: modernConfig.bff?.effect?.entry,
                         format: 'module' === moduleType ? 'esm' : 'cjs'
                     });
                 });
             });
         });
-    const generate = ()=>Promise.resolve().then(()=>{
+    const generate = ()=>Promise.resolve().then(async ()=>{
             const { appDirectory, apiDirectory, lambdaDirectory, port, bffRuntimeFramework, packageName } = api.getAppContext();
             const modernConfig = api.getNormalizedConfig();
             const relativeDistPath = modernConfig?.output?.distPath?.root || 'dist';
@@ -87,43 +65,57 @@ const createBffGenerator = (api)=>{
             const lambdaDir = apiRouter.getLambdaDir();
             const existLambda = apiRouter.isExistLambda();
             const packageJson = fs.readJSONSync(upath.resolve(appDirectory, 'package.json'));
-            const requestId = packageJson.name || packageName;
-            const operationContractsPromise = existLambda ? apiRouter.getApiHandlers().then((handlers)=>buildOperationContractMap({
+            const requestId = bff?.requestId || packageJson.name || packageName || 'default';
+            const operationContractsPromise = 'effect' !== bffRuntimeFramework && existLambda ? apiRouter.getApiHandlers().then((handlers)=>buildOperationContractMap({
                     handlers,
                     requestId,
                     operationVersion: deriveOperationVersion(packageJson.version)
                 })) : Promise.resolve({});
-            return operationContractsPromise.then((operationContracts)=>{
-                const runtime = bff?.runtimeCreateRequest || RUNTIME_CREATE_REQUEST;
-                const relativeApiPath = upath.relative(appDirectory, apiDirectory);
-                const relativeLambdaPath = upath.relative(appDirectory, lambdaDir);
-                const sourceEffectEntry = 'effect' === bffRuntimeFramework ? resolveEffectSourceEntry(appDirectory, apiDirectory, bff?.effect?.entry) : void 0;
-                const relativeEffectEntry = void 0 !== sourceEffectEntry && sourceEffectEntry.length > 0 ? upath.relative(appDirectory, sourceEffectEntry).replace(/\.(?:[cm]?ts|tsx|jsx)$/u, '.js') : '';
+            const runtime = bff?.runtimeCreateRequest || RUNTIME_CREATE_REQUEST;
+            const relativeApiPath = upath.relative(appDirectory, apiDirectory);
+            const relativeLambdaPath = upath.relative(appDirectory, lambdaDir);
+            const { sourceEffectEntry, relativeEffectEntry } = 'effect' === bffRuntimeFramework ? (await import("@modern-js/plugin-bff-extensions/client-generator")).resolveEffectEntryPaths({
+                appDir: appDirectory,
+                apiDir: apiDirectory,
+                effectEntry: bff?.effect?.entry
+            }) : {
+                sourceEffectEntry: void 0,
+                relativeEffectEntry: ''
+            };
+            const clientGenerationPromise = clientGenerator({
+                prefix,
+                appDir: appDirectory,
+                apiDir: apiDirectory,
+                lambdaDir,
+                existLambda,
+                port,
+                requestId,
+                requestCreator: bff?.requestCreator,
+                httpMethodDecider,
+                relativeDistPath,
+                relativeApiPath,
+                apiFiles: apiRouter.getApiFiles(),
+                bffRuntimeFramework,
+                effectEntry: bff?.effect?.entry,
+                effectDataPlatformBatch: bff?.effect?.dataPlatform?.batch
+            });
+            return Promise.all([
+                operationContractsPromise,
+                clientGenerationPromise
+            ]).then(([lambdaContracts, generatedEffectClient])=>{
+                if ('effect' === bffRuntimeFramework && null === generatedEffectClient) throw new Error(`Effect cross-project client generation failed for ${sourceEffectEntry ?? apiDirectory}.`);
+                const operationContracts = 'effect' === bffRuntimeFramework ? generatedEffectClient?.operationContracts ?? {} : lambdaContracts;
                 return pluginGenerator({
                     prefix,
                     appDirectory,
+                    requestId,
                     relativeDistPath,
                     relativeApiPath,
                     relativeLambdaPath,
                     runtimeFramework: 'hono' === bffRuntimeFramework ? 'hono' : 'effect',
                     relativeEffectEntry,
                     operationContracts
-                }).then(()=>clientGenerator({
-                        prefix,
-                        appDir: appDirectory,
-                        apiDir: apiDirectory,
-                        lambdaDir,
-                        existLambda,
-                        port,
-                        requestCreator: bff?.requestCreator,
-                        httpMethodDecider,
-                        relativeDistPath,
-                        relativeApiPath,
-                        apiFiles: apiRouter.getApiFiles(),
-                        bffRuntimeFramework,
-                        effectEntry: bff?.effect?.entry,
-                        effectDataPlatformBatch: bff?.effect?.dataPlatform?.batch
-                    })).then(()=>runtimeGenerator({
+                }).then(()=>runtimeGenerator({
                         runtime,
                         appDirectory,
                         relativeDistPath

package/dist/esm/cli/serverGlobalVars.mjs

@@ -53,7 +53,7 @@ const transformServerGlobalVars = (outputDirectories, globalVars)=>Promise.resol
                                             syntax: "ecmascript"
                                         },
                                         preserveAllComments: true,
-                                        target: 'es2022',
+                                        target: 'es2024',
                                         transform: {
                                             optimizer: {
                                                 globals: {

package/dist/esm/cli.mjs

@@ -58,6 +58,7 @@ const bffPlugin = ()=>({
                                 lambdaDir,
                                 existLambda,
                                 port,
+                                requestId: bff?.requestId,
                                 target: name,
                                 requestCreator: bff?.requestCreator,
                                 httpMethodDecider,

package/dist/esm/loader.mjs

@@ -1,7 +1,7 @@
 import { generateClient } from "@modern-js/bff-core";
+import { generateEffectClientCode, generateEffectWorkerRuntimeWrapper, resolveEffectEntryFile } from "@modern-js/plugin-bff-extensions/effect-source-loader";
 import { logger } from "@modern-js/utils";
 import path from "path";
-import { generateEffectClientCode, resolveEffectEntryFile } from "./utils/effectClientGenerator.mjs";
 const EFFECT_BFF_WORKER_RUNTIME_QUERY = 'modern-bff-runtime';
 const EFFECT_BFF_WORKER_RUNTIME_SOURCE_QUERY = 'modern-bff-runtime-source';
 const createErrorModule = (message)=>`throw new Error(${JSON.stringify(message)});`;
@@ -15,7 +15,7 @@ async function transformEffectRuntimeSource(source, filename) {
                 syntax: "typescript",
                 tsx: filename.endsWith('.tsx') || filename.endsWith('.jsx')
             },
-            target: 'es2022'
+            target: 'es2024'
         },
         module: {
             type: 'es6'
@@ -23,18 +23,6 @@ async function transformEffectRuntimeSource(source, filename) {
     });
     return result.code;
 }
-function createEffectWorkerRuntimeWrapper(resourcePath) {
-    const sourceRequest = `${resourcePath}?${EFFECT_BFF_WORKER_RUNTIME_SOURCE_QUERY}`;
-    return `import * as effectBffModule from ${JSON.stringify(sourceRequest)};
-import { createEffectBffEdgeDispatcher } from '@modern-js/plugin-bff/effect-edge/dispatcher';
-
-export const __modern_create_effect_bff_dispatcher = options =>
-  createEffectBffEdgeDispatcher({
-    ...options,
-    module: effectBffModule,
-  });
-`;
-}
 async function loader(source) {
     this.cacheable();
     const { resourcePath } = this;
@@ -52,7 +40,7 @@ async function loader(source) {
         callback(void 0, code);
         return;
     }
-    if ('effect' === draftOptions.bffRuntimeFramework && effectEntryFile && path.resolve(effectEntryFile) === path.resolve(resourcePath) && resourceQueries.has(EFFECT_BFF_WORKER_RUNTIME_QUERY)) return void callback(void 0, createEffectWorkerRuntimeWrapper(resourcePath));
+    if ('effect' === draftOptions.bffRuntimeFramework && effectEntryFile && path.resolve(effectEntryFile) === path.resolve(resourcePath) && resourceQueries.has(EFFECT_BFF_WORKER_RUNTIME_QUERY)) return void callback(void 0, await generateEffectWorkerRuntimeWrapper(this, draftOptions, resourcePath));
     if ('effect' === draftOptions.bffRuntimeFramework && effectEntryFile && path.resolve(effectEntryFile) === path.resolve(resourcePath)) {
         const code = await generateEffectClientCode({
             appDir: draftOptions.appDir,
@@ -61,13 +49,14 @@ async function loader(source) {
             prefix: Array.isArray(draftOptions.prefix) ? draftOptions.prefix[0] : draftOptions.prefix,
             port: Number(draftOptions.port),
             target: draftOptions.target,
+            requestId: draftOptions.requestId,
             requestCreator: draftOptions.requestCreator,
             httpMethodDecider: draftOptions.httpMethodDecider,
             dataPlatformBatch: draftOptions.effectDataPlatformBatch,
             onDependency: (dependency)=>this.addDependency(dependency)
         });
         if (code) return void callback(void 0, code);
-        callback(void 0, createErrorModule(`Failed to generate Effect client for ${resourcePath}`));
+        callback(new Error(`Failed to generate Effect client for ${resourcePath}`));
         return;
     }
     const warning = `The file ${resourcePath} is not allowed to be imported in src directory, only API definition files are allowed.`;

package/dist/esm/runtime/data-platform/index.mjs

@@ -1,7 +1 @@
-export { measureTextBytes, normalizeMethod } from "./batch/request.mjs";
-export { DATA_BATCH_TRANSPORT_OTEL_EVENT, createDataBatchTransport, createDataBatchTransportTelemetryAttributes, emitDataBatchTransportEvent } from "./batch-transport.mjs";
-export { buildQueryKey, buildScopeKey, createOperationId, decodeRequestEnvelopeHeader, encodeRequestEnvelopeHeader, isPlainObject, normalizeOrigin, stableStringify } from "./codec.mjs";
-export { createInvalidationEvent, shouldApplyInvalidation } from "./invalidation.mjs";
-export { deriveChildTraceContext, formatTraceparentHeader, parseTraceparentHeader } from "./trace.mjs";
-export { DEFAULT_DATA_BATCH_ENDPOINT, DEFAULT_DATA_BATCH_HEADER, DEFAULT_DATA_ENVELOPE_HEADER } from "./types.mjs";
-export { createHydrationEnvelope, createRequestEnvelope, validateHydrationEnvelope, validateRequestEnvelope, validateSelectionPlan } from "./validation.mjs";
+export * from "@modern-js/bff-effect/data-platform";

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

@@ -1,38 +1 @@
-import { dispatchEffectBffRequestWithContext } from "./dispatch.mjs";
-import { runWithEffectContext, useEffectContext, useOperationContext } from "./edge-context.mjs";
-import { resolveEffectBffModuleHandler } from "./module.mjs";
-export * from "./handler.mjs";
-async function dispatchEffectBffRequest(handler, request, options = {}) {
-    return dispatchEffectBffRequestWithContext(handler, request, {
-        ...options,
-        runWithEffectContext: runWithEffectContext
-    });
-}
-async function createEffectBffEdgeDispatcher(options) {
-    const loaded = await resolveEffectBffModuleHandler(options.module, {
-        openapi: options.openapi,
-        dataPlatform: options.dataPlatform,
-        onWarning: options.onWarning
-    });
-    if (!loaded) throw new Error('[BFF][Effect] Invalid Effect edge module. Export defineEffectBff(...) or a { api, layer } HttpApi module.');
-    return {
-        dispatch: (request, dispatchOptions = {})=>dispatchEffectBffRequest(loaded.handler, request, {
-                ...dispatchOptions,
-                prefix: options.prefix,
-                onError: options.onError
-            }),
-        dispose: async ()=>{
-            await loaded.dispose?.();
-        }
-    };
-}
-const createEffectBffTestHandler = createEffectBffEdgeHandler;
-async function createEffectBffEdgeHandler(options) {
-    const dispatcher = await createEffectBffEdgeDispatcher(options);
-    return {
-        handler: dispatcher.dispatch,
-        dispose: dispatcher.dispose
-    };
-}
-export { createEffectOperationContext } from "./operation-context.mjs";
-export { createEffectBffEdgeDispatcher, createEffectBffEdgeHandler, createEffectBffTestHandler, dispatchEffectBffRequest, runWithEffectContext, useEffectContext, useOperationContext };
+export * from "@modern-js/bff-effect/effect-edge";

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

@@ -1,2 +1,2 @@
-export * from "./edge-dispatcher.mjs";
-export { BACKEND_FEDERATION_CONTRACT_VERSION, BACKEND_FEDERATION_EFFECT_EXPOSE, BACKEND_FEDERATION_MANIFEST_FILE, BACKEND_FEDERATION_NODE_ADAPTER_VERSION, createBackendFederationLoadEntryPlugin, createBackendFederationRuntime, loadBackendFederatedEffectApi, validateExpectedBackendFederationIdentity } from "./backend-federation.mjs";
+export * from "@modern-js/bff-effect/effect-edge";
+export * from "@modern-js/plugin-bff-extensions/backend-federation/edge";

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

@@ -1,8 +1,16 @@
-import * as __rspack_external__effect_opentelemetry_66324c75 from "@effect/opentelemetry";
-export * from "./backend-federation.mjs";
-export * from "./handler.mjs";
-export { BACKEND_FEDERATION_CONTRACT_VERSION, BACKEND_FEDERATION_EFFECT_EXPOSE, BACKEND_FEDERATION_MANIFEST_FILE, BACKEND_FEDERATION_NODE_ADAPTER_VERSION, createBackendFederationLoadEntryPlugin, createBackendFederationRuntime, loadBackendFederatedEffectApi } from "./backend-federation.mjs";
-export { BackendFederationManifestAdapterError, loadBackendFederatedEffectApiFromManifest, loadBackendFederationManifest, resolveBackendFederationRemoteFromManifest } from "./backend-federation-manifest.mjs";
-export { createEffectOperationContext, runWithEffectContext, useEffectContext, useOperationContext } from "./context.mjs";
-export { createEffectBffEdgeHandler, createEffectBffTestHandler, dispatchEffectBffRequest } from "./edge.mjs";
-export { __rspack_external__effect_opentelemetry_66324c75 as OpenTelemetry };
+import * as __rspack_external_effect_Config_76cfa59d from "effect/Config";
+import * as __rspack_external_effect_Effect_41060786 from "effect/Effect";
+import * as __rspack_external_effect_Schema_6065f72d from "effect/Schema";
+import * as __rspack_external_effect_Option_0498e63a from "effect/Option";
+import * as __rspack_external_effect_Layer_69c46453 from "effect/Layer";
+export * from "effect/unstable/http";
+export * from "effect/unstable/httpapi";
+export * from "effect/unstable/rpc";
+export { OpenTelemetry, createEffectBffEdgeHandler, createEffectBffTestHandler, createEffectOperationContext, createHttpApiHandler, defineEffectBff, defineEffectRpcBff, dispatchEffectBffRequest, runWithEffectContext, useEffectContext, useOperationContext } from "@modern-js/bff-effect/effect";
+export { BACKEND_FEDERATION_CONTRACT_VERSION, BACKEND_FEDERATION_EFFECT_EXPOSE, BACKEND_FEDERATION_MANIFEST_FILE, BACKEND_FEDERATION_NODE_ADAPTER_VERSION, createBackendFederationLoadEntryPlugin, createBackendFederationRuntime, validateExpectedBackendFederationIdentity } from "@modern-js/plugin-bff-extensions/backend-federation";
+export { loadBackendFederatedEffectApi } from "@modern-js/plugin-bff-extensions/backend-federation/node";
+export { BackendFederationManifestAdapterError, loadBackendFederationManifest, resolveBackendFederationRemoteFromManifest } from "@modern-js/plugin-bff-extensions/backend-federation-manifest";
+export { loadBackendFederatedEffectApiFromManifest } from "@modern-js/plugin-bff-extensions/backend-federation-manifest/node";
+export { HttpTraceContext } from "effect/unstable/http";
+export { HttpApiBuilder } from "effect/unstable/httpapi";
+export { __rspack_external_effect_Config_76cfa59d as Config, __rspack_external_effect_Effect_41060786 as Effect, __rspack_external_effect_Layer_69c46453 as Layer, __rspack_external_effect_Option_0498e63a as Option, __rspack_external_effect_Schema_6065f72d as Schema };