* implement const cbor encoding + decoding for basic types * implement map encoding and decoding * fix map test * all tests passing * dynamically sized arrays * smaller str encoding * swap array and list and add more documentation * move serialization and deserialization for each struct together * support both legacy and new assets * bump const serialize version * fix asset conversion code * pull out manganis symbol struct from tuble * test reading old asset versions * more list/array cleanup and bump rust version * fix clippy * switch cli opt port * install playwright deps * split cli-optimization package to avoid two dioxus' in the same crate * fix clippy * force the toast.png asset to be included in the linker stage #[used] has platform depedant behavior * bundle both formats in the link section and only use the asset the cli changed * remove sudo which doesn't exist on windows * add binstall to the playwright workflow * separate bin target for the old cli * lockfile * cargo update to get versions shaken out * notes on binstalls, add back `.read()` for compat * use 0.8.0-alpha.0 for const-serialize instead of 0.8 this ensures we can still publish breaking changes on 0.8 without taking over the full version * fix clippy in example * small debug nits * update rust-overlay in nix * fix flake? * migrate to new structure * just comment out binstalls * just remove old test harness --------- Co-authored-by: Jonathan Kelley <jkelleyrtp@gmail.com>
595 lines
23 KiB
Rust
595 lines
23 KiB
Rust
//! The dioxus asset system.
|
|
//!
|
|
//! This module provides functionality for extracting assets from a binary file and then writing back
|
|
//! their asset hashes directly into the binary file. Previously, we performed asset hashing in the
|
|
//! `asset!()` macro. The new system, implemented here, instead performs the hashing at build time,
|
|
//! which provides more flexibility in the asset processing pipeline.
|
|
//!
|
|
//! We chose to implement this approach since assets might reference each other which means we minimally
|
|
//! need to parse the asset to create a unique hash for each asset before they are used in the application.
|
|
//! The hashes are used both for cache busting the asset in the browser and to cache the asset optimization
|
|
//! process in the build system.
|
|
//!
|
|
//! We use the same lessons learned from the hot-patching engine which parses the binary file and its
|
|
//! symbol table to find symbols that match the `__ASSETS__` prefix. These symbols are ideally data
|
|
//! symbols and contain the BundledAsset data type which implements ConstSerialize and ConstDeserialize.
|
|
//!
|
|
//! When the binary is built, the `dioxus asset!()` macro will emit its metadata into the __ASSETS__
|
|
//! symbols, which we process here. After reading the metadata directly from the executable, we then
|
|
//! hash it and write the hash directly into the binary file.
|
|
//!
|
|
//! During development, we can skip this step for most platforms since local paths are sufficient
|
|
//! for asset loading. However, for WASM and for production builds, we need to ensure that assets
|
|
//! can be found relative to the current exe. Unfortunately, on android, the `current_exe` path is wrong,
|
|
//! so the assets are resolved against the "asset root" - which is covered by the asset loader crate.
|
|
//!
|
|
//! Finding the __ASSETS__ symbols is not quite straightforward when hotpatching, especially on WASM
|
|
//! since we build and link the module as relocatable, which is not a stable WASM proposal. In this
|
|
//! implementation, we handle both the non-PIE *and* PIC cases which are rather bespoke to our whole
|
|
//! build system.
|
|
|
|
use std::{
|
|
io::{Cursor, Read, Seek, Write},
|
|
path::{Path, PathBuf},
|
|
};
|
|
|
|
use crate::Result;
|
|
use anyhow::{bail, Context};
|
|
use const_serialize::{serialize_const, ConstVec, SerializeConst};
|
|
use dioxus_cli_opt::AssetManifest;
|
|
use manganis::{AssetOptions, AssetVariant, BundledAsset, ImageFormat, ImageSize};
|
|
use object::{File, Object, ObjectSection, ObjectSymbol, ReadCache, ReadRef, Section, Symbol};
|
|
use pdb::FallibleIterator;
|
|
use rayon::iter::{IntoParallelRefMutIterator, ParallelIterator};
|
|
|
|
/// Extract all manganis symbols and their sections from the given object file.
|
|
fn manganis_symbols<'a, 'b, R: ReadRef<'a>>(
|
|
file: &'b File<'a, R>,
|
|
) -> impl Iterator<Item = (ManganisVersion, Symbol<'a, 'b, R>, Section<'a, 'b, R>)> + 'b {
|
|
file.symbols().filter_map(move |symbol| {
|
|
let name = symbol.name().ok()?;
|
|
let version = looks_like_manganis_symbol(name)?;
|
|
let section_index = symbol.section_index()?;
|
|
let section = file.section_by_index(section_index).ok()?;
|
|
Some((version, symbol, section))
|
|
})
|
|
}
|
|
|
|
#[derive(Copy, Clone)]
|
|
enum ManganisVersion {
|
|
/// The legacy version of the manganis format published with 0.7.0 and 0.7.1
|
|
Legacy,
|
|
/// The new version of the manganis format 0.7.2 onward
|
|
New,
|
|
}
|
|
|
|
impl ManganisVersion {
|
|
fn size(&self) -> usize {
|
|
match self {
|
|
ManganisVersion::Legacy => {
|
|
<manganis_core_07::BundledAsset as const_serialize_07::SerializeConst>::MEMORY_LAYOUT.size()
|
|
}
|
|
ManganisVersion::New => BundledAsset::MEMORY_LAYOUT.size(),
|
|
}
|
|
}
|
|
|
|
fn deserialize(&self, data: &[u8]) -> Option<BundledAsset> {
|
|
match self {
|
|
ManganisVersion::Legacy => {
|
|
let buffer = const_serialize_07::ConstReadBuffer::new(data);
|
|
|
|
let (_, legacy_asset) =
|
|
const_serialize_07::deserialize_const!(manganis_core_07::BundledAsset, buffer)?;
|
|
|
|
Some(legacy_asset_to_modern_asset(&legacy_asset))
|
|
}
|
|
ManganisVersion::New => {
|
|
let (_, asset) =
|
|
const_serialize::deserialize_const!(manganis_core::BundledAsset, data)?;
|
|
|
|
Some(asset)
|
|
}
|
|
}
|
|
}
|
|
|
|
fn serialize(&self, asset: &BundledAsset) -> Vec<u8> {
|
|
match self {
|
|
ManganisVersion::Legacy => {
|
|
let legacy_asset = modern_asset_to_legacy_asset(asset);
|
|
let buffer = const_serialize_07::serialize_const(
|
|
&legacy_asset,
|
|
const_serialize_07::ConstVec::new(),
|
|
);
|
|
buffer.as_ref().to_vec()
|
|
}
|
|
ManganisVersion::New => {
|
|
let buffer = serialize_const(asset, ConstVec::new());
|
|
buffer.as_ref().to_vec()
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
fn legacy_asset_to_modern_asset(
|
|
legacy_asset: &manganis_core_07::BundledAsset,
|
|
) -> manganis_core::BundledAsset {
|
|
let bundled_path = legacy_asset.bundled_path();
|
|
let absolute_path = legacy_asset.absolute_source_path();
|
|
let legacy_options = legacy_asset.options();
|
|
let add_hash = legacy_options.hash_suffix();
|
|
let options = match legacy_options.variant() {
|
|
manganis_core_07::AssetVariant::Image(image) => {
|
|
let format = match image.format() {
|
|
manganis_core_07::ImageFormat::Png => ImageFormat::Png,
|
|
manganis_core_07::ImageFormat::Jpg => ImageFormat::Jpg,
|
|
manganis_core_07::ImageFormat::Webp => ImageFormat::Webp,
|
|
manganis_core_07::ImageFormat::Avif => ImageFormat::Avif,
|
|
manganis_core_07::ImageFormat::Unknown => ImageFormat::Unknown,
|
|
};
|
|
let size = match image.size() {
|
|
manganis_core_07::ImageSize::Automatic => ImageSize::Automatic,
|
|
manganis_core_07::ImageSize::Manual { width, height } => {
|
|
ImageSize::Manual { width, height }
|
|
}
|
|
};
|
|
let preload = image.preloaded();
|
|
|
|
AssetOptions::image()
|
|
.with_format(format)
|
|
.with_size(size)
|
|
.with_preload(preload)
|
|
.with_hash_suffix(add_hash)
|
|
.into_asset_options()
|
|
}
|
|
manganis_core_07::AssetVariant::Folder(_) => AssetOptions::folder()
|
|
.with_hash_suffix(add_hash)
|
|
.into_asset_options(),
|
|
manganis_core_07::AssetVariant::Css(css) => AssetOptions::css()
|
|
.with_hash_suffix(add_hash)
|
|
.with_minify(css.minified())
|
|
.with_preload(css.preloaded())
|
|
.with_static_head(css.static_head())
|
|
.into_asset_options(),
|
|
manganis_core_07::AssetVariant::CssModule(css_module) => AssetOptions::css_module()
|
|
.with_hash_suffix(add_hash)
|
|
.with_minify(css_module.minified())
|
|
.with_preload(css_module.preloaded())
|
|
.into_asset_options(),
|
|
manganis_core_07::AssetVariant::Js(js) => AssetOptions::js()
|
|
.with_hash_suffix(add_hash)
|
|
.with_minify(js.minified())
|
|
.with_preload(js.preloaded())
|
|
.with_static_head(js.static_head())
|
|
.into_asset_options(),
|
|
_ => AssetOptions::builder()
|
|
.with_hash_suffix(add_hash)
|
|
.into_asset_options(),
|
|
};
|
|
|
|
BundledAsset::new(absolute_path, bundled_path, options)
|
|
}
|
|
|
|
fn modern_asset_to_legacy_asset(modern_asset: &BundledAsset) -> manganis_core_07::BundledAsset {
|
|
let bundled_path = modern_asset.bundled_path();
|
|
let absolute_path = modern_asset.absolute_source_path();
|
|
let legacy_options = modern_asset.options();
|
|
let add_hash = legacy_options.hash_suffix();
|
|
let options = match legacy_options.variant() {
|
|
AssetVariant::Image(image) => {
|
|
let format = match image.format() {
|
|
ImageFormat::Png => manganis_core_07::ImageFormat::Png,
|
|
ImageFormat::Jpg => manganis_core_07::ImageFormat::Jpg,
|
|
ImageFormat::Webp => manganis_core_07::ImageFormat::Webp,
|
|
ImageFormat::Avif => manganis_core_07::ImageFormat::Avif,
|
|
ImageFormat::Unknown => manganis_core_07::ImageFormat::Unknown,
|
|
};
|
|
let size = match image.size() {
|
|
ImageSize::Automatic => manganis_core_07::ImageSize::Automatic,
|
|
ImageSize::Manual { width, height } => {
|
|
manganis_core_07::ImageSize::Manual { width, height }
|
|
}
|
|
};
|
|
let preload = image.preloaded();
|
|
|
|
manganis_core_07::AssetOptions::image()
|
|
.with_format(format)
|
|
.with_size(size)
|
|
.with_preload(preload)
|
|
.with_hash_suffix(add_hash)
|
|
.into_asset_options()
|
|
}
|
|
AssetVariant::Folder(_) => manganis_core_07::AssetOptions::folder()
|
|
.with_hash_suffix(add_hash)
|
|
.into_asset_options(),
|
|
AssetVariant::Css(css) => manganis_core_07::AssetOptions::css()
|
|
.with_hash_suffix(add_hash)
|
|
.with_minify(css.minified())
|
|
.with_preload(css.preloaded())
|
|
.with_static_head(css.static_head())
|
|
.into_asset_options(),
|
|
AssetVariant::CssModule(css_module) => manganis_core_07::AssetOptions::css_module()
|
|
.with_hash_suffix(add_hash)
|
|
.with_minify(css_module.minified())
|
|
.with_preload(css_module.preloaded())
|
|
.into_asset_options(),
|
|
AssetVariant::Js(js) => manganis_core_07::AssetOptions::js()
|
|
.with_hash_suffix(add_hash)
|
|
.with_minify(js.minified())
|
|
.with_preload(js.preloaded())
|
|
.with_static_head(js.static_head())
|
|
.into_asset_options(),
|
|
_ => manganis_core_07::AssetOptions::builder()
|
|
.with_hash_suffix(add_hash)
|
|
.into_asset_options(),
|
|
};
|
|
|
|
manganis_core_07::BundledAsset::new(absolute_path, bundled_path, options)
|
|
}
|
|
|
|
fn looks_like_manganis_symbol(name: &str) -> Option<ManganisVersion> {
|
|
if name.contains("__MANGANIS__") {
|
|
Some(ManganisVersion::Legacy)
|
|
} else if name.contains("__ASSETS__") {
|
|
Some(ManganisVersion::New)
|
|
} else {
|
|
None
|
|
}
|
|
}
|
|
|
|
/// An asset offset in the binary
|
|
#[derive(Clone, Copy)]
|
|
struct ManganisSymbolOffset {
|
|
version: ManganisVersion,
|
|
offset: u64,
|
|
}
|
|
|
|
impl ManganisSymbolOffset {
|
|
fn new(version: ManganisVersion, offset: u64) -> Self {
|
|
Self { version, offset }
|
|
}
|
|
}
|
|
|
|
/// Find the offsets of any manganis symbols in the given file.
|
|
fn find_symbol_offsets<'a, R: ReadRef<'a>>(
|
|
path: &Path,
|
|
file_contents: &[u8],
|
|
file: &File<'a, R>,
|
|
) -> Result<Vec<ManganisSymbolOffset>> {
|
|
let pdb_file = find_pdb_file(path);
|
|
|
|
match file.format() {
|
|
// We need to handle dynamic offsets in wasm files differently
|
|
object::BinaryFormat::Wasm => find_wasm_symbol_offsets(file_contents, file),
|
|
// Windows puts the symbol information in a PDB file alongside the executable.
|
|
// If this is a windows PE file and we found a PDB file, we will use that to find the symbol offsets.
|
|
object::BinaryFormat::Pe if pdb_file.is_some() => {
|
|
find_pdb_symbol_offsets(&pdb_file.unwrap())
|
|
}
|
|
// Otherwise, look for manganis symbols in the object file.
|
|
_ => find_native_symbol_offsets(file),
|
|
}
|
|
}
|
|
|
|
/// Find the pdb file matching the executable file.
|
|
fn find_pdb_file(path: &Path) -> Option<PathBuf> {
|
|
let mut pdb_file = path.with_extension("pdb");
|
|
// Also try to find it in the same directory as the executable with _'s instead of -'s
|
|
if let Some(file_name) = pdb_file.file_name() {
|
|
let new_file_name = file_name.to_string_lossy().replace('-', "_");
|
|
let altrnate_pdb_file = pdb_file.with_file_name(new_file_name);
|
|
// Keep the most recent pdb file
|
|
match (pdb_file.metadata(), altrnate_pdb_file.metadata()) {
|
|
(Ok(pdb_metadata), Ok(alternate_metadata)) => {
|
|
if let (Ok(pdb_modified), Ok(alternate_modified)) =
|
|
(pdb_metadata.modified(), alternate_metadata.modified())
|
|
{
|
|
if pdb_modified < alternate_modified {
|
|
pdb_file = altrnate_pdb_file;
|
|
}
|
|
}
|
|
}
|
|
(Err(_), Ok(_)) => {
|
|
pdb_file = altrnate_pdb_file;
|
|
}
|
|
_ => {}
|
|
}
|
|
}
|
|
if pdb_file.exists() {
|
|
Some(pdb_file)
|
|
} else {
|
|
None
|
|
}
|
|
}
|
|
|
|
/// Find the offsets of any manganis symbols in a pdb file.
|
|
fn find_pdb_symbol_offsets(pdb_file: &Path) -> Result<Vec<ManganisSymbolOffset>> {
|
|
let pdb_file_handle = std::fs::File::open(pdb_file)?;
|
|
let mut pdb_file = pdb::PDB::open(pdb_file_handle).context("Failed to open PDB file")?;
|
|
let Ok(Some(sections)) = pdb_file.sections() else {
|
|
tracing::error!("Failed to read sections from PDB file");
|
|
return Ok(Vec::new());
|
|
};
|
|
let global_symbols = pdb_file
|
|
.global_symbols()
|
|
.context("Failed to read global symbols from PDB file")?;
|
|
let address_map = pdb_file
|
|
.address_map()
|
|
.context("Failed to read address map from PDB file")?;
|
|
let mut symbols = global_symbols.iter();
|
|
let mut addresses = Vec::new();
|
|
while let Ok(Some(symbol)) = symbols.next() {
|
|
let Ok(pdb::SymbolData::Public(data)) = symbol.parse() else {
|
|
continue;
|
|
};
|
|
let Some(rva) = data.offset.to_section_offset(&address_map) else {
|
|
continue;
|
|
};
|
|
|
|
let name = data.name.to_string();
|
|
if let Some(version) = looks_like_manganis_symbol(&name) {
|
|
let section = sections
|
|
.get(rva.section as usize - 1)
|
|
.expect("Section index out of bounds");
|
|
|
|
addresses.push(ManganisSymbolOffset::new(
|
|
version,
|
|
(section.pointer_to_raw_data + rva.offset) as u64,
|
|
));
|
|
}
|
|
}
|
|
Ok(addresses)
|
|
}
|
|
|
|
/// Find the offsets of any manganis symbols in a native object file.
|
|
fn find_native_symbol_offsets<'a, R: ReadRef<'a>>(
|
|
file: &File<'a, R>,
|
|
) -> Result<Vec<ManganisSymbolOffset>> {
|
|
let mut offsets = Vec::new();
|
|
for (version, symbol, section) in manganis_symbols(file) {
|
|
let virtual_address = symbol.address();
|
|
|
|
let Some((section_range_start, _)) = section.file_range() else {
|
|
tracing::error!(
|
|
"Found __ASSETS__ symbol {:?} in section {}, but the section has no file range",
|
|
symbol.name(),
|
|
section.index()
|
|
);
|
|
continue;
|
|
};
|
|
// Translate the section_relative_address to the file offset
|
|
let section_relative_address: u64 = (virtual_address as i128 - section.address() as i128)
|
|
.try_into()
|
|
.expect("Virtual address should be greater than or equal to section address");
|
|
let file_offset = section_range_start + section_relative_address;
|
|
offsets.push(ManganisSymbolOffset::new(version, file_offset));
|
|
}
|
|
|
|
Ok(offsets)
|
|
}
|
|
|
|
fn eval_walrus_global_expr(module: &walrus::Module, expr: &walrus::ConstExpr) -> Option<u64> {
|
|
match expr {
|
|
walrus::ConstExpr::Value(walrus::ir::Value::I32(value)) => Some(*value as u64),
|
|
walrus::ConstExpr::Value(walrus::ir::Value::I64(value)) => Some(*value as u64),
|
|
walrus::ConstExpr::Global(id) => {
|
|
let global = module.globals.get(*id);
|
|
if let walrus::GlobalKind::Local(pointer) = &global.kind {
|
|
eval_walrus_global_expr(module, pointer)
|
|
} else {
|
|
None
|
|
}
|
|
}
|
|
_ => None,
|
|
}
|
|
}
|
|
|
|
/// Find the offsets of any manganis symbols in the wasm file.
|
|
fn find_wasm_symbol_offsets<'a, R: ReadRef<'a>>(
|
|
file_contents: &[u8],
|
|
file: &File<'a, R>,
|
|
) -> Result<Vec<ManganisSymbolOffset>> {
|
|
let Some(section) = file
|
|
.sections()
|
|
.find(|section| section.name() == Ok("<data>"))
|
|
else {
|
|
tracing::error!("Failed to find <data> section in WASM file");
|
|
return Ok(Vec::new());
|
|
};
|
|
let Some((_, section_range_end)) = section.file_range() else {
|
|
tracing::error!("Failed to find file range for <data> section in WASM file");
|
|
return Ok(Vec::new());
|
|
};
|
|
let section_size = section.data()?.len() as u64;
|
|
let section_start = section_range_end - section_size;
|
|
|
|
// Translate the section_relative_address to the file offset
|
|
// WASM files have a section address of 0 in object, reparse the data section with wasmparser
|
|
// to get the correct address and section start
|
|
// Note: We need to reparse just the data section with wasmparser to get the file offset because walrus does
|
|
// not expose the file offset information
|
|
let reader = wasmparser::DataSectionReader::new(wasmparser::BinaryReader::new(
|
|
&file_contents[section_start as usize..section_range_end as usize],
|
|
0,
|
|
))
|
|
.context("Failed to create WASM data section reader")?;
|
|
let main_memory = reader
|
|
.into_iter()
|
|
.next()
|
|
.context("Failed find main memory from WASM data section")?
|
|
.context("Failed to read main memory from WASM data section")?;
|
|
// main_memory.data is a slice somewhere in file_contents. Find out the offset in the file
|
|
let data_start_offset = (main_memory.data.as_ptr() as u64)
|
|
.checked_sub(file_contents.as_ptr() as u64)
|
|
.expect("Data section start offset should be within the file contents");
|
|
|
|
// Parse the wasm file to find the globals
|
|
let module = walrus::Module::from_buffer(file_contents).unwrap();
|
|
let mut offsets = Vec::new();
|
|
|
|
// Find the main memory offset
|
|
let main_memory = module
|
|
.data
|
|
.iter()
|
|
.next()
|
|
.context("Failed to find main memory in WASM module")?;
|
|
|
|
let walrus::DataKind::Active {
|
|
offset: main_memory_offset,
|
|
..
|
|
} = main_memory.kind
|
|
else {
|
|
tracing::error!("Failed to find main memory offset in WASM module");
|
|
return Ok(Vec::new());
|
|
};
|
|
|
|
// In the hot patch build, the main memory offset is a global from the main module and each global
|
|
// is it's own global. Use an offset of 0 instead if we can't evaluate the global
|
|
let main_memory_offset =
|
|
eval_walrus_global_expr(&module, &main_memory_offset).unwrap_or_default();
|
|
|
|
for export in module.exports.iter() {
|
|
let Some(version) = looks_like_manganis_symbol(&export.name) else {
|
|
continue;
|
|
};
|
|
|
|
let walrus::ExportItem::Global(global) = export.item else {
|
|
continue;
|
|
};
|
|
|
|
let walrus::GlobalKind::Local(pointer) = module.globals.get(global).kind else {
|
|
continue;
|
|
};
|
|
|
|
let Some(virtual_address) = eval_walrus_global_expr(&module, &pointer) else {
|
|
tracing::error!(
|
|
"Found __ASSETS__ symbol {:?} in WASM file, but the global expression could not be evaluated",
|
|
export.name
|
|
);
|
|
continue;
|
|
};
|
|
|
|
let section_relative_address: u64 = ((virtual_address as i128)
|
|
- main_memory_offset as i128)
|
|
.try_into()
|
|
.expect("Virtual address should be greater than or equal to section address");
|
|
let file_offset = data_start_offset + section_relative_address;
|
|
|
|
offsets.push(ManganisSymbolOffset::new(version, file_offset));
|
|
}
|
|
|
|
Ok(offsets)
|
|
}
|
|
|
|
/// Find all assets in the given file, hash them, and write them back to the file.
|
|
/// Then return an `AssetManifest` containing all the assets found in the file.
|
|
pub(crate) async fn extract_assets_from_file(path: impl AsRef<Path>) -> Result<AssetManifest> {
|
|
let path = path.as_ref();
|
|
let mut file = open_file_for_writing_with_timeout(
|
|
path,
|
|
std::fs::OpenOptions::new().write(true).read(true),
|
|
)
|
|
.await?;
|
|
|
|
let mut file_contents = Vec::new();
|
|
file.read_to_end(&mut file_contents)?;
|
|
let mut reader = Cursor::new(&file_contents);
|
|
let read_cache = ReadCache::new(&mut reader);
|
|
let object_file = object::File::parse(&read_cache)?;
|
|
let offsets = find_symbol_offsets(path, &file_contents, &object_file)?;
|
|
|
|
let mut assets = Vec::new();
|
|
|
|
// Read each asset from the data section using the offsets
|
|
for symbol in offsets.iter().copied() {
|
|
let version = symbol.version;
|
|
let offset = symbol.offset;
|
|
file.seek(std::io::SeekFrom::Start(offset))?;
|
|
let mut data_in_range = vec![0; version.size()];
|
|
file.read_exact(&mut data_in_range)?;
|
|
|
|
if let Some(bundled_asset) = version.deserialize(&data_in_range) {
|
|
tracing::debug!(
|
|
"Found asset at offset {offset}: {:?}",
|
|
bundled_asset.absolute_source_path()
|
|
);
|
|
assets.push(bundled_asset);
|
|
} else {
|
|
tracing::warn!("Found an asset at offset {offset} that could not be deserialized. This may be caused by a mismatch between your dioxus and dioxus-cli versions.");
|
|
}
|
|
}
|
|
|
|
// Add the hash to each asset in parallel
|
|
assets
|
|
.par_iter_mut()
|
|
.for_each(dioxus_cli_opt::add_hash_to_asset);
|
|
|
|
// Write back the assets to the binary file
|
|
for (symbol, asset) in offsets.into_iter().zip(&assets) {
|
|
let version = symbol.version;
|
|
let offset = symbol.offset;
|
|
let new_data = version.serialize(asset);
|
|
|
|
file.seek(std::io::SeekFrom::Start(offset))?;
|
|
// Write the modified binary data back to the file
|
|
file.write_all(new_data.as_ref())?;
|
|
}
|
|
|
|
// Ensure the file is flushed to disk
|
|
file.sync_all()
|
|
.context("Failed to sync file after writing assets")?;
|
|
|
|
// If the file is a macos binary, we need to re-sign the modified binary
|
|
if object_file.format() == object::BinaryFormat::MachO && !assets.is_empty() {
|
|
// Spawn the codesign command to re-sign the binary
|
|
let output = std::process::Command::new("codesign")
|
|
.arg("--force")
|
|
.arg("--sign")
|
|
.arg("-") // Sign with an empty identity
|
|
.arg(path)
|
|
.output()
|
|
.context("Failed to run codesign - is `codesign` in your path?")?;
|
|
|
|
if !output.status.success() {
|
|
bail!(
|
|
"Failed to re-sign the binary with codesign after finalizing the assets: {}",
|
|
String::from_utf8_lossy(&output.stderr)
|
|
);
|
|
}
|
|
}
|
|
|
|
// Finally, create the asset manifest
|
|
let mut manifest = AssetManifest::default();
|
|
for asset in assets {
|
|
manifest.insert_asset(asset);
|
|
}
|
|
|
|
Ok(manifest)
|
|
}
|
|
|
|
/// Try to open a file for writing, retrying if the file is already open by another process.
|
|
///
|
|
/// This is useful on windows where antivirus software might grab the executable before we have a chance to read it.
|
|
async fn open_file_for_writing_with_timeout(
|
|
file: &Path,
|
|
options: &mut std::fs::OpenOptions,
|
|
) -> Result<std::fs::File> {
|
|
let start_time = std::time::Instant::now();
|
|
let timeout = std::time::Duration::from_secs(5);
|
|
loop {
|
|
match options.open(file) {
|
|
Ok(file) => return Ok(file),
|
|
Err(e) => {
|
|
if cfg!(windows) && e.raw_os_error() == Some(32) && start_time.elapsed() < timeout {
|
|
// File is already open, wait and retry
|
|
tracing::trace!(
|
|
"Failed to open file because another process is using it. Retrying..."
|
|
);
|
|
tokio::time::sleep(std::time::Duration::from_millis(50)).await;
|
|
} else {
|
|
return Err(e.into());
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|