Skip to content

feat: Added client memory stats + cleaned up diagnostics prefabs #316

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

feat: Added client memory stats + cleaned up diagnostics prefabs #316

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
94f48c3
feat: Added client memory stats + cleaned up diagnostics prefabs
JakeShirley May 2, 2025
880af3e
removed unused file
JakeShirley May 2, 2025
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
200 changes: 29 additions & 171 deletions webview-ui/src/diagnostics_panel/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,11 @@ import MinecraftStatisticStackedLineChart from './controls/MinecraftStatisticSta
import MinecraftStatisticStackedBarChart from './controls/MinecraftStatisticStackedBarChart';
import { MultipleStatisticProvider, SimpleStatisticProvider, StatisticUpdatedMessage } from './StatisticProvider';
import ReplayControls from './controls/ReplayControls';
import * as statPrefabs from './StatisticPrefabs';
import * as statPrefabs from './prefabs/StatisticPrefabs';
import { Icons } from './Icons';
import './App.css';
import tabPrefabs from './prefabs';
import { TabPrefabDataSource } from './prefabs/TabPrefab';

declare global {
interface Window {
Expand All @@ -25,19 +27,6 @@ interface VSCodePanelsChangeEvent extends Event {
target: EventTarget & { activeid: string };
}

// Filter out events with a value of zero that haven't been previously subscribed to
function constructSubscribedSignalFilter() {
const nonFilteredValues: string[] = [];
const func = (event: StatisticUpdatedMessage) => {
if (event.values.length === 1 && event.values[0] === 0 && !nonFilteredValues.includes(event.id)) {
return false;
}
nonFilteredValues.push(event.id);
return true;
};
return func;
}

const onRestart = () => {
vscode.postMessage({ type: 'restart' });
};
Expand Down Expand Up @@ -110,163 +99,32 @@ function App() {
/>
)}
<VSCodePanels activeid={currentTab} onChange={event => handlePanelChange(event as VSCodePanelsChangeEvent)}>
<VSCodePanelTab id="tab-1">World</VSCodePanelTab>
<VSCodePanelTab id="tab-2">Memory</VSCodePanelTab>
<VSCodePanelTab id="tab-3">Server Timing</VSCodePanelTab>
<VSCodePanelTab id="tab-4">Client Timing</VSCodePanelTab>
<VSCodePanelTab id="tab-5">Networking - Packets</VSCodePanelTab>
<VSCodePanelTab id="tab-6">Networking - Bandwidth</VSCodePanelTab>
<VSCodePanelTab id="tab-7">Handle Counts</VSCodePanelTab>
<VSCodePanelTab id="tab-8">Subscriber Counts</VSCodePanelTab>
<VSCodePanelView id="view-1" style={{ flexDirection: 'column' }}>
<div style={{ flexDirection: 'row', display: 'flex' }}>
{statPrefabs.entityCount.reactNode}
{statPrefabs.loadedChunks.reactNode}
</div>
<div style={{ flexDirection: 'row', display: 'flex' }}>{statPrefabs.commandsRan.reactNode}</div>
</VSCodePanelView>
<VSCodePanelView id="view-2" style={{ flexDirection: 'column' }}>
<div style={{ flexDirection: 'row', display: 'flex' }}>
{statPrefabs.appMemoryUsage.reactNode}
{statPrefabs.appMemoryFree.reactNode}
</div>
<div style={{ flexDirection: 'row', display: 'flex' }}>
{statPrefabs.javaScriptMemoryAllocated.reactNode}
{statPrefabs.javaScriptMemoryFree.reactNode}
</div>
</VSCodePanelView>
<VSCodePanelView id="view-3" style={{ flexDirection: 'column' }}>
<div style={{ flexDirection: 'row', display: 'flex' }}>
{statPrefabs.serverTickTimings.reactNode}
</div>
<div style={{ flexDirection: 'row', display: 'flex' }}>{statPrefabs.commandsRan.reactNode}</div>
</VSCodePanelView>
<VSCodePanelView id="view-4" style={{ flexDirection: 'column' }}>
<StatGroupSelectionBox
labelName="Client"
statParentId="client_frame_timings"
onChange={handleClientSelection}
/>
<MinecraftStatisticLineChart
title="FPS"
yLabel="FPS"
statisticDataProvider={
new SimpleStatisticProvider({
statisticId: 'avg_fps',
statisticParentId: new RegExp(`client_frame_timings_${selectedClient}`),
})
}
statisticOptions={{
type: StatisticType.Absolute,
yAxisType: YAxisType.Absolute,
tickRange: 20 * 10,
}}
/>
<MinecraftStatisticStackedLineChart
title="Frame Timings"
yLabel="Frame Times (ms)"
statisticDataProvider={
new MultipleStatisticProvider({
statisticIds: [
'avg_server_simtick_time',
'avg_client_simtick_time',
'avg_begin_frame_time',
'avg_input_time',
'avg_render_time',
'avg_end_frame_time',
],
statisticParentId: new RegExp(`client_frame_timings_${selectedClient}`),
})
}
catageoryLabels={{
avg_server_simtick_time: 'Server Simtick Time',
avg_client_simtick_time: 'Client Simtick Time',
avg_begin_frame_time: 'Begin Frame Time',
avg_input_time: 'Input Time',
avg_render_time: 'Render Time',
avg_end_frame_time: 'End Frame Time',
}}
statisticResolver={createStatResolver({
type: StatisticType.Absolute,
tickRange: 20 * 10,
yAxisType: YAxisType.Absolute,
valueScalar: 1 / 1000,
})}
/>
</VSCodePanelView>
<VSCodePanelView id="view-5">
<div style={{ flexDirection: 'column' }}>
{statPrefabs.packetsReceivedLineChart.reactNode}
{statPrefabs.packetsReceivedStackedLineChart.reactNode}
</div>
<div style={{ flexDirection: 'column' }}>
{statPrefabs.packetsSentLineChart.reactNode}
{statPrefabs.packetsSentStackedLineChart.reactNode}
</div>
</VSCodePanelView>
<VSCodePanelView id="view-6">
{statPrefabs.packetDataReceived.reactNode}
{statPrefabs.packetDataSent.reactNode}
</VSCodePanelView>
<VSCodePanelView id="view-7">
<StatGroupSelectionBox
labelName="Script Plugin"
statParentId="handle_counts"
onChange={handlePluginSelection}
/>
<MinecraftStatisticLineChart
title="Entity Handles"
yLabel="Number of Entities"
statisticDataProvider={
new SimpleStatisticProvider({
statisticId: 'entity',
statisticParentId: new RegExp(`handle_counts_${selectedPlugin}`),
})
}
statisticOptions={{
type: StatisticType.Absolute,
yAxisType: YAxisType.Absolute,
tickRange: 20 * 30, // About 30 seconds
}}
/>
<MinecraftStatisticLineChart
title="Entity Changes"
yLabel="Difference in Number of Entities"
statisticDataProvider={
new SimpleStatisticProvider({
statisticId: 'entity',
statisticParentId: new RegExp(`handle_counts_${selectedPlugin}`),
})
}
statisticOptions={{
type: StatisticType.Difference,
yAxisType: YAxisType.Mirrored,
tickRange: 20 * 30, // About 30 seconds
}}
/>
</VSCodePanelView>
<VSCodePanelView id="view-8">
<StatGroupSelectionBox
labelName="Script Plugin"
statParentId="fine_grained_subscribers"
onChange={handlePluginSelection}
/>
<MinecraftStatisticStackedBarChart
title="Signal Subscribers"
yLabel="Number of World and System Before and After Event Subscribers Broken Down By Signal"
statisticDataProvider={
new MultipleStatisticProvider({
statisticParentId: new RegExp(`fine_grained_subscribers_${selectedPlugin}`),
valuesFilter: constructSubscribedSignalFilter(),
})
}
statisticResolver={createStatResolver({
type: StatisticType.Absolute,
tickRange: 20 * 15 /* About 15 seconds */,
yAxisType: YAxisType.Absolute,
})}
/>
</VSCodePanelView>
{tabPrefabs.map((tabPrefab, index) => (
<VSCodePanelTab id={`tab-${index}`}>{tabPrefab.name}</VSCodePanelTab>
))}
{tabPrefabs.map((tabPrefab, index) => (
<VSCodePanelView id={`view-${index}`} style={{ flexDirection: 'column' }}>
{tabPrefab.dataSource === TabPrefabDataSource.Client ? (
<StatGroupSelectionBox
labelName="Client"
statParentId="client_stats"
onChange={handleClientSelection}
/>
) : (
<div />
)}
{tabPrefab.dataSource === TabPrefabDataSource.ServerScript ? (
<StatGroupSelectionBox
labelName="Script Plugin"
statParentId="handle_counts"
onChange={handlePluginSelection}
/>
) : (
<div />
)}
{tabPrefab.content({ selectedClient, selectedPlugin })}
</VSCodePanelView>
))}
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is so cool.

</VSCodePanels>
</main>
);
Expand Down
2 changes: 1 addition & 1 deletion webview-ui/src/diagnostics_panel/CustomizedStatisticPane.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright (C) Microsoft Corporation. All rights reserved.

import { VSCodeDropdown, VSCodeOption } from '@vscode/webview-ui-toolkit/react';
import * as statPrefabs from './StatisticPrefabs';
import * as statPrefabs from './prefabs/StatisticPrefabs';

type Options = {
name: string;
Expand Down
Loading
Loading