Skip to content

Commit a0df690

Browse files
author
Mohammod Al Amin Ashik
committed
updates tests
1 parent 31e3266 commit a0df690

139 files changed

Lines changed: 6878 additions & 4307 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/ci.yml‎

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@ on:
66
pull_request:
77
branches: [main]
88

9+
# Cancel in-progress runs when a new commit is pushed to the same PR or branch
910
concurrency:
10-
group: ${{ github.workflow }}-${{ github.ref }}
11+
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
1112
cancel-in-progress: true
1213

1314
env:
@@ -33,7 +34,10 @@ jobs:
3334
- name: Install Linux deps
3435
run: |
3536
sudo apt-get update
36-
sudo apt-get install -y libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf libsecret-1-dev
37+
sudo apt-get install -y pkg-config libglib2.0-dev libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf libsecret-1-dev
38+
39+
- name: Set PKG_CONFIG_PATH
40+
run: echo "PKG_CONFIG_PATH=/usr/lib/x86_64-linux-gnu/pkgconfig:/usr/share/pkgconfig" >> $GITHUB_ENV
3741

3842
- name: Format check
3943
run: cargo fmt --all --check
@@ -94,7 +98,11 @@ jobs:
9498
if: matrix.os == 'ubuntu-latest'
9599
run: |
96100
sudo apt-get update
97-
sudo apt-get install -y libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf libsecret-1-dev
101+
sudo apt-get install -y pkg-config libglib2.0-dev libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf libsecret-1-dev
102+
103+
- name: Set PKG_CONFIG_PATH
104+
if: matrix.os == 'ubuntu-latest'
105+
run: echo "PKG_CONFIG_PATH=/usr/lib/x86_64-linux-gnu/pkgconfig:/usr/share/pkgconfig" >> $GITHUB_ENV
98106

99107
# Install cargo-nextest
100108
- name: Install nextest
@@ -147,7 +155,11 @@ jobs:
147155
if: matrix.os == 'ubuntu-latest'
148156
run: |
149157
sudo apt-get update
150-
sudo apt-get install -y libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf libsecret-1-dev
158+
sudo apt-get install -y pkg-config libglib2.0-dev libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf libsecret-1-dev
159+
160+
- name: Set PKG_CONFIG_PATH
161+
if: matrix.os == 'ubuntu-latest'
162+
run: echo "PKG_CONFIG_PATH=/usr/lib/x86_64-linux-gnu/pkgconfig:/usr/share/pkgconfig" >> $GITHUB_ENV
151163

152164
- run: pnpm install --frozen-lockfile
153165
- run: pnpm build
@@ -229,7 +241,11 @@ jobs:
229241
if: matrix.os == 'ubuntu-latest'
230242
run: |
231243
sudo apt-get update
232-
sudo apt-get install -y libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf libsecret-1-dev webkit2gtk-driver xvfb
244+
sudo apt-get install -y pkg-config libglib2.0-dev libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf libsecret-1-dev webkit2gtk-driver xvfb
245+
246+
- name: Set PKG_CONFIG_PATH
247+
if: matrix.os == 'ubuntu-latest'
248+
run: echo "PKG_CONFIG_PATH=/usr/lib/x86_64-linux-gnu/pkgconfig:/usr/share/pkgconfig" >> $GITHUB_ENV
233249

234250
# Cache tauri-driver binary
235251
- name: Cache tauri-driver

‎.github/workflows/e2e-tauri-comment.yml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,11 @@ jobs:
5858
if: matrix.os == 'ubuntu-latest'
5959
run: |
6060
sudo apt-get update
61-
sudo apt-get install -y libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf libsecret-1-dev webkit2gtk-driver xvfb
61+
sudo apt-get install -y pkg-config libglib2.0-dev libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf libsecret-1-dev webkit2gtk-driver xvfb
62+
63+
- name: Set PKG_CONFIG_PATH
64+
if: matrix.os == 'ubuntu-latest'
65+
run: echo "PKG_CONFIG_PATH=/usr/lib/x86_64-linux-gnu/pkgconfig:/usr/share/pkgconfig" >> $GITHUB_ENV
6266

6367
- name: Cache tauri-driver
6468
uses: actions/cache@v4

‎apps/desktop/src-tauri/build.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ fn main() {
1212
}
1313
}
1414
}
15-
15+
1616
// Tell Cargo to re-run this script if tauri.conf.json changes
1717
println!("cargo:rerun-if-changed=tauri.conf.json");
18-
18+
1919
tauri_build::build()
2020
}

‎apps/desktop/src-tauri/src/commands/client.rs‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ use tauri::State;
1010
use tokio::sync::RwLock;
1111
use uuid::Uuid;
1212

13-
use crate::state::AppState;
1413
use crate::commands::gateway::GatewayAppState;
14+
use crate::state::AppState;
1515

1616
/// Response for client listing
1717
#[derive(Debug, Serialize)]
@@ -28,7 +28,9 @@ pub struct ClientResponse {
2828
impl From<Client> for ClientResponse {
2929
fn from(c: Client) -> Self {
3030
let (mode, locked_id) = match &c.connection_mode {
31-
ConnectionMode::Locked { space_id } => ("locked".to_string(), Some(space_id.to_string())),
31+
ConnectionMode::Locked { space_id } => {
32+
("locked".to_string(), Some(space_id.to_string()))
33+
}
3234
ConnectionMode::FollowActive => ("follow_active".to_string(), None),
3335
ConnectionMode::AskOnChange { .. } => ("ask_on_change".to_string(), None),
3436
};

‎apps/desktop/src-tauri/src/commands/client_custom_features.rs‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
//! Commands for managing client-specific custom feature sets
22
3-
use tauri::State;
43
use crate::state::AppState;
54
use mcpmux_core::{FeatureSet, FeatureSetType};
5+
use tauri::State;
66

77
/// Find or create a custom feature set for a specific client in a space
88
/// This ensures only one custom feature set exists per client per space
@@ -13,20 +13,20 @@ pub async fn find_or_create_client_custom_feature_set(
1313
space_id: String,
1414
) -> Result<FeatureSet, String> {
1515
let custom_set_name = format!("{} - Custom", client_name);
16-
16+
1717
// First, try to find existing custom feature set
1818
let existing_sets = state
1919
.feature_set_repository
2020
.list_by_space(&space_id)
2121
.await
2222
.map_err(|e| format!("Failed to list feature sets: {}", e))?;
23-
23+
2424
// Look for existing custom feature set with this name
25-
if let Some(existing) = existing_sets.iter().find(|fs|
26-
fs.name == custom_set_name &&
27-
fs.feature_set_type == FeatureSetType::Custom &&
28-
!fs.is_deleted
29-
) {
25+
if let Some(existing) = existing_sets.iter().find(|fs| {
26+
fs.name == custom_set_name
27+
&& fs.feature_set_type == FeatureSetType::Custom
28+
&& !fs.is_deleted
29+
}) {
3030
// Load members
3131
return state
3232
.feature_set_repository
@@ -35,18 +35,17 @@ pub async fn find_or_create_client_custom_feature_set(
3535
.map_err(|e| format!("Failed to load feature set: {}", e))?
3636
.ok_or_else(|| "Feature set not found".to_string());
3737
}
38-
38+
3939
// No existing set found, create a new one
4040
let new_set = FeatureSet::new_custom(&custom_set_name, &space_id)
4141
.with_description(format!("Custom features for {}", client_name))
4242
.with_icon("⚙️");
43-
43+
4444
state
4545
.feature_set_repository
4646
.create(&new_set)
4747
.await
4848
.map_err(|e| format!("Failed to create custom feature set: {}", e))?;
49-
49+
5050
Ok(new_set)
5151
}
52-

‎apps/desktop/src-tauri/src/commands/config_export.rs‎

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22
//!
33
//! IPC commands for generating MCP configuration files for clients.
44
5-
use mcpmux_core::{ConfigExporter, ConfigFormat, ResolvedTransport, ResolvedServer, TransportConfig};
5+
use mcpmux_core::{
6+
ConfigExporter, ConfigFormat, ResolvedServer, ResolvedTransport, TransportConfig,
7+
};
68
use serde::{Deserialize, Serialize};
79
use std::collections::HashMap;
810
use std::path::PathBuf;
@@ -78,27 +80,29 @@ async fn build_resolved_servers(
7880
if let Some(entry) = inst.get_definition() {
7981
// Build resolved transport from registry transport + input values
8082
let transport = match &entry.transport {
81-
TransportConfig::Stdio { command, args, env, .. } => {
83+
TransportConfig::Stdio {
84+
command, args, env, ..
85+
} => {
8286
// Resolve placeholders in command
8387
let resolved_command = resolve_placeholders(command, &inst.input_values);
84-
88+
8589
// Resolve placeholders in args
8690
let mut resolved_args: Vec<String> = args
8791
.iter()
8892
.map(|arg| resolve_placeholders(arg, &inst.input_values))
8993
.collect();
90-
94+
9195
// Append user's extra args
9296
resolved_args.extend(inst.args_append.clone());
9397

9498
// Build env from registry + input values + env_overrides
9599
let mut resolved_env = HashMap::new();
96-
100+
97101
// 1. Start with registry env
98102
for (k, v) in env {
99103
resolved_env.insert(k.clone(), resolve_placeholders(v, &inst.input_values));
100104
}
101-
105+
102106
// 2. Add input values (for api_key type servers)
103107
if !mask_credentials {
104108
resolved_env.extend(inst.input_values.clone());
@@ -107,7 +111,7 @@ async fn build_resolved_servers(
107111
resolved_env.insert(k.clone(), "***MASKED***".to_string());
108112
}
109113
}
110-
114+
111115
// 3. Apply user's env overrides
112116
resolved_env.extend(inst.env_overrides.clone());
113117

@@ -119,16 +123,16 @@ async fn build_resolved_servers(
119123
}
120124
TransportConfig::Http { url, headers, .. } => {
121125
let resolved_url = resolve_placeholders(url, &inst.input_values);
122-
126+
123127
// Resolve headers from registry
124128
let mut resolved_headers: HashMap<String, String> = headers
125129
.iter()
126130
.map(|(k, v)| (k.clone(), resolve_placeholders(v, &inst.input_values)))
127131
.collect();
128-
132+
129133
// Add user's extra headers
130134
resolved_headers.extend(inst.extra_headers.clone());
131-
135+
132136
ResolvedTransport::Http {
133137
url: resolved_url,
134138
headers: resolved_headers,

‎apps/desktop/src-tauri/src/commands/feature_members.rs‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ use tauri::State;
88
use tokio::sync::RwLock;
99
use uuid::Uuid as StdUuid;
1010

11-
use crate::state::AppState;
1211
use crate::commands::gateway::GatewayAppState;
12+
use crate::state::AppState;
1313

1414
/// Add an individual feature (tool/prompt/resource) to a feature set
1515
#[tauri::command]
@@ -21,7 +21,7 @@ pub async fn add_feature_to_set(
2121
mode: String,
2222
) -> Result<(), String> {
2323
let app_state = &*state;
24-
24+
2525
let mode = match mode.as_str() {
2626
"include" => MemberMode::Include,
2727
"exclude" => MemberMode::Exclude,
@@ -33,12 +33,12 @@ pub async fn add_feature_to_set(
3333
.add_feature_member(&feature_set_id, &feature_id, mode)
3434
.await
3535
.map_err(|e| format!("Failed to add feature to set: {}", e))?;
36-
36+
3737
// Emit domain event if gateway is running
3838
let gw_state = gateway_state.read().await;
3939
if let Some(ref gw) = gw_state.gateway_state {
4040
let gw = gw.read().await;
41-
41+
4242
// Get feature set to access space_id
4343
if let Ok(Some(fs)) = app_state.feature_set_repository.get(&feature_set_id).await {
4444
if let Some(space_id_str) = fs.space_id {
@@ -72,12 +72,12 @@ pub async fn remove_feature_from_set(
7272
.remove_feature_member(&feature_set_id, &feature_id)
7373
.await
7474
.map_err(|e| format!("Failed to remove feature from set: {}", e))?;
75-
75+
7676
// Emit domain event if gateway is running
7777
let gw_state = gateway_state.read().await;
7878
if let Some(ref gw) = gw_state.gateway_state {
7979
let gw = gw.read().await;
80-
80+
8181
// Get feature set to access space_id
8282
if let Ok(Some(fs)) = app_state.feature_set_repository.get(&feature_set_id).await {
8383
if let Some(space_id_str) = fs.space_id {
@@ -112,4 +112,3 @@ pub async fn get_feature_set_members(
112112

113113
Ok(members)
114114
}
115-

0 commit comments

Comments
 (0)