feat: support useRequest

Author: yimingjfe

Diff for: packages/cli/uni-builder/src/shared/rsc/plugins/rsbuild-rsc-plugin.ts

@@ -86,6 +86,12 @@ export const rsbuildRscPlugin = ({
             .layer(webpackRscLayerName)
             .end();
 
+          // chain.module
+          //   .rule('default-module')
+          //   .resource([/node\/storage/])
+          //   .layer('default')
+          //   .end();
+
           chain.module
             .rule(webpackRscLayerName)
             .issuerLayer(webpackRscLayerName)

Diff for: packages/runtime/plugin-runtime/src/core/server/stream/shared.tsx

@@ -76,63 +76,69 @@ export function createRenderStreaming(
     const createReadableStreamFromElement = await createReadableStreamPromise;
     const headersData = parseHeaders(request);
 
-    return run(headersData, async () => {
-      const end = time();
-      const { runtimeContext, config, resource } = options;
-
-      const onError = createOnError(options.onError);
-      const onTiming = createOnTiming(options.onTiming);
-
-      const { htmlTemplate, entryName } = resource;
-
-      const ssrConfig = getSSRConfigByEntry(
-        entryName,
-        config.ssr,
-        config.ssrByEntries,
-      );
-
-      const RSCServerRoot = ({ children }: { children: React.ReactNode }) => {
-        return <>{children}</>;
-      };
+    return run(
+      {
+        request,
+        headers: headersData,
+      },
+      async () => {
+        const end = time();
+        const { runtimeContext, config, resource } = options;
 
-      let rootElement = wrapRuntimeContextProvider(
-        serverRoot,
-        Object.assign(runtimeContext, { ssr: true }),
-      );
+        const onError = createOnError(options.onError);
+        const onTiming = createOnTiming(options.onTiming);
 
-      rootElement = <RSCServerRoot>{rootElement}</RSCServerRoot>;
+        const { htmlTemplate, entryName } = resource;
 
-      const stream = await createReadableStreamFromElement(
-        request,
-        rootElement,
-        {
-          config,
-          htmlTemplate,
-          runtimeContext,
-          ssrConfig,
+        const ssrConfig = getSSRConfigByEntry(
           entryName,
-          rscClientManifest: options.rscClientManifest,
-          rscSSRManifest: options.rscSSRManifest,
-          rscServerManifest: options.rscServerManifest,
-          rscRoot: options.rscRoot,
-          onShellReady() {
-            const cost = end();
-            onTiming(SSRTimings.RENDER_SHELL, cost);
-          },
-          onAllReady() {
-            const cost = end();
-            onTiming(SSRTimings.RENDER_HTML, cost);
-          },
-          onShellError(error) {
-            onError(SSRErrors.RENDER_SHELL, error);
-          },
-          onError(error) {
-            onError(SSRErrors.RENDER_STREAM, error);
+          config.ssr,
+          config.ssrByEntries,
+        );
+
+        const RSCServerRoot = ({ children }: { children: React.ReactNode }) => {
+          return <>{children}</>;
+        };
+
+        let rootElement = wrapRuntimeContextProvider(
+          serverRoot,
+          Object.assign(runtimeContext, { ssr: true }),
+        );
+
+        rootElement = <RSCServerRoot>{rootElement}</RSCServerRoot>;
+
+        const stream = await createReadableStreamFromElement(
+          request,
+          rootElement,
+          {
+            config,
+            htmlTemplate,
+            runtimeContext,
+            ssrConfig,
+            entryName,
+            rscClientManifest: options.rscClientManifest,
+            rscSSRManifest: options.rscSSRManifest,
+            rscServerManifest: options.rscServerManifest,
+            rscRoot: options.rscRoot,
+            onShellReady() {
+              const cost = end();
+              onTiming(SSRTimings.RENDER_SHELL, cost);
+            },
+            onAllReady() {
+              const cost = end();
+              onTiming(SSRTimings.RENDER_HTML, cost);
+            },
+            onShellError(error) {
+              onError(SSRErrors.RENDER_SHELL, error);
+            },
+            onError(error) {
+              onError(SSRErrors.RENDER_STREAM, error);
+            },
           },
-        },
-      );
+        );
 
-      return stream;
-    });
+        return stream;
+      },
+    );
   };
 }

Diff for: packages/runtime/plugin-runtime/src/rsc/server.ts

@@ -1 +1,2 @@
 export * from '@modern-js/render/rsc';
+export { useRequest } from '@modern-js/runtime-utils/node';

Diff for: packages/toolkit/runtime-utils/src/node/index.ts

@@ -4,9 +4,22 @@
 import type { IncomingHttpHeaders } from 'http';
 import { createStorage } from './storage';
 
-const { run, useContext: useHeaders } = createStorage<IncomingHttpHeaders>();
+const { run, useContext } = createStorage<{
+  request?: Request;
+  headers?: IncomingHttpHeaders;
+}>();
 
-export { run, useHeaders };
+const useRequest = () => {
+  const context = useContext();
+  return context?.request;
+};
+
+const useHeaders = () => {
+  const context = useContext();
+  return context?.headers;
+};
+
+export { run, useHeaders, useRequest };
 
 export { serializeJson } from './serialize';
 export * from './loaderContext';

Diff for: packages/toolkit/runtime-utils/src/node/storage.ts

@@ -29,10 +29,11 @@ const createStorage = <T>() => {
       throw new Error(`Unable to use async_hook, please confirm the node version >= 12.17
         `);
     }
+
     const context = storage.getStore();
     if (!context) {
       throw new Error(
-        `Can't call useContext out of scope, make sure @modern-js/utils is a single version in node_modules`,
+        `Can't call useContext out of scope, make sure @modern-js/runtime-utils is a single version in node_modules`,
       );
     }
 

Diff for: tests/integration/rsc-ssr-app/modern.config.ts

@@ -22,6 +22,13 @@ export default applyBaseConfig({
         .add(path.resolve(__dirname, 'node_modules'))
         .add('node_modules');
     },
+    webpack(config) {
+      config.externals = {
+        '@modern-js/runtime-utils/node': '@modern-js/runtime-utils/node',
+      };
+
+      return config;
+    },
     rspack(config, { isServer }) {
       if (!config.output) {
         config.output = {};

Diff for: tests/integration/rsc-ssr-app/src/server-component-root/App.tsx

@@ -1,11 +1,14 @@
 import 'server-only';
+import { useRequest } from '@modern-js/runtime/rsc/server';
 import { Suspense } from 'react';
 import styles from './App.module.less';
 import Suspended from './Suspended';
 import { Counter } from './components/Counter';
 import { getCountState } from './components/ServerState';
 
 const App = ({ name }: { name: string }) => {
+  const request = useRequest();
+  console.log('mmmmmmmmmm', request?.method);
   const countStateFromServer = getCountState();
   return (
     <div className={styles.root}>