feat: clone stream for hono bff

Author: keepview

Diff for: packages/cli/core/src/types/context.ts

@@ -83,4 +83,9 @@ export interface IAppContext {
    * @private
    */
   partialsByEntrypoint?: Record<string, HtmlPartials>;
+  /**
+   * Identification for bff runtime framework
+   * @private
+   */
+  bffRuntimeFramework?: string;
 }

Diff for: packages/cli/plugin-bff/src/cli.ts

@@ -3,7 +3,13 @@ import type { AppTools, CliPlugin } from '@modern-js/app-tools';
 import { ApiRouter } from '@modern-js/bff-core';
 import { compile } from '@modern-js/server-utils';
 import type { ServerRoute } from '@modern-js/types';
-import { fs, API_DIR, SHARED_DIR, normalizeOutputPath } from '@modern-js/utils';
+import {
+  fs,
+  API_DIR,
+  SHARED_DIR,
+  isProd,
+  normalizeOutputPath,
+} from '@modern-js/utils';
 import clientGenerator from './utils/clientGenerator';
 import pluginGenerator from './utils/pluginGenerator';
 import runtimeGenerator from './utils/runtimeGenerator';
@@ -15,11 +21,6 @@ const RUNTIME_CREATE_REQUEST = '@modern-js/plugin-bff/runtime/create-request';
 export const bffPlugin = (): CliPlugin<AppTools> => ({
   name: '@modern-js/plugin-bff',
   setup: api => {
-    const useConfig = api.useConfigContext();
-
-    useConfig.bff ??= {};
-    (useConfig.bff as any).runtimeFramework = 'hono';
-
     const compileApi = async () => {
       const {
         appDirectory,
@@ -130,15 +131,17 @@ export const bffPlugin = (): CliPlugin<AppTools> => ({
       }
     };
 
+    const isHono = () => {
+      const { bffRuntimeFramework } = api.useAppContext();
+      return bffRuntimeFramework === 'hono';
+    };
+
     return {
       config() {
         const useConfig = api.useConfigContext();
-        const { bff } = useConfig ?? {};
-        const isHono = (bff as any)?.runtimeFramework === 'hono';
-        const isDev = process.env.NODE_ENV === 'development';
-        const useLocalRuntime = isDev && !useConfig?.bff?.crossProject;
+        const useLocalRuntime = !isProd() && !useConfig?.bff?.crossProject;
 
-        const runtimePath = isHono
+        const runtimePath = isHono()
           ? useLocalRuntime
             ? require.resolve('@modern-js/plugin-bff/runtime')
             : '@modern-js/plugin-bff/runtime'
@@ -227,7 +230,7 @@ export const bffPlugin = (): CliPlugin<AppTools> => ({
           isSSR: false,
         })) as ServerRoute[];
 
-        if ((bff as any).runtimeFramework !== 'hono' && bff?.enableHandleWeb) {
+        if (!isHono() && bff?.enableHandleWeb) {
           return {
             routes: (
               routes.map(route => {

Diff for: packages/cli/plugin-bff/src/runtime/hono.ts

@@ -8,12 +8,9 @@ import createHonoRoutes from '../utils/createHonoRoutes';
 
 const before = ['custom-server-hook', 'custom-server-middleware', 'render'];
 
-type SF = (args: any) => void;
-
 interface MiddlewareOptions {
   prefix: string;
   enableHandleWeb?: boolean;
-  customMiddlewares: SF[];
 }
 
 export class HonoRuntime {
@@ -54,10 +51,11 @@ export class HonoRuntime {
   };
 
   registerMiddleware = async (options: MiddlewareOptions) => {
-    const { prefix, enableHandleWeb, customMiddlewares } = options;
+    const { prefix } = options;
+
+    const { bffRuntimeFramework } = this.api.useAppContext();
 
-    const { bff } = this.api.useConfigContext();
-    if ((bff as any)?.runtimeFramework !== 'hono') {
+    if (bffRuntimeFramework !== 'hono') {
       this.isHono = false;
       return;
     }
@@ -80,21 +78,6 @@ export class HonoRuntime {
         before,
       });
 
-    (customMiddlewares as unknown as MiddlewareHandler[]).forEach(handler => {
-      globalMiddlewares.push({
-        name: 'bff-custom-middleware',
-        handler: (c: Context, next: Next) => {
-          if (c.req.path.startsWith(prefix || '/api') || enableHandleWeb) {
-            return handler(c, next);
-          } else {
-            return next();
-          }
-        },
-        order: 'post',
-        before,
-      });
-    });
-
     await this.setHandlers();
 
     if (isProd()) {

Diff for: packages/cli/plugin-bff/src/server.ts

@@ -1,6 +1,6 @@
 import path from 'path';
 import { ApiRouter } from '@modern-js/bff-core';
-import type { PluginAPI, ServerPlugin } from '@modern-js/server-core';
+import type { ServerPlugin } from '@modern-js/server-core';
 import type { ServerNodeMiddleware } from '@modern-js/server-core/node';
 import {
   API_DIR,
@@ -107,7 +107,6 @@ export default (): ServerPlugin => ({
         }
 
         honoRuntime.registerMiddleware({
-          customMiddlewares: middlewares,
           prefix,
           enableHandleWeb,
         });

Diff for: packages/cli/plugin-bff/src/utils/createHonoRoutes.ts

@@ -112,13 +112,12 @@ const getHonoInput = async (c: Context) => {
     const contentType = c.req.header('content-type') || '';
     if (typeIs.is(contentType, ['application/json'])) {
       try {
-        draft.data = await c.req.json();
+        draft.data = await resolveData(c);
       } catch {
         draft.data = {};
       }
     } else if (typeIs.is(contentType, ['multipart/form-data'])) {
-      const formData = await resolveHonoFormData(c);
-      draft.formData = formData;
+      draft.formData = await resolveFormData(c);
     } else if (typeIs.is(contentType, ['application/x-www-form-urlencoded'])) {
       draft.formUrlencoded = await c.req.parseBody();
     } else {
@@ -130,20 +129,45 @@ const getHonoInput = async (c: Context) => {
   return draft;
 };
 
-const resolveHonoFormData = (c: Context): Promise<Record<string, any>> => {
-  const form = formidable({ multiples: true });
+const resolveFormData = (c: Context): Promise<Record<string, any>> => {
   return new Promise((resolve, reject) => {
-    form.parse(c.env.node?.req, (err, fields, files) => {
-      if (err) {
-        reject(err);
-      }
+    try {
+      const nodeReadable = c.env.node?.req;
 
-      resolve({
-        ...fields,
-        ...files,
+      if (!c.env.node?.req) return {};
+
+      nodeReadable.headers = {
+        'content-type': c.env.node.req.headers['content-type'],
+        'content-length': c.env.node.req.headers['content-length'],
+      };
+      const form = formidable({
+        multiples: true,
       });
-    });
+
+      form.parse(nodeReadable, (err, fields, files) => {
+        if (err) reject(err);
+        resolve({ ...fields, ...files });
+      });
+    } catch (error) {
+      reject(error);
+    }
   });
 };
 
+async function resolveData(c: Context): Promise<Record<string, any>> {
+  try {
+    const nodeReadable = c.env.node?.req;
+    if (!c.env.node?.req) return {};
+
+    let data = '';
+    for await (const chunk of nodeReadable) {
+      data += chunk.toString('utf8');
+    }
+
+    return JSON.parse(data);
+  } catch (error) {
+    return {};
+  }
+}
+
 export default createHonoRoutes;

Diff for: packages/cli/plugin-bff/tests/__snapshots__/cli.test.ts.snap

@@ -4,6 +4,7 @@ exports[`bff cli plugin config 1`] = `
 [
   {
     "source": {
+      "alias": undefined,
       "moduleScopes": [
         "api",
         /create-request/,

Diff for: packages/server/core/src/adapters/node/node.ts

@@ -114,6 +114,7 @@ const getRequestListener = (handler: RequestHandler) => {
   return async (req: NodeRequest, res: NodeResponse) => {
     try {
       const request = createWebRequest(req, res);
+
       const response = await handler(request, {
         node: {
           req,

Diff for: packages/server/core/src/serverBase.ts

@@ -32,6 +32,7 @@ export type ServerBaseOptions = {
     sharedDirectory?: string;
     apiDirectory?: string;
     lambdaDirectory?: string;
+    bffRuntimeFramework?: string;
   };
   runMode?: 'apiOnly' | 'ssrOnly' | 'webOnly';
 };
@@ -102,6 +103,7 @@ export class ServerBase<E extends Env = any> {
       plugins: [],
       metaName: metaName || 'modern-js',
       serverBase: this,
+      bffRuntimeFramework: context.bffRuntimeFramework,
     } as any;
 
     return createContext<ISAppContext>(appContext);

Diff for: packages/server/create-request/src/browser.ts

@@ -162,7 +162,6 @@ export const createUploader: UploadCreator = ({
     const fetcher = realRequest.get(requestId) || originFetch;
 
     const { body, headers } = getUploadPayload(args);
-    console.log('up headers', headers);
 
     const configDomain = domainMap.get(requestId);
     const finalURL = `${configDomain || domain || ''}${path}`;

Diff for: packages/server/plugin-express/src/cli/index.ts

@@ -12,8 +12,12 @@ export const expressPlugin = (): CliPlugin<AppTools> => ({
 
     const useConfig = api.useConfigContext();
 
-    useConfig.bff ??= {};
-    (useConfig.bff as any).runtimeFramework = 'express';
+    const appContext = api.useAppContext();
+
+    api.setAppContext({
+      ...appContext,
+      bffRuntimeFramework: 'express',
+    });
 
     return {
       config() {

Diff for: packages/server/plugin-koa/src/cli/index.ts

@@ -11,8 +11,12 @@ export const koaPlugin = (): CliPlugin<AppTools> => ({
     const runtimeModulePath = path.resolve(__dirname, '../runtime');
     const useConfig = api.useConfigContext();
 
-    useConfig.bff ??= {};
-    (useConfig.bff as any).runtimeFramework = 'koa';
+    const appContext = api.useAppContext();
+
+    api.setAppContext({
+      ...appContext,
+      bffRuntimeFramework: 'koa',
+    });
 
     return {
       config() {

Diff for: packages/solutions/app-tools/src/commands/dev.ts

@@ -110,6 +110,7 @@ export const dev = async (
       apiDirectory: appContext.apiDirectory,
       lambdaDirectory: appContext.lambdaDirectory,
       sharedDirectory: appContext.sharedDirectory,
+      bffRuntimeFramework: appContext.bffRuntimeFramework,
     },
     serverConfigPath,
     routes: serverRoutes,

Diff for: packages/solutions/app-tools/src/commands/serve.ts

@@ -95,6 +95,7 @@ export const serve = async (
             appContext.appDirectory,
             appContext.distDirectory,
           ),
+      bffRuntimeFramework: appContext.bffRuntimeFramework,
     },
     runMode,
   });

Diff for: packages/solutions/app-tools/src/types/new.ts

@@ -162,6 +162,11 @@ export interface AppToolsExtendContext<B extends Bundler = 'webpack'> {
    * @deprecated compat old plugin, default is app tools
    */
   toolsType?: string;
+  /**
+   * Identification for bff runtime framework
+   * @private
+   */
+  bffRuntimeFramework?: string;
 }
 
 export type AppToolsContext<B extends Bundler = 'webpack'> = AppContext<

Diff for: packages/solutions/app-tools/src/utils/initAppContext.ts

@@ -51,5 +51,6 @@ export const initAppContext = ({
     apiOnly: false,
     internalDirAlias: `@_${metaName.replace(/-/g, '_')}_internal`,
     internalSrcAlias: `@_${metaName.replace(/-/g, '_')}_src`,
+    bffRuntimeFramework: 'hono',
   };
 };

Diff for: pnpm-lock.yaml

@@ -93,4 +93,4 @@
     "dist-1/runtime/**/*",
     "dist-1/plugin/**/*"
   ]
-}
+}

Diff for: tests/integration/bff-corss-project/bff-api-app/package.json

@@ -1,5 +1,3 @@
-# bff-express
-
 ## 2.65.2
 
 ### Patch Changes

Diff for: tests/integration/bff-hono/CHANGELOG.md

@@ -0,0 +1,10 @@
+import { useContext } from '@modern-js/runtime/server';
+
+export default async () => {
+  const ctx = useContext();
+  const { res } = ctx;
+  res.headers.set('x-id', '1');
+  return {
+    message: 'Hello Modern.js',
+  };
+};

Diff for: tests/integration/bff-hono/api/_app.ts

@@ -12,9 +12,11 @@ import {
 } from '@modern-js/runtime/server';
 import { z } from 'zod';
 
-export default async () => ({
-  message: 'Hello Modern.js',
-});
+export default async () => {
+  return {
+    message: 'Hello Modern.js',
+  };
+};
 
 export const post = async ({ formUrlencoded }: { formUrlencoded: any }) => {
   return {
@@ -37,7 +39,6 @@ const ParamsSchema = z.object({
 
 const HeadersSchema = z.object({
   'x-header': z.string(),
-  'x-parse-through-body': z.string(),
 });
 
 export const postHello = Api(

Diff for: tests/integration/bff-hono/api/context/index.ts

@@ -7,8 +7,8 @@ export default applyBaseConfig({
     ssr: true,
   },
   bff: {
-    prefix: '/bff-hono',
-    enableHandleWeb: true,
+    prefix: '/bff-api',
+    // enableHandleWeb: true,
     // crossProject: true,
   },
   plugins: [bffPlugin(), serverPlugin()],

Diff for: tests/integration/bff-hono/api/index.ts

@@ -31,7 +31,6 @@
     "@types/react": "^18.3.11",
     "@types/react-dom": "^18.3.1",
     "typescript": "^5",
-        "ts-node": "~10.8.1",
     "tsconfig-paths": "~3.14.1"
   },
   "exports": {