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
82 changes: 79 additions & 3 deletions AGENTS.md

Large diffs are not rendered by default.

50 changes: 38 additions & 12 deletions Cargo.lock

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

4 changes: 3 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,15 @@ members = [
"crates/iran-split-rules",
"crates/iran-split-platform-linux",
"crates/iran-split-platform-win",
"crates/iran-split-platform-macos",
"crates/iran-split-helper",
"crates/iran-split-helper-winacl",
"crates/iran-split-cli",
"src-tauri",
]

[workspace.package]
version = "6.2.52"
version = "6.2.57"
edition = "2021"
license = "MIT OR Apache-2.0"
rust-version = "1.88"
Expand All @@ -36,6 +37,7 @@ idna = "1.0.3"
ipnet = { version = "2.11.0", features = ["serde"] }
psl = "2.1.148"
nix = { version = "0.30.1", features = ["socket", "user", "signal", "process", "fs"] }
libc = "0.2.174"
rand = "0.9.1"
regex = "1.11.1"
reqwest = { version = "0.12.15", default-features = false, features = ["json", "rustls-tls", "socks"] }
Expand Down
2 changes: 1 addition & 1 deletion apps/desktop/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@iran-split/desktop",
"version": "6.2.52",
"version": "6.2.57",
"private": true,
"type": "module",
"scripts": {
Expand Down
11 changes: 7 additions & 4 deletions apps/desktop/src/i18n/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -813,12 +813,15 @@ const resources = {
},
} as const;

const savedLanguage =
typeof localStorage !== "undefined"
? (localStorage.getItem("biflow-language") ??
localStorage.getItem("iran-split-language"))
: undefined;

void i18n.use(initReactI18next).init({
resources,
lng:
localStorage.getItem("biflow-language") ??
localStorage.getItem("iran-split-language") ??
"en",
lng: savedLanguage ?? "en",
fallbackLng: "en",
interpolation: { escapeValue: false },
});
Expand Down
17 changes: 16 additions & 1 deletion apps/desktop/src/lib/presets.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ export type PresetStatus = "working" | "catalog" | "unsupported";
export interface PresetDownloads {
linux: string;
windows: string;
macos: string;
}

export interface PresetSpec {
Expand All @@ -37,6 +38,7 @@ export const PRESETS: PresetSpec[] = [
downloads: {
linux: "https://github.com/hiddify/hiddify-app/releases/latest",
windows: "https://github.com/hiddify/hiddify-app/releases/latest",
macos: "https://github.com/hiddify/hiddify-app/releases/latest",
},
},
{
Expand All @@ -50,6 +52,7 @@ export const PRESETS: PresetSpec[] = [
downloads: {
linux: "https://openvpn.net/community-downloads/",
windows: "https://openvpn.net/community-downloads/",
macos: "https://openvpn.net/community-downloads/",
},
},
{
Expand All @@ -63,6 +66,7 @@ export const PRESETS: PresetSpec[] = [
downloads: {
linux: "https://www.happ.su/main/download",
windows: "https://www.happ.su/main/download",
macos: "https://www.happ.su/main/download",
},
},
{
Expand All @@ -76,6 +80,7 @@ export const PRESETS: PresetSpec[] = [
downloads: {
linux: "https://github.com/2dust/v2rayN/releases/latest",
windows: "https://github.com/2dust/v2rayN/releases/latest",
macos: "https://github.com/2dust/v2rayN/releases/latest",
},
},
{
Expand All @@ -88,6 +93,7 @@ export const PRESETS: PresetSpec[] = [
downloads: {
linux: "https://github.com/MatsuriDayo/nekoray/releases/latest",
windows: "https://github.com/MatsuriDayo/nekoray/releases/latest",
macos: "https://github.com/MatsuriDayo/nekoray/releases/latest",
},
},
{
Expand All @@ -102,6 +108,7 @@ export const PRESETS: PresetSpec[] = [
linux: "https://github.com/shadowsocks/shadowsocks-rust/releases/latest",
windows:
"https://github.com/shadowsocks/shadowsocks-windows/releases/latest",
macos: "https://github.com/shadowsocks/shadowsocks-rust/releases/latest",
},
},
{
Expand All @@ -115,6 +122,7 @@ export const PRESETS: PresetSpec[] = [
downloads: {
linux: "https://www.wireguard.com/install/",
windows: "https://www.wireguard.com/install/",
macos: "https://www.wireguard.com/install/",
},
},
{
Expand All @@ -128,6 +136,7 @@ export const PRESETS: PresetSpec[] = [
downloads: {
linux: "https://windscribe.com/getconfig/openvpn",
windows: "https://windscribe.com/getconfig/openvpn",
macos: "https://windscribe.com/getconfig/openvpn",
},
},
];
Expand All @@ -138,7 +147,13 @@ export function presetById(id: PresetId): PresetSpec {

/** Official vendor download page for the current desktop platform. */
export function downloadUrlFor(spec: PresetSpec, platform: string): string {
return platform === "windows" ? spec.downloads.windows : spec.downloads.linux;
if (platform === "windows") {
return spec.downloads.windows;
}
if (platform === "macos") {
return spec.downloads.macos;
}
return spec.downloads.linux;
}

export type PresetDownloadLabel =
Expand Down
50 changes: 50 additions & 0 deletions apps/desktop/src/test/localStorage-shim.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
// vitest runs `setupFiles` in order; this file is listed before setup.ts so
// the shim is installed before any setup import (notably `i18n/config`,
// which reads the saved language at module-load time) runs.
//
// Node 26 ships an experimental `localStorage` global that stays
// `undefined` unless `--localstorage-file` is passed, and jsdom 26 defers
// to it instead of providing its own, so `window.localStorage` is also
// absent. Tests and the i18n bootstrap both need a working Storage, so
// install a minimal in-memory implementation on the shared global.

interface StorageEntry {
value: string;
}

const store = new Map<string, StorageEntry>();

const storage: Storage = {
get length(): number {
return store.size;
},
clear(): void {
store.clear();
},
getItem(key: string): string | null {
return store.has(key) ? (store.get(key) as StorageEntry).value : null;
},
key(index: number): string | null {
return Array.from(store.keys())[index] ?? null;
},
removeItem(key: string): void {
store.delete(key);
},
setItem(key: string, value: string): void {
store.set(key, { value: String(value) });
},
};

Object.defineProperty(globalThis, "localStorage", {
value: storage,
writable: true,
configurable: true,
});

if (typeof window !== "undefined" && window.localStorage === undefined) {
Object.defineProperty(window, "localStorage", {
value: storage,
writable: true,
configurable: true,
});
}
2 changes: 1 addition & 1 deletion apps/desktop/tsconfig.app.tsbuildinfo
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"root":["./src/App.test.tsx","./src/App.tsx","./src/installContextMenuGuard.ts","./src/main.tsx","./src/palette.test.ts","./src/shell.test.ts","./src/version.test.ts","./src/version.ts","./src/vite-env.d.ts","./src/api/desktop.native.test.ts","./src/api/desktop.ts","./src/api/mock.test.ts","./src/api/mock.ts","./src/api/models.ts","./src/components/About.test.tsx","./src/components/About.tsx","./src/components/AddSiteBar.tsx","./src/components/AppButton.test.tsx","./src/components/AppButton.tsx","./src/components/AppStatusBar.test.tsx","./src/components/AppStatusBar.tsx","./src/components/BasicDashboard.test.tsx","./src/components/BasicDashboard.tsx","./src/components/BottomNav.test.tsx","./src/components/BottomNav.tsx","./src/components/ClientRegistry.test.tsx","./src/components/ClientRegistry.tsx","./src/components/ConnectionActionButton.test.tsx","./src/components/ConnectionActionButton.tsx","./src/components/Dashboard.test.tsx","./src/components/Dashboard.tsx","./src/components/DefaultRouteSelect.tsx","./src/components/Diagnostics.test.tsx","./src/components/Diagnostics.tsx","./src/components/DirectRules.test.tsx","./src/components/DirectRules.tsx","./src/components/InputContextMenu.test.tsx","./src/components/InputContextMenu.tsx","./src/components/LifecycleCancelButton.tsx","./src/components/MihomoConfigDialog.tsx","./src/components/PageSkeleton.tsx","./src/components/RecentSites.test.tsx","./src/components/RecentSites.tsx","./src/components/Settings.test.tsx","./src/components/Settings.tsx","./src/components/SettingsApplyBanner.test.tsx","./src/components/SettingsApplyBanner.tsx","./src/components/SortHeader.tsx","./src/components/StatusPill.tsx","./src/components/TrafficFlow.tsx","./src/components/UiModeSwitch.test.tsx","./src/components/UiModeSwitch.tsx","./src/components/country.ts","./src/components/ui/InfoTip.tsx","./src/components/ui/PageHeader.tsx","./src/components/ui/Tabs.tsx","./src/components/ui/Toast.tsx","./src/components/ui/usePageTab.ts","./src/dev/local-deps.test.ts","./src/i18n/config.ts","./src/lib/clients.test.ts","./src/lib/clients.ts","./src/lib/clipboard.ts","./src/lib/connectComponentProgress.test.ts","./src/lib/connectRequirements.test.ts","./src/lib/connectRequirements.ts","./src/lib/connectionGroups.test.ts","./src/lib/connectionGroups.ts","./src/lib/connectionProgress.test.ts","./src/lib/connectionProgress.ts","./src/lib/directDns.test.ts","./src/lib/directDns.ts","./src/lib/editableTarget.test.ts","./src/lib/editableTarget.ts","./src/lib/failureReason.test.ts","./src/lib/failureReason.ts","./src/lib/formatTraffic.test.ts","./src/lib/formatTraffic.ts","./src/lib/hiddenHosts.test.ts","./src/lib/hiddenHosts.ts","./src/lib/host.test.ts","./src/lib/host.ts","./src/lib/lifecycle.test.ts","./src/lib/lifecycle.ts","./src/lib/navigation.ts","./src/lib/outbound.ts","./src/lib/presets.test.ts","./src/lib/presets.ts","./src/lib/settingsApply.test.ts","./src/lib/settingsApply.ts","./src/lib/sideTunnelConnect.test.ts","./src/lib/sideTunnelConnect.ts","./src/lib/tableSort.test.ts","./src/lib/tableSort.ts","./src/lib/uiMode.ts","./src/lib/viewport.test.ts","./src/lib/viewport.ts","./src/lib/yamlHighlight.test.ts","./src/lib/yamlHighlight.ts","./src/store/app.test.ts","./src/store/app.ts","./src/test/fixtures.ts","./src/test/setup.ts"],"version":"5.8.3"}
{"root":["./src/app.test.tsx","./src/app.tsx","./src/installcontextmenuguard.ts","./src/main.tsx","./src/palette.test.ts","./src/shell.test.ts","./src/version.test.ts","./src/version.ts","./src/vite-env.d.ts","./src/api/desktop.native.test.ts","./src/api/desktop.ts","./src/api/mock.test.ts","./src/api/mock.ts","./src/api/models.ts","./src/components/about.test.tsx","./src/components/about.tsx","./src/components/addsitebar.tsx","./src/components/appbutton.test.tsx","./src/components/appbutton.tsx","./src/components/appstatusbar.test.tsx","./src/components/appstatusbar.tsx","./src/components/basicdashboard.test.tsx","./src/components/basicdashboard.tsx","./src/components/bottomnav.test.tsx","./src/components/bottomnav.tsx","./src/components/clientregistry.test.tsx","./src/components/clientregistry.tsx","./src/components/connectionactionbutton.test.tsx","./src/components/connectionactionbutton.tsx","./src/components/dashboard.test.tsx","./src/components/dashboard.tsx","./src/components/defaultrouteselect.tsx","./src/components/diagnostics.test.tsx","./src/components/diagnostics.tsx","./src/components/directrules.test.tsx","./src/components/directrules.tsx","./src/components/inputcontextmenu.test.tsx","./src/components/inputcontextmenu.tsx","./src/components/lifecyclecancelbutton.tsx","./src/components/mihomoconfigdialog.tsx","./src/components/pageskeleton.tsx","./src/components/recentsites.test.tsx","./src/components/recentsites.tsx","./src/components/settings.test.tsx","./src/components/settings.tsx","./src/components/settingsapplybanner.test.tsx","./src/components/settingsapplybanner.tsx","./src/components/sortheader.tsx","./src/components/statuspill.tsx","./src/components/trafficflow.tsx","./src/components/uimodeswitch.test.tsx","./src/components/uimodeswitch.tsx","./src/components/country.ts","./src/components/ui/infotip.tsx","./src/components/ui/pageheader.tsx","./src/components/ui/tabs.tsx","./src/components/ui/toast.tsx","./src/components/ui/usepagetab.ts","./src/dev/local-deps.test.ts","./src/i18n/config.ts","./src/lib/clients.test.ts","./src/lib/clients.ts","./src/lib/clipboard.ts","./src/lib/connectcomponentprogress.test.ts","./src/lib/connectrequirements.test.ts","./src/lib/connectrequirements.ts","./src/lib/connectiongroups.test.ts","./src/lib/connectiongroups.ts","./src/lib/connectionprogress.test.ts","./src/lib/connectionprogress.ts","./src/lib/directdns.test.ts","./src/lib/directdns.ts","./src/lib/editabletarget.test.ts","./src/lib/editabletarget.ts","./src/lib/failurereason.test.ts","./src/lib/failurereason.ts","./src/lib/formattraffic.test.ts","./src/lib/formattraffic.ts","./src/lib/hiddenhosts.test.ts","./src/lib/hiddenhosts.ts","./src/lib/host.test.ts","./src/lib/host.ts","./src/lib/lifecycle.test.ts","./src/lib/lifecycle.ts","./src/lib/navigation.ts","./src/lib/outbound.ts","./src/lib/presets.test.ts","./src/lib/presets.ts","./src/lib/settingsapply.test.ts","./src/lib/settingsapply.ts","./src/lib/sidetunnelconnect.test.ts","./src/lib/sidetunnelconnect.ts","./src/lib/tablesort.test.ts","./src/lib/tablesort.ts","./src/lib/uimode.ts","./src/lib/viewport.test.ts","./src/lib/viewport.ts","./src/lib/yamlhighlight.test.ts","./src/lib/yamlhighlight.ts","./src/store/app.test.ts","./src/store/app.ts","./src/test/fixtures.ts","./src/test/localstorage-shim.ts","./src/test/setup.ts"],"version":"5.8.3"}
2 changes: 1 addition & 1 deletion apps/desktop/tsconfig.node.tsbuildinfo

Large diffs are not rendered by default.

11 changes: 10 additions & 1 deletion apps/desktop/vite.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,16 @@ export default defineConfig({
},
test: {
environment: "jsdom",
setupFiles: "./src/test/setup.ts",
environmentOptions: {
jsdom: {
// jsdom only exposes `localStorage` for a real origin; the default
// `about:blank` is opaque, so `window.localStorage` is undefined and
// every test that reads the language or the mock-deps flag fails
// (Node 26 also warns `localStorage is not available`).
url: "http://localhost/",
},
},
setupFiles: ["./src/test/localStorage-shim.ts", "./src/test/setup.ts"],
isolate: true,
css: true,
exclude: ["**/node_modules/**", "**/e2e/**", "**/dist/**"],
Expand Down
Loading