Merge pull request #189228 from zackliu/fixquickstart

[AzureSignalR] Fix Quickstart

Author: PRMerger18

articles/azure-signalr/signalr-quickstart-azure-functions-csharp.md

@@ -54,6 +54,7 @@ Having issues? Try the [troubleshooting guide](signalr-howto-troubleshoot-guide.
     ```csharp
     using System;
     using System.IO;
+    using System.Linq;
     using System.Net.Http;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Http;
@@ -62,15 +63,17 @@ Having issues? Try the [troubleshooting guide](signalr-howto-troubleshoot-guide.
     using Microsoft.Azure.WebJobs.Extensions.Http;
     using Microsoft.Azure.WebJobs.Extensions.SignalRService;
     using Newtonsoft.Json;
-
+    
     namespace CSharp
     {
         public static class Function
         {
             private static HttpClient httpClient = new HttpClient();
-
+            private static string Etag = string.Empty;
+            private static string StarCount = "0";
+    
             [FunctionName("index")]
-            public static IActionResult Index([HttpTrigger(AuthorizationLevel.Anonymous)]HttpRequest req, ExecutionContext context)
+            public static IActionResult GetHomePage([HttpTrigger(AuthorizationLevel.Anonymous)]HttpRequest req, ExecutionContext context)
             {
                 var path = Path.Combine(context.FunctionAppDirectory, "content", "index.html");
                 return new ContentResult
@@ -79,31 +82,41 @@ Having issues? Try the [troubleshooting guide](signalr-howto-troubleshoot-guide.
                     ContentType = "text/html",
                 };
             }
-
+    
             [FunctionName("negotiate")]
-            public static SignalRConnectionInfo Negotiate(
+            public static SignalRConnectionInfo Negotiate( 
                 [HttpTrigger(AuthorizationLevel.Anonymous)] HttpRequest req,
-                [SignalRConnectionInfo(HubName = "serverlessSample")] SignalRConnectionInfo connectionInfo)
+                [SignalRConnectionInfo(HubName = "serverless")] SignalRConnectionInfo connectionInfo)
             {
                 return connectionInfo;
             }
-
+    
             [FunctionName("broadcast")]
             public static async Task Broadcast([TimerTrigger("*/5 * * * * *")] TimerInfo myTimer,
-            [SignalR(HubName = "serverlessSample")] IAsyncCollector<SignalRMessage> signalRMessages)
+            [SignalR(HubName = "serverless")] IAsyncCollector<SignalRMessage> signalRMessages)
             {
                 var request = new HttpRequestMessage(HttpMethod.Get, "https://api.github.com/repos/azure/azure-signalr");
                 request.Headers.UserAgent.ParseAdd("Serverless");
+                request.Headers.Add("If-None-Match", Etag);
                 var response = await httpClient.SendAsync(request);
-                var result = JsonConvert.DeserializeObject<GitResult>(await response.Content.ReadAsStringAsync());
+                if (response.Headers.Contains("Etag"))
+                {
+                    Etag = response.Headers.GetValues("Etag").First();
+                }
+                if (response.StatusCode == System.Net.HttpStatusCode.OK)
+                {
+                    var result = JsonConvert.DeserializeObject<GitResult>(await response.Content.ReadAsStringAsync());
+                    StarCount = result.StarCount;
+                }
+                
                 await signalRMessages.AddAsync(
                     new SignalRMessage
                     {
                         Target = "newMessage",
-                        Arguments = new[] { $"Current star count of https://github.com/Azure/azure-signalr is: {result.StarCount}" }
+                        Arguments = new[] { $"Current star count of https://github.com/Azure/azure-signalr is: {StarCount}" }
                     });
             }
-
+    
             private class GitResult
             {
                 [JsonRequired]

articles/azure-signalr/signalr-quickstart-azure-functions-java.md

@@ -69,7 +69,7 @@ Having issues? Try the [troubleshooting guide](signalr-howto-troubleshoot-guide.
 
     ```java
     package com.signalr;
-  
+    
     import com.google.gson.Gson;
     import com.microsoft.azure.functions.ExecutionContext;
     import com.microsoft.azure.functions.HttpMethod;
@@ -97,6 +97,9 @@ Having issues? Try the [troubleshooting guide](signalr-howto-troubleshoot-guide.
     import java.util.Optional;
     
     public class Function {
+        private static String Etag = "";
+        private static String StarCount;
+    
         @FunctionName("index")
         public HttpResponseMessage run(
                 @HttpTrigger(
@@ -109,7 +112,7 @@ Having issues? Try the [troubleshooting guide](signalr-howto-troubleshoot-guide.
             String text = IOUtils.toString(inputStream, StandardCharsets.UTF_8.name());
             return request.createResponseBuilder(HttpStatus.OK).header("Content-Type", "text/html").body(text).build();
         }
-  
+    
         @FunctionName("negotiate")
         public SignalRConnectionInfo negotiate(
                 @HttpTrigger(
@@ -127,13 +130,21 @@ Having issues? Try the [troubleshooting guide](signalr-howto-troubleshoot-guide.
         @SignalROutput(name = "$return", hubName = "serverless")
         public SignalRMessage broadcast(
             @TimerTrigger(name = "timeTrigger", schedule = "*/5 * * * * *") String timerInfo) throws IOException, InterruptedException {
-            
             HttpClient client = HttpClient.newHttpClient();
-            HttpRequest req = HttpRequest.newBuilder().uri(URI.create("https://api.github.com/repos/azure/azure-signalr")).header("User-Agent", "serverless").build();
+            HttpRequest req = HttpRequest.newBuilder().uri(URI.create("https://api.github.com/repos/azure/azure-signalr")).header("User-Agent", "serverless").header("If-None-Match", Etag).build();
             HttpResponse<String> res = client.send(req, BodyHandlers.ofString());
-            Gson gson = new Gson();
-            GitResult result = gson.fromJson(res.body(), GitResult.class);
-            return new SignalRMessage("newMessage", "Current star count of https://github.com/Azure/azure-signalr is:".concat(result.stargazers_count));
+            if (res.headers().firstValue("Etag").isPresent())
+            {
+                Etag = res.headers().firstValue("Etag").get();
+            }
+            if (res.statusCode() == 200)
+            {
+                Gson gson = new Gson();
+                GitResult result = gson.fromJson(res.body(), GitResult.class);
+                StarCount = result.stargazers_count;
+            }
+            
+            return new SignalRMessage("newMessage", "Current start count of https://github.com/Azure/azure-signalr is:".concat(StarCount));
         }
     
         class GitResult {

articles/azure-signalr/signalr-quickstart-azure-functions-javascript.md

@@ -176,21 +176,32 @@ Having issues? Try the [troubleshooting guide](signalr-howto-troubleshoot-guide.
         ```javascript
         var https = require('https');
         
+        var etag = '';
+        var star = 0;
+        
         module.exports = function (context) {
             var req = https.request("https://api.github.com/repos/azure/azure-signalr", {
                 method: 'GET',
-                headers: {'User-Agent': 'serverless'}
+                headers: {'User-Agent': 'serverless', 'If-None-Match': etag}
             }, res => {
+                if (res.headers['etag']) {
+                    etag = res.headers['etag']
+                }
+        
                 var body = "";
         
                 res.on('data', data => {
                     body += data;
                 });
                 res.on("end", () => {
-                    var jbody = JSON.parse(body);
+                    if (res.statusCode === 200) {
+                        var jbody = JSON.parse(body);
+                        star = jbody['stargazers_count'];
+                    }
+                    
                     context.bindings.signalRMessages = [{
                         "target": "newMessage",
-                        "arguments": [ `Current star count of https://github.com/Azure/azure-signalr is: ${jbody['stargazers_count']}` ]
+                        "arguments": [ `Current star count of https://github.com/Azure/azure-signalr is: ${star}` ]
                     }]
                     context.done();
                 });
@@ -203,7 +214,7 @@ Having issues? Try the [troubleshooting guide](signalr-howto-troubleshoot-guide.
                 context.done();
             });
             req.end();
-        }    
+        }
         ```
 
 3. The client interface of this sample is a web page. Considered we read HTML content from `content/index.html` in `index` function, create a new file `index.html` in `content` directory under your project root folder. And copy the following content.

articles/azure-signalr/signalr-quickstart-azure-functions-python.md

@@ -180,15 +180,24 @@ Having issues? Try the [troubleshooting guide](signalr-howto-troubleshoot-guide.
         
         import azure.functions as func
         
+        etag = ''
+        start_count = 0
         
         def main(myTimer: func.TimerRequest, signalRMessages: func.Out[str]) -> None:
-            headers = {'User-Agent': 'serverless'}
+            global etag
+            global start_count
+            headers = {'User-Agent': 'serverless', 'If-None-Match': etag}
             res = requests.get('https://api.github.com/repos/azure/azure-signalr', headers=headers)
-            jres = res.json()
+            if res.headers.get('ETag'):
+                etag = res.headers.get('ETag')
         
+            if res.status_code == 200:
+                jres = res.json()
+                start_count = jres['stargazers_count']
+            
             signalRMessages.set(json.dumps({
                 'target': 'newMessage',
-                'arguments': [ 'Current star count of https://github.com/Azure/azure-signalr is: ' + str(jres['stargazers_count']) ]
+                'arguments': [ 'Current star count of https://github.com/Azure/azure-signalr is: ' + str(start_count) ]
             }))
         ```