feat: resolve pr issues

Author: keepview

packages/cli/plugin-bff/package.json

@@ -21,12 +21,12 @@
   "main": "./dist/cjs/cli.js",
   "module": "./dist/esm/cli.js",
   "exports": {
+    "./types": "./types.d.ts",
     ".": {
       "types": "./dist/types/cli.d.ts",
       "jsnext:source": "./src/cli.ts",
       "default": "./dist/cjs/cli.js"
     },
-    "./types": "./types/index.d.ts",
     "./cli": {
       "types": "./dist/types/cli.d.ts",
       "jsnext:source": "./src/cli.ts",
@@ -87,7 +87,6 @@
     "@modern-js/server-utils": "workspace:*",
     "@modern-js/utils": "workspace:*",
     "type-is": "^1.6.18",
-    "formidable": "^1.2.2",
     "@swc/helpers": "0.5.13"
   },
   "devDependencies": {
@@ -103,18 +102,13 @@
     "@types/jest": "^29",
     "@types/node": "^14",
     "@types/type-is": "^1.6.3",
-    "@types/formidable": "^1.2.3",
     "jest": "^29",
     "memfs": "^3.5.1",
     "ts-jest": "^29.1.0",
     "typescript": "^5",
     "webpack": "^5.98.0",
-    "hono": "^3.12.2",
     "zod": "^3.22.3"
   },
-  "peerDependencies": {
-    "hono": "^3.12.2"
-  },
   "sideEffects": false,
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",

packages/cli/plugin-bff/src/cli.ts

@@ -3,13 +3,7 @@ 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,
-  isProd,
-  normalizeOutputPath,
-} from '@modern-js/utils';
+import { fs, API_DIR, SHARED_DIR, normalizeOutputPath } from '@modern-js/utils';
 import clientGenerator from './utils/clientGenerator';
 import pluginGenerator from './utils/pluginGenerator';
 import runtimeGenerator from './utils/runtimeGenerator';

packages/cli/plugin-bff/src/runtime/hono/adapter.ts

@@ -1,8 +1,14 @@
 import type { APIHandlerInfo } from '@modern-js/bff-core';
-import type { PluginAPI, ServerMiddleware } from '@modern-js/server-core';
+import type {
+  Context,
+  MiddlewareHandler,
+  Next,
+  PluginAPI,
+  ServerMiddleware,
+} from '@modern-js/server-core';
+import { Hono } from '@modern-js/server-core';
+
 import { isProd } from '@modern-js/utils';
-import { Hono } from 'hono';
-import type { Context, MiddlewareHandler, Next } from 'hono';
 import createHonoRoutes from '../../utils/createHonoRoutes';
 
 const before = ['custom-server-hook', 'custom-server-middleware', 'render'];
@@ -76,7 +82,10 @@ export class HonoAdapter {
         before,
         handler: async (c: Context, next: Next) => {
           if (this.apiServer) {
-            const response = await this.apiServer.fetch(c.req.raw, c.env);
+            const response = await this.apiServer.fetch(
+              c.req as unknown as Request,
+              c.env,
+            );
 
             if (response.status !== 404) {
               return new Response(response.body, response);

packages/cli/plugin-bff/src/runtime/hono/operators.ts

@@ -1,6 +1,9 @@
 import type { Operator } from '@modern-js/bff-core';
-import { useHonoContext } from '@modern-js/server-core';
-import type { Context, Next } from 'hono';
+import {
+  type Context,
+  type Next,
+  useHonoContext,
+} from '@modern-js/server-core';
 
 export type EndFunction = ((func: (res: Response) => void) => void) &
   ((data: unknown) => void);

packages/cli/plugin-bff/src/utils/createHonoRoutes.ts

@@ -1,5 +1,3 @@
-import type { IncomingMessage } from 'node:http';
-import { Readable } from 'node:stream';
 import type { APIHandlerInfo } from '@modern-js/bff-core';
 import {
   HttpMetadata,
@@ -8,8 +6,7 @@ import {
   ValidationError,
   isWithMetaHandler,
 } from '@modern-js/bff-core';
-import formidable from 'formidable';
-import type { Context, Next } from 'hono';
+import type { Context, Next } from '@modern-js/server-core';
 import typeIs from 'type-is';
 
 type Handler = APIHandlerInfo['handler'];
@@ -67,7 +64,7 @@ export const createHonoHandler = (handler: Handler) => {
           if (response) {
             return response;
           }
-          if (c.env?.node?.res?.headersSent) return;
+          if (c.finalized) return;
 
           const result = await handler(input);
           return result && typeof result === 'object'
@@ -87,7 +84,7 @@ export const createHonoHandler = (handler: Handler) => {
         const args = Object.values(input.params).concat(input);
         try {
           const body = await handler(...args);
-          if (c.env?.node?.res?.headersSent) {
+          if (c.finalized) {
             return await Promise.resolve();
           }
 
@@ -118,8 +115,7 @@ const getHonoInput = async (c: Context) => {
     if (typeIs.is(contentType, ['application/json'])) {
       draft.data = await c.req.json();
     } else if (typeIs.is(contentType, ['multipart/form-data'])) {
-      const nodeStream = await webStreamToNodeStream(c);
-      draft.formData = await resolveFormData(nodeStream);
+      draft.formData = await c.req.parseBody();
     } else if (typeIs.is(contentType, ['application/x-www-form-urlencoded'])) {
       draft.formUrlencoded = await c.req.parseBody();
     } else {
@@ -131,51 +127,4 @@ const getHonoInput = async (c: Context) => {
   return draft;
 };
 
-async function webStreamToNodeStream(c: Context) {
-  const reader = (c.req.raw.body as ReadableStream<Uint8Array>).getReader();
-  const nodeStream = new Readable({
-    async read() {
-      try {
-        const { done, value } = await reader.read();
-        if (done) {
-          this.push(null);
-        } else {
-          this.push(value);
-        }
-      } catch (err) {
-        this.destroy(err as any);
-      }
-    },
-    destroy(err, callback) {
-      reader.cancel(err).finally(() => callback(err));
-    },
-  }) as IncomingMessage;
-
-  const headers = {
-    'content-type': c.req.header('content-type') || 'multipart/form-data',
-    'content-length': c.req.header('content-length') || '0',
-  };
-
-  nodeStream.headers = headers;
-  return nodeStream;
-}
-
-const resolveFormData = (
-  request: IncomingMessage,
-): Promise<Record<string, any>> => {
-  const form = formidable({ multiples: true });
-  return new Promise((resolve, reject) => {
-    form.parse(request, (err, fields, files) => {
-      if (err) {
-        reject(err);
-      }
-
-      resolve({
-        ...fields,
-        ...files,
-      });
-    });
-  });
-};
-
 export default createHonoRoutes;

packages/cli/plugin-bff/types/index.d.ts renamed to packages/cli/plugin-bff/types.d.ts

@@ -5,7 +5,7 @@ export { AGGRED_DIR } from './constants';
 export type { ServerBase, ServerBaseOptions } from './serverBase';
 export { createServerBase } from './serverBase';
 export { useHonoContext } from './context';
-export { CustomServer } from './plugins/customServer';
+export { Hono, type MiddlewareHandler } from 'hono';
 
 export type {
   Middleware,

packages/server/core/src/index.ts

@@ -186,14 +186,6 @@ export class ServerBase<E extends Env = any> {
     return this.app.notFound.bind(this.app);
   }
 
-  get routes() {
-    return this.app.routes;
-  }
-
-  get route() {
-    return this.app.route.bind(this.app);
-  }
-
   get onError() {
     return this.app.onError.bind(this.app);
   }

packages/server/core/src/serverBase.ts

@@ -39,6 +39,7 @@ async function initServer() {
       sharedDirectory: p_sharedDirectory,
       apiDirectory: p_apiDirectory,
       lambdaDirectory: p_lambdaDirectory,
+      bffRuntimeFramework: p_bffRuntimeFramework,
     },
     plugins: p_plugins,
     ...dynamicProdOptions,

packages/solutions/app-tools/src/plugins/deploy/platforms/netlify-handler.cjs

@@ -138,6 +138,10 @@ export const createNetlifyPreset: CreatePreset = (
         .replace('p_ROUTE_SPEC_FILE', `"${ROUTE_SPEC_FILE}"`)
         .replace('p_dynamicProdOptions', JSON.stringify(dynamicProdOptions))
         .replace('p_plugins', pluginsCode)
+        .replace(
+          'p_bffRuntimeFramework',
+          `"${serverAppContext.bffRuntimeFramework}"`,
+        )
         .replace('p_sharedDirectory', serverAppContext.sharedDirectory)
         .replace('p_apiDirectory', serverAppContext.apiDirectory)
         .replace('p_lambdaDirectory', serverAppContext.lambdaDirectory);

packages/solutions/app-tools/src/plugins/deploy/platforms/netlify.ts

@@ -35,6 +35,7 @@ async function main() {
       sharedDirectory: p_sharedDirectory,
       apiDirectory: p_apiDirectory,
       lambdaDirectory: p_lambdaDirectory,
+      bffRuntimeFramework: p_bffRuntimeFramework,
     },
     plugins: p_plugins,
     ...dynamicProdOptions,

packages/solutions/app-tools/src/plugins/deploy/platforms/node-entry.js

@@ -70,6 +70,10 @@ export const createNodePreset: CreatePreset = (appContext, config) => {
         .replace('p_plugins', pluginsCode)
         .replace('p_sharedDirectory', serverAppContext.sharedDirectory)
         .replace('p_apiDirectory', serverAppContext.apiDirectory)
+        .replace(
+          'p_bffRuntimeFramework',
+          `"${serverAppContext.bffRuntimeFramework}"`,
+        )
         .replace('p_lambdaDirectory', serverAppContext.lambdaDirectory);
 
       if (isEsmProject) {

packages/solutions/app-tools/src/plugins/deploy/platforms/node.ts

@@ -102,7 +102,7 @@ export const createVercelPreset: CreatePreset = (
         });
 
         await fse.writeJSON(path.join(funcsDirectory, '.vc-config.json'), {
-          runtime: 'nodejs20.x',
+          runtime: 'nodejs16.x',
           handler: 'index.js',
           launcherType: 'Nodejs',
           shouldAddHelpers: false,

packages/solutions/app-tools/src/plugins/deploy/platforms/vercel.ts

@@ -8,6 +8,7 @@ export type ServerAppContext = {
   apiDirectory: string;
   lambdaDirectory: string;
   metaName: string;
+  bffRuntimeFramework: string;
 };
 
 export const serverAppContenxtTemplate = (
@@ -19,6 +20,7 @@ export const serverAppContenxtTemplate = (
     apiDirectory,
     lambdaDirectory,
     metaName,
+    bffRuntimeFramework,
   } = appContext;
   return {
     sharedDirectory: `path.join(__dirname, "${path.relative(
@@ -34,6 +36,7 @@ export const serverAppContenxtTemplate = (
       lambdaDirectory,
     )}")`,
     metaName,
+    bffRuntimeFramework: bffRuntimeFramework || 'hono',
   };
 };
 

packages/solutions/app-tools/src/plugins/deploy/utils.ts

@@ -1,5 +1,2 @@
-import type { IncomingMessage, ServerResponse } from 'node:http';
-import type { Http2ServerRequest, Http2ServerResponse } from 'node:http2';
-
 export type NodeRequest = IncomingMessage | Http2ServerRequest;
 export type NodeResponse = ServerResponse | Http2ServerResponse;