@bleedingdev/modern-js-bff-effect 3.9.0-ultramodern.11 → 3.9.0-ultramodern.13

package/src/effect/handler/batch-handler.ts

@@ -8,6 +8,7 @@ import {
   isPlainObject,
   normalizeMethod as normalizeItemMethod,
 } from '../../data-platform';
+import { normalizeBatchLimits } from '../../data-platform/batch/options';
 import {
   decodeBatchBody,
   isBatchBody,
@@ -18,7 +19,6 @@ import {
   createBatchValidationResponse,
   isBatchRequestPayload,
   mapWithConcurrency,
-  normalizeBatchAllowedMethods,
   normalizeBatchPath,
   promiseWithTimeout,
   toBatchItemError,
@@ -129,14 +129,11 @@ export function createDataPlatformBatchRequestHandler<TContext>(options: {
   const dataPlatformBatchOptions = options.dataPlatform?.batch;
   const batchEnabled = dataPlatformBatchOptions?.enabled !== false;
   const batchPath = normalizeBatchPath(dataPlatformBatchOptions?.endpoint);
-  const batchMaxSize = Math.max(
-    1,
-    dataPlatformBatchOptions?.maxBatchSize ?? 16,
-  );
-  const batchMaxBytes = Math.max(
-    1024,
-    dataPlatformBatchOptions?.maxBatchBytes ?? 64 * 1024,
-  );
+  const {
+    maxBatchSize: batchMaxSize,
+    maxBatchBytes: batchMaxBytes,
+    allowedMethods: batchAllowedMethods,
+  } = normalizeBatchLimits(dataPlatformBatchOptions);
   const batchConcurrency = Math.max(
     1,
     dataPlatformBatchOptions?.maxConcurrency ?? 4,
@@ -145,9 +142,6 @@ export function createDataPlatformBatchRequestHandler<TContext>(options: {
     0,
     dataPlatformBatchOptions?.requestTimeoutMs ?? 10_000,
   );
-  const batchAllowedMethods = normalizeBatchAllowedMethods(
-    dataPlatformBatchOptions?.allowedMethods,
-  );
   const envelopeHeader =
     options.dataPlatform?.envelopeHeader || DEFAULT_DATA_ENVELOPE_HEADER;
   const normalizedEnvelopeHeader = envelopeHeader.toLowerCase();

package/src/effect/handler/batch.ts

@@ -24,16 +24,6 @@ export function normalizeBatchPath(pathname: string | undefined) {
   return pathname as `/${string}`;
 }
 
-export function normalizeBatchAllowedMethods(
-  allowedMethods: string[] | undefined,
-) {
-  const source =
-    Array.isArray(allowedMethods) && allowedMethods.length > 0
-      ? allowedMethods
-      : ['GET'];
-  return new Set(source.map(method => method.toUpperCase()));
-}
-
 type ParsedBatchRequestPayload = Omit<DataBatchRequestPayload, 'items'> & {
   items: unknown[];
 };

package/src/effect/handler/types.ts

@@ -43,8 +43,7 @@ export type EffectRpcSerialization =
   | 'json'
   | 'ndjson'
   | 'jsonRpc'
-  | 'ndJsonRpc'
-  | 'msgPack';
+  | 'ndJsonRpc';
 
 export type EffectRpcRuntimeLayer<TRpcs extends Rpc.Any = Rpc.Any> =
   Layer.Layer<

package/src/effect/module.ts

@@ -12,6 +12,7 @@ import {
   type EffectBffOpenApiConfig,
   type EffectDataPlatformValidationOptions,
   type EffectRequestValidator,
+  type EffectRpcBffDefinition,
   type EffectRuntimeLayer,
 } from './handler';
 import type { EffectContext } from './operation-context';
@@ -33,6 +34,7 @@ export type EffectBffHandlerFactory = (options?: {
 export type EffectApiModule = {
   api?: unknown;
   layer?: unknown;
+  rpc?: EffectRpcBffDefinition;
   handler?: EffectBffRequestHandler;
   createHandler?: EffectBffHandlerFactory;
   default?: unknown;
@@ -125,6 +127,11 @@ function resolveClassifiedEffectBffModuleHandler(
     }
   }
 
+  if (facts.module.rpc !== undefined && !facts.createHandlerValidatorAware) {
+    rejectUnsupportedEffectModuleShape(options, 'unbranded RPC runtime');
+    return null;
+  }
+
   if (typeof facts.createHandler === 'function') {
     if (facts.createHandlerValidatorAware) {
       const factory = facts.createHandler as EffectBffHandlerFactory;

package/src/effect/operation-context.ts

@@ -128,7 +128,7 @@ export const createEffectOperationContext = ({
       : {}),
     routePath: servicePath,
     method: (method || request.method || 'GET').toUpperCase(),
-    source: 'effect-adapter',
+    source: 'effect-server',
     ...(path && path !== servicePath
       ? { attributes: { mountedPath: path } }
       : {}),

package/src/effect/rpcSerialization.ts

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

package/src/effect-client/cross-project.ts

@@ -2,6 +2,7 @@ import {
   BFF_ENVELOPE_HEADER,
   BFF_OPERATION_CONTEXT_DETAIL_HEADER,
   BFF_OPERATION_CONTEXT_HEADER,
+  digestOperationContract,
   resolveCrossProjectRequestObservation,
 } from '@modern-js/server-runtime-extensions/bff-policy';
 import * as Effect from 'effect/Effect';
@@ -66,22 +67,16 @@ export function withCrossProjectPolicy<
         );
       }
       return Effect.gen(function* () {
-        // Canonical field order matches the server's route-identity SHA-256.
-        const input = encodeJson({
-          httpMethod: contract.method,
-          name: contract.name,
-          requestId: options.requestId,
-          routePath: contract.routePath,
-        });
-        const digest = yield* Effect.promise(() =>
-          globalThis.crypto.subtle.digest(
-            'SHA-256',
-            new TextEncoder().encode(input),
+        const schemaHash = yield* Effect.promise(() =>
+          digestOperationContract(
+            {
+              httpMethod: contract.method,
+              name: contract.name,
+              routePath: contract.routePath,
+            },
+            options.requestId,
           ),
         );
-        const schemaHash = Array.from(new Uint8Array(digest), value =>
-          value.toString(16).padStart(2, '0'),
-        ).join('');
         return request.pipe(
           HttpClientRequest.setHeader(
             BFF_ENVELOPE_HEADER,

package/src/effect-client/index.ts

@@ -24,6 +24,7 @@ import {
 import {
   Rpc,
   RpcClient,
+  RpcClientError,
   RpcGroup,
   RpcSchema,
   RpcSerialization,
@@ -106,8 +107,7 @@ export type EffectRpcSerialization =
   | 'json'
   | 'ndjson'
   | 'jsonRpc'
-  | 'ndJsonRpc'
-  | 'msgPack';
+  | 'ndJsonRpc';
 
 export class EffectRpcClientError extends Data.TaggedError(
   'EffectRpcClientError',
@@ -138,8 +138,8 @@ export type EffectRpcClientHandle<
   Rpcs extends Rpc.Any,
   Flatten extends boolean = false,
 > = (Flatten extends true
-  ? RpcClient.RpcClient.Flat<Rpcs, unknown>
-  : RpcClient.RpcClient<Rpcs, unknown>) & {
+  ? RpcClient.RpcClient.Flat<Rpcs, RpcClientError.RpcClientError>
+  : RpcClient.RpcClient<Rpcs, RpcClientError.RpcClientError>) & {
   dispose: () => Promise<void>;
 };
 

package/src/microvertical-api.ts

@@ -48,7 +48,7 @@ export const MicroVerticalOperationSourceSchema = Schema.Literals([
   'client',
   'server',
   'generated-client',
-  'effect-adapter',
+  'effect-server',
   'data-platform',
   'unknown',
 ]);