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

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,
@@ -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/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,
@@ -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);

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

@@ -75,6 +75,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,
@@ -332,9 +367,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);

package/package.json

@@ -17,7 +17,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "3.4.0-ultramodern.2",
+  "version": "3.4.0-ultramodern.3",
   "types": "./dist/types/cli.d.ts",
   "main": "./dist/cjs/cli.js",
   "exports": {
@@ -157,12 +157,12 @@
     "effect": "4.0.0-beta.89",
     "qs": "^6.15.3",
     "type-is": "^2.1.0",
-    "@modern-js/builder": "npm:@bleedingdev/modern-js-builder@3.4.0-ultramodern.2",
-    "@modern-js/create-request": "npm:@bleedingdev/modern-js-create-request@3.4.0-ultramodern.2",
-    "@modern-js/server-core": "npm:@bleedingdev/modern-js-server-core@3.4.0-ultramodern.2",
-    "@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.4.0-ultramodern.2",
-    "@modern-js/bff-core": "npm:@bleedingdev/modern-js-bff-core@3.4.0-ultramodern.2",
-    "@modern-js/server-utils": "npm:@bleedingdev/modern-js-server-utils@3.4.0-ultramodern.2"
+    "@modern-js/builder": "npm:@bleedingdev/modern-js-builder@3.4.0-ultramodern.3",
+    "@modern-js/create-request": "npm:@bleedingdev/modern-js-create-request@3.4.0-ultramodern.3",
+    "@modern-js/server-core": "npm:@bleedingdev/modern-js-server-core@3.4.0-ultramodern.3",
+    "@modern-js/server-utils": "npm:@bleedingdev/modern-js-server-utils@3.4.0-ultramodern.3",
+    "@modern-js/bff-core": "npm:@bleedingdev/modern-js-bff-core@3.4.0-ultramodern.3",
+    "@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.4.0-ultramodern.3"
   },
   "devDependencies": {
     "@rsbuild/core": "2.1.0",
@@ -174,12 +174,12 @@
     "memfs": "^4.57.8",
     "typescript": "^6.0.3",
     "zod": "^4.4.3",
-    "@modern-js/bff-runtime": "npm:@bleedingdev/modern-js-bff-runtime@3.4.0-ultramodern.2",
-    "@modern-js/app-tools": "npm:@bleedingdev/modern-js-app-tools@3.4.0-ultramodern.2",
-    "@modern-js/plugin": "npm:@bleedingdev/modern-js-plugin@3.4.0-ultramodern.2",
-    "@modern-js/runtime": "npm:@bleedingdev/modern-js-runtime@3.4.0-ultramodern.2",
-    "@modern-js/types": "npm:@bleedingdev/modern-js-types@3.4.0-ultramodern.2",
-    "@scripts/rstest-config": "2.66.0"
+    "@modern-js/bff-runtime": "npm:@bleedingdev/modern-js-bff-runtime@3.4.0-ultramodern.3",
+    "@modern-js/app-tools": "npm:@bleedingdev/modern-js-app-tools@3.4.0-ultramodern.3",
+    "@modern-js/plugin": "npm:@bleedingdev/modern-js-plugin@3.4.0-ultramodern.3",
+    "@modern-js/runtime": "npm:@bleedingdev/modern-js-runtime@3.4.0-ultramodern.3",
+    "@scripts/rstest-config": "2.66.0",
+    "@modern-js/types": "npm:@bleedingdev/modern-js-types@3.4.0-ultramodern.3"
   },
   "sideEffects": false,
   "publishConfig": {