check turn validity if cached

pydt · Dec 13, 2023 · 0e15b5c · 0e15b5c
1 parent a8d4e0a
commit 0e15b5c
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 5 deletions.
diff --git a/ui/playTurn/playTurn.component.ts b/ui/playTurn/playTurn.component.ts
@@ -105,8 +105,20 @@ export class PlayTurnComponent implements OnInit, OnDestroy {
 
     this.turnDownloader.startDownload();
 
-    if (this.turnDownloader.data$.value) {
-      this.status = "Turn already downloaded, moving to save location...";
+    const curData = this.turnDownloader.data$.value;
+
+    if (curData) {
+      this.status = "Turn already downloaded, validating...";
+
+      const turn = await this.gameService.getTurn(this.playTurnState.game.gameId, "yup").toPromise();
+
+      if (turn.version === curData.version) {
+        this.status = "Turn downloaded & validated, moving to save location...";
+      } else {
+        this.status = "Turn data is out of date, re-downloading...";
+        this.turnDownloader.abort();
+        this.turnDownloader.startDownload();
+      }
     }
 
     this.turnDownloader.error$.subscribe(err => {
@@ -126,7 +138,7 @@ export class PlayTurnComponent implements OnInit, OnDestroy {
         }, 500);
 
         try {
-          window.pydtApi.fs.writeFileSync(this.saveFileToPlay, data);
+          window.pydtApi.fs.writeFileSync(this.saveFileToPlay, data.data);
 
           await new Promise(sleepResolve => setTimeout(sleepResolve, 500));
 

diff --git a/ui/shared/turnCacheService.ts b/ui/shared/turnCacheService.ts
@@ -8,7 +8,7 @@ import { PydtSettingsFactory } from "./pydtSettings";
 export class TurnDownloader {
   private xhr: XMLHttpRequest;
   private downloading = false;
-  public readonly data$ = new BehaviorSubject<Uint8Array>(null);
+  public readonly data$ = new BehaviorSubject<{ data: Uint8Array; version?: string }>(null);
   public readonly error$ = new BehaviorSubject<string>(null);
   public readonly curBytes$ = new BehaviorSubject<number>(0);
   public readonly maxBytes$ = new BehaviorSubject<number>(0);
@@ -113,7 +113,10 @@ export class TurnDownloader {
                 // Ignore - file probably wasn't gzipped...
               }
 
-              this.data$.next(data);
+              this.data$.next({
+                data,
+                version: resp.version,
+              });
             } catch (err) {
               // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
               this.error$.next(err);