Merge pull request #1135 from ionite34/merge-main-to-dev-2345f69

Author: ionite34

StabilityMatrix.Avalonia/Helpers/UnixPrerequisiteHelper.cs

@@ -377,6 +377,21 @@ public Task<ProcessResult> GetGitOutput(ProcessArgs args, string? workingDirecto
         return ProcessRunner.RunBashCommand(args.Prepend("git"), workingDirectory ?? "");
     }
 
+    private async Task<string> RunNode(
+        ProcessArgs args,
+        string? workingDirectory = null,
+        IReadOnlyDictionary<string, string>? envVars = null
+    )
+    {
+        var nodePath = Path.Combine(NodeDir, "bin", "node");
+        var result = await ProcessRunner
+            .GetProcessResultAsync(nodePath, args, workingDirectory, envVars)
+            .ConfigureAwait(false);
+
+        result.EnsureSuccessExitCode();
+        return result.StandardOutput ?? result.StandardError ?? string.Empty;
+    }
+
     [Localizable(false)]
     [SupportedOSPlatform("Linux")]
     [SupportedOSPlatform("macOS")]
@@ -476,17 +491,32 @@ public async Task<Process> RunDotnet(
     [SupportedOSPlatform("macOS")]
     public async Task InstallNodeIfNecessary(IProgress<ProgressReport>? progress = null)
     {
-        if (IsNodeInstalled)
+        // NOTE TO FUTURE DEVS: if this is causing merge conflicts with dev, just nuke it we don't need anymore
+        if (NodeDir.Exists)
         {
-            Logger.Info("node already installed");
-            return;
+            try
+            {
+                var result = await RunNode("-v");
+                if (result.Contains("20.19.3"))
+                {
+                    Logger.Debug("Node.js already installed at {NodeExistsPath}", NodeDir);
+                    return;
+                }
+            }
+            catch (Exception)
+            {
+                // ignored
+            }
+
+            Logger.Warn("Node.js version mismatch, reinstalling...");
+            await NodeDir.DeleteAsync(true);
         }
 
         Logger.Info("Downloading node");
 
         var downloadUrl = Compat.IsMacOS
-            ? "https://nodejs.org/dist/v20.11.0/node-v20.11.0-darwin-arm64.tar.gz"
-            : "https://nodejs.org/dist/v20.11.0/node-v20.11.0-linux-x64.tar.gz";
+            ? "https://nodejs.org/dist/v20.19.3/node-v20.19.3-darwin-arm64.tar.gz"
+            : "https://nodejs.org/dist/v20.19.3/node-v20.19.3-linux-x64.tar.gz";
 
         var nodeDownloadPath = AssetsDir.JoinFile(Path.GetFileName(downloadUrl));
 
@@ -506,8 +536,8 @@ public async Task InstallNodeIfNecessary(IProgress<ProgressReport>? progress = n
         await ArchiveHelper.Extract7ZAuto(nodeDownloadPath, AssetsDir);
 
         var nodeDir = Compat.IsMacOS
-            ? AssetsDir.JoinDir("node-v20.11.0-darwin-arm64")
-            : AssetsDir.JoinDir("node-v20.11.0-linux-x64");
+            ? AssetsDir.JoinDir("node-v20.19.3-darwin-arm64")
+            : AssetsDir.JoinDir("node-v20.19.3-linux-x64");
         Directory.Move(nodeDir, NodeDir);
 
         progress?.Report(

StabilityMatrix.Avalonia/Helpers/WindowsPrerequisiteHelper.cs

@@ -34,7 +34,7 @@ IPyInstallationManager pyInstallationManager
     private const string TkinterDownloadUrl =
         "https://cdn.lykos.ai/tkinter-cpython-embedded-3.10.11-win-x64.zip";
 
-    private const string NodeDownloadUrl = "https://nodejs.org/dist/v20.11.0/node-v20.11.0-win-x64.zip";
+    private const string NodeDownloadUrl = "https://nodejs.org/dist/v20.19.3/node-v20.19.3-win-x64.zip";
 
     private const string Dotnet7DownloadUrl =
         "https://download.visualstudio.microsoft.com/download/pr/2133b143-9c4f-4daa-99b0-34fa6035d67b/193ede446d922eb833f1bfe0239be3fc/dotnet-sdk-7.0.405-win-x64.zip";
@@ -89,6 +89,7 @@ private string GetPythonLibraryZipPath(PyVersion version) =>
     private string TkinterExtractPath => Path.Combine(AssetsDir, "Python310");
     private string TkinterExistsPath => Path.Combine(TkinterExtractPath, "tkinter");
     private string NodeExistsPath => Path.Combine(AssetsDir, "nodejs", "npm.cmd");
+    private string NodeExePath => Path.Combine(AssetsDir, "nodejs", "node.exe");
     private string NodeDownloadPath => Path.Combine(AssetsDir, "nodejs.zip");
     private string Dotnet7DownloadPath => Path.Combine(AssetsDir, "dotnet-sdk-7.0.405-win-x64.zip");
     private string Dotnet8DownloadPath => Path.Combine(AssetsDir, "dotnet-sdk-8.0.101-win-x64.zip");
@@ -176,6 +177,20 @@ public Task<ProcessResult> GetGitOutput(ProcessArgs args, string? workingDirecto
         );
     }
 
+    private async Task<string> RunNode(
+        ProcessArgs args,
+        string? workingDirectory = null,
+        IReadOnlyDictionary<string, string>? envVars = null
+    )
+    {
+        var result = await ProcessRunner
+            .GetProcessResultAsync(NodeExePath, args, workingDirectory, envVars)
+            .ConfigureAwait(false);
+
+        result.EnsureSuccessExitCode();
+        return result.StandardOutput ?? result.StandardError ?? string.Empty;
+    }    
+
     public async Task RunNpm(
         ProcessArgs args,
         string? workingDirectory = null,
@@ -685,12 +700,31 @@ await downloadService.DownloadToFileAsync(
     [SupportedOSPlatform("windows")]
     public async Task InstallNodeIfNecessary(IProgress<ProgressReport>? progress = null)
     {
-        if (File.Exists(NodeExistsPath))
-            return;
+        // NOTE TO FUTURE DEVS: if this is causing merge conflicts with dev, just nuke it we don't need anymore
+        var nodeFolder = new DirectoryPath(AssetsDir, "nodejs");
+        if (nodeFolder.Exists)
+        {
+            try
+            {
+                var result = await RunNode("-v");
+                if (result.Contains("20.19.3"))
+                {
+                    Logger.Debug("Node.js already installed at {NodeExistsPath}", NodeExistsPath);
+                    return;
+                }
+            }
+            catch (Exception)
+            {
+                // ignored
+            }
+
+            Logger.Warn("Node.js version mismatch, reinstalling...");
+            await nodeFolder.DeleteAsync(true);
+        }
 
         await DownloadAndExtractPrerequisite(progress, NodeDownloadUrl, NodeDownloadPath, AssetsDir);
 
-        var extractedNodeDir = Path.Combine(AssetsDir, "node-v20.11.0-win-x64");
+        var extractedNodeDir = Path.Combine(AssetsDir, "node-v20.19.3-win-x64");
         if (Directory.Exists(extractedNodeDir))
         {
             Directory.Move(extractedNodeDir, Path.Combine(AssetsDir, "nodejs"));

StabilityMatrix.Core/Helper/ImageMetadata.cs

@@ -2,6 +2,7 @@
 using System.Text;
 using System.Text.Json;
 using ExifLibrary;
+using KGySoft.CoreLibraries;
 using MetadataExtractor;
 using MetadataExtractor.Formats.Exif;
 using MetadataExtractor.Formats.Png;