diff --git a/scripts/vendor-node.cjs b/scripts/vendor-node.cjs index 47387f09..c3ae3c5c 100644 --- a/scripts/vendor-node.cjs +++ b/scripts/vendor-node.cjs @@ -16,13 +16,6 @@ const URL_MAP = { [WIN_X64]: 'https://nodejs.org/download/release/v22.5.1/node-v22.5.1-win-x64.zip', }; -const DST_BIN_MAP = { - darwin_arm64: 'node-aarch64-apple-darwin', - darwin_x64: 'node-x86_64-apple-darwin', - linux_x64: 'node-x86_64-unknown-linux-gnu', - win32_x64: 'node-x86_64-pc-windows-msvc.exe', -}; - const SRC_BIN_MAP = { [MAC_ARM]: 'node-v22.5.1-darwin-arm64/bin/node', [MAC_X64]: 'node-v22.5.1-darwin-x64/bin/node', @@ -30,6 +23,13 @@ const SRC_BIN_MAP = { [WIN_X64]: 'node-v22.5.1-win-x64/node.exe', }; +const DST_BIN_MAP = { + darwin_arm64: 'yaaknode-aarch64-apple-darwin', + darwin_x64: 'yaaknode-x86_64-apple-darwin', + linux_x64: 'yaaknode-x86_64-unknown-linux-gnu', + win32_x64: 'yaaknode-x86_64-pc-windows-msvc.exe', +}; + const dstDir = path.join(__dirname, `..`, 'src-tauri', 'vendored', 'node'); rmSync(dstDir, {recursive: true, force: true}); mkdirSync(dstDir, {recursive: true}); diff --git a/scripts/vendor-protoc.cjs b/scripts/vendor-protoc.cjs index 204ca1ab..e4015fca 100644 --- a/scripts/vendor-protoc.cjs +++ b/scripts/vendor-protoc.cjs @@ -17,13 +17,6 @@ const URL_MAP = { [WIN_X64]: 'https://github.com/protocolbuffers/protobuf/releases/download/v27.2/protoc-27.2-win64.zip', }; -const DST_BIN_MAP = { - [MAC_ARM]: 'protoc-aarch64-apple-darwin', - [MAC_X64]: 'protoc-x86_64-apple-darwin', - [LNX_X64]: 'protoc-x86_64-unknown-linux-gnu', - [WIN_X64]: 'protoc-x86_64-pc-windows-msvc.exe', -}; - const SRC_BIN_MAP = { [MAC_ARM]: 'bin/protoc', [MAC_X64]: 'bin/protoc', @@ -31,6 +24,13 @@ const SRC_BIN_MAP = { [WIN_X64]: 'bin/protoc.exe', }; +const DST_BIN_MAP = { + [MAC_ARM]: 'yaakprotoc-aarch64-apple-darwin', + [MAC_X64]: 'yaakprotoc-x86_64-apple-darwin', + [LNX_X64]: 'yaakprotoc-x86_64-unknown-linux-gnu', + [WIN_X64]: 'yaakprotoc-x86_64-pc-windows-msvc.exe', +}; + const dstDir = path.join(__dirname, `..`, 'src-tauri', 'vendored', 'protoc'); rmSync(dstDir, {recursive: true, force: true}); mkdirSync(dstDir, {recursive: true}); diff --git a/src-tauri/grpc/src/proto.rs b/src-tauri/grpc/src/proto.rs index 5de2e44e..571c8489 100644 --- a/src-tauri/grpc/src/proto.rs +++ b/src-tauri/grpc/src/proto.rs @@ -67,11 +67,11 @@ pub async fn fill_pool_from_files( let (mut rx, _child) = app_handle .shell() - .sidecar("protoc") - .expect("protoc not found") + .sidecar("yaakprotoc") + .expect("yaakprotoc not found") .args(args) .spawn() - .expect("protoc failed to start"); + .expect("yaakprotoc failed to start"); while let Some(event) = rx.recv().await { match event { diff --git a/src-tauri/tauri-plugin-plugin-runtime/src/nodejs.rs b/src-tauri/tauri-plugin-plugin-runtime/src/nodejs.rs index ae9593ad..5d9c706c 100644 --- a/src-tauri/tauri-plugin-plugin-runtime/src/nodejs.rs +++ b/src-tauri/tauri-plugin-plugin-runtime/src/nodejs.rs @@ -44,13 +44,13 @@ pub async fn node_start(app: &AppHandle, temp_dir: &PathBuf) -> S let (mut rx, _child) = app .shell() - .sidecar("node") - .unwrap() + .sidecar("yaaknode") + .expect("yaaknode not found") .env("YAAK_GRPC_PORT_FILE_PATH", port_file_path.clone()) .env("YAAK_PLUGINS_DIR", plugins_dir) .args(&[plugin_runtime_dir.join("index.cjs")]) .spawn() - .unwrap(); + .expect("yaaknode failed to start"); tauri::async_runtime::spawn(async move { // read events such as stdout