fix(diagnostics): fix diagnostics replay restart (#274)

Mojang · Dec 13, 2024 · 6af0405 · 6af0405
1 parent 623301d
commit 6af0405
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 3 deletions.
diff --git a/src/panels/minecraft-diagnostics.ts b/src/panels/minecraft-diagnostics.ts
@@ -32,12 +32,12 @@ export class MinecraftDiagnosticsPanel {
         this._panel.webview.onDidReceiveMessage(message => {
             switch (message.type) {
                 case 'restart':
+                    this._statsTracker.stop();
                     this._panel.webview.html = this._getWebviewContent(
                         this._panel.webview,
                         extensionUri,
                         statsTracker.manualControl()
                     );
-                    this._statsTracker.stop();
                     break;
                 case 'pause':
                     this._statsTracker.pause();

diff --git a/src/stats/replay-stats-provider.test.ts b/src/stats/replay-stats-provider.test.ts
@@ -55,6 +55,27 @@ describe('ReplayStatsProvider', () => {
         expect(statCount).toBeGreaterThan(0);
     });
 
+    it('should restart propertly', async () => {
+        const replayFilePath = path.resolve('./test/diagnostics-replay-compressed.mcstats');
+        const replay = new ReplayStatsProvider(replayFilePath);
+        let statCount = 0;
+        let statsCallback: StatsListener = {
+            onStatUpdated: (stat: StatData) => {
+                statCount++;
+                expect(stat).toBeDefined();
+            },
+        };
+        replay.addStatListener(statsCallback);
+        let results = await replay.start();
+        expect(results.statLinesRead).toBe(3);
+        expect(results.statEventsSent).toBe(3);
+        expect(statCount).toBeGreaterThan(0);
+        replay.stop();
+        let results2 = await replay.start();
+        expect(results2.statLinesRead).toBe(3);
+        expect(results2.statEventsSent).toBe(3);
+    });
+
     it('should fire notification on invalid file read', async () => {
         const replayFilePath = './not-a-real-file.mcstats';
         const replay = new ReplayStatsProvider(replayFilePath);

diff --git a/src/stats/replay-stats-provider.ts b/src/stats/replay-stats-provider.ts
@@ -22,9 +22,9 @@ export class ReplayStatsProvider extends StatsProvider {
     private _simTickPeriod: number;
     private _simTickCurrent: number;
     private _simTimeoutId: NodeJS.Timeout | null;
-    private _replayHeader: ReplayStatMessageHeader | undefined;
     private _base64Gzipped: boolean;
     private _pendingStats: StatMessageModel[];
+    private _replayHeader: ReplayStatMessageHeader | undefined;
     private _replayResults: ReplayResults;
     private _onComplete: ((results: ReplayResults) => void) | undefined;
 
@@ -52,6 +52,7 @@ export class ReplayStatsProvider extends StatsProvider {
         this._simTimeoutId = null;
         this._base64Gzipped = false;
         this._pendingStats = [];
+        this._replayHeader = undefined;
         this._replayResults = new ReplayResults();
         this._onComplete = undefined;
     }
@@ -85,7 +86,6 @@ export class ReplayStatsProvider extends StatsProvider {
         }
         if (this._onComplete) {
             this._onComplete(this._replayResults);
-            this._onComplete = undefined;
         }
         if (this._replayStreamReader) {
             this._replayStreamReader.close();
@@ -97,6 +97,9 @@ export class ReplayStatsProvider extends StatsProvider {
         this._simTimeoutId = null;
         this._base64Gzipped = false;
         this._pendingStats = [];
+        this._replayHeader = undefined;
+        this._replayResults = new ReplayResults();
+        this._onComplete = undefined;
     }
 
     public override pause() {