extracted streaming logic out from modified file

kodakyellow · kodakyellow · commit 47515ece39fe · 2018-03-20T16:55:42.000-07:00
diff --git a/SSRtest/ModifiedReact.js b/SSRtest/ModifiedReact.js
@@ -2713,7 +2713,7 @@ var ReactMarkupReadableStream = function (_Readable) {
  */
 
 
-function originalRenderToNodeStream(element, cache, streamingStart, memLife=0) {
+function renderToNodeStream(element, cache, streamingStart, memLife=0) {
       return new ReactMarkupReadableStream(
         element,
         false,
@@ -2807,28 +2807,28 @@ class ComponentCache {
 
 }  
 
-function renderToNodeStream(compo, cache, res){
+// function renderToNodeStream(compo, cache, res){
 
-  const htmlStart =
-  '<html><head><title>Page</title></head><body><div id="react-root">';
+//   const htmlStart =
+//   '<html><head><title>Page</title></head><body><div id="react-root">';
 
-  const htmlEnd = "</div></body></html>";
+//   const htmlEnd = "</div></body></html>";
 
-  const streamingStart = {
-    sliceStartCount: htmlStart.length, 
-  }
+//   const streamingStart = {
+//     sliceStartCount: htmlStart.length, 
+//   }
 
-  const cacheStream = createCacheStream(cache, streamingStart);
-    cacheStream.pipe(res);
-    cacheStream.write(htmlStart);
+//   const cacheStream = createCacheStream(cache, streamingStart);
+//     cacheStream.pipe(res);
+//     cacheStream.write(htmlStart);
 
-    const stream = originalRenderToNodeStream(compo, cache, streamingStart);
-    stream.pipe(cacheStream, { end: false });
-    stream.on("end", () => {
-      cacheStream.end(htmlEnd);
-    });
+//     const stream = originalRenderToNodeStream(compo, cache, streamingStart);
+//     stream.pipe(cacheStream, { end: false });
+//     stream.on("end", () => {
+//       cacheStream.end(htmlEnd);
+//     });
 
-}
+// }
 // Note: when changing this, also consider https://github.com/facebook/react/issues/11526
 var ReactDOMServerNode = {
   renderToString: renderToString,
diff --git a/SSRtest/src/server/index.js b/SSRtest/src/server/index.js
@@ -4,7 +4,7 @@ import React from 'react';
 import ReactCC from '../../ModifiedReact';
 import { flushChunkNames } from 'react-universal-component/server';
 import flushChunks from 'webpack-flush-chunks';
-
+import zNodeStream from "./zNodeStream.js";
 import App from '../shared/App';
 
 // can pass in max-size, otherwise defaults to 1 million
@@ -30,7 +30,7 @@ const cache = new ReactCC.ComponentCache();
 export default ({ clientStats }) => async (req, res) => {
   // Need To Come back To If Statement
   if(true){
-    ReactCC.renderToNodeStream(<App/>, cache, res); 
+    zNodeStream(<App/>, false, cache, res); 
     // const cacheStream = ReactCC.createCacheStream(cache, streamingStart);
     // cacheStream.pipe(res);
     // cacheStream.write(htmlStart);
diff --git a/SSRtest/src/server/zNodeStream.js b/SSRtest/src/server/zNodeStream.js
@@ -1,6 +1,7 @@
 import { Transform } from "stream";
-import { create } from "domain";
-import { lstat } from "fs";
+// import { create } from "domain";
+// import { lstat } from "fs";
+import { renderToNodeStream, renderToStaticNodeStream } from "../../ModifiedReact.js";
 
 const createCacheStream = (cache, streamingStart, memLife=0) => {
   const bufferedChunks = [];
@@ -49,4 +50,27 @@ const createCacheStream = (cache, streamingStart, memLife=0) => {
   });
 };
 
-export default createCacheStream;
+function zNodeStream(compo, staticMarkup, cache, res){
+
+  const htmlStart =
+  '<html><head><title>Page</title></head><body><div id="react-root">';
+
+  const htmlEnd = "</div></body></html>";
+
+  const streamingStart = {
+    sliceStartCount: htmlStart.length, 
+  }
+
+  const cacheStream = createCacheStream(cache, streamingStart);
+    cacheStream.pipe(res);
+    cacheStream.write(htmlStart);
+
+    const stream = staticMarkup? renderToStaticNodeStream(compo, cache, streamingStart) : renderToNodeStream(compo, cache, streamingStart);
+    stream.pipe(cacheStream, { end: false });
+    stream.on("end", () => {
+      cacheStream.end(htmlEnd);
+    });
+
+}
+
+export default zNodeStream;
