Update js65

.gitignore

@@ -17,3 +17,4 @@
 .DS_Store
 *.log
 *.user
+*.mlb

CommandLine/Program.cs

@@ -137,7 +137,7 @@ public async Task Randomize()
         var randomizer = new Hyrule(createAsm,palaceRooms);
         var rom = await randomizer.Randomize(vanillaRomData!, configuration, UpdateProgress, cts.Token);
 
-        if (rom != null)
+        if (rom.romdata != null)
         {
 
             char os_sep = Path.DirectorySeparatorChar;
@@ -151,8 +151,14 @@ public async Task Randomize()
                     : Directory.GetCurrentDirectory();
             }
             string newFileName =  $"{outpath}/Z2_{Seed}_{Flags}.nes";
-            File.WriteAllBytes(newFileName, rom);
+            await File.WriteAllBytesAsync(newFileName, rom.romdata);
             logger.Info($"File {newFileName} has been created!");
+            if (rom.debuginfo != null)
+            {
+                var mlbfile = $"{outpath}/Z2_{Seed}_{Flags}.mlb";
+                await File.WriteAllTextAsync(mlbfile, rom.debuginfo);
+                logger.Info($"File {mlbfile} has been created!");
+            }
         }
         else
         {

CrossPlatformUI.Browser/CrossPlatformUI.Browser.csproj

@@ -64,7 +64,7 @@
 
     <ItemGroup>
         <PackageReference Include="Avalonia.Browser" Version="$(AvaloniaVersion)" />
-        <PackageReference Include="js65.interop" Version="1.0.0-alpha3" />
+        <PackageReference Include="js65.browser" Version="$(Js65Version)" />
     </ItemGroup>
 
     <ItemGroup>

CrossPlatformUI.Browser/Program.cs

@@ -1,5 +1,7 @@
 using System;
 using System.Diagnostics.CodeAnalysis;
+using System.IO;
+using System.Reflection;
 using System.Runtime.InteropServices.JavaScript;
 using System.Runtime.Versioning;
 using System.Threading.Tasks;
@@ -8,6 +10,7 @@
 using Avalonia.Browser;
 using ReactiveUI.Avalonia;
 using CrossPlatformUI.Services;
+using js65;
 using Z2Randomizer.RandomizerCore;
 
 [assembly: SupportedOSPlatform("browser")]
@@ -20,6 +23,17 @@ internal sealed partial class Program
     [JSImport("globalThis.window.SetTitle")]
     internal static partial void SetTitle(string title);
 
+    private static string LoadTextFileCallback(string basePath, string relPath)
+    {
+        return _assembly.ReadResource(relPath);
+    }
+    private static byte[] LoadBinaryFileCallback(string basePath, string relPath)
+    {
+        return _assembly.ReadBinaryResource(relPath);
+    }
+
+    private static readonly Assembly _assembly = typeof(RandomizerConfiguration).Assembly;
+
     private static Task Main(string[] args)
     {
 #if DEBUG
@@ -33,7 +47,7 @@ private static Task Main(string[] args)
         {
             App.ServiceContainer ??= new();
 
-            App.ServiceContainer.AddSingleton<Hyrule.NewAssemblerFn>((opts, debug) => new BrowserJsEngine(opts));
+            App.ServiceContainer.AddSingleton<Hyrule.NewAssemblerFn>(MakeBrowserAssembler);
             App.FileSystemService = new BrowserFileService();
             App.ServiceContainer.AddSingleton<IFileSystemService>(x => App.FileSystemService);
 
@@ -42,6 +56,17 @@ private static Task Main(string[] args)
         .StartBrowserAppAsync("out");
     }
 
+
+    public static Assembler MakeBrowserAssembler(Js65Options? options = null, bool debugJavaScript = false)
+    {
+        var callbacks = new Js65Callbacks
+        {
+            OnFileReadBinary = LoadBinaryFileCallback,
+            OnFileReadText = LoadTextFileCallback
+        };
+        return new BrowserJsEngine(options, callbacks);
+    }
+
     public static AppBuilder BuildAvaloniaApp()
         => AppBuilder.Configure<App>()
 #if DEBUG
@@ -52,3 +77,28 @@ public static AppBuilder BuildAvaloniaApp()
                  MaxGpuResourceSizeBytes = 64 * 1024 * 1024, // Default is 28 MB
              });
 }
+
+internal static class AssemblyExtensions
+{
+    public static string ReadResource(this Assembly assembly, string name)
+    {
+        // Format: "{Namespace}.{Folder}.{filename}.{Extension}"
+        using var stream = assembly.GetManifestResourceStream(name)!;
+        using var reader = new StreamReader(stream);
+        return reader.ReadToEnd();
+    }
+    public static async Task<string> ReadResourceAsync(this Assembly assembly, string name)
+    {
+        // Format: "{Namespace}.{Folder}.{filename}.{Extension}"
+        await using var stream = assembly.GetManifestResourceStream(name)!;
+        using StreamReader reader = new(stream);
+        return await reader.ReadToEndAsync();
+    }
+    public static byte[] ReadBinaryResource(this Assembly assembly, string name)
+    {
+        // Format: "{Namespace}.{Folder}.{filename}.{Extension}"
+        using var stream = assembly.GetManifestResourceStream(name)!;
+        using var reader = new BinaryReader(stream);
+        return reader.ReadBytes((int)stream.Length);
+    }
+}

CrossPlatformUI/ViewModels/GenerateRomViewModel.cs

@@ -93,11 +93,11 @@
                 {
                     var romdata = host.RomFileViewModel.RomData!.ToArray();
                     var output = await Task.Run(async () => await randomizer.Randomize(romdata, config, UpdateProgress, tokenSource.Token));
-                    if(!tokenSource.IsCancellationRequested)
+                    if(!tokenSource.IsCancellationRequested && output.success)
                     {
                         var flags = config.SerializeFlags();
                         var filename = $"Z2_{config.Seed}_{flags}.nes";
                         await files.SaveGeneratedBinaryFile(filename, output!, Main.OutputFilePath);
                         if (config.GenerateSpoiler)
                         {
                             var spoilerFilename = $"Z2_{config.Seed}_{flags}_spoiler.txt";
@@ -107,6 +107,9 @@
                         }
                         ProgressHeading = "Generation Complete";
                         ProgressBody = $"Hash: {randomizer.Hash}\n\nFile: {filename}";
+                    } else if (!output.success)
+                    {
+                        throw new Exception(output.messages);
                     }
                     IsComplete = true;
                 }
@@ -116,16 +119,15 @@
                     lastError = e;
                     HasError = true;
                     string errorHeading, errorBody;
-                    var userError = e as UserFacingException;
-                    if (userError != null)
+                    if (e is UserFacingException userError)
                     {
                         errorHeading = userError.Heading;
                         errorBody = userError.Message;
                     }
                     else
                     {
 #if DEBUG
-                        if (System.Diagnostics.Debugger.IsAttached) { throw; }
+                        // if (System.Diagnostics.Debugger.IsAttached) { throw; }
 #endif
                         errorHeading = "Error Generating Seed";
                         errorBody = "Please report this on the discord";

Desktop.Common/Desktop.Common.csproj

@@ -17,8 +17,10 @@
     <ItemGroup>
         <ProjectReference Include="..\CrossPlatformUI\CrossPlatformUI.csproj" />
         <ProjectReference Include="..\RandomizerCore\RandomizerCore.csproj" />
-        <PackageReference Include="Microsoft.ClearScript.V8.Native.linux-x64" Version="7.4.5" Condition="$([MSBuild]::IsOsPlatform('Linux')) and '$(TargetFramework)' != 'net10.0-browser'" />
-        <PackageReference Include="Microsoft.ClearScript.V8.Native.osx-arm64" Version="7.4.5" Condition="$([MSBuild]::IsOsPlatform('OSX')) and '$(TargetFramework)' != 'net10.0-browser'" />
-        <PackageReference Include="Microsoft.ClearScript.V8.Native.win-x64" Version="7.4.5" Condition="$([MSBuild]::IsOsPlatform('Windows')) and '$(TargetFramework)' != 'net10.0-browser'" />
+        <PackageReference Include="js65.clearscript" Version="$(Js65Version)" />
+
+        <PackageReference Include="Microsoft.ClearScript.V8.Native.linux-x64" Version="7.5.0" Condition="$([MSBuild]::IsOsPlatform('Linux')) and '$(TargetFramework)' != 'net10.0-browser'" />
+        <PackageReference Include="Microsoft.ClearScript.V8.Native.osx-arm64" Version="7.5.0" Condition="$([MSBuild]::IsOsPlatform('OSX')) and '$(TargetFramework)' != 'net10.0-browser'" />
+        <PackageReference Include="Microsoft.ClearScript.V8.Native.win-x64" Version="7.5.0" Condition="$([MSBuild]::IsOsPlatform('Windows')) and '$(TargetFramework)' != 'net10.0-browser'" />
     </ItemGroup>
 </Project>

Directory.Build.props

@@ -2,6 +2,7 @@
   <PropertyGroup>
     <TargetFramework>net10.0</TargetFramework>
     <Nullable>enable</Nullable>
+    <Js65Version>1.0.7</Js65Version>
     <AvaloniaVersion>11.3.11</AvaloniaVersion>
     <DialogHostAvaloniaVersion>0.10.4</DialogHostAvaloniaVersion>
     <MaterialAvaloniaVersion>3.13.4</MaterialAvaloniaVersion>