closes:#260

src/BinaryKits.Zpl.Viewer.WebApi/BinaryKits.Zpl.Viewer.WebApi.csproj

@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
+    <UserSecretsId>1e4848b5-b05b-4295-9890-853a993c210c</UserSecretsId>
   </PropertyGroup>
 
   <ItemGroup>

src/BinaryKits.Zpl.Viewer.WebApi/Controllers/ViewerController.cs

@@ -53,6 +53,10 @@ private ActionResult<RenderResponseDto> RenderZpl(RenderRequestDto request)
             var pdfs = new List<RenderLabelDto>();
             foreach (var labelInfo in analyzeInfo.LabelInfos)
             {
+                if (labelInfo.ZplElements?.Length <= 0)
+                {
+                    continue;
+                }
                 if (request.Type == "image")
                 {
                     var imageData = drawer.Draw(labelInfo.ZplElements, request.LabelWidth, request.LabelHeight, request.PrintDensityDpmm);

src/BinaryKits.Zpl.Viewer.WebApi/Properties/launchSettings.json

@@ -3,7 +3,7 @@
     "windowsAuthentication": false,
     "anonymousAuthentication": true,
     "iisExpress": {
-      "applicationUrl": "http://localhost:2019",
+      "applicationUrl": "http://localhost:8019",
       "sslPort": 44301
     }
   },
@@ -21,8 +21,7 @@
       "launchBrowser": true,
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
-      },
-      "applicationUrl": "https://localhost:5001;http://localhost:5000"
+      }
     },
     "WSL": {
       "commandName": "WSL2",

src/BinaryKits.Zpl.Viewer.WebApi/ServiceInstall.bat

@@ -0,0 +1,60 @@
+@ECHO OFF
+setlocal enabledelayedexpansion
+color 00
+title NSSM�����Զ���װ��������(��Ҫϵͳ����ԱȨ�޲�������)
+::��������װ����
+@echo ������������������NSSM.exe�����д�������,�뽫��Ҫ��װ��exe����NSSM.exe�������������������ͬһ���ļ��С�
+
+
+PUSHD %~DP0 & cd /d "%~dp0"
+%1 %2
+mshta vbscript:createobject("shell.application").shellexecute("%~s0","goto :runas","","runas",1)(window.close)&goto :eof
+:runas
+
+
+echo.
+echo.
+echo ######################��ѡ��Ҫִ�еIJ���######################
+echo ----------------------1.��װ������Ŀ���Զ�����----------------------
+echo ----------------------2.ж�ظ÷���----------------------------------
+echo.
+echo.
+echo ��ѡ��Ҫִ�еIJ���
+set /p sel=
+@set clientname=BinaryKitsZPL
+@set clientexe=D:\Program Files (x86)\BinaryKits\BinaryKits.Zpl.Viewer.WebApi.exe
+::@set clientDescript=ZPLԤ������������ͽӿڿ�ͨ��http://localhost:8019��ַ����-- Description=%clientDescript%
+
+@echo on
+if %sel% equ 1 (
+	::for /f "tokens=* delims=" %%a in ('sc query %clientname% | findstr /i "δ��װ"') do set output=%%a
+	::if %output% equ ''(
+	nssm install %clientname% %clientexe% 
+      if %ERRORLEVEL% equ 1 (
+			 ECHO ִ��nssm install�������
+			 pause>nul
+			exit 0
+		)
+
+
+   nssm start %clientname%
+)
+
+ if %sel% equ 2 (
+   nssm stop %clientname%
+   echo %ERRORLEVEL%
+   if %ERRORLEVEL% equ 1 (
+      ECHO ִ��nssm stop�������
+	  pause>nul
+      exit 0
+   )
+   nssm remove %clientname% confirm
+   if %ERRORLEVEL% NEQ 1 (
+      ECHO ִ��nssm remove�������
+	  pause>nul
+      exit 0
+   )
+)
+echo ִ�����,������˳�...
+pause>nul
+exit 0

src/BinaryKits.Zpl.Viewer.WebApi/Startup.cs

@@ -32,6 +32,7 @@ public void ConfigureServices(IServiceCollection services)
                         builder.WithOrigins(allowedOrigins.Split(","))
                                .AllowAnyHeader()
                                .AllowAnyMethod();
+
                     });
                 });
             }
@@ -50,14 +51,12 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
             {
                 app.UseDeveloperExceptionPage();
             }
-
             app.UseCors();
 
             app.UseSwagger();
             app.UseSwaggerUI(c => c.SwaggerEndpoint("/swagger/v1/swagger.json", "BinaryKits.Zpl.Viewer.WebApi v1"));
 
             app.UseRouting();
-
             app.UseDefaultFiles();
             app.UseStaticFiles();
 

src/BinaryKits.Zpl.Viewer.WebApi/appsettings.json

@@ -6,5 +6,6 @@
       "Microsoft.Hosting.Lifetime": "Information"
     }
   },
-  "AllowedHosts": "*"
+  "AllowedHosts": "*",
+  "Urls": "http://localhost:8019"
 }

src/BinaryKits.Zpl.Viewer/CommandAnalyzers/DownloadGraphicsZplCommandAnalyzer.cs

@@ -9,7 +9,7 @@ namespace BinaryKits.Zpl.Viewer.CommandAnalyzers
 {
     public class DownloadGraphicsZplCommandAnalyzer : ZplCommandAnalyzerBase
     {
-        private static readonly Regex commandRegex = new Regex( @"^~DG(\w:)?(.*?\..+?),(\d+),(\d+),(.+)$",RegexOptions.Compiled);
+        private static readonly Regex commandRegex = new Regex( @"^~DG(\w:)?(.*?|\..+?),(\d+),(\d+),(.+)$",RegexOptions.Compiled);
 
         private readonly IPrinterStorage _printerStorage;
 

src/BinaryKits.Zpl.Viewer/CommandAnalyzers/RecallGraphicZplCommandAnalyzer.cs

@@ -5,7 +5,7 @@ namespace BinaryKits.Zpl.Viewer.CommandAnalyzers
 {
     public class RecallGraphicZplCommandAnalyzer : ZplCommandAnalyzerBase
     {
-        private static readonly Regex commandRegex = new Regex(@"^\^XG(\w:)?(.*?\..+?)(?:,(\d*))?(?:,(\d*))?$", RegexOptions.Compiled);
+        private static readonly Regex commandRegex = new Regex(@"^\^XG(\w:)?(.*?|\..+?)(?:,(\d*))?(?:,(\d*))?$", RegexOptions.Compiled);
 
         public RecallGraphicZplCommandAnalyzer(VirtualPrinter virtualPrinter) : base("^XG", virtualPrinter) { }
 

src/BinaryKits.Zpl.Viewer/ZplAnalyzer.cs

@@ -78,7 +78,7 @@ public AnalyzeInfo Analyze(string zplData)
             var elements = new List<ZplElementBase>();
             for (var i = 0; i < zplCommands.Length; i++)
             {
-                var currentCommand = zplCommands[i];
+                var currentCommand = zplCommands[i].Trim();//any command can not end with white-space
 
                 if (this._labelStartCommand.Equals(currentCommand.Trim(), StringComparison.OrdinalIgnoreCase))
                 {
@@ -134,61 +134,71 @@ public AnalyzeInfo Analyze(string zplData)
 
         private string[] SplitZplCommands(string zplData)
         {
-            if (string.IsNullOrWhiteSpace(zplData))
+            try
             {
-                return Array.Empty<string>();
-            }
-
-            var cleanZpl = verticalWhitespaceRegex.Replace(zplData, string.Empty);
-            char caret = '^';
-            char tilde = '~';
-            List<string> results = new(200);
-            StringBuilder buffer = new(2000);
-            HashSet<string> ignoredCommandsHS = new HashSet<string>(ignoredCommands);
-            for (int i = 0; i < cleanZpl.Length; i++)
-            {
-                char c = cleanZpl[i];
-                if (c == caret || c == tilde)
+                if (string.IsNullOrWhiteSpace(zplData))
                 {
-                    string command = buffer.ToString();
-                    buffer.Clear();
-
-                    // all commands have at least 3 chars, even ^A because of required font parameter
-                    if (command.Length > 2)
+                    return Array.Empty<string>();
+                }
+                zplData = zplData.Replace("\u0010CT~", "~CT").Replace("~CD", "^CD").Replace("~CC^", "^CC").Replace("~CT~", "");
+
+                var cleanZpl = verticalWhitespaceRegex.Replace(zplData, string.Empty);
+                char caret = '^';
+                char tilde = '~';
+                List<string> results = new(200);
+                StringBuilder buffer = new(2000);
+                HashSet<string> ignoredCommandsHS = new HashSet<string>(ignoredCommands);
+                for (int i = 0; i < cleanZpl.Length; i++)
+                {
+                    char c = cleanZpl[i];
+                    if (c == caret || c == tilde)
                     {
-                        PatchCommand(ref command, ref caret, ref tilde);
-
-                        var commandLetters = command.Substring(1, 2).ToUpper();
+                        string command = buffer.ToString();
+                        buffer.Clear();
 
-                        if (commandLetters == "CT")
+                        // all commands have at least 3 chars, even ^A because of required font parameter
+                        if (command.Length > 2)
                         {
-                            tilde = command[3];
+                            PatchCommand(ref command, ref caret, ref tilde);
+
+                            var commandLetters = command.Substring(1, 2).ToUpper();
+
+                            if (commandLetters == "CT")
+                            {
+                                tilde = command.Length > 3 ? command[3] : command[0];
+                            }
+                            else if (commandLetters == "CC")
+                            {
+                                caret = command.Length > 3 ? command[3] : command[0];
+                            }
+                            else if (!ignoredCommandsHS.Contains(commandLetters))
+                            {
+                                results.Add(command);
+                            }
                         }
-                        else if (commandLetters == "CC")
+                        // likely invalid command
+                        else if (command.Trim().Length > 0)
                         {
-                            caret = command[3];
+                            results.Add(command.Trim());
                         }
-                        else if (!ignoredCommandsHS.Contains(commandLetters))
-                        {
-                            results.Add(command);
-                        }
-                    }
-                    // likely invalid command
-                    else if (command.Trim().Length > 0)
-                    {
-                        results.Add(command.Trim());
+                        // no else case, multiple ^ or ~ in a row should not be valid commands to be processed
                     }
-                    // no else case, multiple ^ or ~ in a row should not be valid commands to be processed
+                    buffer.Append(c);
                 }
-                buffer.Append(c);
+                string lastCommand = buffer.ToString();
+                if (lastCommand.Length > 0)
+                {
+                    PatchCommand(ref lastCommand, ref caret, ref tilde);
+                    results.Add(lastCommand);
+                }
+                return results.ToArray();
+
             }
-            string lastCommand = buffer.ToString();
-            if (lastCommand.Length > 0)
+            catch (Exception exception)
             {
-                PatchCommand(ref lastCommand, ref caret, ref tilde);
-                results.Add(lastCommand);
+                Console.WriteLine(exception.ToString());
+                return new string[0];
             }
-            return results.ToArray();
         }
 
         private void PatchCommand(ref string command, ref char caret, ref char tilde)