Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions .github/workflows/release-typescript-sdk.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -103,6 +103,7 @@ jobs:
needs: verify
runs-on: ${{ matrix.runner }}
timeout-minutes: 60
continue-on-error: true
strategy:
fail-fast: false
matrix:
Expand DownExpand Up@@ -131,6 +132,8 @@ jobs:

- name: Setup Rust CI toolchain and tools
uses: ./.github/actions/rust-ci-setup
with:
cargo-tools: cargo-make,cargo-nextest

- name: Setup pnpm
uses: pnpm/action-setup@v4
Expand All@@ -154,7 +157,7 @@ jobs:
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
shell: bash
run: pnpm publish --access public --no-git-checks
run: node ../../scripts/publish-package.mjs

- name: Pack native runtime package
if: needs.verify.outputs.publish_release != 'true'
Expand DownExpand Up@@ -239,7 +242,7 @@ jobs:
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
shell: bash
run: pnpm publish --access public --no-git-checks
run: node scripts/publish-package.mjs

- name: Pack TypeScript SDK
if: needs.verify.outputs.publish_release != 'true'
Expand Down
24 changes: 1 addition & 23 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions Cargo.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,8 @@ exclude = ["crates/sof-solana-gossip"]
[patch.crates-io]
sof-solana-gossip = { path = "crates/sof-solana-gossip" }
helius-laserstream = { path = "vendor/helius-laserstream" }
laserstream-core-proto = { path = "vendor/laserstream-core-proto" }
yellowstone-grpc-client = { path = "vendor/yellowstone-grpc-client" }

[workspace.package]
edition = "2024"
Expand Down
4 changes: 4 additions & 0 deletions crates/sof-observer/src/ingest/config.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -70,18 +70,21 @@ pub(super) fn read_udp_idle_wait_ms() -> u64 {
.unwrap_or(100)
}

#[cfg(target_os = "linux")]
pub(super) fn read_udp_busy_poll_us() -> Option<u32> {
read_env_var("SOF_UDP_BUSY_POLL_US")
.and_then(|value| value.parse::<u32>().ok())
.filter(|value| *value > 0)
}

#[cfg(target_os = "linux")]
pub(super) fn read_udp_busy_poll_budget() -> Option<u32> {
read_env_var("SOF_UDP_BUSY_POLL_BUDGET")
.and_then(|value| value.parse::<u32>().ok())
.filter(|value| *value > 0)
}

#[cfg(target_os = "linux")]
pub(super) fn read_udp_prefer_busy_poll() -> bool {
read_bool_env("SOF_UDP_PREFER_BUSY_POLL", false)
}
Expand All@@ -90,6 +93,7 @@ pub(super) fn read_udp_drop_on_channel_full() -> bool {
read_bool_env("SOF_UDP_DROP_ON_CHANNEL_FULL", true)
}

#[cfg(target_os = "linux")]
fn read_udp_track_rxq_ovfl() -> bool {
read_bool_env("SOF_UDP_TRACK_RXQ_OVFL", false)
}
Expand Down
4 changes: 4 additions & 0 deletions crates/sof-observer/src/ingest/receiver/core.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -142,6 +142,7 @@ impl RawPacketBatch {
storage.packets.reserve(additional);
}

#[cfg(target_os = "linux")]
pub(super) fn ensure_receive_slots(&mut self, additional: usize) -> usize {
let Some(storage) = self.storage.as_mut() else {
return 0;
Expand All@@ -156,13 +157,15 @@ impl RawPacketBatch {
start_index
}

#[cfg(target_os = "linux")]
pub(super) fn receive_buffer_mut(
&mut self,
buffer_index: usize,
) -> Option<&mut [u8; UDP_PACKET_BUFFER_BYTES]> {
self.storage.as_mut()?.buffers.get_mut(buffer_index)
}

#[cfg(target_os = "linux")]
pub(super) fn push_received_metadata(
&mut self,
source: SocketAddr,
Expand DownExpand Up@@ -366,6 +369,7 @@ impl ReceiverTelemetry {
.store(current_unix_ms(), Ordering::Relaxed);
}

#[cfg(target_os = "linux")]
fn record_packets(&self, packet_count: usize) {
self.packets.fetch_add(
u64::try_from(packet_count).unwrap_or(u64::MAX),
Expand Down
7 changes: 3 additions & 4 deletions crates/sof-observer/src/runtime.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ use std::{
path::PathBuf,
pin::Pin,
sync::Arc,
thread::{self, available_parallelism},
thread::available_parallelism,
time::{Duration, Instant},
};

Expand DownExpand Up@@ -3449,7 +3449,7 @@ async fn wait_for_termination_signal() {
#[cfg(unix)]
{
let (shutdown_tx, shutdown_rx) = tokio::sync::oneshot::channel();
thread::spawn(move || {
std::thread::spawn(move || {
let mut signals = match signal_hook::iterator::Signals::new([
signal_hook::consts::signal::SIGTERM,
signal_hook::consts::signal::SIGINT,
Expand DownExpand Up@@ -3822,7 +3822,6 @@ mod tests {
Arc, Mutex,
atomic::{AtomicUsize, Ordering},
},
thread,
time::Instant,
};

Expand DownExpand Up@@ -5326,7 +5325,7 @@ mod tests {
if counter.load(Ordering::Relaxed) >= expected {
return true;
}
thread::sleep(Duration::from_millis(10));
std::thread::sleep(Duration::from_millis(10));
}
counter.load(Ordering::Relaxed) >= expected
}
Expand Down
3 changes: 3 additions & 0 deletions pnpm-workspace.yaml
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
packages:
- sdks/typescript
- sdks/typescript/native/*

onlyBuiltDependencies:
- "@biomejs/biome"
133 changes: 107 additions & 26 deletions sdks/typescript/scripts/build-native-host.mjs
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,72 @@
import { spawnSync } from "node:child_process";
import { chmodSync, copyFileSync, existsSync, mkdirSync, readFileSync } from "node:fs";
import { basename, join } from "node:path";
import { basename, delimiter, join } from "node:path";

const scriptDirectory = import.meta.dirname;
const sdkPackageDirectory = join(scriptDirectory, "..");
const workspaceDirectory = join(sdkPackageDirectory, "..", "..");
const cargoTargetRoot = process.env.CARGO_TARGET_DIR ?? join(workspaceDirectory, "target");
const overriddenPlatform = process.env.SOF_TS_NATIVE_PLATFORM;
const overriddenArch = process.env.SOF_TS_NATIVE_ARCH;
const overriddenTarget = process.env.SOF_TS_NATIVE_TARGET;
const cargoSubcommand = process.env.SOF_TS_NATIVE_CARGO_SUBCOMMAND;
const crossBuildCargoSubcommand = "zigbuild";

function runtimeHostBinaryName() {
return process.platform === "win32" ? "sof_ts_runtime_host.exe" : "sof_ts_runtime_host";
function packagePlatformFromDirectory(packageDirectory) {
const name = basename(packageDirectory);
const separator = name.indexOf("-");
if (separator === -1) {
return;
}

return {
arch: name.slice(separator + 1),
platform: name.slice(0, separator),
};
}

function buildPlatform(packageDirectory) {
return (
overriddenPlatform ??
packagePlatformFromDirectory(packageDirectory)?.platform ??
process.platform
);
}

function buildArch(packageDirectory) {
return overriddenArch ?? packagePlatformFromDirectory(packageDirectory)?.arch ?? process.arch;
}

function runtimeHostBinaryName(platform) {
return platform === "win32" ? "sof_ts_runtime_host.exe" : "sof_ts_runtime_host";
}

function defaultCargoTarget(platform, arch) {
if (platform === process.platform && arch === process.arch) {
return;
}

if (platform === "darwin" && arch === "x64") {
return "x86_64-apple-darwin";
}
if (platform === "darwin" && arch === "arm64") {
return "aarch64-apple-darwin";
}
if (platform === "win32" && arch === "x64") {
return "x86_64-pc-windows-gnu";
}
if (platform === "win32" && arch === "arm64") {
return "aarch64-pc-windows-gnullvm";
}
if (platform === "linux" && arch === "arm64") {
return "aarch64-unknown-linux-gnu";
}
}

function defaultCargoSubcommand(target) {
if (target !== undefined) {
return crossBuildCargoSubcommand;
}
}

function nativePackageDirectory() {
Expand All@@ -29,7 +88,7 @@ function packageMetadata(packageDirectory) {
const packageJsonPath = join(packageDirectory, "package.json");
if (!existsSync(packageJsonPath)) {
throw new Error(
`native package metadata was not found at ${packageJsonPath}; expected a package for ${process.platform}-${process.arch}`,
`native package metadata was not found at ${packageJsonPath}; expected a package for ${buildPlatform()}-${buildArch()}`,
);
}

Expand All@@ -38,40 +97,62 @@ function packageMetadata(packageDirectory) {

const packageDirectory = nativePackageDirectory();
const packageJson = packageMetadata(packageDirectory);
const platform = buildPlatform(packageDirectory);
const arch = buildArch(packageDirectory);
const target = overriddenTarget ?? defaultCargoTarget(platform, arch);
const subcommand = cargoSubcommand ?? defaultCargoSubcommand(target);
const outputDirectory = join(packageDirectory, "vendor");
const outputPath = join(outputDirectory, runtimeHostBinaryName());
const sourcePath = join(workspaceDirectory, "target", "release", runtimeHostBinaryName());
const binaryName = runtimeHostBinaryName(platform);
const targetDirectory = target === undefined ? "release" : join(target, "release");
const outputPath = join(outputDirectory, binaryName);
const sourcePath = join(cargoTargetRoot, targetDirectory, binaryName);
const features = ["provider-websocket", "provider-grpc", "gossip-bootstrap"];

if (process.platform === "linux") {
if (platform === "linux") {
features.push("kernel-bypass");
}

const packagePlatform = basename(packageDirectory);
if (packagePlatform !== `${process.platform}-${process.arch}`) {
const currentPlatformKey = `${platform}-${arch}`;
if (packagePlatform !== currentPlatformKey) {
throw new Error(
`native package ${packageJson.name ?? packagePlatform} does not match the current platform ${process.platform}-${process.arch}`,
`native package ${packageJson.name ?? packagePlatform} does not match the selected platform ${currentPlatformKey}`,
);
}

const cargo = spawnSync(
"cargo",
[
"build",
"--release",
"-p",
"sof",
"--features",
features.join(","),
"--bin",
"sof_ts_runtime_host",
],
{
cwd: workspaceDirectory,
stdio: "inherit",
},
const cargoArgs = [];
if (subcommand !== undefined && subcommand.length > 0) {
cargoArgs.push(subcommand);
} else {
cargoArgs.push("build");
}
if (target !== undefined) {
cargoArgs.push("--target", target);
}
cargoArgs.push(
"--release",
"-p",
"sof",
"--features",
features.join(","),
"--bin",
"sof_ts_runtime_host",
);

const cargoEnv = { ...process.env };
cargoEnv.PATH = [join(sdkPackageDirectory, "node_modules", ".bin"), cargoEnv.PATH]
.filter((value) => value !== undefined && value.length > 0)
.join(delimiter);
if (platform === "darwin") {
cargoEnv.CARGO_PROFILE_RELEASE_LTO = "off";
}

const cargo = spawnSync("cargo", cargoArgs, {
cwd: workspaceDirectory,
env: cargoEnv,
stdio: "inherit",
});

if (cargo.error !== undefined) {
throw new Error(`failed to run cargo: ${cargo.error.message}`);
}
Expand All@@ -87,6 +168,6 @@ if (!existsSync(sourcePath)) {

mkdirSync(outputDirectory, { recursive: true });
copyFileSync(sourcePath, outputPath);
if (process.platform !== "win32") {
if (platform !== "win32") {
chmodSync(outputPath, 0o755);
}
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions .github/workflows/release-typescript-sdk.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -103,6 +103,7 @@ jobs:
needs: verify
runs-on: ${{ matrix.runner }}
timeout-minutes: 60
continue-on-error: true
strategy:
fail-fast: false
matrix:
Expand DownExpand Up@@ -131,6 +132,8 @@ jobs:

- name: Setup Rust CI toolchain and tools
uses: ./.github/actions/rust-ci-setup
with:
cargo-tools: cargo-make,cargo-nextest

- name: Setup pnpm
uses: pnpm/action-setup@v4
Expand All@@ -154,7 +157,7 @@ jobs:
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
shell: bash
run: pnpm publish --access public --no-git-checks
run: node ../../scripts/publish-package.mjs

- name: Pack native runtime package
if: needs.verify.outputs.publish_release != 'true'
Expand DownExpand Up@@ -239,7 +242,7 @@ jobs:
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
shell: bash
run: pnpm publish --access public --no-git-checks
run: node scripts/publish-package.mjs

- name: Pack TypeScript SDK
if: needs.verify.outputs.publish_release != 'true'
Expand Down
24 changes: 1 addition & 23 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions Cargo.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,8 @@ exclude = ["crates/sof-solana-gossip"]
[patch.crates-io]
sof-solana-gossip = { path = "crates/sof-solana-gossip" }
helius-laserstream = { path = "vendor/helius-laserstream" }
laserstream-core-proto = { path = "vendor/laserstream-core-proto" }
yellowstone-grpc-client = { path = "vendor/yellowstone-grpc-client" }

[workspace.package]
edition = "2024"
Expand Down
4 changes: 4 additions & 0 deletions crates/sof-observer/src/ingest/config.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -70,18 +70,21 @@ pub(super) fn read_udp_idle_wait_ms() -> u64 {
.unwrap_or(100)
}

#[cfg(target_os = "linux")]
pub(super) fn read_udp_busy_poll_us() -> Option<u32> {
read_env_var("SOF_UDP_BUSY_POLL_US")
.and_then(|value| value.parse::<u32>().ok())
.filter(|value| *value > 0)
}

#[cfg(target_os = "linux")]
pub(super) fn read_udp_busy_poll_budget() -> Option<u32> {
read_env_var("SOF_UDP_BUSY_POLL_BUDGET")
.and_then(|value| value.parse::<u32>().ok())
.filter(|value| *value > 0)
}

#[cfg(target_os = "linux")]
pub(super) fn read_udp_prefer_busy_poll() -> bool {
read_bool_env("SOF_UDP_PREFER_BUSY_POLL", false)
}
Expand All@@ -90,6 +93,7 @@ pub(super) fn read_udp_drop_on_channel_full() -> bool {
read_bool_env("SOF_UDP_DROP_ON_CHANNEL_FULL", true)
}

#[cfg(target_os = "linux")]
fn read_udp_track_rxq_ovfl() -> bool {
read_bool_env("SOF_UDP_TRACK_RXQ_OVFL", false)
}
Expand Down
4 changes: 4 additions & 0 deletions crates/sof-observer/src/ingest/receiver/core.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -142,6 +142,7 @@ impl RawPacketBatch {
storage.packets.reserve(additional);
}

#[cfg(target_os = "linux")]
pub(super) fn ensure_receive_slots(&mut self, additional: usize) -> usize {
let Some(storage) = self.storage.as_mut() else {
return 0;
Expand All@@ -156,13 +157,15 @@ impl RawPacketBatch {
start_index
}

#[cfg(target_os = "linux")]
pub(super) fn receive_buffer_mut(
&mut self,
buffer_index: usize,
) -> Option<&mut [u8; UDP_PACKET_BUFFER_BYTES]> {
self.storage.as_mut()?.buffers.get_mut(buffer_index)
}

#[cfg(target_os = "linux")]
pub(super) fn push_received_metadata(
&mut self,
source: SocketAddr,
Expand DownExpand Up@@ -366,6 +369,7 @@ impl ReceiverTelemetry {
.store(current_unix_ms(), Ordering::Relaxed);
}

#[cfg(target_os = "linux")]
fn record_packets(&self, packet_count: usize) {
self.packets.fetch_add(
u64::try_from(packet_count).unwrap_or(u64::MAX),
Expand Down
7 changes: 3 additions & 4 deletions crates/sof-observer/src/runtime.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ use std::{
path::PathBuf,
pin::Pin,
sync::Arc,
thread::{self, available_parallelism},
thread::available_parallelism,
time::{Duration, Instant},
};

Expand DownExpand Up@@ -3449,7 +3449,7 @@ async fn wait_for_termination_signal() {
#[cfg(unix)]
{
let (shutdown_tx, shutdown_rx) = tokio::sync::oneshot::channel();
thread::spawn(move || {
std::thread::spawn(move || {
let mut signals = match signal_hook::iterator::Signals::new([
signal_hook::consts::signal::SIGTERM,
signal_hook::consts::signal::SIGINT,
Expand DownExpand Up@@ -3822,7 +3822,6 @@ mod tests {
Arc, Mutex,
atomic::{AtomicUsize, Ordering},
},
thread,
time::Instant,
};

Expand DownExpand Up@@ -5326,7 +5325,7 @@ mod tests {
if counter.load(Ordering::Relaxed) >= expected {
return true;
}
thread::sleep(Duration::from_millis(10));
std::thread::sleep(Duration::from_millis(10));
}
counter.load(Ordering::Relaxed) >= expected
}
Expand Down
3 changes: 3 additions & 0 deletions pnpm-workspace.yaml
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
packages:
- sdks/typescript
- sdks/typescript/native/*

onlyBuiltDependencies:
- "@biomejs/biome"
133 changes: 107 additions & 26 deletions sdks/typescript/scripts/build-native-host.mjs
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,72 @@
import { spawnSync } from "node:child_process";
import { chmodSync, copyFileSync, existsSync, mkdirSync, readFileSync } from "node:fs";
import { basename, join } from "node:path";
import { basename, delimiter, join } from "node:path";

const scriptDirectory = import.meta.dirname;
const sdkPackageDirectory = join(scriptDirectory, "..");
const workspaceDirectory = join(sdkPackageDirectory, "..", "..");
const cargoTargetRoot = process.env.CARGO_TARGET_DIR ?? join(workspaceDirectory, "target");
const overriddenPlatform = process.env.SOF_TS_NATIVE_PLATFORM;
const overriddenArch = process.env.SOF_TS_NATIVE_ARCH;
const overriddenTarget = process.env.SOF_TS_NATIVE_TARGET;
const cargoSubcommand = process.env.SOF_TS_NATIVE_CARGO_SUBCOMMAND;
const crossBuildCargoSubcommand = "zigbuild";

function runtimeHostBinaryName() {
return process.platform === "win32" ? "sof_ts_runtime_host.exe" : "sof_ts_runtime_host";
function packagePlatformFromDirectory(packageDirectory) {
const name = basename(packageDirectory);
const separator = name.indexOf("-");
if (separator === -1) {
return;
}

return {
arch: name.slice(separator + 1),
platform: name.slice(0, separator),
};
}

function buildPlatform(packageDirectory) {
return (
overriddenPlatform ??
packagePlatformFromDirectory(packageDirectory)?.platform ??
process.platform
);
}

function buildArch(packageDirectory) {
return overriddenArch ?? packagePlatformFromDirectory(packageDirectory)?.arch ?? process.arch;
}

function runtimeHostBinaryName(platform) {
return platform === "win32" ? "sof_ts_runtime_host.exe" : "sof_ts_runtime_host";
}

function defaultCargoTarget(platform, arch) {
if (platform === process.platform && arch === process.arch) {
return;
}

if (platform === "darwin" && arch === "x64") {
return "x86_64-apple-darwin";
}
if (platform === "darwin" && arch === "arm64") {
return "aarch64-apple-darwin";
}
if (platform === "win32" && arch === "x64") {
return "x86_64-pc-windows-gnu";
}
if (platform === "win32" && arch === "arm64") {
return "aarch64-pc-windows-gnullvm";
}
if (platform === "linux" && arch === "arm64") {
return "aarch64-unknown-linux-gnu";
}
}

function defaultCargoSubcommand(target) {
if (target !== undefined) {
return crossBuildCargoSubcommand;
}
}

function nativePackageDirectory() {
Expand All@@ -29,7 +88,7 @@ function packageMetadata(packageDirectory) {
const packageJsonPath = join(packageDirectory, "package.json");
if (!existsSync(packageJsonPath)) {
throw new Error(
`native package metadata was not found at ${packageJsonPath}; expected a package for ${process.platform}-${process.arch}`,
`native package metadata was not found at ${packageJsonPath}; expected a package for ${buildPlatform()}-${buildArch()}`,
);
}

Expand All@@ -38,40 +97,62 @@ function packageMetadata(packageDirectory) {

const packageDirectory = nativePackageDirectory();
const packageJson = packageMetadata(packageDirectory);
const platform = buildPlatform(packageDirectory);
const arch = buildArch(packageDirectory);
const target = overriddenTarget ?? defaultCargoTarget(platform, arch);
const subcommand = cargoSubcommand ?? defaultCargoSubcommand(target);
const outputDirectory = join(packageDirectory, "vendor");
const outputPath = join(outputDirectory, runtimeHostBinaryName());
const sourcePath = join(workspaceDirectory, "target", "release", runtimeHostBinaryName());
const binaryName = runtimeHostBinaryName(platform);
const targetDirectory = target === undefined ? "release" : join(target, "release");
const outputPath = join(outputDirectory, binaryName);
const sourcePath = join(cargoTargetRoot, targetDirectory, binaryName);
const features = ["provider-websocket", "provider-grpc", "gossip-bootstrap"];

if (process.platform === "linux") {
if (platform === "linux") {
features.push("kernel-bypass");
}

const packagePlatform = basename(packageDirectory);
if (packagePlatform !== `${process.platform}-${process.arch}`) {
const currentPlatformKey = `${platform}-${arch}`;
if (packagePlatform !== currentPlatformKey) {
throw new Error(
`native package ${packageJson.name ?? packagePlatform} does not match the current platform ${process.platform}-${process.arch}`,
`native package ${packageJson.name ?? packagePlatform} does not match the selected platform ${currentPlatformKey}`,
);
}

const cargo = spawnSync(
"cargo",
[
"build",
"--release",
"-p",
"sof",
"--features",
features.join(","),
"--bin",
"sof_ts_runtime_host",
],
{
cwd: workspaceDirectory,
stdio: "inherit",
},
const cargoArgs = [];
if (subcommand !== undefined && subcommand.length > 0) {
cargoArgs.push(subcommand);
} else {
cargoArgs.push("build");
}
if (target !== undefined) {
cargoArgs.push("--target", target);
}
cargoArgs.push(
"--release",
"-p",
"sof",
"--features",
features.join(","),
"--bin",
"sof_ts_runtime_host",
);

const cargoEnv = { ...process.env };
cargoEnv.PATH = [join(sdkPackageDirectory, "node_modules", ".bin"), cargoEnv.PATH]
.filter((value) => value !== undefined && value.length > 0)
.join(delimiter);
if (platform === "darwin") {
cargoEnv.CARGO_PROFILE_RELEASE_LTO = "off";
}

const cargo = spawnSync("cargo", cargoArgs, {
cwd: workspaceDirectory,
env: cargoEnv,
stdio: "inherit",
});

if (cargo.error !== undefined) {
throw new Error(`failed to run cargo: ${cargo.error.message}`);
}
Expand All@@ -87,6 +168,6 @@ if (!existsSync(sourcePath)) {

mkdirSync(outputDirectory, { recursive: true });
copyFileSync(sourcePath, outputPath);
if (process.platform !== "win32") {
if (platform !== "win32") {
chmodSync(outputPath, 0o755);
}
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions .github/workflows/release-typescript-sdk.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -103,6 +103,7 @@ jobs:
needs: verify
runs-on: ${{ matrix.runner }}
timeout-minutes: 60
continue-on-error: true
strategy:
fail-fast: false
matrix:
Expand DownExpand Up@@ -131,6 +132,8 @@ jobs:

- name: Setup Rust CI toolchain and tools
uses: ./.github/actions/rust-ci-setup
with:
cargo-tools: cargo-make,cargo-nextest

- name: Setup pnpm
uses: pnpm/action-setup@v4
Expand All@@ -154,7 +157,7 @@ jobs:
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
shell: bash
run: pnpm publish --access public --no-git-checks
run: node ../../scripts/publish-package.mjs

- name: Pack native runtime package
if: needs.verify.outputs.publish_release != 'true'
Expand DownExpand Up@@ -239,7 +242,7 @@ jobs:
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
shell: bash
run: pnpm publish --access public --no-git-checks
run: node scripts/publish-package.mjs

- name: Pack TypeScript SDK
if: needs.verify.outputs.publish_release != 'true'
Expand Down
24 changes: 1 addition & 23 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions Cargo.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,8 @@ exclude = ["crates/sof-solana-gossip"]
[patch.crates-io]
sof-solana-gossip = { path = "crates/sof-solana-gossip" }
helius-laserstream = { path = "vendor/helius-laserstream" }
laserstream-core-proto = { path = "vendor/laserstream-core-proto" }
yellowstone-grpc-client = { path = "vendor/yellowstone-grpc-client" }

[workspace.package]
edition = "2024"
Expand Down
4 changes: 4 additions & 0 deletions crates/sof-observer/src/ingest/config.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -70,18 +70,21 @@ pub(super) fn read_udp_idle_wait_ms() -> u64 {
.unwrap_or(100)
}

#[cfg(target_os = "linux")]
pub(super) fn read_udp_busy_poll_us() -> Option<u32> {
read_env_var("SOF_UDP_BUSY_POLL_US")
.and_then(|value| value.parse::<u32>().ok())
.filter(|value| *value > 0)
}

#[cfg(target_os = "linux")]
pub(super) fn read_udp_busy_poll_budget() -> Option<u32> {
read_env_var("SOF_UDP_BUSY_POLL_BUDGET")
.and_then(|value| value.parse::<u32>().ok())
.filter(|value| *value > 0)
}

#[cfg(target_os = "linux")]
pub(super) fn read_udp_prefer_busy_poll() -> bool {
read_bool_env("SOF_UDP_PREFER_BUSY_POLL", false)
}
Expand All@@ -90,6 +93,7 @@ pub(super) fn read_udp_drop_on_channel_full() -> bool {
read_bool_env("SOF_UDP_DROP_ON_CHANNEL_FULL", true)
}

#[cfg(target_os = "linux")]
fn read_udp_track_rxq_ovfl() -> bool {
read_bool_env("SOF_UDP_TRACK_RXQ_OVFL", false)
}
Expand Down
4 changes: 4 additions & 0 deletions crates/sof-observer/src/ingest/receiver/core.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -142,6 +142,7 @@ impl RawPacketBatch {
storage.packets.reserve(additional);
}

#[cfg(target_os = "linux")]
pub(super) fn ensure_receive_slots(&mut self, additional: usize) -> usize {
let Some(storage) = self.storage.as_mut() else {
return 0;
Expand All@@ -156,13 +157,15 @@ impl RawPacketBatch {
start_index
}

#[cfg(target_os = "linux")]
pub(super) fn receive_buffer_mut(
&mut self,
buffer_index: usize,
) -> Option<&mut [u8; UDP_PACKET_BUFFER_BYTES]> {
self.storage.as_mut()?.buffers.get_mut(buffer_index)
}

#[cfg(target_os = "linux")]
pub(super) fn push_received_metadata(
&mut self,
source: SocketAddr,
Expand DownExpand Up@@ -366,6 +369,7 @@ impl ReceiverTelemetry {
.store(current_unix_ms(), Ordering::Relaxed);
}

#[cfg(target_os = "linux")]
fn record_packets(&self, packet_count: usize) {
self.packets.fetch_add(
u64::try_from(packet_count).unwrap_or(u64::MAX),
Expand Down
7 changes: 3 additions & 4 deletions crates/sof-observer/src/runtime.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ use std::{
path::PathBuf,
pin::Pin,
sync::Arc,
thread::{self, available_parallelism},
thread::available_parallelism,
time::{Duration, Instant},
};

Expand DownExpand Up@@ -3449,7 +3449,7 @@ async fn wait_for_termination_signal() {
#[cfg(unix)]
{
let (shutdown_tx, shutdown_rx) = tokio::sync::oneshot::channel();
thread::spawn(move || {
std::thread::spawn(move || {
let mut signals = match signal_hook::iterator::Signals::new([
signal_hook::consts::signal::SIGTERM,
signal_hook::consts::signal::SIGINT,
Expand DownExpand Up@@ -3822,7 +3822,6 @@ mod tests {
Arc, Mutex,
atomic::{AtomicUsize, Ordering},
},
thread,
time::Instant,
};

Expand DownExpand Up@@ -5326,7 +5325,7 @@ mod tests {
if counter.load(Ordering::Relaxed) >= expected {
return true;
}
thread::sleep(Duration::from_millis(10));
std::thread::sleep(Duration::from_millis(10));
}
counter.load(Ordering::Relaxed) >= expected
}
Expand Down
3 changes: 3 additions & 0 deletions pnpm-workspace.yaml
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
packages:
- sdks/typescript
- sdks/typescript/native/*

onlyBuiltDependencies:
- "@biomejs/biome"
133 changes: 107 additions & 26 deletions sdks/typescript/scripts/build-native-host.mjs
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,72 @@
import { spawnSync } from "node:child_process";
import { chmodSync, copyFileSync, existsSync, mkdirSync, readFileSync } from "node:fs";
import { basename, join } from "node:path";
import { basename, delimiter, join } from "node:path";

const scriptDirectory = import.meta.dirname;
const sdkPackageDirectory = join(scriptDirectory, "..");
const workspaceDirectory = join(sdkPackageDirectory, "..", "..");
const cargoTargetRoot = process.env.CARGO_TARGET_DIR ?? join(workspaceDirectory, "target");
const overriddenPlatform = process.env.SOF_TS_NATIVE_PLATFORM;
const overriddenArch = process.env.SOF_TS_NATIVE_ARCH;
const overriddenTarget = process.env.SOF_TS_NATIVE_TARGET;
const cargoSubcommand = process.env.SOF_TS_NATIVE_CARGO_SUBCOMMAND;
const crossBuildCargoSubcommand = "zigbuild";

function runtimeHostBinaryName() {
return process.platform === "win32" ? "sof_ts_runtime_host.exe" : "sof_ts_runtime_host";
function packagePlatformFromDirectory(packageDirectory) {
const name = basename(packageDirectory);
const separator = name.indexOf("-");
if (separator === -1) {
return;
}

return {
arch: name.slice(separator + 1),
platform: name.slice(0, separator),
};
}

function buildPlatform(packageDirectory) {
return (
overriddenPlatform ??
packagePlatformFromDirectory(packageDirectory)?.platform ??
process.platform
);
}

function buildArch(packageDirectory) {
return overriddenArch ?? packagePlatformFromDirectory(packageDirectory)?.arch ?? process.arch;
}

function runtimeHostBinaryName(platform) {
return platform === "win32" ? "sof_ts_runtime_host.exe" : "sof_ts_runtime_host";
}

function defaultCargoTarget(platform, arch) {
if (platform === process.platform && arch === process.arch) {
return;
}

if (platform === "darwin" && arch === "x64") {
return "x86_64-apple-darwin";
}
if (platform === "darwin" && arch === "arm64") {
return "aarch64-apple-darwin";
}
if (platform === "win32" && arch === "x64") {
return "x86_64-pc-windows-gnu";
}
if (platform === "win32" && arch === "arm64") {
return "aarch64-pc-windows-gnullvm";
}
if (platform === "linux" && arch === "arm64") {
return "aarch64-unknown-linux-gnu";
}
}

function defaultCargoSubcommand(target) {
if (target !== undefined) {
return crossBuildCargoSubcommand;
}
}

function nativePackageDirectory() {
Expand All@@ -29,7 +88,7 @@ function packageMetadata(packageDirectory) {
const packageJsonPath = join(packageDirectory, "package.json");
if (!existsSync(packageJsonPath)) {
throw new Error(
`native package metadata was not found at ${packageJsonPath}; expected a package for ${process.platform}-${process.arch}`,
`native package metadata was not found at ${packageJsonPath}; expected a package for ${buildPlatform()}-${buildArch()}`,
);
}

Expand All@@ -38,40 +97,62 @@ function packageMetadata(packageDirectory) {

const packageDirectory = nativePackageDirectory();
const packageJson = packageMetadata(packageDirectory);
const platform = buildPlatform(packageDirectory);
const arch = buildArch(packageDirectory);
const target = overriddenTarget ?? defaultCargoTarget(platform, arch);
const subcommand = cargoSubcommand ?? defaultCargoSubcommand(target);
const outputDirectory = join(packageDirectory, "vendor");
const outputPath = join(outputDirectory, runtimeHostBinaryName());
const sourcePath = join(workspaceDirectory, "target", "release", runtimeHostBinaryName());
const binaryName = runtimeHostBinaryName(platform);
const targetDirectory = target === undefined ? "release" : join(target, "release");
const outputPath = join(outputDirectory, binaryName);
const sourcePath = join(cargoTargetRoot, targetDirectory, binaryName);
const features = ["provider-websocket", "provider-grpc", "gossip-bootstrap"];

if (process.platform === "linux") {
if (platform === "linux") {
features.push("kernel-bypass");
}

const packagePlatform = basename(packageDirectory);
if (packagePlatform !== `${process.platform}-${process.arch}`) {
const currentPlatformKey = `${platform}-${arch}`;
if (packagePlatform !== currentPlatformKey) {
throw new Error(
`native package ${packageJson.name ?? packagePlatform} does not match the current platform ${process.platform}-${process.arch}`,
`native package ${packageJson.name ?? packagePlatform} does not match the selected platform ${currentPlatformKey}`,
);
}

const cargo = spawnSync(
"cargo",
[
"build",
"--release",
"-p",
"sof",
"--features",
features.join(","),
"--bin",
"sof_ts_runtime_host",
],
{
cwd: workspaceDirectory,
stdio: "inherit",
},
const cargoArgs = [];
if (subcommand !== undefined && subcommand.length > 0) {
cargoArgs.push(subcommand);
} else {
cargoArgs.push("build");
}
if (target !== undefined) {
cargoArgs.push("--target", target);
}
cargoArgs.push(
"--release",
"-p",
"sof",
"--features",
features.join(","),
"--bin",
"sof_ts_runtime_host",
);

const cargoEnv = { ...process.env };
cargoEnv.PATH = [join(sdkPackageDirectory, "node_modules", ".bin"), cargoEnv.PATH]
.filter((value) => value !== undefined && value.length > 0)
.join(delimiter);
if (platform === "darwin") {
cargoEnv.CARGO_PROFILE_RELEASE_LTO = "off";
}

const cargo = spawnSync("cargo", cargoArgs, {
cwd: workspaceDirectory,
env: cargoEnv,
stdio: "inherit",
});

if (cargo.error !== undefined) {
throw new Error(`failed to run cargo: ${cargo.error.message}`);
}
Expand All@@ -87,6 +168,6 @@ if (!existsSync(sourcePath)) {

mkdirSync(outputDirectory, { recursive: true });
copyFileSync(sourcePath, outputPath);
if (process.platform !== "win32") {
if (platform !== "win32") {
chmodSync(outputPath, 0o755);
}
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions .github/workflows/release-typescript-sdk.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -103,6 +103,7 @@ jobs:
needs: verify
runs-on: ${{ matrix.runner }}
timeout-minutes: 60
continue-on-error: true
strategy:
fail-fast: false
matrix:
Expand DownExpand Up@@ -131,6 +132,8 @@ jobs:

- name: Setup Rust CI toolchain and tools
uses: ./.github/actions/rust-ci-setup
with:
cargo-tools: cargo-make,cargo-nextest

- name: Setup pnpm
uses: pnpm/action-setup@v4
Expand All@@ -154,7 +157,7 @@ jobs:
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
shell: bash
run: pnpm publish --access public --no-git-checks
run: node ../../scripts/publish-package.mjs

- name: Pack native runtime package
if: needs.verify.outputs.publish_release != 'true'
Expand DownExpand Up@@ -239,7 +242,7 @@ jobs:
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
shell: bash
run: pnpm publish --access public --no-git-checks
run: node scripts/publish-package.mjs

- name: Pack TypeScript SDK
if: needs.verify.outputs.publish_release != 'true'
Expand Down
24 changes: 1 addition & 23 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions Cargo.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,8 @@ exclude = ["crates/sof-solana-gossip"]
[patch.crates-io]
sof-solana-gossip = { path = "crates/sof-solana-gossip" }
helius-laserstream = { path = "vendor/helius-laserstream" }
laserstream-core-proto = { path = "vendor/laserstream-core-proto" }
yellowstone-grpc-client = { path = "vendor/yellowstone-grpc-client" }

[workspace.package]
edition = "2024"
Expand Down
4 changes: 4 additions & 0 deletions crates/sof-observer/src/ingest/config.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -70,18 +70,21 @@ pub(super) fn read_udp_idle_wait_ms() -> u64 {
.unwrap_or(100)
}

#[cfg(target_os = "linux")]
pub(super) fn read_udp_busy_poll_us() -> Option<u32> {
read_env_var("SOF_UDP_BUSY_POLL_US")
.and_then(|value| value.parse::<u32>().ok())
.filter(|value| *value > 0)
}

#[cfg(target_os = "linux")]
pub(super) fn read_udp_busy_poll_budget() -> Option<u32> {
read_env_var("SOF_UDP_BUSY_POLL_BUDGET")
.and_then(|value| value.parse::<u32>().ok())
.filter(|value| *value > 0)
}

#[cfg(target_os = "linux")]
pub(super) fn read_udp_prefer_busy_poll() -> bool {
read_bool_env("SOF_UDP_PREFER_BUSY_POLL", false)
}
Expand All@@ -90,6 +93,7 @@ pub(super) fn read_udp_drop_on_channel_full() -> bool {
read_bool_env("SOF_UDP_DROP_ON_CHANNEL_FULL", true)
}

#[cfg(target_os = "linux")]
fn read_udp_track_rxq_ovfl() -> bool {
read_bool_env("SOF_UDP_TRACK_RXQ_OVFL", false)
}
Expand Down
4 changes: 4 additions & 0 deletions crates/sof-observer/src/ingest/receiver/core.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -142,6 +142,7 @@ impl RawPacketBatch {
storage.packets.reserve(additional);
}

#[cfg(target_os = "linux")]
pub(super) fn ensure_receive_slots(&mut self, additional: usize) -> usize {
let Some(storage) = self.storage.as_mut() else {
return 0;
Expand All@@ -156,13 +157,15 @@ impl RawPacketBatch {
start_index
}

#[cfg(target_os = "linux")]
pub(super) fn receive_buffer_mut(
&mut self,
buffer_index: usize,
) -> Option<&mut [u8; UDP_PACKET_BUFFER_BYTES]> {
self.storage.as_mut()?.buffers.get_mut(buffer_index)
}

#[cfg(target_os = "linux")]
pub(super) fn push_received_metadata(
&mut self,
source: SocketAddr,
Expand DownExpand Up@@ -366,6 +369,7 @@ impl ReceiverTelemetry {
.store(current_unix_ms(), Ordering::Relaxed);
}

#[cfg(target_os = "linux")]
fn record_packets(&self, packet_count: usize) {
self.packets.fetch_add(
u64::try_from(packet_count).unwrap_or(u64::MAX),
Expand Down
7 changes: 3 additions & 4 deletions crates/sof-observer/src/runtime.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ use std::{
path::PathBuf,
pin::Pin,
sync::Arc,
thread::{self, available_parallelism},
thread::available_parallelism,
time::{Duration, Instant},
};

Expand DownExpand Up@@ -3449,7 +3449,7 @@ async fn wait_for_termination_signal() {
#[cfg(unix)]
{
let (shutdown_tx, shutdown_rx) = tokio::sync::oneshot::channel();
thread::spawn(move || {
std::thread::spawn(move || {
let mut signals = match signal_hook::iterator::Signals::new([
signal_hook::consts::signal::SIGTERM,
signal_hook::consts::signal::SIGINT,
Expand DownExpand Up@@ -3822,7 +3822,6 @@ mod tests {
Arc, Mutex,
atomic::{AtomicUsize, Ordering},
},
thread,
time::Instant,
};

Expand DownExpand Up@@ -5326,7 +5325,7 @@ mod tests {
if counter.load(Ordering::Relaxed) >= expected {
return true;
}
thread::sleep(Duration::from_millis(10));
std::thread::sleep(Duration::from_millis(10));
}
counter.load(Ordering::Relaxed) >= expected
}
Expand Down
3 changes: 3 additions & 0 deletions pnpm-workspace.yaml
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
packages:
- sdks/typescript
- sdks/typescript/native/*

onlyBuiltDependencies:
- "@biomejs/biome"
133 changes: 107 additions & 26 deletions sdks/typescript/scripts/build-native-host.mjs
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,72 @@
import { spawnSync } from "node:child_process";
import { chmodSync, copyFileSync, existsSync, mkdirSync, readFileSync } from "node:fs";
import { basename, join } from "node:path";
import { basename, delimiter, join } from "node:path";

const scriptDirectory = import.meta.dirname;
const sdkPackageDirectory = join(scriptDirectory, "..");
const workspaceDirectory = join(sdkPackageDirectory, "..", "..");
const cargoTargetRoot = process.env.CARGO_TARGET_DIR ?? join(workspaceDirectory, "target");
const overriddenPlatform = process.env.SOF_TS_NATIVE_PLATFORM;
const overriddenArch = process.env.SOF_TS_NATIVE_ARCH;
const overriddenTarget = process.env.SOF_TS_NATIVE_TARGET;
const cargoSubcommand = process.env.SOF_TS_NATIVE_CARGO_SUBCOMMAND;
const crossBuildCargoSubcommand = "zigbuild";

function runtimeHostBinaryName() {
return process.platform === "win32" ? "sof_ts_runtime_host.exe" : "sof_ts_runtime_host";
function packagePlatformFromDirectory(packageDirectory) {
const name = basename(packageDirectory);
const separator = name.indexOf("-");
if (separator === -1) {
return;
}

return {
arch: name.slice(separator + 1),
platform: name.slice(0, separator),
};
}

function buildPlatform(packageDirectory) {
return (
overriddenPlatform ??
packagePlatformFromDirectory(packageDirectory)?.platform ??
process.platform
);
}

function buildArch(packageDirectory) {
return overriddenArch ?? packagePlatformFromDirectory(packageDirectory)?.arch ?? process.arch;
}

function runtimeHostBinaryName(platform) {
return platform === "win32" ? "sof_ts_runtime_host.exe" : "sof_ts_runtime_host";
}

function defaultCargoTarget(platform, arch) {
if (platform === process.platform && arch === process.arch) {
return;
}

if (platform === "darwin" && arch === "x64") {
return "x86_64-apple-darwin";
}
if (platform === "darwin" && arch === "arm64") {
return "aarch64-apple-darwin";
}
if (platform === "win32" && arch === "x64") {
return "x86_64-pc-windows-gnu";
}
if (platform === "win32" && arch === "arm64") {
return "aarch64-pc-windows-gnullvm";
}
if (platform === "linux" && arch === "arm64") {
return "aarch64-unknown-linux-gnu";
}
}

function defaultCargoSubcommand(target) {
if (target !== undefined) {
return crossBuildCargoSubcommand;
}
}

function nativePackageDirectory() {
Expand All@@ -29,7 +88,7 @@ function packageMetadata(packageDirectory) {
const packageJsonPath = join(packageDirectory, "package.json");
if (!existsSync(packageJsonPath)) {
throw new Error(
`native package metadata was not found at ${packageJsonPath}; expected a package for ${process.platform}-${process.arch}`,
`native package metadata was not found at ${packageJsonPath}; expected a package for ${buildPlatform()}-${buildArch()}`,
);
}

Expand All@@ -38,40 +97,62 @@ function packageMetadata(packageDirectory) {

const packageDirectory = nativePackageDirectory();
const packageJson = packageMetadata(packageDirectory);
const platform = buildPlatform(packageDirectory);
const arch = buildArch(packageDirectory);
const target = overriddenTarget ?? defaultCargoTarget(platform, arch);
const subcommand = cargoSubcommand ?? defaultCargoSubcommand(target);
const outputDirectory = join(packageDirectory, "vendor");
const outputPath = join(outputDirectory, runtimeHostBinaryName());
const sourcePath = join(workspaceDirectory, "target", "release", runtimeHostBinaryName());
const binaryName = runtimeHostBinaryName(platform);
const targetDirectory = target === undefined ? "release" : join(target, "release");
const outputPath = join(outputDirectory, binaryName);
const sourcePath = join(cargoTargetRoot, targetDirectory, binaryName);
const features = ["provider-websocket", "provider-grpc", "gossip-bootstrap"];

if (process.platform === "linux") {
if (platform === "linux") {
features.push("kernel-bypass");
}

const packagePlatform = basename(packageDirectory);
if (packagePlatform !== `${process.platform}-${process.arch}`) {
const currentPlatformKey = `${platform}-${arch}`;
if (packagePlatform !== currentPlatformKey) {
throw new Error(
`native package ${packageJson.name ?? packagePlatform} does not match the current platform ${process.platform}-${process.arch}`,
`native package ${packageJson.name ?? packagePlatform} does not match the selected platform ${currentPlatformKey}`,
);
}

const cargo = spawnSync(
"cargo",
[
"build",
"--release",
"-p",
"sof",
"--features",
features.join(","),
"--bin",
"sof_ts_runtime_host",
],
{
cwd: workspaceDirectory,
stdio: "inherit",
},
const cargoArgs = [];
if (subcommand !== undefined && subcommand.length > 0) {
cargoArgs.push(subcommand);
} else {
cargoArgs.push("build");
}
if (target !== undefined) {
cargoArgs.push("--target", target);
}
cargoArgs.push(
"--release",
"-p",
"sof",
"--features",
features.join(","),
"--bin",
"sof_ts_runtime_host",
);

const cargoEnv = { ...process.env };
cargoEnv.PATH = [join(sdkPackageDirectory, "node_modules", ".bin"), cargoEnv.PATH]
.filter((value) => value !== undefined && value.length > 0)
.join(delimiter);
if (platform === "darwin") {
cargoEnv.CARGO_PROFILE_RELEASE_LTO = "off";
}

const cargo = spawnSync("cargo", cargoArgs, {
cwd: workspaceDirectory,
env: cargoEnv,
stdio: "inherit",
});

if (cargo.error !== undefined) {
throw new Error(`failed to run cargo: ${cargo.error.message}`);
}
Expand All@@ -87,6 +168,6 @@ if (!existsSync(sourcePath)) {

mkdirSync(outputDirectory, { recursive: true });
copyFileSync(sourcePath, outputPath);
if (process.platform !== "win32") {
if (platform !== "win32") {
chmodSync(outputPath, 0o755);
}
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions .github/workflows/release-typescript-sdk.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -103,6 +103,7 @@ jobs:
needs: verify
runs-on: ${{ matrix.runner }}
timeout-minutes: 60
continue-on-error: true
strategy:
fail-fast: false
matrix:
Expand DownExpand Up@@ -131,6 +132,8 @@ jobs:

- name: Setup Rust CI toolchain and tools
uses: ./.github/actions/rust-ci-setup
with:
cargo-tools: cargo-make,cargo-nextest

- name: Setup pnpm
uses: pnpm/action-setup@v4
Expand All@@ -154,7 +157,7 @@ jobs:
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
shell: bash
run: pnpm publish --access public --no-git-checks
run: node ../../scripts/publish-package.mjs

- name: Pack native runtime package
if: needs.verify.outputs.publish_release != 'true'
Expand DownExpand Up@@ -239,7 +242,7 @@ jobs:
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
shell: bash
run: pnpm publish --access public --no-git-checks
run: node scripts/publish-package.mjs

- name: Pack TypeScript SDK
if: needs.verify.outputs.publish_release != 'true'
Expand Down
24 changes: 1 addition & 23 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions Cargo.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,8 @@ exclude = ["crates/sof-solana-gossip"]
[patch.crates-io]
sof-solana-gossip = { path = "crates/sof-solana-gossip" }
helius-laserstream = { path = "vendor/helius-laserstream" }
laserstream-core-proto = { path = "vendor/laserstream-core-proto" }
yellowstone-grpc-client = { path = "vendor/yellowstone-grpc-client" }

[workspace.package]
edition = "2024"
Expand Down
4 changes: 4 additions & 0 deletions crates/sof-observer/src/ingest/config.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -70,18 +70,21 @@ pub(super) fn read_udp_idle_wait_ms() -> u64 {
.unwrap_or(100)
}

#[cfg(target_os = "linux")]
pub(super) fn read_udp_busy_poll_us() -> Option<u32> {
read_env_var("SOF_UDP_BUSY_POLL_US")
.and_then(|value| value.parse::<u32>().ok())
.filter(|value| *value > 0)
}

#[cfg(target_os = "linux")]
pub(super) fn read_udp_busy_poll_budget() -> Option<u32> {
read_env_var("SOF_UDP_BUSY_POLL_BUDGET")
.and_then(|value| value.parse::<u32>().ok())
.filter(|value| *value > 0)
}

#[cfg(target_os = "linux")]
pub(super) fn read_udp_prefer_busy_poll() -> bool {
read_bool_env("SOF_UDP_PREFER_BUSY_POLL", false)
}
Expand All@@ -90,6 +93,7 @@ pub(super) fn read_udp_drop_on_channel_full() -> bool {
read_bool_env("SOF_UDP_DROP_ON_CHANNEL_FULL", true)
}

#[cfg(target_os = "linux")]
fn read_udp_track_rxq_ovfl() -> bool {
read_bool_env("SOF_UDP_TRACK_RXQ_OVFL", false)
}
Expand Down
4 changes: 4 additions & 0 deletions crates/sof-observer/src/ingest/receiver/core.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -142,6 +142,7 @@ impl RawPacketBatch {
storage.packets.reserve(additional);
}

#[cfg(target_os = "linux")]
pub(super) fn ensure_receive_slots(&mut self, additional: usize) -> usize {
let Some(storage) = self.storage.as_mut() else {
return 0;
Expand All@@ -156,13 +157,15 @@ impl RawPacketBatch {
start_index
}

#[cfg(target_os = "linux")]
pub(super) fn receive_buffer_mut(
&mut self,
buffer_index: usize,
) -> Option<&mut [u8; UDP_PACKET_BUFFER_BYTES]> {
self.storage.as_mut()?.buffers.get_mut(buffer_index)
}

#[cfg(target_os = "linux")]
pub(super) fn push_received_metadata(
&mut self,
source: SocketAddr,
Expand DownExpand Up@@ -366,6 +369,7 @@ impl ReceiverTelemetry {
.store(current_unix_ms(), Ordering::Relaxed);
}

#[cfg(target_os = "linux")]
fn record_packets(&self, packet_count: usize) {
self.packets.fetch_add(
u64::try_from(packet_count).unwrap_or(u64::MAX),
Expand Down
7 changes: 3 additions & 4 deletions crates/sof-observer/src/runtime.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ use std::{
path::PathBuf,
pin::Pin,
sync::Arc,
thread::{self, available_parallelism},
thread::available_parallelism,
time::{Duration, Instant},
};

Expand DownExpand Up@@ -3449,7 +3449,7 @@ async fn wait_for_termination_signal() {
#[cfg(unix)]
{
let (shutdown_tx, shutdown_rx) = tokio::sync::oneshot::channel();
thread::spawn(move || {
std::thread::spawn(move || {
let mut signals = match signal_hook::iterator::Signals::new([
signal_hook::consts::signal::SIGTERM,
signal_hook::consts::signal::SIGINT,
Expand DownExpand Up@@ -3822,7 +3822,6 @@ mod tests {
Arc, Mutex,
atomic::{AtomicUsize, Ordering},
},
thread,
time::Instant,
};

Expand DownExpand Up@@ -5326,7 +5325,7 @@ mod tests {
if counter.load(Ordering::Relaxed) >= expected {
return true;
}
thread::sleep(Duration::from_millis(10));
std::thread::sleep(Duration::from_millis(10));
}
counter.load(Ordering::Relaxed) >= expected
}
Expand Down
3 changes: 3 additions & 0 deletions pnpm-workspace.yaml
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
packages:
- sdks/typescript
- sdks/typescript/native/*

onlyBuiltDependencies:
- "@biomejs/biome"
133 changes: 107 additions & 26 deletions sdks/typescript/scripts/build-native-host.mjs
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,72 @@
import { spawnSync } from "node:child_process";
import { chmodSync, copyFileSync, existsSync, mkdirSync, readFileSync } from "node:fs";
import { basename, join } from "node:path";
import { basename, delimiter, join } from "node:path";

const scriptDirectory = import.meta.dirname;
const sdkPackageDirectory = join(scriptDirectory, "..");
const workspaceDirectory = join(sdkPackageDirectory, "..", "..");
const cargoTargetRoot = process.env.CARGO_TARGET_DIR ?? join(workspaceDirectory, "target");
const overriddenPlatform = process.env.SOF_TS_NATIVE_PLATFORM;
const overriddenArch = process.env.SOF_TS_NATIVE_ARCH;
const overriddenTarget = process.env.SOF_TS_NATIVE_TARGET;
const cargoSubcommand = process.env.SOF_TS_NATIVE_CARGO_SUBCOMMAND;
const crossBuildCargoSubcommand = "zigbuild";

function runtimeHostBinaryName() {
return process.platform === "win32" ? "sof_ts_runtime_host.exe" : "sof_ts_runtime_host";
function packagePlatformFromDirectory(packageDirectory) {
const name = basename(packageDirectory);
const separator = name.indexOf("-");
if (separator === -1) {
return;
}

return {
arch: name.slice(separator + 1),
platform: name.slice(0, separator),
};
}

function buildPlatform(packageDirectory) {
return (
overriddenPlatform ??
packagePlatformFromDirectory(packageDirectory)?.platform ??
process.platform
);
}

function buildArch(packageDirectory) {
return overriddenArch ?? packagePlatformFromDirectory(packageDirectory)?.arch ?? process.arch;
}

function runtimeHostBinaryName(platform) {
return platform === "win32" ? "sof_ts_runtime_host.exe" : "sof_ts_runtime_host";
}

function defaultCargoTarget(platform, arch) {
if (platform === process.platform && arch === process.arch) {
return;
}

if (platform === "darwin" && arch === "x64") {
return "x86_64-apple-darwin";
}
if (platform === "darwin" && arch === "arm64") {
return "aarch64-apple-darwin";
}
if (platform === "win32" && arch === "x64") {
return "x86_64-pc-windows-gnu";
}
if (platform === "win32" && arch === "arm64") {
return "aarch64-pc-windows-gnullvm";
}
if (platform === "linux" && arch === "arm64") {
return "aarch64-unknown-linux-gnu";
}
}

function defaultCargoSubcommand(target) {
if (target !== undefined) {
return crossBuildCargoSubcommand;
}
}

function nativePackageDirectory() {
Expand All@@ -29,7 +88,7 @@ function packageMetadata(packageDirectory) {
const packageJsonPath = join(packageDirectory, "package.json");
if (!existsSync(packageJsonPath)) {
throw new Error(
`native package metadata was not found at ${packageJsonPath}; expected a package for ${process.platform}-${process.arch}`,
`native package metadata was not found at ${packageJsonPath}; expected a package for ${buildPlatform()}-${buildArch()}`,
);
}

Expand All@@ -38,40 +97,62 @@ function packageMetadata(packageDirectory) {

const packageDirectory = nativePackageDirectory();
const packageJson = packageMetadata(packageDirectory);
const platform = buildPlatform(packageDirectory);
const arch = buildArch(packageDirectory);
const target = overriddenTarget ?? defaultCargoTarget(platform, arch);
const subcommand = cargoSubcommand ?? defaultCargoSubcommand(target);
const outputDirectory = join(packageDirectory, "vendor");
const outputPath = join(outputDirectory, runtimeHostBinaryName());
const sourcePath = join(workspaceDirectory, "target", "release", runtimeHostBinaryName());
const binaryName = runtimeHostBinaryName(platform);
const targetDirectory = target === undefined ? "release" : join(target, "release");
const outputPath = join(outputDirectory, binaryName);
const sourcePath = join(cargoTargetRoot, targetDirectory, binaryName);
const features = ["provider-websocket", "provider-grpc", "gossip-bootstrap"];

if (process.platform === "linux") {
if (platform === "linux") {
features.push("kernel-bypass");
}

const packagePlatform = basename(packageDirectory);
if (packagePlatform !== `${process.platform}-${process.arch}`) {
const currentPlatformKey = `${platform}-${arch}`;
if (packagePlatform !== currentPlatformKey) {
throw new Error(
`native package ${packageJson.name ?? packagePlatform} does not match the current platform ${process.platform}-${process.arch}`,
`native package ${packageJson.name ?? packagePlatform} does not match the selected platform ${currentPlatformKey}`,
);
}

const cargo = spawnSync(
"cargo",
[
"build",
"--release",
"-p",
"sof",
"--features",
features.join(","),
"--bin",
"sof_ts_runtime_host",
],
{
cwd: workspaceDirectory,
stdio: "inherit",
},
const cargoArgs = [];
if (subcommand !== undefined && subcommand.length > 0) {
cargoArgs.push(subcommand);
} else {
cargoArgs.push("build");
}
if (target !== undefined) {
cargoArgs.push("--target", target);
}
cargoArgs.push(
"--release",
"-p",
"sof",
"--features",
features.join(","),
"--bin",
"sof_ts_runtime_host",
);

const cargoEnv = { ...process.env };
cargoEnv.PATH = [join(sdkPackageDirectory, "node_modules", ".bin"), cargoEnv.PATH]
.filter((value) => value !== undefined && value.length > 0)
.join(delimiter);
if (platform === "darwin") {
cargoEnv.CARGO_PROFILE_RELEASE_LTO = "off";
}

const cargo = spawnSync("cargo", cargoArgs, {
cwd: workspaceDirectory,
env: cargoEnv,
stdio: "inherit",
});

if (cargo.error !== undefined) {
throw new Error(`failed to run cargo: ${cargo.error.message}`);
}
Expand All@@ -87,6 +168,6 @@ if (!existsSync(sourcePath)) {

mkdirSync(outputDirectory, { recursive: true });
copyFileSync(sourcePath, outputPath);
if (process.platform !== "win32") {
if (platform !== "win32") {
chmodSync(outputPath, 0o755);
}
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions .github/workflows/release-typescript-sdk.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -103,6 +103,7 @@ jobs:
needs: verify
runs-on: ${{ matrix.runner }}
timeout-minutes: 60
continue-on-error: true
strategy:
fail-fast: false
matrix:
Expand DownExpand Up@@ -131,6 +132,8 @@ jobs:

- name: Setup Rust CI toolchain and tools
uses: ./.github/actions/rust-ci-setup
with:
cargo-tools: cargo-make,cargo-nextest

- name: Setup pnpm
uses: pnpm/action-setup@v4
Expand All@@ -154,7 +157,7 @@ jobs:
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
shell: bash
run: pnpm publish --access public --no-git-checks
run: node ../../scripts/publish-package.mjs

- name: Pack native runtime package
if: needs.verify.outputs.publish_release != 'true'
Expand DownExpand Up@@ -239,7 +242,7 @@ jobs:
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
shell: bash
run: pnpm publish --access public --no-git-checks
run: node scripts/publish-package.mjs

- name: Pack TypeScript SDK
if: needs.verify.outputs.publish_release != 'true'
Expand Down
24 changes: 1 addition & 23 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions Cargo.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,8 @@ exclude = ["crates/sof-solana-gossip"]
[patch.crates-io]
sof-solana-gossip = { path = "crates/sof-solana-gossip" }
helius-laserstream = { path = "vendor/helius-laserstream" }
laserstream-core-proto = { path = "vendor/laserstream-core-proto" }
yellowstone-grpc-client = { path = "vendor/yellowstone-grpc-client" }

[workspace.package]
edition = "2024"
Expand Down
4 changes: 4 additions & 0 deletions crates/sof-observer/src/ingest/config.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -70,18 +70,21 @@ pub(super) fn read_udp_idle_wait_ms() -> u64 {
.unwrap_or(100)
}

#[cfg(target_os = "linux")]
pub(super) fn read_udp_busy_poll_us() -> Option<u32> {
read_env_var("SOF_UDP_BUSY_POLL_US")
.and_then(|value| value.parse::<u32>().ok())
.filter(|value| *value > 0)
}

#[cfg(target_os = "linux")]
pub(super) fn read_udp_busy_poll_budget() -> Option<u32> {
read_env_var("SOF_UDP_BUSY_POLL_BUDGET")
.and_then(|value| value.parse::<u32>().ok())
.filter(|value| *value > 0)
}

#[cfg(target_os = "linux")]
pub(super) fn read_udp_prefer_busy_poll() -> bool {
read_bool_env("SOF_UDP_PREFER_BUSY_POLL", false)
}
Expand All@@ -90,6 +93,7 @@ pub(super) fn read_udp_drop_on_channel_full() -> bool {
read_bool_env("SOF_UDP_DROP_ON_CHANNEL_FULL", true)
}

#[cfg(target_os = "linux")]
fn read_udp_track_rxq_ovfl() -> bool {
read_bool_env("SOF_UDP_TRACK_RXQ_OVFL", false)
}
Expand Down
4 changes: 4 additions & 0 deletions crates/sof-observer/src/ingest/receiver/core.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -142,6 +142,7 @@ impl RawPacketBatch {
storage.packets.reserve(additional);
}

#[cfg(target_os = "linux")]
pub(super) fn ensure_receive_slots(&mut self, additional: usize) -> usize {
let Some(storage) = self.storage.as_mut() else {
return 0;
Expand All@@ -156,13 +157,15 @@ impl RawPacketBatch {
start_index
}

#[cfg(target_os = "linux")]
pub(super) fn receive_buffer_mut(
&mut self,
buffer_index: usize,
) -> Option<&mut [u8; UDP_PACKET_BUFFER_BYTES]> {
self.storage.as_mut()?.buffers.get_mut(buffer_index)
}

#[cfg(target_os = "linux")]
pub(super) fn push_received_metadata(
&mut self,
source: SocketAddr,
Expand DownExpand Up@@ -366,6 +369,7 @@ impl ReceiverTelemetry {
.store(current_unix_ms(), Ordering::Relaxed);
}

#[cfg(target_os = "linux")]
fn record_packets(&self, packet_count: usize) {
self.packets.fetch_add(
u64::try_from(packet_count).unwrap_or(u64::MAX),
Expand Down
7 changes: 3 additions & 4 deletions crates/sof-observer/src/runtime.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ use std::{
path::PathBuf,
pin::Pin,
sync::Arc,
thread::{self, available_parallelism},
thread::available_parallelism,
time::{Duration, Instant},
};

Expand DownExpand Up@@ -3449,7 +3449,7 @@ async fn wait_for_termination_signal() {
#[cfg(unix)]
{
let (shutdown_tx, shutdown_rx) = tokio::sync::oneshot::channel();
thread::spawn(move || {
std::thread::spawn(move || {
let mut signals = match signal_hook::iterator::Signals::new([
signal_hook::consts::signal::SIGTERM,
signal_hook::consts::signal::SIGINT,
Expand DownExpand Up@@ -3822,7 +3822,6 @@ mod tests {
Arc, Mutex,
atomic::{AtomicUsize, Ordering},
},
thread,
time::Instant,
};

Expand DownExpand Up@@ -5326,7 +5325,7 @@ mod tests {
if counter.load(Ordering::Relaxed) >= expected {
return true;
}
thread::sleep(Duration::from_millis(10));
std::thread::sleep(Duration::from_millis(10));
}
counter.load(Ordering::Relaxed) >= expected
}
Expand Down
3 changes: 3 additions & 0 deletions pnpm-workspace.yaml
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
packages:
- sdks/typescript
- sdks/typescript/native/*

onlyBuiltDependencies:
- "@biomejs/biome"
133 changes: 107 additions & 26 deletions sdks/typescript/scripts/build-native-host.mjs
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,72 @@
import { spawnSync } from "node:child_process";
import { chmodSync, copyFileSync, existsSync, mkdirSync, readFileSync } from "node:fs";
import { basename, join } from "node:path";
import { basename, delimiter, join } from "node:path";

const scriptDirectory = import.meta.dirname;
const sdkPackageDirectory = join(scriptDirectory, "..");
const workspaceDirectory = join(sdkPackageDirectory, "..", "..");
const cargoTargetRoot = process.env.CARGO_TARGET_DIR ?? join(workspaceDirectory, "target");
const overriddenPlatform = process.env.SOF_TS_NATIVE_PLATFORM;
const overriddenArch = process.env.SOF_TS_NATIVE_ARCH;
const overriddenTarget = process.env.SOF_TS_NATIVE_TARGET;
const cargoSubcommand = process.env.SOF_TS_NATIVE_CARGO_SUBCOMMAND;
const crossBuildCargoSubcommand = "zigbuild";

function runtimeHostBinaryName() {
return process.platform === "win32" ? "sof_ts_runtime_host.exe" : "sof_ts_runtime_host";
function packagePlatformFromDirectory(packageDirectory) {
const name = basename(packageDirectory);
const separator = name.indexOf("-");
if (separator === -1) {
return;
}

return {
arch: name.slice(separator + 1),
platform: name.slice(0, separator),
};
}

function buildPlatform(packageDirectory) {
return (
overriddenPlatform ??
packagePlatformFromDirectory(packageDirectory)?.platform ??
process.platform
);
}

function buildArch(packageDirectory) {
return overriddenArch ?? packagePlatformFromDirectory(packageDirectory)?.arch ?? process.arch;
}

function runtimeHostBinaryName(platform) {
return platform === "win32" ? "sof_ts_runtime_host.exe" : "sof_ts_runtime_host";
}

function defaultCargoTarget(platform, arch) {
if (platform === process.platform && arch === process.arch) {
return;
}

if (platform === "darwin" && arch === "x64") {
return "x86_64-apple-darwin";
}
if (platform === "darwin" && arch === "arm64") {
return "aarch64-apple-darwin";
}
if (platform === "win32" && arch === "x64") {
return "x86_64-pc-windows-gnu";
}
if (platform === "win32" && arch === "arm64") {
return "aarch64-pc-windows-gnullvm";
}
if (platform === "linux" && arch === "arm64") {
return "aarch64-unknown-linux-gnu";
}
}

function defaultCargoSubcommand(target) {
if (target !== undefined) {
return crossBuildCargoSubcommand;
}
}

function nativePackageDirectory() {
Expand All@@ -29,7 +88,7 @@ function packageMetadata(packageDirectory) {
const packageJsonPath = join(packageDirectory, "package.json");
if (!existsSync(packageJsonPath)) {
throw new Error(
`native package metadata was not found at ${packageJsonPath}; expected a package for ${process.platform}-${process.arch}`,
`native package metadata was not found at ${packageJsonPath}; expected a package for ${buildPlatform()}-${buildArch()}`,
);
}

Expand All@@ -38,40 +97,62 @@ function packageMetadata(packageDirectory) {

const packageDirectory = nativePackageDirectory();
const packageJson = packageMetadata(packageDirectory);
const platform = buildPlatform(packageDirectory);
const arch = buildArch(packageDirectory);
const target = overriddenTarget ?? defaultCargoTarget(platform, arch);
const subcommand = cargoSubcommand ?? defaultCargoSubcommand(target);
const outputDirectory = join(packageDirectory, "vendor");
const outputPath = join(outputDirectory, runtimeHostBinaryName());
const sourcePath = join(workspaceDirectory, "target", "release", runtimeHostBinaryName());
const binaryName = runtimeHostBinaryName(platform);
const targetDirectory = target === undefined ? "release" : join(target, "release");
const outputPath = join(outputDirectory, binaryName);
const sourcePath = join(cargoTargetRoot, targetDirectory, binaryName);
const features = ["provider-websocket", "provider-grpc", "gossip-bootstrap"];

if (process.platform === "linux") {
if (platform === "linux") {
features.push("kernel-bypass");
}

const packagePlatform = basename(packageDirectory);
if (packagePlatform !== `${process.platform}-${process.arch}`) {
const currentPlatformKey = `${platform}-${arch}`;
if (packagePlatform !== currentPlatformKey) {
throw new Error(
`native package ${packageJson.name ?? packagePlatform} does not match the current platform ${process.platform}-${process.arch}`,
`native package ${packageJson.name ?? packagePlatform} does not match the selected platform ${currentPlatformKey}`,
);
}

const cargo = spawnSync(
"cargo",
[
"build",
"--release",
"-p",
"sof",
"--features",
features.join(","),
"--bin",
"sof_ts_runtime_host",
],
{
cwd: workspaceDirectory,
stdio: "inherit",
},
const cargoArgs = [];
if (subcommand !== undefined && subcommand.length > 0) {
cargoArgs.push(subcommand);
} else {
cargoArgs.push("build");
}
if (target !== undefined) {
cargoArgs.push("--target", target);
}
cargoArgs.push(
"--release",
"-p",
"sof",
"--features",
features.join(","),
"--bin",
"sof_ts_runtime_host",
);

const cargoEnv = { ...process.env };
cargoEnv.PATH = [join(sdkPackageDirectory, "node_modules", ".bin"), cargoEnv.PATH]
.filter((value) => value !== undefined && value.length > 0)
.join(delimiter);
if (platform === "darwin") {
cargoEnv.CARGO_PROFILE_RELEASE_LTO = "off";
}

const cargo = spawnSync("cargo", cargoArgs, {
cwd: workspaceDirectory,
env: cargoEnv,
stdio: "inherit",
});

if (cargo.error !== undefined) {
throw new Error(`failed to run cargo: ${cargo.error.message}`);
}
Expand All@@ -87,6 +168,6 @@ if (!existsSync(sourcePath)) {

mkdirSync(outputDirectory, { recursive: true });
copyFileSync(sourcePath, outputPath);
if (process.platform !== "win32") {
if (platform !== "win32") {
chmodSync(outputPath, 0o755);
}
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions .github/workflows/release-typescript-sdk.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -103,6 +103,7 @@ jobs:
needs: verify
runs-on: ${{ matrix.runner }}
timeout-minutes: 60
continue-on-error: true
strategy:
fail-fast: false
matrix:
Expand DownExpand Up@@ -131,6 +132,8 @@ jobs:

- name: Setup Rust CI toolchain and tools
uses: ./.github/actions/rust-ci-setup
with:
cargo-tools: cargo-make,cargo-nextest

- name: Setup pnpm
uses: pnpm/action-setup@v4
Expand All@@ -154,7 +157,7 @@ jobs:
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
shell: bash
run: pnpm publish --access public --no-git-checks
run: node ../../scripts/publish-package.mjs

- name: Pack native runtime package
if: needs.verify.outputs.publish_release != 'true'
Expand DownExpand Up@@ -239,7 +242,7 @@ jobs:
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
shell: bash
run: pnpm publish --access public --no-git-checks
run: node scripts/publish-package.mjs

- name: Pack TypeScript SDK
if: needs.verify.outputs.publish_release != 'true'
Expand Down
24 changes: 1 addition & 23 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions Cargo.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,8 @@ exclude = ["crates/sof-solana-gossip"]
[patch.crates-io]
sof-solana-gossip = { path = "crates/sof-solana-gossip" }
helius-laserstream = { path = "vendor/helius-laserstream" }
laserstream-core-proto = { path = "vendor/laserstream-core-proto" }
yellowstone-grpc-client = { path = "vendor/yellowstone-grpc-client" }

[workspace.package]
edition = "2024"
Expand Down
4 changes: 4 additions & 0 deletions crates/sof-observer/src/ingest/config.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -70,18 +70,21 @@ pub(super) fn read_udp_idle_wait_ms() -> u64 {
.unwrap_or(100)
}

#[cfg(target_os = "linux")]
pub(super) fn read_udp_busy_poll_us() -> Option<u32> {
read_env_var("SOF_UDP_BUSY_POLL_US")
.and_then(|value| value.parse::<u32>().ok())
.filter(|value| *value > 0)
}

#[cfg(target_os = "linux")]
pub(super) fn read_udp_busy_poll_budget() -> Option<u32> {
read_env_var("SOF_UDP_BUSY_POLL_BUDGET")
.and_then(|value| value.parse::<u32>().ok())
.filter(|value| *value > 0)
}

#[cfg(target_os = "linux")]
pub(super) fn read_udp_prefer_busy_poll() -> bool {
read_bool_env("SOF_UDP_PREFER_BUSY_POLL", false)
}
Expand All@@ -90,6 +93,7 @@ pub(super) fn read_udp_drop_on_channel_full() -> bool {
read_bool_env("SOF_UDP_DROP_ON_CHANNEL_FULL", true)
}

#[cfg(target_os = "linux")]
fn read_udp_track_rxq_ovfl() -> bool {
read_bool_env("SOF_UDP_TRACK_RXQ_OVFL", false)
}
Expand Down
4 changes: 4 additions & 0 deletions crates/sof-observer/src/ingest/receiver/core.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -142,6 +142,7 @@ impl RawPacketBatch {
storage.packets.reserve(additional);
}

#[cfg(target_os = "linux")]
pub(super) fn ensure_receive_slots(&mut self, additional: usize) -> usize {
let Some(storage) = self.storage.as_mut() else {
return 0;
Expand All@@ -156,13 +157,15 @@ impl RawPacketBatch {
start_index
}

#[cfg(target_os = "linux")]
pub(super) fn receive_buffer_mut(
&mut self,
buffer_index: usize,
) -> Option<&mut [u8; UDP_PACKET_BUFFER_BYTES]> {
self.storage.as_mut()?.buffers.get_mut(buffer_index)
}

#[cfg(target_os = "linux")]
pub(super) fn push_received_metadata(
&mut self,
source: SocketAddr,
Expand DownExpand Up@@ -366,6 +369,7 @@ impl ReceiverTelemetry {
.store(current_unix_ms(), Ordering::Relaxed);
}

#[cfg(target_os = "linux")]
fn record_packets(&self, packet_count: usize) {
self.packets.fetch_add(
u64::try_from(packet_count).unwrap_or(u64::MAX),
Expand Down
7 changes: 3 additions & 4 deletions crates/sof-observer/src/runtime.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ use std::{
path::PathBuf,
pin::Pin,
sync::Arc,
thread::{self, available_parallelism},
thread::available_parallelism,
time::{Duration, Instant},
};

Expand DownExpand Up@@ -3449,7 +3449,7 @@ async fn wait_for_termination_signal() {
#[cfg(unix)]
{
let (shutdown_tx, shutdown_rx) = tokio::sync::oneshot::channel();
thread::spawn(move || {
std::thread::spawn(move || {
let mut signals = match signal_hook::iterator::Signals::new([
signal_hook::consts::signal::SIGTERM,
signal_hook::consts::signal::SIGINT,
Expand DownExpand Up@@ -3822,7 +3822,6 @@ mod tests {
Arc, Mutex,
atomic::{AtomicUsize, Ordering},
},
thread,
time::Instant,
};

Expand DownExpand Up@@ -5326,7 +5325,7 @@ mod tests {
if counter.load(Ordering::Relaxed) >= expected {
return true;
}
thread::sleep(Duration::from_millis(10));
std::thread::sleep(Duration::from_millis(10));
}
counter.load(Ordering::Relaxed) >= expected
}
Expand Down
3 changes: 3 additions & 0 deletions pnpm-workspace.yaml
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
packages:
- sdks/typescript
- sdks/typescript/native/*

onlyBuiltDependencies:
- "@biomejs/biome"
133 changes: 107 additions & 26 deletions sdks/typescript/scripts/build-native-host.mjs
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,72 @@
import { spawnSync } from "node:child_process";
import { chmodSync, copyFileSync, existsSync, mkdirSync, readFileSync } from "node:fs";
import { basename, join } from "node:path";
import { basename, delimiter, join } from "node:path";

const scriptDirectory = import.meta.dirname;
const sdkPackageDirectory = join(scriptDirectory, "..");
const workspaceDirectory = join(sdkPackageDirectory, "..", "..");
const cargoTargetRoot = process.env.CARGO_TARGET_DIR ?? join(workspaceDirectory, "target");
const overriddenPlatform = process.env.SOF_TS_NATIVE_PLATFORM;
const overriddenArch = process.env.SOF_TS_NATIVE_ARCH;
const overriddenTarget = process.env.SOF_TS_NATIVE_TARGET;
const cargoSubcommand = process.env.SOF_TS_NATIVE_CARGO_SUBCOMMAND;
const crossBuildCargoSubcommand = "zigbuild";

function runtimeHostBinaryName() {
return process.platform === "win32" ? "sof_ts_runtime_host.exe" : "sof_ts_runtime_host";
function packagePlatformFromDirectory(packageDirectory) {
const name = basename(packageDirectory);
const separator = name.indexOf("-");
if (separator === -1) {
return;
}

return {
arch: name.slice(separator + 1),
platform: name.slice(0, separator),
};
}

function buildPlatform(packageDirectory) {
return (
overriddenPlatform ??
packagePlatformFromDirectory(packageDirectory)?.platform ??
process.platform
);
}

function buildArch(packageDirectory) {
return overriddenArch ?? packagePlatformFromDirectory(packageDirectory)?.arch ?? process.arch;
}

function runtimeHostBinaryName(platform) {
return platform === "win32" ? "sof_ts_runtime_host.exe" : "sof_ts_runtime_host";
}

function defaultCargoTarget(platform, arch) {
if (platform === process.platform && arch === process.arch) {
return;
}

if (platform === "darwin" && arch === "x64") {
return "x86_64-apple-darwin";
}
if (platform === "darwin" && arch === "arm64") {
return "aarch64-apple-darwin";
}
if (platform === "win32" && arch === "x64") {
return "x86_64-pc-windows-gnu";
}
if (platform === "win32" && arch === "arm64") {
return "aarch64-pc-windows-gnullvm";
}
if (platform === "linux" && arch === "arm64") {
return "aarch64-unknown-linux-gnu";
}
}

function defaultCargoSubcommand(target) {
if (target !== undefined) {
return crossBuildCargoSubcommand;
}
}

function nativePackageDirectory() {
Expand All@@ -29,7 +88,7 @@ function packageMetadata(packageDirectory) {
const packageJsonPath = join(packageDirectory, "package.json");
if (!existsSync(packageJsonPath)) {
throw new Error(
`native package metadata was not found at ${packageJsonPath}; expected a package for ${process.platform}-${process.arch}`,
`native package metadata was not found at ${packageJsonPath}; expected a package for ${buildPlatform()}-${buildArch()}`,
);
}

Expand All@@ -38,40 +97,62 @@ function packageMetadata(packageDirectory) {

const packageDirectory = nativePackageDirectory();
const packageJson = packageMetadata(packageDirectory);
const platform = buildPlatform(packageDirectory);
const arch = buildArch(packageDirectory);
const target = overriddenTarget ?? defaultCargoTarget(platform, arch);
const subcommand = cargoSubcommand ?? defaultCargoSubcommand(target);
const outputDirectory = join(packageDirectory, "vendor");
const outputPath = join(outputDirectory, runtimeHostBinaryName());
const sourcePath = join(workspaceDirectory, "target", "release", runtimeHostBinaryName());
const binaryName = runtimeHostBinaryName(platform);
const targetDirectory = target === undefined ? "release" : join(target, "release");
const outputPath = join(outputDirectory, binaryName);
const sourcePath = join(cargoTargetRoot, targetDirectory, binaryName);
const features = ["provider-websocket", "provider-grpc", "gossip-bootstrap"];

if (process.platform === "linux") {
if (platform === "linux") {
features.push("kernel-bypass");
}

const packagePlatform = basename(packageDirectory);
if (packagePlatform !== `${process.platform}-${process.arch}`) {
const currentPlatformKey = `${platform}-${arch}`;
if (packagePlatform !== currentPlatformKey) {
throw new Error(
`native package ${packageJson.name ?? packagePlatform} does not match the current platform ${process.platform}-${process.arch}`,
`native package ${packageJson.name ?? packagePlatform} does not match the selected platform ${currentPlatformKey}`,
);
}

const cargo = spawnSync(
"cargo",
[
"build",
"--release",
"-p",
"sof",
"--features",
features.join(","),
"--bin",
"sof_ts_runtime_host",
],
{
cwd: workspaceDirectory,
stdio: "inherit",
},
const cargoArgs = [];
if (subcommand !== undefined && subcommand.length > 0) {
cargoArgs.push(subcommand);
} else {
cargoArgs.push("build");
}
if (target !== undefined) {
cargoArgs.push("--target", target);
}
cargoArgs.push(
"--release",
"-p",
"sof",
"--features",
features.join(","),
"--bin",
"sof_ts_runtime_host",
);

const cargoEnv = { ...process.env };
cargoEnv.PATH = [join(sdkPackageDirectory, "node_modules", ".bin"), cargoEnv.PATH]
.filter((value) => value !== undefined && value.length > 0)
.join(delimiter);
if (platform === "darwin") {
cargoEnv.CARGO_PROFILE_RELEASE_LTO = "off";
}

const cargo = spawnSync("cargo", cargoArgs, {
cwd: workspaceDirectory,
env: cargoEnv,
stdio: "inherit",
});

if (cargo.error !== undefined) {
throw new Error(`failed to run cargo: ${cargo.error.message}`);
}
Expand All@@ -87,6 +168,6 @@ if (!existsSync(sourcePath)) {

mkdirSync(outputDirectory, { recursive: true });
copyFileSync(sourcePath, outputPath);
if (process.platform !== "win32") {
if (platform !== "win32") {
chmodSync(outputPath, 0o755);
}
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions .github/workflows/release-typescript-sdk.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -103,6 +103,7 @@ jobs:
needs: verify
runs-on: ${{ matrix.runner }}
timeout-minutes: 60
continue-on-error: true
strategy:
fail-fast: false
matrix:
Expand DownExpand Up@@ -131,6 +132,8 @@ jobs:

- name: Setup Rust CI toolchain and tools
uses: ./.github/actions/rust-ci-setup
with:
cargo-tools: cargo-make,cargo-nextest

- name: Setup pnpm
uses: pnpm/action-setup@v4
Expand All@@ -154,7 +157,7 @@ jobs:
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
shell: bash
run: pnpm publish --access public --no-git-checks
run: node ../../scripts/publish-package.mjs

- name: Pack native runtime package
if: needs.verify.outputs.publish_release != 'true'
Expand DownExpand Up@@ -239,7 +242,7 @@ jobs:
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
shell: bash
run: pnpm publish --access public --no-git-checks
run: node scripts/publish-package.mjs

- name: Pack TypeScript SDK
if: needs.verify.outputs.publish_release != 'true'
Expand Down
24 changes: 1 addition & 23 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions Cargo.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,8 @@ exclude = ["crates/sof-solana-gossip"]
[patch.crates-io]
sof-solana-gossip = { path = "crates/sof-solana-gossip" }
helius-laserstream = { path = "vendor/helius-laserstream" }
laserstream-core-proto = { path = "vendor/laserstream-core-proto" }
yellowstone-grpc-client = { path = "vendor/yellowstone-grpc-client" }

[workspace.package]
edition = "2024"
Expand Down
4 changes: 4 additions & 0 deletions crates/sof-observer/src/ingest/config.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -70,18 +70,21 @@ pub(super) fn read_udp_idle_wait_ms() -> u64 {
.unwrap_or(100)
}

#[cfg(target_os = "linux")]
pub(super) fn read_udp_busy_poll_us() -> Option<u32> {
read_env_var("SOF_UDP_BUSY_POLL_US")
.and_then(|value| value.parse::<u32>().ok())
.filter(|value| *value > 0)
}

#[cfg(target_os = "linux")]
pub(super) fn read_udp_busy_poll_budget() -> Option<u32> {
read_env_var("SOF_UDP_BUSY_POLL_BUDGET")
.and_then(|value| value.parse::<u32>().ok())
.filter(|value| *value > 0)
}

#[cfg(target_os = "linux")]
pub(super) fn read_udp_prefer_busy_poll() -> bool {
read_bool_env("SOF_UDP_PREFER_BUSY_POLL", false)
}
Expand All@@ -90,6 +93,7 @@ pub(super) fn read_udp_drop_on_channel_full() -> bool {
read_bool_env("SOF_UDP_DROP_ON_CHANNEL_FULL", true)
}

#[cfg(target_os = "linux")]
fn read_udp_track_rxq_ovfl() -> bool {
read_bool_env("SOF_UDP_TRACK_RXQ_OVFL", false)
}
Expand Down
4 changes: 4 additions & 0 deletions crates/sof-observer/src/ingest/receiver/core.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -142,6 +142,7 @@ impl RawPacketBatch {
storage.packets.reserve(additional);
}

#[cfg(target_os = "linux")]
pub(super) fn ensure_receive_slots(&mut self, additional: usize) -> usize {
let Some(storage) = self.storage.as_mut() else {
return 0;
Expand All@@ -156,13 +157,15 @@ impl RawPacketBatch {
start_index
}

#[cfg(target_os = "linux")]
pub(super) fn receive_buffer_mut(
&mut self,
buffer_index: usize,
) -> Option<&mut [u8; UDP_PACKET_BUFFER_BYTES]> {
self.storage.as_mut()?.buffers.get_mut(buffer_index)
}

#[cfg(target_os = "linux")]
pub(super) fn push_received_metadata(
&mut self,
source: SocketAddr,
Expand DownExpand Up@@ -366,6 +369,7 @@ impl ReceiverTelemetry {
.store(current_unix_ms(), Ordering::Relaxed);
}

#[cfg(target_os = "linux")]
fn record_packets(&self, packet_count: usize) {
self.packets.fetch_add(
u64::try_from(packet_count).unwrap_or(u64::MAX),
Expand Down
7 changes: 3 additions & 4 deletions crates/sof-observer/src/runtime.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ use std::{
path::PathBuf,
pin::Pin,
sync::Arc,
thread::{self, available_parallelism},
thread::available_parallelism,
time::{Duration, Instant},
};

Expand DownExpand Up@@ -3449,7 +3449,7 @@ async fn wait_for_termination_signal() {
#[cfg(unix)]
{
let (shutdown_tx, shutdown_rx) = tokio::sync::oneshot::channel();
thread::spawn(move || {
std::thread::spawn(move || {
let mut signals = match signal_hook::iterator::Signals::new([
signal_hook::consts::signal::SIGTERM,
signal_hook::consts::signal::SIGINT,
Expand DownExpand Up@@ -3822,7 +3822,6 @@ mod tests {
Arc, Mutex,
atomic::{AtomicUsize, Ordering},
},
thread,
time::Instant,
};

Expand DownExpand Up@@ -5326,7 +5325,7 @@ mod tests {
if counter.load(Ordering::Relaxed) >= expected {
return true;
}
thread::sleep(Duration::from_millis(10));
std::thread::sleep(Duration::from_millis(10));
}
counter.load(Ordering::Relaxed) >= expected
}
Expand Down
3 changes: 3 additions & 0 deletions pnpm-workspace.yaml
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
packages:
- sdks/typescript
- sdks/typescript/native/*

onlyBuiltDependencies:
- "@biomejs/biome"
133 changes: 107 additions & 26 deletions sdks/typescript/scripts/build-native-host.mjs
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,72 @@
import { spawnSync } from "node:child_process";
import { chmodSync, copyFileSync, existsSync, mkdirSync, readFileSync } from "node:fs";
import { basename, join } from "node:path";
import { basename, delimiter, join } from "node:path";

const scriptDirectory = import.meta.dirname;
const sdkPackageDirectory = join(scriptDirectory, "..");
const workspaceDirectory = join(sdkPackageDirectory, "..", "..");
const cargoTargetRoot = process.env.CARGO_TARGET_DIR ?? join(workspaceDirectory, "target");
const overriddenPlatform = process.env.SOF_TS_NATIVE_PLATFORM;
const overriddenArch = process.env.SOF_TS_NATIVE_ARCH;
const overriddenTarget = process.env.SOF_TS_NATIVE_TARGET;
const cargoSubcommand = process.env.SOF_TS_NATIVE_CARGO_SUBCOMMAND;
const crossBuildCargoSubcommand = "zigbuild";

function runtimeHostBinaryName() {
return process.platform === "win32" ? "sof_ts_runtime_host.exe" : "sof_ts_runtime_host";
function packagePlatformFromDirectory(packageDirectory) {
const name = basename(packageDirectory);
const separator = name.indexOf("-");
if (separator === -1) {
return;
}

return {
arch: name.slice(separator + 1),
platform: name.slice(0, separator),
};
}

function buildPlatform(packageDirectory) {
return (
overriddenPlatform ??
packagePlatformFromDirectory(packageDirectory)?.platform ??
process.platform
);
}

function buildArch(packageDirectory) {
return overriddenArch ?? packagePlatformFromDirectory(packageDirectory)?.arch ?? process.arch;
}

function runtimeHostBinaryName(platform) {
return platform === "win32" ? "sof_ts_runtime_host.exe" : "sof_ts_runtime_host";
}

function defaultCargoTarget(platform, arch) {
if (platform === process.platform && arch === process.arch) {
return;
}

if (platform === "darwin" && arch === "x64") {
return "x86_64-apple-darwin";
}
if (platform === "darwin" && arch === "arm64") {
return "aarch64-apple-darwin";
}
if (platform === "win32" && arch === "x64") {
return "x86_64-pc-windows-gnu";
}
if (platform === "win32" && arch === "arm64") {
return "aarch64-pc-windows-gnullvm";
}
if (platform === "linux" && arch === "arm64") {
return "aarch64-unknown-linux-gnu";
}
}

function defaultCargoSubcommand(target) {
if (target !== undefined) {
return crossBuildCargoSubcommand;
}
}

function nativePackageDirectory() {
Expand All@@ -29,7 +88,7 @@ function packageMetadata(packageDirectory) {
const packageJsonPath = join(packageDirectory, "package.json");
if (!existsSync(packageJsonPath)) {
throw new Error(
`native package metadata was not found at ${packageJsonPath}; expected a package for ${process.platform}-${process.arch}`,
`native package metadata was not found at ${packageJsonPath}; expected a package for ${buildPlatform()}-${buildArch()}`,
);
}

Expand All@@ -38,40 +97,62 @@ function packageMetadata(packageDirectory) {

const packageDirectory = nativePackageDirectory();
const packageJson = packageMetadata(packageDirectory);
const platform = buildPlatform(packageDirectory);
const arch = buildArch(packageDirectory);
const target = overriddenTarget ?? defaultCargoTarget(platform, arch);
const subcommand = cargoSubcommand ?? defaultCargoSubcommand(target);
const outputDirectory = join(packageDirectory, "vendor");
const outputPath = join(outputDirectory, runtimeHostBinaryName());
const sourcePath = join(workspaceDirectory, "target", "release", runtimeHostBinaryName());
const binaryName = runtimeHostBinaryName(platform);
const targetDirectory = target === undefined ? "release" : join(target, "release");
const outputPath = join(outputDirectory, binaryName);
const sourcePath = join(cargoTargetRoot, targetDirectory, binaryName);
const features = ["provider-websocket", "provider-grpc", "gossip-bootstrap"];

if (process.platform === "linux") {
if (platform === "linux") {
features.push("kernel-bypass");
}

const packagePlatform = basename(packageDirectory);
if (packagePlatform !== `${process.platform}-${process.arch}`) {
const currentPlatformKey = `${platform}-${arch}`;
if (packagePlatform !== currentPlatformKey) {
throw new Error(
`native package ${packageJson.name ?? packagePlatform} does not match the current platform ${process.platform}-${process.arch}`,
`native package ${packageJson.name ?? packagePlatform} does not match the selected platform ${currentPlatformKey}`,
);
}

const cargo = spawnSync(
"cargo",
[
"build",
"--release",
"-p",
"sof",
"--features",
features.join(","),
"--bin",
"sof_ts_runtime_host",
],
{
cwd: workspaceDirectory,
stdio: "inherit",
},
const cargoArgs = [];
if (subcommand !== undefined && subcommand.length > 0) {
cargoArgs.push(subcommand);
} else {
cargoArgs.push("build");
}
if (target !== undefined) {
cargoArgs.push("--target", target);
}
cargoArgs.push(
"--release",
"-p",
"sof",
"--features",
features.join(","),
"--bin",
"sof_ts_runtime_host",
);

const cargoEnv = { ...process.env };
cargoEnv.PATH = [join(sdkPackageDirectory, "node_modules", ".bin"), cargoEnv.PATH]
.filter((value) => value !== undefined && value.length > 0)
.join(delimiter);
if (platform === "darwin") {
cargoEnv.CARGO_PROFILE_RELEASE_LTO = "off";
}

const cargo = spawnSync("cargo", cargoArgs, {
cwd: workspaceDirectory,
env: cargoEnv,
stdio: "inherit",
});

if (cargo.error !== undefined) {
throw new Error(`failed to run cargo: ${cargo.error.message}`);
}
Expand All@@ -87,6 +168,6 @@ if (!existsSync(sourcePath)) {

mkdirSync(outputDirectory, { recursive: true });
copyFileSync(sourcePath, outputPath);
if (process.platform !== "win32") {
if (platform !== "win32") {
chmodSync(outputPath, 0o755);
}
Loading
Loading