Merge pull request #250869 from vicancy/patch-8

Update socketio-build-realtime-code-streaming-app.md

Author: prmerger-automator[bot]

articles/azure-web-pubsub/socketio-build-realtime-code-streaming-app.md

@@ -398,7 +398,7 @@ You can clone the repo and run `npm install` to install project dependencies.
 ### Start the server
 
 ```bash
-node index.js <web-pubsub-connection-string>
+node server.js <web-pubsub-connection-string>
 ```
 
 This is the connection string that you received in [an earlier step](#get-a-connection-string).

articles/azure-web-pubsub/tutorial-subprotocol.md

@@ -149,68 +149,34 @@ Now let's create a web application using the `json.webpubsub.azure.v1` subprotoc
 
     # [C#](#tab/csharp)
 
-    Update `Startup.cs` with the below code.
-    - Update the `ConfigureServices` method to add the service client, and read the connection string from configuration. 
-    - Update the `Configure` method to add `app.UseStaticFiles();` before `app.UseRouting();` to support static files. 
-    - And update `app.UseEndpoints` to generate the client access token with `/negotiate` requests.
+    Update `Program.cs` with the below code.
+    - Use `AddAzureClients` to add the service client, and read the connection string from configuration. 
+    - Add `app.UseStaticFiles();` before `app.Run();` to support static files. 
+    - And update `app.MapGet` to generate the client access token with `/negotiate` requests.
 
     ```csharp
     using Azure.Messaging.WebPubSub;
-
-    using Microsoft.AspNetCore.Builder;
-    using Microsoft.AspNetCore.Hosting;
-    using Microsoft.AspNetCore.Http;
     using Microsoft.Extensions.Azure;
-    using Microsoft.Extensions.Configuration;
-    using Microsoft.Extensions.DependencyInjection;
-    using Microsoft.Extensions.Hosting;
 
-    namespace logstream
+    var builder = WebApplication.CreateBuilder(args);
+    builder.Services.AddAzureClients(s =>
     {
-        public class Startup
-        {
-            public Startup(IConfiguration configuration)
-            {
-                Configuration = configuration;
-            }
-    
-            public IConfiguration Configuration { get; }
-    
-            public void ConfigureServices(IServiceCollection services)
-            {
-                services.AddAzureClients(builder =>
-                {
-                    builder.AddWebPubSubServiceClient(Configuration["Azure:WebPubSub:ConnectionString"], "stream");
-                });
-            }
-    
-            public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
-            {
-                if (env.IsDevelopment())
-                {
-                    app.UseDeveloperExceptionPage();
-                }
-    
-                app.UseStaticFiles();
-    
-                app.UseRouting();
+        s.AddWebPubSubServiceClient(builder.Configuration["Azure:WebPubSub:ConnectionString"], "stream");
+    });
 
-                app.UseEndpoints(endpoints =>
-                {
-                    endpoints.MapGet("/negotiate", async context =>
-                    {
-                        var service = context.RequestServices.GetRequiredService<WebPubSubServiceClient>();
-                        var response = new
-                        {
-                            url = service.GetClientAccessUri(roles: new string[] { "webpubsub.sendToGroup.stream", "webpubsub.joinLeaveGroup.stream" }).AbsoluteUri
-                        };
-                        await context.Response.WriteAsJsonAsync(response);
-                    });
-                });
-            }
-        }
-    }
+    var app = builder.Build();
+    app.UseStaticFiles();
+    app.MapGet("/negotiate", async context =>
+    {
+        var service = context.RequestServices.GetRequiredService<WebPubSubServiceClient>();
+        var response = new
+        {
+            url = service.GetClientAccessUri(roles: new string[] { "webpubsub.sendToGroup.stream", "webpubsub.joinLeaveGroup.stream" }).AbsoluteUri
+        };
+        await context.Response.WriteAsJsonAsync(response);
+    });
 
+    app.Run();
     ```
     
     # [JavaScript](#tab/javascript)
@@ -366,32 +332,30 @@ Now let's create a web application using the `json.webpubsub.azure.v1` subprotoc
 
     ```html
     <html>
-
-    <body>
-      <div id="output"></div>
-      <script>
-        (async function () {
-          let res = await fetch('/negotiate')
-          let data = await res.json();
-          let ws = new WebSocket(data.url, 'json.webpubsub.azure.v1');
-          ws.onopen = () => {
-            console.log('connected');
-          };
-
-          let output = document.querySelector('#output');
-          ws.onmessage = event => {
-            let d = document.createElement('p');
-            d.innerText = event.data;
-            output.appendChild(d);
-          };
-        })();
-      </script>
-    </body>
-
-    </html>
+      <body>
+        <div id="output"></div>
+        <script>
+          (async function () {
+            let res = await fetch('/negotiate')
+            let data = await res.json();
+            let ws = new WebSocket(data.url, 'json.webpubsub.azure.v1');
+            ws.onopen = () => {
+              console.log('connected');
+            };
+    
+            let output = document.querySelector('#output');
+            ws.onmessage = event => {
+              let d = document.createElement('p');
+              d.innerText = event.data;
+              output.appendChild(d);
+            };
+          })();
+        </script>
+      </body>
+    </html>                                                                
     ```
 
-    It just connects to the service and print any message received to the page. The main change is that we specify the subprotocol when creating the WebSocket connection.
+    The code above connects to the service and print any message received to the page. The main change is that we specify the subprotocol when creating the WebSocket connection.
 
 4. Run the server
     # [C#](#tab/csharp)