X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=client%2Fsrc%2Futils%2FgameStorage.js;h=a9ebf33ae234b5aa49052dd39aad1d599f50d0d5;hb=63ca2b89cfe577efd168c6b2e26750cb01b66d64;hp=77acf94356b546dc98ed310f968c1ed490adc9bd;hpb=66d03f23c9ce085877c3f7272db44dc382762b5a;p=vchess.git

diff --git a/client/src/utils/gameStorage.js b/client/src/utils/gameStorage.js
index 77acf943..a9ebf33a 100644
--- a/client/src/utils/gameStorage.js
+++ b/client/src/utils/gameStorage.js
@@ -1,6 +1,6 @@
 // Game object: {
 //   // Static informations:
-//   gameId: string
+//   id: string
 //   vname: string,
 //   fenStart: string,
 //   players: array of sid+id+name,
@@ -16,6 +16,8 @@
 //   score: string (several options; '*' == running),
 // }
 
+import { ajax } from "@/utils/ajax";
+
 function dbOperation(callback)
 {
   let db = null;
@@ -37,7 +39,7 @@ function dbOperation(callback)
       alert("Error while loading database: " + event.target.errorCode);
     };
     // Create objectStore for vchess->games
-    let objectStore = db.createObjectStore("games", { keyPath: "gameId" });
+    let objectStore = db.createObjectStore("games", { keyPath: "id" });
     objectStore.createIndex("score", "score"); //to search by game result
   }
 }
@@ -45,6 +47,7 @@ function dbOperation(callback)
 export const GameStorage =
 {
   // Optional callback to get error status
+  // TODO: this func called from Hall seems to not work now...
   add: function(game, callback)
   {
     dbOperation((db) => {
@@ -64,55 +67,90 @@ export const GameStorage =
   },
 
   // TODO: also option to takeback a move ?
-  // NOTE: for live games only (all on server for corr)
-  update: function(gameId, obj) //colorIdx, nextIdx, move, fen, addTime, score
+  update: function(gameId, obj) //chat, move, fen, clocks, score, initime, ...
+  {
+    if (Number.isInteger(gameId) || !isNaN(parseInt(gameId)))
+    {
+      // corr: only move, fen and score
+      ajax(
+        "/games",
+        "PUT",
+        {
+          gid: gameId,
+          newObj:
+          {
+            chat: obj.chat,
+            move: obj.move, //may be undefined...
+            fen: obj.fen,
+            score: obj.score,
+            drawOffer: obj.drawOffer,
+          }
+        }
+      );
+    }
+    else
+    {
+      // live
+      dbOperation((db) => {
+        let objectStore = db.transaction("games", "readwrite").objectStore("games");
+        objectStore.get(gameId).onsuccess = function(event) {
+          const game = event.target.result;
+          Object.keys(obj).forEach(k => {
+            if (k == "move")
+              game.moves.push(obj[k]);
+            else
+              game[k] = obj[k];
+          });
+          objectStore.put(game); //save updated data
+        }
+      });
+    }
+  },
+
+  // Retrieve all local games (running, completed, imported...)
+  getAll: function(callback)
   {
     dbOperation((db) => {
-      let objectStore = db.transaction("games", "readwrite").objectStore("games");
-      objectStore.get(gameId).onsuccess = function(event) {
-        const game = event.target.result;
-        if (!!obj.move)
+      let objectStore = db.transaction('games').objectStore('games');
+      let games = [];
+      objectStore.openCursor().onsuccess = function(event) {
+        let cursor = event.target.result;
+        // if there is still another cursor to go, keep running this code
+        if (cursor)
         {
-          game.moves.push(obj.move);
-          game.fen = obj.fen;
-          game.clocks[obj.colorIdx] += obj.addTime;
-          game.initime[obj.nextIdx] = Date.now();
+          games.push(cursor.value);
+          cursor.continue();
         }
-        if (!!obj.score)
-          game.score = obj.score;
-        objectStore.put(game); //save updated data
+        else
+          callback(games);
       }
     });
   },
 
-  // Retrieve any live game from its identifiers (locally, running or not)
+  // Retrieve any game from its identifiers (locally or on server)
   // NOTE: need callback because result is obtained asynchronously
   get: function(gameId, callback)
   {
-    dbOperation((db) => {
-      let objectStore = db.transaction('games').objectStore('games');
-      if (!gameId) //retrieve all
-      {
-        let games = [];
-        objectStore.openCursor().onsuccess = function(event) {
-          let cursor = event.target.result;
-          // if there is still another cursor to go, keep running this code
-          if (cursor)
-          {
-            games.push(cursor.value);
-            cursor.continue();
-          }
-          else
-            callback(games);
-        }
-      }
-      else //just one game
-      {
+    // corr games identifiers are integers
+    if (Number.isInteger(gameId) || !isNaN(parseInt(gameId)))
+    {
+      ajax("/games", "GET", {gid:gameId}, res => {
+        let game = res.game;
+        game.moves.forEach(m => {
+          m.squares = JSON.parse(m.squares);
+        });
+        callback(game);
+      });
+    }
+    else //local game
+    {
+      dbOperation((db) => {
+        let objectStore = db.transaction('games').objectStore('games');
         objectStore.get(gameId).onsuccess = function(event) {
           callback(event.target.result);
         }
-      }
-    });
+      });
+    }
   },
 
   getCurrent: function(callback)