up

morriq · morriq · commit b08e27a055bb · 2018-06-20T22:18:42.000+02:00
diff --git a/samples/misc/NodeServicesExamples/Controllers/HomeController.cs b/samples/misc/NodeServicesExamples/Controllers/HomeController.cs
@@ -19,14 +19,16 @@ public IActionResult ES2015Transpilation()
             return View();
         }
 
-		public IActionResult Stream([FromServices] INodeServices nodeServices)
+		public FileStreamResult Stream([FromServices] INodeServices nodeServices)
 		{
-			Console.WriteLine("start");
 			var d = nodeServices.InvokeAsync<Stream>("./addNumbers");
+			var a = d.Result;
 
-			Console.WriteLine(d);
-			 
-            return View();
+			// byte[] bytes = new byte[10];
+                
+            //a.ReadAsync(bytes, 0, 10);
+
+			return new FileStreamResult(a, "text/plain");
         }
 
         public async Task<IActionResult> Chart([FromServices] INodeServices nodeServices)
diff --git a/samples/misc/NodeServicesExamples/NodeServicesExamples.csproj b/samples/misc/NodeServicesExamples/NodeServicesExamples.csproj
@@ -27,7 +27,7 @@
     <Compile Remove="Views\Home\Stream.cshtml" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="Views\Home\Stream.cshtml" />
+    <Content Remove="Views\Home\Stream.cshtml" />
   </ItemGroup>
   <Target Name="PrepublishScript" BeforeTargets="PrepareForPublish">
     <Exec Command="npm install" />
diff --git a/samples/misc/NodeServicesExamples/addNumbers.js b/samples/misc/NodeServicesExamples/addNumbers.js
@@ -10,7 +10,7 @@ rstream.on("end", () => {
     setTimeout(() => {
 
     result.stream.end();
-    }, 2000);
+    }, 20000);
 });
 
     //rstream.pipe(result.stream);
diff --git a/src/Microsoft.AspNetCore.NodeServices.Sockets/VirtualConnections/VirtualConnection.cs b/src/Microsoft.AspNetCore.NodeServices.Sockets/VirtualConnections/VirtualConnection.cs
@@ -63,9 +63,9 @@ public override async Task<int> ReadAsync(byte[] buffer, int offset, int count,
                 {
                     Buffer.BlockCopy(_receivedDataNotYetUsed.Array, _receivedDataNotYetUsed.Offset, buffer, bytesRead, bytesToExtract);
                     _receivedDataNotYetUsed = new ArraySegment<byte>(_receivedDataNotYetUsed.Array, _receivedDataNotYetUsed.Offset + bytesToExtract, _receivedDataNotYetUsed.Count - bytesToExtract);
+                    Console.WriteLine(_receivedDataNotYetUsed);
                     bytesRead += bytesToExtract;
                 }
-
                 // If we've completely filled the output buffer, we're done
                 if (bytesRead == count)
                 {

Original file line number	Diff line number	Diff line change
`@@ -19,14 +19,16 @@ public IActionResult ES2015Transpilation()`
`19`	`19`	`return View();`
`20`	`20`	`}`
`21`	`21`
`22`		`- public IActionResult Stream([FromServices] INodeServices nodeServices)`
	`22`	`+ public FileStreamResult Stream([FromServices] INodeServices nodeServices)`
`23`	`23`	`{`
`24`		`- Console.WriteLine("start");`
`25`	`24`	`var d = nodeServices.InvokeAsync<Stream>("./addNumbers");`
	`25`	`+ var a = d.Result;`
`26`	`26`
`27`		`- Console.WriteLine(d);`
`28`		`-`
`29`		`- return View();`
	`27`	`+ // byte[] bytes = new byte[10];`
	`28`	`+`
	`29`	`+ //a.ReadAsync(bytes, 0, 10);`
	`30`	`+`
	`31`	`+ return new FileStreamResult(a, "text/plain");`
`30`	`32`	`}`
`31`	`33`
`32`	`34`	`public async Task<IActionResult> Chart([FromServices] INodeServices nodeServices)`
Original file line number	Diff line number	Diff line change
`@@ -63,9 +63,9 @@ public override async Task<int> ReadAsync(byte[] buffer, int offset, int count,`
`63`	`63`	`{`
`64`	`64`	`Buffer.BlockCopy(_receivedDataNotYetUsed.Array, _receivedDataNotYetUsed.Offset, buffer, bytesRead, bytesToExtract);`
`65`	`65`	`_receivedDataNotYetUsed = new ArraySegment<byte>(_receivedDataNotYetUsed.Array, _receivedDataNotYetUsed.Offset + bytesToExtract, _receivedDataNotYetUsed.Count - bytesToExtract);`
	`66`	`+ Console.WriteLine(_receivedDataNotYetUsed);`
`66`	`67`	`bytesRead += bytesToExtract;`
`67`	`68`	`}`
`68`		`-`
`69`	`69`	`// If we've completely filled the output buffer, we're done`
`70`	`70`	`if (bytesRead == count)`
`71`	`71`	`{`