Skip to content
Open
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
15 changes: 0 additions & 15 deletions client/.env.example
Original file line number Diff line number Diff line change
Expand Up @@ -46,30 +46,17 @@ VITE_DEV_POWER_USER_PUBKEY=
VITE_DEV_MODE_AUTH=false

# ===========================================
# Vircadia Multi-User XR Configuration
# ===========================================
VITE_VIRCADIA_SERVER_URL=ws://localhost:3020/world/ws
VITE_VIRCADIA_AUTH_TOKEN=your-system-token-here
VITE_VIRCADIA_AUTH_PROVIDER=system
VITE_VIRCADIA_ENABLED=true
VITE_VIRCADIA_SYNC_GROUP=public.NORMAL
VITE_VIRCADIA_ENABLE_MULTI_USER=true
VITE_VIRCADIA_ENABLE_SPATIAL_AUDIO=false

# ===========================================
# Quest 3 XR Settings
# ===========================================
VITE_QUEST3_AUTO_CONNECT_VIRCADIA=true
VITE_QUEST3_ENABLE_HAND_TRACKING=true
VITE_QUEST3_ENABLE_PASSTHROUGH=true

# ===========================================
# Performance Configuration
# ===========================================
VITE_VIRCADIA_BATCH_SIZE=100
VITE_VIRCADIA_SYNC_INTERVAL_MS=100
VITE_VIRCADIA_MAX_RECONNECT_ATTEMPTS=5
VITE_VIRCADIA_RECONNECT_DELAY_MS=5000

# Three.js Rendering Optimization
VITE_INSTANCED_RENDERING=true
Expand All @@ -80,8 +67,6 @@ VITE_MAX_RENDER_DISTANCE=50
# Logging & Debug
# ===========================================
VITE_LOG_LEVEL=info
VITE_VIRCADIA_DEBUG=false
VITE_VIRCADIA_SUPPRESS_LOGS=false

# Console logging (can be toggled at runtime via Control Center)
VITE_CONSOLE_LOGGING=true
Expand Down
32 changes: 1 addition & 31 deletions client/.github/workflows/benchmarks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,38 +59,8 @@ jobs:
benchmark-results/benchmark-*.json
fi

integration:
runs-on: ubuntu-latest
timeout-minutes: 30

steps:
- name: Checkout code
uses: actions/checkout@v4

- name: Setup Node.js
uses: actions/setup-node@v4
with:
node-version: '20'
cache: 'npm'

- name: Install dependencies
working-directory: client
run: npm ci

- name: Run Vircadia integration tests
working-directory: client
run: npm run benchmark:integration
continue-on-error: true

- name: Upload integration results
uses: actions/upload-artifact@v4
with:
name: integration-results
path: client/benchmark-results/vircadia-*.md
retention-days: 30

report:
needs: [benchmark, integration]
needs: [benchmark]
runs-on: ubuntu-latest
if: always()

Expand Down
30 changes: 1 addition & 29 deletions client/scripts/run-benchmarks.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
* - Multi-user load tests
* - VR performance validation
* - Network resilience tests
* - Vircadia integration tests
*/

import * as fs from 'fs';
Expand All @@ -34,11 +33,6 @@ import {
DEFAULT_NETWORK_TEST_CONFIG,
NetworkTestResult
} from '../src/tests/network/LatencyTest';
import {
VircadiaIntegrationTest,
DEFAULT_VIRCADIA_CONFIG,
VircadiaTestResult
} from '../src/tests/integration/VircadiaTest';

interface TestSuite {
name: string;
Expand All @@ -54,7 +48,6 @@ interface BenchmarkReport {
load?: LoadTestResult[];
vr?: VRPerformanceResult;
network?: NetworkTestResult[];
vircadia?: VircadiaTestResult;
};
summary: {
totalTests: number;
Expand Down Expand Up @@ -187,13 +180,6 @@ class BenchmarkRunner {
});
}

// Vircadia test
if (results.vircadia) {
totalTests++;
if (results.vircadia.passed) passed++;
else failed++;
if (results.vircadia.issues.length > 0) warnings++;
}

return { totalTests, passed, failed, warnings };
}
Expand Down Expand Up @@ -251,13 +237,6 @@ class BenchmarkRunner {
);
}

if (report.results.vircadia) {
const md = VircadiaIntegrationTest.generateReport(report.results.vircadia);
fs.writeFileSync(
path.join(this.outputDir, `vircadia-${timestamp}.md`),
md
);
}
}

/**
Expand Down Expand Up @@ -296,20 +275,18 @@ program
.option('-l, --load', 'Run load tests')
.option('-v, --vr', 'Run VR performance tests')
.option('-n, --network', 'Run network resilience tests')
.option('-i, --integration', 'Run Vircadia integration tests')
.option('-a, --all', 'Run all tests (default)', true)
.option('-o, --output <dir>', 'Output directory', './benchmark-results')
.parse(process.argv);

const options = program.opts();

// Determine which tests to run
const runAll = options.all || (!options.performance && !options.load && !options.vr && !options.network && !options.integration);
const runAll = options.all || (!options.performance && !options.load && !options.vr && !options.network);
const runPerformance = runAll || options.performance;
const runLoad = runAll || options.load;
const runVr = runAll || options.vr;
const runNetwork = runAll || options.network;
const runIntegration = runAll || options.integration;

// Create runner
const runner = new BenchmarkRunner(options.output);
Expand All @@ -335,11 +312,6 @@ runner.registerSuite('Network Resilience', async () => {
return await networkTest.run();
}, runNetwork);

runner.registerSuite('Vircadia Integration', async () => {
const vircadiaTest = new VircadiaIntegrationTest(DEFAULT_VIRCADIA_CONFIG);
return await vircadiaTest.run();
}, runIntegration);

// Run benchmarks
runner.runAll()
.then(() => process.exit(0))
Expand Down
18 changes: 6 additions & 12 deletions client/src/app/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@ import { ConnectionWarning } from '../components/ConnectionWarning';
import { useAutoBalanceNotifications } from '../hooks/useAutoBalanceNotifications';
import ErrorBoundary from '../components/ErrorBoundary';
import { remoteLogger } from '../services/remoteLogger';
import { VircadiaProvider } from '../contexts/VircadiaContext';
import { VircadiaBridgesProvider } from '../contexts/VircadiaBridgesContext';
import { useNostrAuth } from '../hooks/useNostrAuth';
import { OnboardingWizard } from '../components/OnboardingWizard';
import { LoadingScreen } from '../components/LoadingScreen';
Expand Down Expand Up @@ -180,24 +178,20 @@ function App() {
case 'initialized':
return shouldUseImmersiveClient() ? (
<BotsDataProvider>
<VircadiaBridgesProvider enableBotsBridge={true} enableGraphBridge={true}>
<Suspense fallback={<LoadingScreen message="Loading immersive client..." />}>
<ImmersiveApp />
</Suspense>
</VircadiaBridgesProvider>
<Suspense fallback={<LoadingScreen message="Loading immersive client..." />}>
<ImmersiveApp />
</Suspense>
</BotsDataProvider>
) : (
<BotsDataProvider>
<VircadiaBridgesProvider enableBotsBridge={true} enableGraphBridge={false}>
<MainLayout />
</VircadiaBridgesProvider>
<MainLayout />
</BotsDataProvider>
);
}
};

return (
<VircadiaProvider autoConnect={false}>
<>
<a href="#main-content" className="sr-only focus:not-sr-only focus:absolute focus:z-50 focus:p-4 focus:bg-white focus:text-black">Skip to graph</a>
<TooltipProvider delayDuration={300} skipDelayDuration={100}>
<HelpProvider>
Expand All @@ -223,7 +217,7 @@ function App() {
</OnboardingProvider>
</HelpProvider>
</TooltipProvider>
</VircadiaProvider>
</>
);
}

Expand Down
Loading