@bleedingdev/modern-js-bff-effect 3.9.0-ultramodern.2 → 3.9.0-ultramodern.21

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

@@ -1,16 +1,11 @@
 import { DEFAULT_DATA_BATCH_ENDPOINT, isPlainObject, normalizeMethod } from "../../data-platform/index.mjs";
 import { encodeBatchText } from "../../data-platform/batch/protocol.mjs";
+import * as __rspack_external_effect_Data_2b3f4efb from "effect/Data";
 function normalizeBatchPath(pathname) {
     if (!pathname || '/' === pathname) return DEFAULT_DATA_BATCH_ENDPOINT;
     if (!pathname.startsWith('/')) return `/${pathname}`;
     return pathname;
 }
-function normalizeBatchAllowedMethods(allowedMethods) {
-    const source = Array.isArray(allowedMethods) && allowedMethods.length > 0 ? allowedMethods : [
-        'GET'
-    ];
-    return new Set(source.map((method)=>method.toUpperCase()));
-}
 function isBatchRequestPayload(value) {
     return isPlainObject(value) && 2 === value.protocolVersion && 'string' == typeof value.batchId && 'number' == typeof value.sentAt && Array.isArray(value.items);
 }
@@ -64,7 +59,13 @@ function toBatchItemError(id, status, message) {
         }))
     };
 }
-class BatchItemTimeoutError extends Error {
+class BatchItemTimeoutError extends __rspack_external_effect_Data_2b3f4efb.TaggedError('BatchItemTimeoutError') {
+    constructor(message){
+        super({
+            message
+        });
+        this.name = 'Error';
+    }
 }
 function promiseWithTimeout(effect, timeoutMs, onTimeout) {
     if (timeoutMs <= 0) return effect;
@@ -102,4 +103,4 @@ async function mapWithConcurrency(items, concurrency, mapper) {
     return output;
 }
 export { toHeaderRecord } from "../../headers.mjs";
-export { BatchItemTimeoutError, createBatchValidationResponse, isBatchRequestPayload, mapWithConcurrency, normalizeBatchAllowedMethods, normalizeBatchPath, prepareJsonRequestBody, promiseWithTimeout, toBatchItemError };
+export { BatchItemTimeoutError, createBatchValidationResponse, isBatchRequestPayload, mapWithConcurrency, normalizeBatchPath, prepareJsonRequestBody, promiseWithTimeout, toBatchItemError };

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

@@ -20,30 +20,10 @@ function defineEffectBff(definition) {
             validateRequest: options?.validateRequest
         });
     });
-    const client = createLoaderMaterializedClientPlaceholder();
     return {
         ...definition,
-        createHandler,
-        client
-    };
-}
-const LOADER_CLIENT_IGNORED_KEYS = new Set([
-    'then',
-    'catch',
-    'finally',
-    'toJSON',
-    '$$typeof'
-]);
-function createLoaderMaterializedClientPlaceholder() {
-    const explain = (property)=>{
-        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.`);
+        createHandler
     };
-    return new Proxy(Object.create(null), {
-        get (_target, property) {
-            if ('symbol' == typeof property || LOADER_CLIENT_IGNORED_KEYS.has(property)) return;
-            return explain(property);
-        }
-    });
 }
 function defineEffectRpcBff(definition) {
     const createHandler = (options)=>createRpcApiHandler({

package/dist/esm/effect/index.mjs

@@ -1,7 +1,7 @@
 import * as __rspack_external__effect_opentelemetry_66324c75 from "@effect/opentelemetry";
 export * from "./endpoint-contracts.mjs";
 export * from "./handler.mjs";
-export { createEffectOperationContext, runWithEffectContext, useEffectContext, useOperationContext } from "./context.mjs";
+export { createEffectOperationContext, runWithEffectContext, useEffectContext, useOperationContext } from "@modern-js/bff-effect/context";
 export { createEffectBffEdgeHandler, createEffectBffTestHandler, dispatchEffectBffRequest } from "./edge.mjs";
 export { resolveEffectBffModuleHandler } from "./module.mjs";
 export { __rspack_external__effect_opentelemetry_66324c75 as OpenTelemetry };

package/dist/esm/effect/module.mjs

@@ -11,7 +11,7 @@ function shareDispose(dispose) {
         return disposePromise;
     };
 }
-function rejectLegacyEffectModuleShape(options, shape) {
+function rejectUnsupportedEffectModuleShape(options, shape) {
     options.onWarning?.(`${strictEffectApproachMessage} Rejected ${shape}.`);
     return true;
 }
@@ -39,8 +39,12 @@ function classifyEffectBffRuntimeEntryShape(module) {
 }
 function resolveClassifiedEffectBffModuleHandler(facts, options = {}) {
     if (!facts) return null;
-    if (facts.legacyShape) {
-        if (rejectLegacyEffectModuleShape(options, facts.legacyShape)) return null;
+    if (facts.unsupportedShape) {
+        if (rejectUnsupportedEffectModuleShape(options, facts.unsupportedShape)) return null;
+    }
+    if (void 0 !== facts.module.rpc && !facts.createHandlerValidatorAware) {
+        rejectUnsupportedEffectModuleShape(options, 'unbranded RPC runtime');
+        return null;
     }
     if ('function' == typeof facts.createHandler) {
         if (facts.createHandlerValidatorAware) {
@@ -53,7 +57,7 @@ function resolveClassifiedEffectBffModuleHandler(facts, options = {}) {
             return createLoadedHandler(webHandler);
         }
         if (void 0 === facts.api || !facts.hasRuntimeLayer) {
-            rejectLegacyEffectModuleShape(options, 'unbranded `createHandler` export');
+            rejectUnsupportedEffectModuleShape(options, 'unbranded `createHandler` export');
             return null;
         }
         options.onWarning?.(`${strictEffectApproachMessage} Ignored unbranded \`createHandler\` export and rebuilt the handler from its { api, layer } exports.`);

package/dist/esm/effect/operation-context.mjs

@@ -1,5 +1,4 @@
-import { BFF_LOCALE_HEADER, BFF_OPERATION_CONTEXT_DETAIL_HEADER, BFF_OPERATION_CONTEXT_HEADER, BFF_TRACEPARENT_HEADER, parseTraceparent } from "@modern-js/create-request";
-const kEffectContextStorage = Symbol.for('modernjs.plugin-bff.effectContextStorage');
+import { BFF_LOCALE_HEADER, BFF_OPERATION_CONTEXT_DETAIL_HEADER, BFF_OPERATION_CONTEXT_HEADER, BFF_TRACEPARENT_HEADER, parseTraceparent } from "@modern-js/runtime-extensions/request-context";
 const readHeader = (headers, header)=>{
     const value = headers.get(header);
     return value && value.length > 0 ? value : void 0;
@@ -54,7 +53,7 @@ const createEffectOperationContext = ({ request, path, method })=>{
         } : {},
         routePath: servicePath,
         method: (method || request.method || 'GET').toUpperCase(),
-        source: 'effect-adapter',
+        source: 'effect-server',
         ...path && path !== servicePath ? {
             attributes: {
                 mountedPath: path
@@ -72,4 +71,4 @@ const createEffectOperationContext = ({ request, path, method })=>{
         } : {}
     };
 };
-export { createEffectOperationContext, kEffectContextStorage };
+export { createEffectOperationContext };

package/dist/esm/effect/rpcSerialization.mjs

@@ -7,8 +7,6 @@ function getRpcSerializationLayer(serialization) {
             return RpcSerialization.layerJsonRpc();
         case 'ndJsonRpc':
             return RpcSerialization.layerNdJsonRpc();
-        case 'msgPack':
-            return RpcSerialization.layerMsgPack;
         default:
             return RpcSerialization.layerJsonRpc();
     }

package/dist/esm/effect-client/cross-project.mjs

@@ -0,0 +1,51 @@
+import { BFF_ENVELOPE_HEADER, BFF_OPERATION_CONTEXT_DETAIL_HEADER, BFF_OPERATION_CONTEXT_HEADER, digestOperationContract, resolveCrossProjectRequestObservation } from "@modern-js/server-runtime-extensions/bff-policy";
+import { HttpClient, HttpClientRequest } from "effect/unstable/http";
+import { HttpApi } from "effect/unstable/httpapi";
+import * as __rspack_external_effect_Effect_41060786 from "effect/Effect";
+import * as __rspack_external_effect_Schema_6065f72d from "effect/Schema";
+const encodeJson = __rspack_external_effect_Schema_6065f72d.encodeSync(__rspack_external_effect_Schema_6065f72d.fromJsonString(__rspack_external_effect_Schema_6065f72d.Unknown));
+function withCrossProjectPolicy(api, options, client) {
+    const contracts = {};
+    const prefix = options.prefix.replace(/\/$/, '');
+    HttpApi.reflect(api, {
+        onGroup: ()=>{},
+        onEndpoint: ({ endpoint })=>{
+            const routePath = `${prefix}${'/' === endpoint.path ? '' : endpoint.path}` || '/';
+            const name = endpoint.identifier;
+            contracts[`${endpoint.method}:${routePath}`] = {
+                operationId: `${options.requestId}:${name}`,
+                name,
+                method: endpoint.method,
+                routePath
+            };
+        }
+    });
+    return client.pipe(HttpClient.mapRequestEffect((request)=>{
+        const observed = resolveCrossProjectRequestObservation({
+            method: request.method,
+            pathname: new URL(request.url, 'http://effect.invalid').pathname
+        }, {
+            expectedOperationContracts: contracts
+        });
+        const contract = observed && contracts[`${observed.method}:${observed.routePath}`];
+        if (void 0 === contract) return __rspack_external_effect_Effect_41060786.die(new Error('[BFF][Effect] Request has no matching shared operation contract.'));
+        return __rspack_external_effect_Effect_41060786.gen(function*() {
+            const schemaHash = yield* __rspack_external_effect_Effect_41060786.promise(()=>digestOperationContract({
+                    httpMethod: contract.method,
+                    name: contract.name,
+                    routePath: contract.routePath
+                }, options.requestId));
+            return request.pipe(HttpClientRequest.setHeader(BFF_ENVELOPE_HEADER, encodeJson({
+                requestId: options.requestId
+            })), HttpClientRequest.setHeader(BFF_OPERATION_CONTEXT_HEADER, contract.operationId), HttpClientRequest.setHeader(BFF_OPERATION_CONTEXT_DETAIL_HEADER, encodeJson({
+                requestId: options.requestId,
+                operationId: contract.operationId,
+                method: contract.method,
+                routePath: contract.routePath,
+                schemaHash,
+                operationVersion: options.operationVersion
+            })));
+        });
+    }));
+}
+export { withCrossProjectPolicy };

package/dist/esm/effect-client/index.mjs

@@ -1,10 +1,11 @@
-import { createRequestContextHeaders } from "@modern-js/create-request";
+import { createRequestContextHeaders } from "@modern-js/runtime-extensions/request-context";
 import * as __rspack_external_effect_Effect_41060786 from "effect/Effect";
 import * as __rspack_external_effect_Layer_69c46453 from "effect/Layer";
 import { FetchHttpClient, HttpClient, HttpClientRequest } from "effect/unstable/http";
 import { HttpApi, HttpApiClient, HttpApiEndpoint, HttpApiGroup, HttpApiSchema } from "effect/unstable/httpapi";
 import { Rpc, RpcClient, RpcGroup, RpcSchema, RpcSerialization } from "effect/unstable/rpc";
 import { getRpcSerializationLayer } from "../effect/rpcSerialization.mjs";
+import { withCrossProjectPolicy } from "./cross-project.mjs";
 import * as __rspack_external_effect_Schema_6065f72d from "effect/Schema";
 import * as __rspack_external_effect_unstable_http_HttpClientError_4b9eaee6 from "effect/unstable/http/HttpClientError";
 import * as __rspack_external_effect_Data_2b3f4efb from "effect/Data";
@@ -46,7 +47,8 @@ function makeEffectHttpApiClient(api, options) {
             for (const [header, value] of Object.entries(requestContextHeaders))if (void 0 === nextRequest.headers[header.toLowerCase()]) nextRequest = HttpClientRequest.setHeader(nextRequest, header, value);
             return nextRequest;
         }));
-        return 'function' == typeof options?.transformClient ? options.transformClient(contextClient) : contextClient;
+        const policyClient = options?.crossProject !== void 0 ? withCrossProjectPolicy(api, options.crossProject, contextClient) : contextClient;
+        return 'function' == typeof options?.transformClient ? options.transformClient(policyClient) : policyClient;
     };
     return HttpApiClient.make(api, {
         baseUrl: options?.baseUrl,

package/dist/esm/microvertical-api.mjs

@@ -0,0 +1,67 @@
+import { Schema } from "effect";
+const MicroVerticalAppIdSchema = Schema.String.pipe(Schema.brand('MicroVerticalAppId'), Schema.decodeTo(Schema.String));
+const MicroVerticalUnitIdSchema = Schema.String.pipe(Schema.brand('MicroVerticalUnitId'), Schema.decodeTo(Schema.String));
+const MicroVerticalOperationIdSchema = Schema.String.pipe(Schema.brand('MicroVerticalOperationId'), Schema.decodeTo(Schema.String));
+const MicroVerticalTraceIdSchema = Schema.String.pipe(Schema.brand('MicroVerticalTraceId'), Schema.decodeTo(Schema.String));
+const MicroVerticalBuildMarkerSchema = Schema.Struct({
+    appId: MicroVerticalAppIdSchema,
+    build: Schema.String,
+    buildMarker: Schema.String,
+    deployProfile: Schema.String,
+    packageName: Schema.String,
+    sourceRevision: Schema.String,
+    surface: Schema.String,
+    unitId: MicroVerticalUnitIdSchema,
+    version: Schema.String
+});
+const MicroVerticalReadinessSchema = Schema.Struct({
+    checks: Schema.Struct({
+        api: Schema.Literal('ready'),
+        moduleFederation: Schema.Literal('ready'),
+        ssr: Schema.Literal('ready'),
+        translations: Schema.Literal('ready')
+    }),
+    marker: MicroVerticalBuildMarkerSchema,
+    status: Schema.Literal('ready'),
+    versionSkew: Schema.Literal('none')
+});
+const MicroVerticalOperationSourceSchema = Schema.Literals([
+    'client',
+    'server',
+    'generated-client',
+    'effect-server',
+    'data-platform',
+    'unknown'
+]);
+const MicroVerticalOperationContextSchema = Schema.Struct({
+    method: Schema.String,
+    operationId: MicroVerticalOperationIdSchema,
+    routePath: Schema.String,
+    source: MicroVerticalOperationSourceSchema,
+    traceId: Schema.optionalKey(MicroVerticalTraceIdSchema)
+});
+const createMicroVerticalOperationContext = (input)=>{
+    const context = {
+        method: input.method,
+        operationId: input.operationId,
+        routePath: input.routePath,
+        source: 'generated-client'
+    };
+    return void 0 === input.traceId ? context : {
+        ...context,
+        traceId: input.traceId
+    };
+};
+const microVerticalOperationAttributes = (operationContext)=>{
+    const attributes = {
+        'modernjs.operation.id': operationContext.operationId,
+        'modernjs.operation.method': operationContext.method,
+        'modernjs.operation.route': operationContext.routePath,
+        'modernjs.operation.source': operationContext.source
+    };
+    return void 0 === operationContext.traceId ? attributes : {
+        ...attributes,
+        'modernjs.trace.id': operationContext.traceId
+    };
+};
+export { MicroVerticalBuildMarkerSchema, MicroVerticalOperationContextSchema, MicroVerticalOperationSourceSchema, MicroVerticalReadinessSchema, createMicroVerticalOperationContext, microVerticalOperationAttributes };

package/dist/esm-node/assembly.mjs

@@ -0,0 +1,13 @@
+import "node:module";
+import { HttpApiBuilder } from "effect/unstable/httpapi";
+import { defineEffectBff } from "./effect/handler/definition.mjs";
+import * as __rspack_external_effect_Layer_69c46453 from "effect/Layer";
+const assembleEffectBffRuntime = ({ api, handlers, transport })=>{
+    const apiLayer = HttpApiBuilder.layer(api).pipe(__rspack_external_effect_Layer_69c46453.provide(handlers));
+    const layer = void 0 === transport ? apiLayer : apiLayer.pipe(__rspack_external_effect_Layer_69c46453.merge(transport));
+    return defineEffectBff({
+        api,
+        layer
+    });
+};
+export { assembleEffectBffRuntime };

package/dist/esm-node/data-platform/batch/options.mjs

@@ -0,0 +1,11 @@
+import "node:module";
+function normalizeBatchLimits(options = {}) {
+    return {
+        maxBatchSize: Math.max(1, options.maxBatchSize ?? 16),
+        maxBatchBytes: Math.max(1024, options.maxBatchBytes ?? 65536),
+        allowedMethods: new Set((void 0 !== options.allowedMethods && options.allowedMethods.length > 0 ? options.allowedMethods : [
+            'GET'
+        ]).map((method)=>method.toUpperCase()))
+    };
+}
+export { normalizeBatchLimits };

package/dist/esm-node/data-platform/batch/queue.mjs

@@ -1,6 +1,7 @@
 import "node:module";
 import { stableStringify } from "../codec.mjs";
 import { DEFAULT_DATA_BATCH_HEADER } from "../types.mjs";
+import { normalizeBatchLimits } from "./options.mjs";
 import { decodeBatchBody, isNullBodyStatus } from "./protocol.mjs";
 import { createBatchId, measureTextBytes, normalizeMethod, shouldBatchRequest, toHeaderRecord, toRequestBody } from "./request.mjs";
 import { isBatchResponsePayload, parseResponseLikeCreateRequest } from "./response.mjs";
@@ -79,7 +80,6 @@ class BatchBucketRegistry {
         if (existing) return existing;
         const next = {
             items: [],
-            bytes: 0,
             batchId: createBatchId(),
             sentAt: Date.now(),
             timer: null,
@@ -98,12 +98,8 @@ class BatchBucketRegistry {
 }
 function createBatchTransportQueue({ options, baseFetch, bucketRegistry }) {
     const flushIntervalMs = Math.max(0, options.flushIntervalMs ?? 8);
-    const maxBatchSize = Math.max(1, options.maxBatchSize ?? 16);
-    const maxBatchBytes = Math.max(1024, options.maxBatchBytes ?? 65536);
+    const { maxBatchSize, maxBatchBytes, allowedMethods } = normalizeBatchLimits(options);
     const requestTimeoutMs = options.requestTimeoutMs;
-    const allowedMethods = new Set((options.allowedMethods && options.allowedMethods.length > 0 ? options.allowedMethods : [
-        'GET'
-    ]).map((method)=>method.toUpperCase()));
     const onEvent = options.onEvent;
     const buckets = bucketRegistry ?? new BatchBucketRegistry();
     const pendingByKey = new Map();
@@ -136,7 +132,6 @@ function createBatchTransportQueue({ options, baseFetch, bucketRegistry }) {
         const index = bucket.items.indexOf(request);
         if (-1 === index) return;
         bucket.items.splice(index, 1);
-        bucket.bytes = measurePayload(bucket, bucket.items);
         if (0 === bucket.items.length && bucket.timer) {
             clearTimeout(bucket.timer);
             bucket.timer = null;
@@ -178,7 +173,11 @@ function createBatchTransportQueue({ options, baseFetch, bucketRegistry }) {
         if (!SAFE_REPLAY_METHODS.has(request.item.method)) throw new Error(`Batch result is unknown for ${request.item.method}; automatic replay is disabled (${reason}).`);
         return runSingle(request);
     };
-    const settleAmbiguousBatchRequests = (items, reason)=>settleRequests(items, (request)=>runAfterAmbiguousBatch(request, reason));
+    const finishFlush = (bucketKey, bucket)=>{
+        bucket.flushing = false;
+        if (bucket.items.length > 0 && !bucket.timer) flushBucket(bucketKey);
+        buckets.releaseIfIdle(bucketKey, bucket);
+    };
     const flushBucket = async (bucketKey)=>{
         const bucket = buckets.get(bucketKey);
         if (!bucket || bucket.flushing) return;
@@ -195,7 +194,6 @@ function createBatchTransportQueue({ options, baseFetch, bucketRegistry }) {
             sentAt: bucket.sentAt
         };
         bucket.items = [];
-        bucket.bytes = 0;
         rotatePayloadIdentity(bucket);
         const firstItem = items[0];
         if (!firstItem) {
@@ -211,14 +209,25 @@ function createBatchTransportQueue({ options, baseFetch, bucketRegistry }) {
                 size: items.length,
                 reason: disabledEndpoints.has(endpoint) ? 'batch-disabled' : void 0
             });
-            await settleRequests(items, runSingle);
-            bucket.flushing = false;
-            if (bucket.items.length > 0 && !bucket.timer) flushBucket(bucketKey);
-            buckets.releaseIfIdle(bucketKey, bucket);
+            try {
+                await settleRequests(items, runSingle);
+            } finally{
+                finishFlush(bucketKey, bucket);
+            }
             return;
         }
         const payload = createPayload(payloadIdentity, items);
         const batchId = payload.batchId;
+        const settleAmbiguousBatchRequests = (reason)=>{
+            emitDataBatchTransportEvent(onEvent, {
+                type: 'fallback',
+                endpoint,
+                batchId,
+                size: items.length,
+                reason
+            });
+            return settleRequests(items, (request)=>runAfterAmbiguousBatch(request, reason));
+        };
         emitDataBatchTransportEvent(onEvent, {
             type: 'flush',
             endpoint,
@@ -269,42 +278,13 @@ function createBatchTransportQueue({ options, baseFetch, bucketRegistry }) {
                         batchId,
                         reason: `batch-endpoint-unavailable-${String(response.status)}`
                     });
-                } else emitDataBatchTransportEvent(onEvent, {
-                    type: 'fallback',
-                    endpoint,
-                    batchId,
-                    size: items.length,
-                    reason: `batch-response-${String(response.status)}`
-                });
-                await settleAmbiguousBatchRequests(items, `batch-response-${String(response.status)}`);
-                bucket.flushing = false;
+                    await settleRequests(items, (request)=>runAfterAmbiguousBatch(request, `batch-response-${String(response.status)}`));
+                } else await settleAmbiguousBatchRequests(`batch-response-${String(response.status)}`);
                 return;
             }
             const result = await runWithSignal(controller.signal, async ()=>response.json());
-            if (!isBatchResponsePayload(result)) {
-                emitDataBatchTransportEvent(onEvent, {
-                    type: 'fallback',
-                    endpoint,
-                    batchId,
-                    size: items.length,
-                    reason: 'invalid-batch-response'
-                });
-                await settleAmbiguousBatchRequests(items, 'invalid-batch-response');
-                bucket.flushing = false;
-                return;
-            }
-            if (result.batchId !== batchId) {
-                emitDataBatchTransportEvent(onEvent, {
-                    type: 'fallback',
-                    endpoint,
-                    batchId,
-                    size: items.length,
-                    reason: 'mismatched-batch-id'
-                });
-                await settleAmbiguousBatchRequests(items, 'mismatched-batch-id');
-                bucket.flushing = false;
-                return;
-            }
+            if (!isBatchResponsePayload(result)) return void await settleAmbiguousBatchRequests('invalid-batch-response');
+            if (result.batchId !== batchId) return void await settleAmbiguousBatchRequests('mismatched-batch-id');
             const itemMap = new Map();
             for (const item of result.items)itemMap.set(item.id, item);
             await settleRequests(items, async (request)=>{
@@ -328,19 +308,10 @@ function createBatchTransportQueue({ options, baseFetch, bucketRegistry }) {
                 });
                 return;
             }
-            emitDataBatchTransportEvent(onEvent, {
-                type: 'fallback',
-                endpoint,
-                batchId,
-                size: items.length,
-                reason: 'batch-transport-error'
-            });
-            await settleAmbiguousBatchRequests(items, 'batch-transport-error');
+            await settleAmbiguousBatchRequests('batch-transport-error');
         } finally{
             for (const item of items)item.abortBatchIfUnused = void 0;
-            bucket.flushing = false;
-            if (bucket.items.length > 0 && !bucket.timer) flushBucket(bucketKey);
-            buckets.releaseIfIdle(bucketKey, bucket);
+            finishFlush(bucketKey, bucket);
         }
     };
     const pendingReadPromises = new Map();
@@ -364,7 +335,20 @@ function createBatchTransportQueue({ options, baseFetch, bucketRegistry }) {
         const sourceSignal = initDefinesSignal ? initSignal ?? void 0 : sourceRequest?.signal;
         const requestUrl = toAbsoluteUrl(input);
         const endpoint = normalizeBatchEndpoint(requestUrl, options.endpoint).toString();
+        const itemHeaders = {
+            ...headers
+        };
+        delete itemHeaders.authorization;
+        delete itemHeaders.cookie;
         return {
+            itemHeaders,
+            itemPath: `${requestUrl.pathname}${requestUrl.search}`,
+            bucketKey: stableStringify({
+                endpoint,
+                authorization: headers.authorization ?? null,
+                cookie: headers.cookie ?? null,
+                credentials
+            }),
             requestUrl,
             endpoint,
             method,
@@ -397,22 +381,11 @@ function createBatchTransportQueue({ options, baseFetch, bucketRegistry }) {
             batchEndpoint: request.endpoint,
             requestUrl: request.requestUrl
         })) return;
-        const itemHeaders = {
-            ...request.headers
-        };
-        delete itemHeaders.authorization;
-        delete itemHeaders.cookie;
-        const bucketKey = stableStringify({
-            endpoint: request.endpoint,
-            authorization: request.headers.authorization ?? null,
-            cookie: request.headers.cookie ?? null,
-            credentials: request.credentials
-        });
         return stableStringify({
-            bucketKey,
-            path: `${request.requestUrl.pathname}${request.requestUrl.search}`,
+            bucketKey: request.bucketKey,
+            path: request.itemPath,
             method: request.method,
-            headers: itemHeaders,
+            headers: request.itemHeaders,
             body: null
         });
     };
@@ -430,26 +403,19 @@ function createBatchTransportQueue({ options, baseFetch, bucketRegistry }) {
         const itemId = `${Date.now().toString(36)}_${nextItemId.toString(36)}_${Math.random().toString(16).slice(2, 8)}`;
         nextItemId += 1;
         const itemHeaders = {
-            ...request.headers
+            ...request.itemHeaders
         };
-        delete itemHeaders.authorization;
-        delete itemHeaders.cookie;
         if (preparedBody.body && preparedBody.inferredContentType && !itemHeaders['content-type']) itemHeaders['content-type'] = preparedBody.inferredContentType;
         const item = {
             id: itemId,
-            path: `${request.requestUrl.pathname}${request.requestUrl.search}`,
+            path: request.itemPath,
             method: request.method,
             headers: itemHeaders,
             ...preparedBody.body ? {
                 body: preparedBody.body
             } : {}
         };
-        const bucketKey = stableStringify({
-            endpoint: request.endpoint,
-            authorization: request.headers.authorization ?? null,
-            cookie: request.headers.cookie ?? null,
-            credentials: request.credentials
-        });
+        const { bucketKey } = request;
         const key = stableStringify({
             bucketKey,
             path: item.path,
@@ -543,13 +509,12 @@ function createBatchTransportQueue({ options, baseFetch, bucketRegistry }) {
             }
         }
         bucket.items.push(queued);
-        bucket.bytes = measurePayload(bucket, bucket.items);
         emitDataBatchTransportEvent(onEvent, {
             type: 'enqueue',
             endpoint: request.endpoint,
             size: bucket.items.length
         });
-        if (bucket.items.length >= maxBatchSize || bucket.bytes >= maxBatchBytes) {
+        if (bucket.items.length >= maxBatchSize || measurePayload(bucket, bucket.items) >= maxBatchBytes) {
             flushBucket(bucketKey);
             return queued.promise;
         }

package/dist/esm-node/data-platform/trace.mjs

@@ -1,5 +1,5 @@
 import "node:module";
-import { parseTraceparent } from "@modern-js/create-request";
+import { parseTraceparent } from "@modern-js/runtime-extensions/request-context";
 function isAllZeroHex(value) {
     return /^0+$/.test(value);
 }

package/dist/esm-node/effect/context.mjs

@@ -1,13 +1,28 @@
 import "node:module";
-import { AsyncLocalStorage } from "node:async_hooks";
-import { createEffectOperationContext, kEffectContextStorage } from "./operation-context.mjs";
 const globalStore = globalThis;
-const effectContextStorage = globalStore[kEffectContextStorage] ?? (globalStore[kEffectContextStorage] = new AsyncLocalStorage());
-const runWithEffectContext = (context, cb)=>effectContextStorage.run(context, cb);
+const asyncHooks = globalStore.process?.getBuiltinModule?.('node:async_hooks');
+const AsyncLocalStorage = asyncHooks?.AsyncLocalStorage;
+if ('function' != typeof AsyncLocalStorage) throw new Error('[BFF][Effect] The edge runtime must provide AsyncLocalStorage. Enable Node.js compatibility or the nodejs_als compatibility flag.');
+const EFFECT_BFF_CONTEXT_STORAGE_SHARE = '@modern-js/bff-effect/context-storage';
+let effectContextStorage = new AsyncLocalStorage();
+let effectContextStorageUsed = false;
+const usedEffectContextStorage = ()=>{
+    effectContextStorageUsed = true;
+    return effectContextStorage;
+};
+const runWithEffectContext = (context, cb)=>usedEffectContextStorage().run(context, cb);
 const useEffectContext = ()=>{
-    const context = effectContextStorage.getStore();
+    const context = usedEffectContextStorage().getStore();
     if (!context) throw new Error("Can't call useEffectContext out of Effect runtime scope");
     return context;
 };
+const getEffectContextStorage = ()=>effectContextStorage;
+function adoptEffectContextStorage(storage) {
+    const candidate = storage;
+    if ('function' != typeof candidate?.run || 'function' != typeof candidate.getStore) throw new Error(`[BFF][Effect] Share ${EFFECT_BFF_CONTEXT_STORAGE_SHARE} must provide an AsyncLocalStorage.`);
+    if (effectContextStorageUsed && candidate !== effectContextStorage) throw new Error('[BFF][Effect] A backend federation container received the host request storage after an Effect API already used its own. Evaluate exposes only after container init().');
+    effectContextStorage = candidate;
+}
 const useOperationContext = ()=>useEffectContext().operationContext;
-export { createEffectOperationContext, runWithEffectContext, useEffectContext, useOperationContext };
+export { createEffectOperationContext } from "./operation-context.mjs";
+export { EFFECT_BFF_CONTEXT_STORAGE_SHARE, adoptEffectContextStorage, getEffectContextStorage, runWithEffectContext, useEffectContext, useOperationContext };

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

@@ -1,11 +1,11 @@
 import "node:module";
-import { evaluateCrossProjectPolicy, resolveCrossProjectRequestObservation } from "@modern-js/bff-core/security/cross-project-policy";
+import { runWithEffectContext, useEffectContext, useOperationContext } from "@modern-js/bff-effect/context";
+import { evaluateCrossProjectPolicy, resolveCrossProjectRequestObservation } from "@modern-js/server-runtime-extensions/bff-policy";
+import * as __rspack_external_effect_Effect_41060786 from "effect/Effect";
 import { toHeaderRecord } from "../headers.mjs";
 import { dispatchEffectBffRequestWithContext } from "./dispatch.mjs";
-import { runWithEffectContext, useEffectContext, useOperationContext } from "./edge-context.mjs";
 import { resolveEffectBffModuleHandler } from "./module.mjs";
 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_Layer_69c46453 from "effect/Layer";
 import * as __rspack_external_effect_Option_0498e63a from "effect/Option";
 import * as __rspack_external_effect_Schema_6065f72d from "effect/Schema";
@@ -91,9 +91,9 @@ async function createEffectBffEdgeDispatcher(options) {
         dispose: ()=>{
             disposePromise ??= (async ()=>{
                 acceptingRequests = false;
-                if (activeDispatches > 0) await new Promise((resolve)=>{
-                    resolveDrain = resolve;
-                });
+                if (activeDispatches > 0) await __rspack_external_effect_Effect_41060786.runPromise(__rspack_external_effect_Effect_41060786.callback((resume)=>{
+                    resolveDrain = ()=>resume(__rspack_external_effect_Effect_41060786["void"]);
+                }));
                 await loaded.dispose?.();
             })();
             return disposePromise;

package/dist/esm-node/effect/edge.mjs

@@ -1,2 +1,5 @@
 import "node:module";
 export * from "./edge-dispatcher.mjs";
+export { EFFECT_BFF_CONTEXT_STORAGE_SHARE } from "@modern-js/bff-effect/context";
+export { EFFECT_BFF_HANDLER_FACTORY_REGISTRY_SHARE, adoptEffectBffShareScope } from "./entry-shape.mjs";
+export { createEffectBffEdgeDispatcherFactory } from "./generated-entry.mjs";