@nativescript/windows-hermes 1.0.0-beta.14 → 1.0.0-beta.18

package/framework/__PROJECT_NAME__/Package.appxmanifest

@@ -30,6 +30,5 @@
   <Capabilities>
     <rescap:Capability Name="runFullTrust" />
     <Capability Name="internetClient" />
-    <Capability Name="privateNetworkClientServer" />
   </Capabilities>
 </Package>

package/framework/__PROJECT_NAME__/RuntimeHost.cs

@@ -32,11 +32,7 @@ namespace __PROJECT_NAME__
         [DllImport(NativeScriptLibrary, EntryPoint = nameof(runtime_set_local_folder))]
         private static extern void runtime_set_local_folder([MarshalAs(UnmanagedType.LPUTF8Str)] string localFolder);
 
-        // Escape hatch for apps packed with `nsbundle_pack --key-hex <hex>` (custom-key
-        // app.nsbundle containers). Must be called before runtime_init if used at all: apps
-        // packed with the default pepper (no --key-hex) never need to call this. Not wired to a
-        // default call site here; an app author supplies their own key material and calls this
-        // from Initialize() before runtime_init(...).
+        // Must be called before runtime_init, which opens app.nsbundle.
         [DllImport(NativeScriptLibrary, EntryPoint = nameof(runtime_set_bundle_key))]
         private static extern int runtime_set_bundle_key([MarshalAs(UnmanagedType.LPUTF8Str)] string keyHex);
 
@@ -252,6 +248,15 @@ namespace __PROJECT_NAME__
             }
         }
 
+        private static void ApplyBundleKey()
+        {
+            using var stream = typeof(RuntimeHost).Assembly.GetManifestResourceStream("NSBundleKey");
+            if (stream == null) return;
+            using var reader = new StreamReader(stream);
+            try { runtime_set_bundle_key(reader.ReadToEnd().Trim()); }
+            catch (EntryPointNotFoundException) { }
+        }
+
         public void Initialize()
         {
             if (_initialized) return;
@@ -259,6 +264,7 @@ namespace __PROJECT_NAME__
             try { attached = AttachConsole(ATTACH_PARENT_PROCESS); } catch { }
             runtime_install_ctrlc_handler(0);
             runtime_set_local_folder(LocalFolderPath);
+            ApplyBundleKey();
             _runtime = runtime_init(AppContext.BaseDirectory);
 #if DEBUG
             TrySetDebugBuild();

package/framework/__PROJECT_NAME__/__PROJECT_NAME__.csproj

@@ -87,6 +87,9 @@
     <Content Include="app.nsbundle" Condition="Exists('app.nsbundle')">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <!-- app.nsbundle's per-build key; RuntimeHost passes it to the runtime. -->
+    <EmbeddedResource Include="nsbundle.key" LogicalName="NSBundleKey"
+                      Condition="Exists('app.nsbundle') and Exists('nsbundle.key')" />
     <Content Include="app\**\*" Condition="!Exists('app.nsbundle')">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -154,12 +157,31 @@
   <!--
     Publishes DotNetBridge.dll before the app build.
     Inputs/Outputs make this incremental: MSBuild skips the Exec when DotNetBridge.dll
-    is already newer than both source files.
+    is already newer than the project and every bridge source file.
   -->
+  <ItemGroup>
+    <_DotNetBridgeSources Include="$(NSWindowsRoot)\dotnet-bridge\*.cs" />
+  </ItemGroup>
+
+  <!--
+    @nativescript/windows-hermes: Release builds compile the app's JavaScript to Hermes bytecode
+    (tools\hermes-precompile.ps1), so a launch doesn't compile the bundle again. Only that
+    framework ships tools\hermesc.exe.
+  -->
+  <Target Name="PrecompileHermesBytecode"
+          BeforeTargets="AssignTargetPaths"
+          Condition="'$(Configuration)' == 'Release' and Exists('$(NSWindowsRoot)\tools\hermesc.exe') and Exists('app') and !Exists('app.nsbundle')">
+    <Exec Command="powershell.exe -NoProfile -ExecutionPolicy Bypass -File &quot;$(NSWindowsRoot)\tools\hermes-precompile.ps1&quot; -AppDir &quot;$(MSBuildProjectDirectory)\app&quot; -Hermesc &quot;$(NSWindowsRoot)\tools\hermesc.exe&quot; -Optimize" />
+    <ItemGroup>
+      <Content Include="app\**\*.hbc" Exclude="@(Content)">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </Content>
+    </ItemGroup>
+  </Target>
   <Target Name="PublishDotNetBridge"
           BeforeTargets="Build"
           Inputs="$(NSWindowsRoot)\dotnet-bridge\DotNetBridge.csproj;
-                  $(NSWindowsRoot)\dotnet-bridge\Bridge.cs"
+                  @(_DotNetBridgeSources)"
           Outputs="$(NSWindowsRoot)\dotnet-bridge\publish\DotNetBridge.dll"
           Condition="Exists('$(NSWindowsRoot)\dotnet-bridge\DotNetBridge.csproj')">
     <Message Text="[NativeScript] Publishing DotNetBridge..." Importance="low" />

package/framework/tools/hermes-precompile.ps1

@@ -0,0 +1,62 @@
+# Compiles the app's JavaScript to Hermes bytecode beside each file, for Release builds of
+# @nativescript/windows-hermes apps: <file>.hbc for scripts the host runs as is (runtime.js,
+# vendor.js, bundle.js, the package.json "main"), <file>.cjs.hbc for modules, compiled inside the
+# runtime's CommonJS wrapper. Up-to-date files are skipped; the runtime ignores bytecode older
+# than its source. Runs on Windows PowerShell 5.1.
+param(
+    [Parameter(Mandatory = $true)][string]$AppDir,
+    [Parameter(Mandatory = $true)][string]$Hermesc,
+    [switch]$Optimize
+)
+
+$ErrorActionPreference = 'Stop'
+if (-not (Test-Path $AppDir)) { return }
+$AppDir = (Resolve-Path $AppDir).Path
+
+$entries = @('runtime.js', 'vendor.js', 'bundle.js')
+$packageJson = Join-Path $AppDir 'package.json'
+if (Test-Path $packageJson) {
+    try {
+        $package = Get-Content -Raw $packageJson | ConvertFrom-Json
+        if ($package.main) { $entries += [IO.Path]::GetFileName([string]$package.main) }
+    } catch { }
+}
+
+$wrapperHead = '(function (module, exports, require, __filename, __dirname) {'
+$utf8 = New-Object System.Text.UTF8Encoding($false)
+$scratch = Join-Path ([IO.Path]::GetTempPath()) ("ns-hermes-" + [Guid]::NewGuid().ToString('N'))
+$compiled = 0
+
+try {
+    Get-ChildItem -Path $AppDir -Recurse -File -Filter *.js |
+        Where-Object { $_.FullName -notmatch '\\node_modules\\' } |
+        ForEach-Object {
+            $isEntry = ($_.DirectoryName -eq $AppDir) -and ($entries -contains $_.Name)
+            $out = $_.FullName + $(if ($isEntry) { '.hbc' } else { '.cjs.hbc' })
+            if ((Test-Path $out) -and ((Get-Item $out).LastWriteTimeUtc -ge $_.LastWriteTimeUtc)) { return }
+
+            $source = $_.FullName
+            if (-not $isEntry) {
+                # Same file name in a scratch folder, so the bytecode's debug info names the module.
+                $dir = Join-Path $scratch ([Guid]::NewGuid().ToString('N'))
+                $null = New-Item -ItemType Directory -Force -Path $dir
+                $source = Join-Path $dir $_.Name
+                $text = [IO.File]::ReadAllText($_.FullName)
+                [IO.File]::WriteAllText($source, $wrapperHead + $text + "`n})", $utf8)
+            }
+
+            $hermescArgs = @('-emit-binary', '-w', '-out', $out, $source)
+            if ($Optimize) { $hermescArgs = @('-O') + $hermescArgs }
+            & $Hermesc @hermescArgs
+            if ($LASTEXITCODE -ne 0) {
+                Remove-Item -Force -ErrorAction SilentlyContinue $out
+                Write-Warning "hermesc could not compile $($_.FullName); it will be compiled at run time"
+            } else {
+                $compiled++
+            }
+        }
+} finally {
+    if (Test-Path $scratch) { Remove-Item -Recurse -Force $scratch }
+}
+
+Write-Host "[NativeScript] Hermes bytecode: $compiled file(s) compiled"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nativescript/windows-hermes",
-  "version": "1.0.0-beta.14",
+  "version": "1.0.0-beta.18",
   "description": "NativeScript Windows runtime (Hermes engine) with a WinUI 3 app template",
   "keywords": [
     "NativeScript",