admin/raven
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

case 4586

Browse Source
This commit is contained in:
John Cardinal
2024-05-11 01:38:02 +00:00
parent 557241b0e5
commit d0ab3ea096
1 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
server/AyaNova/biz/ReportBiz.cs
View File

@@ -530,15 +530,15 @@ namespace AyaNova.Biz
//initialization //initialization
log.LogDebug("Initializing report rendering system"); log.LogDebug("Initializing report rendering system");
bool AutoDownloadChromium = true; bool AutoDownloadBrowser = true;
if (string.IsNullOrWhiteSpace(ServerBootConfig.AYANOVA_REPORT_RENDER_BROWSER_PATH)) if (string.IsNullOrWhiteSpace(ServerBootConfig.AYANOVA_REPORT_RENDER_BROWSER_PATH))
{ {
log.LogDebug($"Using default Chromium browser (downloaded)"); log.LogDebug($"Using default browser (downloaded)");
} }
else else
{ {
log.LogDebug($"Using user specified Chromium browser at {ServerBootConfig.AYANOVA_REPORT_RENDER_BROWSER_PATH}"); log.LogDebug($"Using user specified browser at {ServerBootConfig.AYANOVA_REPORT_RENDER_BROWSER_PATH}");
AutoDownloadChromium = false; AutoDownloadBrowser = false;
} }
var ReportJSFolderPath = Path.Combine(ServerBootConfig.AYANOVA_CONTENT_ROOT_PATH, "resource", "rpt"); var ReportJSFolderPath = Path.Combine(ServerBootConfig.AYANOVA_CONTENT_ROOT_PATH, "resource", "rpt");
@@ -549,7 +549,7 @@ namespace AyaNova.Biz
var lo = new LaunchOptions { Headless = true }; var lo = new LaunchOptions { Headless = true };
if (!AutoDownloadChromium) if (!AutoDownloadBrowser)
{ {
lo.ExecutablePath = ServerBootConfig.AYANOVA_REPORT_RENDER_BROWSER_PATH; lo.ExecutablePath = ServerBootConfig.AYANOVA_REPORT_RENDER_BROWSER_PATH;
/* /*
@@ -570,9 +570,13 @@ namespace AyaNova.Biz
} }
else else
{ {
log.LogDebug($"Windows: Calling browserFetcher download async now:"); log.LogDebug($"Calling browserFetcher download async now:");
//await new BrowserFetcher().DownloadAsync(BrowserFetcher.DefaultChromiumRevision); //await new BrowserFetcher().DownloadAsync(BrowserFetcher.DefaultChromiumRevision);
await new BrowserFetcher(SupportedBrowser.Chromium).DownloadAsync();
//case 4586
//puppeteer has gone chrome dev by default and so does puppeteersharp which tests ok so I'm going to allow the default
//this means the files go into binary folder under Chrome and ChromeHeadlessShell
await new BrowserFetcher().DownloadAsync();
} }
@@ -622,11 +626,12 @@ namespace AyaNova.Biz
try try
{ {
//case 4586 todo force an error here and see what we can do with it old vs new behaviour test on current release same report with erorr triggered //case 4586 todo force an error here and see what we can do with it old vs new behaviour test on current release same report with erorr triggered
PageLog.AppendLine($"ERROR: {args.Message.Text}"); //ok, I tested it with an exception and it worked just find so shrug emoji
//case 4586 this no longer works due to no executioncontext in arg in teh block below PageLog.AppendLine($"ERROR: {args.Message.Text}");
// var errorArgs = await Task.WhenAll(args.Message.Args.Select(arg => arg.ExecutionContext.EvaluateFunctionAsync("(arg) => arg instanceof Error ? arg.message : arg", arg))); //case 4586 this no longer works due to no executioncontext in arg in teh block below
// PageLog.AppendLine($"ERROR: {args.Message.Text} args: [{string.Join<object>(", ", errorArgs)}]"); // var errorArgs = await Task.WhenAll(args.Message.Args.Select(arg => arg.ExecutionContext.EvaluateFunctionAsync("(arg) => arg instanceof Error ? arg.message : arg", arg)));
// PageLog.AppendLine($"ERROR: {args.Message.Text} args: [{string.Join<object>(", ", errorArgs)}]");
} }
catch { } catch { }
break; break;