Merge pull request abpframework#3338 from liangshiw/liangshiwei/cli-ignore-remoteserver

Make CLI available when abp.io is offline

Author: maliming

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/AbpIoSourceCodeStore.cs

@@ -2,11 +2,16 @@
 using Microsoft.Extensions.Logging.Abstractions;
 using Microsoft.Extensions.Options;
 using System;
+using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using System.Net.Http;
 using System.Text;
+using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using Volo.Abp.Cli.Http;
+using Volo.Abp.Cli.ProjectBuilding.Templates.App;
+using Volo.Abp.Cli.ProjectBuilding.Templates.MvcModule;
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.Http;
 using Volo.Abp.IO;
@@ -48,16 +53,33 @@ public async Task<TemplateFile> GetAsync(
             string templateSource = null)
         {
 
+            DirectoryHelper.CreateIfNotExists(CliPaths.TemplateCache);
+            
             var latestVersion = await GetLatestSourceCodeVersionAsync(name, type);
             if (version == null)
             {
+                if (latestVersion == null)
+                {
+                    Logger.LogWarning("The remote service is currently unavailable, please specify the version.");
+                    Logger.LogWarning(string.Empty);
+                    Logger.LogWarning("Find the following template in your cache directory: ");
+                    Logger.LogWarning("\t Template Name\tVersion");
+                    
+                    var templateList = GetLocalTemplates();
+                    foreach (var cacheFile in templateList)
+                    {
+                        Logger.LogWarning($"\t {cacheFile.TemplateName}\t\t{cacheFile.Version}");
+                    }
+
+                    Logger.LogWarning(string.Empty);
+                    throw new CliUsageException("Use command: abp new Acme.BookStore -v version");
+                }
+                
                 version = latestVersion;
             }
 
             var nugetVersion = (await GetTemplateNugetVersionAsync(name, type, version)) ?? version;
-
-            DirectoryHelper.CreateIfNotExists(CliPaths.TemplateCache);
-
+            
             if (!string.IsNullOrWhiteSpace(templateSource) && !IsNetworkSource(templateSource))
             {
                 Logger.LogInformation("Using local " + type + ": " + name + ", version: " + version);
@@ -122,7 +144,7 @@ private async Task<string> GetLatestSourceCodeVersionAsync(string name, string t
             catch (Exception ex)
             {
                 Console.WriteLine("Error occured while getting the latest version from {0} : {1}", url, ex.Message);
-                throw;
+                return null;
             }
         }
 
@@ -195,11 +217,30 @@ private async Task<byte[]> DownloadSourceCodeContentAsync(SourceCodeDownloadInpu
             }
         }
 
-        private static bool IsNetworkSource(string source)
+        private bool IsNetworkSource(string source)
         {
             return source.ToLower().StartsWith("http");
         }
 
+        private List<(string TemplateName, string Version)> GetLocalTemplates()
+        {
+            var templateList = new List<(string TemplateName, string Version)>(); 
+            
+            var stringBuilder = new StringBuilder();
+            foreach (var cacheFile in Directory.GetFiles(CliPaths.TemplateCache))
+            {
+                stringBuilder.AppendLine(cacheFile);
+            }
+
+            var matches = Regex.Matches(stringBuilder.ToString(),$"({AppTemplate.TemplateName}|{AppProTemplate.TemplateName}|{ModuleTemplate.TemplateName}|{ModuleProTemplate.TemplateName})-(.+).zip");
+            foreach (Match match in matches)
+            {
+                templateList.Add((match.Groups[1].Value, match.Groups[2].Value));
+            }
+
+            return templateList;
+        }
+
         public class SourceCodeDownloadInputDto
         {
             public string Name { get; set; }

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Analyticses/CliAnalyticsCollect.cs

@@ -1,4 +1,5 @@
-using System.Net.Http;
+using System;
+using System.Net.Http;
 using System.Text;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
@@ -32,27 +33,36 @@ public CliAnalyticsCollect(
         public async Task CollectAsync(CliAnalyticsCollectInputDto input)
         {
             var postData = _jsonSerializer.Serialize(input);
-            using (var client = new CliHttpClient())
+            var url = $"{CliUrls.WwwAbpIo}api/clianalytics/collect";
+            
+            try
             {
-                var responseMessage = await client.PostAsync(
-                    $"{CliUrls.WwwAbpIo}api/clianalytics/collect",
-                    new StringContent(postData, Encoding.UTF8, MimeTypes.Application.Json),
-                    _cancellationTokenProvider.Token
-                );
-
-                if (!responseMessage.IsSuccessStatusCode)
+                using (var client = new CliHttpClient())
                 {
-                    var exceptionMessage = "Remote server returns '" + (int)responseMessage.StatusCode + "-" + responseMessage.ReasonPhrase + "'. ";
-                    var remoteServiceErrorMessage = await _remoteServiceExceptionHandler.GetAbpRemoteServiceErrorAsync(responseMessage);
+                    var responseMessage = await client.PostAsync(
+                        url,
+                        new StringContent(postData, Encoding.UTF8, MimeTypes.Application.Json),
+                        _cancellationTokenProvider.Token
+                    );
 
-                    if (remoteServiceErrorMessage != null)
+                    if (!responseMessage.IsSuccessStatusCode)
                     {
-                        exceptionMessage += remoteServiceErrorMessage;
-                    }
+                        var exceptionMessage = "Remote server returns '" + (int)responseMessage.StatusCode + "-" + responseMessage.ReasonPhrase + "'. ";
+                        var remoteServiceErrorMessage = await _remoteServiceExceptionHandler.GetAbpRemoteServiceErrorAsync(responseMessage);
+
+                        if (remoteServiceErrorMessage != null)
+                        {
+                            exceptionMessage += remoteServiceErrorMessage;
+                        }
 
-                    _logger.LogInformation(exceptionMessage);
+                        _logger.LogInformation(exceptionMessage);
+                    }
                 }
             }
+            catch (Exception ex)
+            {
+                // ignored
+            }
         }
     }
 }