feat(diagnostics): Add Client Subscriber Stats UI (#82)

Mojang · Jul 26, 2024 · 23eedee · 23eedee
1 parent 704f73f
commit 23eedee
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 2 deletions.
diff --git a/webview-ui/src/diagnostics_panel/App.tsx b/webview-ui/src/diagnostics_panel/App.tsx
@@ -7,10 +7,27 @@ import { useCallback, useState } from 'react';
 import { StatisticType, YAxisType, createStatResolver } from './StatisticResolver';
 import MinecraftStatisticLineChart from './controls/MinecraftStatisticLineChart';
 import MinecraftStatisticStackedLineChart from './controls/MinecraftStatisticStackedLineChart';
-import { MultipleStatisticProvider, SimpleStatisticProvider } from './StatisticProvider';
+import MinecraftStatisticStackedBarChart from './controls/MinecraftStatisticStackedBarChart';
+import { MultipleStatisticProvider, SimpleStatisticProvider, StatisticUpdatedMessage } from './StatisticProvider';
 
 import * as statPrefabs from './StatisticPrefabs';
 
+// 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;
+}
+
 function App() {
     // State
     const [selectedPlugin, setSelectedPlugin] = useState<string>('no_plugin_selected');
@@ -37,6 +54,7 @@ function App() {
                 <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}
@@ -166,6 +184,29 @@ function App() {
                         }}
                     />
                 </VSCodePanelView>
+                <VSCodePanelView id="view-8">
+                    <StatGroupSelectionBox
+                        labelName="Script Plugin"
+                        defaultDropdownId="no_plugin_selected"
+                        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>
             </VSCodePanels>
         </main>
     );

diff --git a/webview-ui/src/diagnostics_panel/StatisticProvider.tsx b/webview-ui/src/diagnostics_panel/StatisticProvider.tsx
@@ -91,6 +91,7 @@ export class SimpleStatisticProvider extends StatisticProvider {
 interface MultipleStatisticProviderOptions {
     statisticIds?: string[]; // If not included, all stats will be included
     statisticParentId: string | RegExp;
+    valuesFilter?: (event: StatisticUpdatedMessage) => boolean;
 }
 // Used for things like stacked bar charts
 export class MultipleStatisticProvider extends StatisticProvider {
@@ -117,6 +118,10 @@ export class MultipleStatisticProvider extends StatisticProvider {
             return;
         }
 
+        if (this.options.valuesFilter && !this.options.valuesFilter(event)) {
+            return;
+        }
+
         this._fireEvent(event);
     }
 }

diff --git a/webview-ui/src/diagnostics_panel/controls/MinecraftStatisticStackedBarChart.tsx b/webview-ui/src/diagnostics_panel/controls/MinecraftStatisticStackedBarChart.tsx
@@ -100,7 +100,7 @@ export default function MinecraftStatisticStackedBarChart({
                 plot.remove();
             }
         };
-    }, [data]);
+    }, [data, statisticDataProvider]);
 
     return <div ref={containerRef} />;
 }