X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=client%2Fsrc%2Futils%2FgameStorage.js;h=129866798b63e865e11601bde3364e84abcb05a3;hb=f54f4c26b4c820b14aca298e94644efb20beeed6;hp=6b446321d75a5a9b44bd8d0900a2f724cb8c2516;hpb=11667c79617c057357f2a176c798bfee3b190771;p=vchess.git

diff --git a/client/src/utils/gameStorage.js b/client/src/utils/gameStorage.js
index 6b446321..12986679 100644
--- a/client/src/utils/gameStorage.js
+++ b/client/src/utils/gameStorage.js
@@ -4,10 +4,9 @@
 //   vname: string,
 //   fenStart: string,
 //   players: array of sid+id+name,
-//   timeControl: string,
+//   cadence: string,
 //   increment: integer (seconds),
-//   mode: string ("live" or "corr")
-//   imported: boolean (optional, default false)
+//   type: string ("live" or "corr")
 //   // Game (dynamic) state:
 //   fen: string,
 //   moves: array of Move objects,
@@ -16,166 +15,118 @@
 //   score: string (several options; '*' == running),
 // }
 
-import { ajax } from "@/utils/ajax";
+import { store } from "@/store";
 
-function dbOperation(callback)
-{
+function dbOperation(callback) {
   let db = null;
   let DBOpenRequest = window.indexedDB.open("vchess", 4);
 
   DBOpenRequest.onerror = function(event) {
-    alert("Database error: " + event.target.errorCode);
+    alert(store.state.tr["Database error: stop private browsing, or update your browser"]);
+    callback("error",null);
   };
 
-  DBOpenRequest.onsuccess = function(event) {
+  DBOpenRequest.onsuccess = function() {
     db = DBOpenRequest.result;
-    callback(db);
+    callback(null,db);
     db.close();
   };
 
   DBOpenRequest.onupgradeneeded = function(event) {
     let db = event.target.result;
-    db.onerror = function(event) {
-      alert("Error while loading database: " + event.target.errorCode);
-    };
-    // Create objectStore for vchess->games
     let objectStore = db.createObjectStore("games", { keyPath: "id" });
     objectStore.createIndex("score", "score"); //to search by game result
-  }
+  };
 }
 
-export const GameStorage =
-{
+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) => {
-      let transaction = db.transaction("games", "readwrite");
-      if (callback)
-      {
-        transaction.oncomplete = function() {
-          callback({}); //everything's fine
-        }
-        transaction.onerror = function() {
-          callback({errmsg: "addGame failed: " + transaction.error});
-        };
+  add: function(game, callback) {
+    dbOperation((err,db) => {
+      if (!!err) {
+        callback("error");
+        return;
       }
+      let transaction = db.transaction("games", "readwrite");
+      transaction.oncomplete = function() {
+        callback(); //everything's fine
+      };
+      transaction.onerror = function(err) {
+        callback(err); //duplicate key error (most likely)
+      };
       let objectStore = transaction.objectStore("games");
       objectStore.add(game);
     });
   },
 
-  // TODO: also option to takeback a move ?
-  update: function(gameId, obj) //move, fen, clocks, score, initime, ...
-  {
-    if (Number.isInteger(gameId) || !isNaN(parseInt(gameId)))
-    {
-      // corr: only move, fen and score
-      ajax(
-        "/games",
-        "PUT",
-        {
-          gid: gameId,
-          newObj:
-          {
-            move: obj.move, //may be undefined...
-            fen: obj.fen,
-            score: obj.score,
-          }
-        }
-      );
-    }
-    else
-    {
-      // live
-      dbOperation((db) => {
-        let objectStore = db.transaction("games", "readwrite").objectStore("games");
-        objectStore.get(gameId).onsuccess = function(event) {
-          const game = event.target.result;
+  // obj: chat, move, fen, clocks, score[Msg], initime, ...
+  update: function(gameId, obj) {
+    // live
+    dbOperation((err,db) => {
+      let objectStore = db
+        .transaction("games", "readwrite")
+        .objectStore("games");
+      objectStore.get(gameId).onsuccess = function(event) {
+        // Ignoring error silently: shouldn't happen now. TODO?
+        if (event.target.result) {
+          let game = event.target.result;
+          // Hidden tabs are delayed, to prevent multi-updates:
+          if (obj.moveIdx < game.moves.length) return;
           Object.keys(obj).forEach(k => {
-            if (k == "move")
-              game.moves.push(obj[k]);
-            else
-              game[k] = obj[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').objectStore('games');
+  getAll: function(callback) {
+    dbOperation((err,db) => {
+      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)
-        {
-          games.push(cursor.value);
+        if (cursor) {
+          let g = cursor.value;
+          // Do not retrieve moves or clocks (unused in list mode)
+          g.movesCount = g.moves.length;
+          delete g.moves;
+          delete g.clocks;
+          delete g.initime;
+          games.push(g);
           cursor.continue();
-        }
-        else
-          callback(games);
-      }
+        } else callback(games);
+      };
     });
   },
 
   // Retrieve any game from its identifiers (locally or on server)
   // NOTE: need callback because result is obtained asynchronously
-  get: function(gameId, callback)
-  {
-    // 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)
-  {
-    dbOperation((db) => {
-      let objectStore = db.transaction('games').objectStore('games');
-      objectStore.get("*").onsuccess = function(event) {
+  get: function(gameId, callback) {
+    // Local game
+    dbOperation((err,db) => {
+      let objectStore = db.transaction("games").objectStore("games");
+      objectStore.get(gameId).onsuccess = function(event) {
+        // event.target.result is null if game not found
         callback(event.target.result);
       };
     });
   },
 
   // Delete a game in indexedDB
-  remove: function(gameId, callback)
-  {
-    dbOperation((db) => {
-      let transaction = db.transaction(["games"], "readwrite");
-      if (callback)
-      {
+  remove: function(gameId, callback) {
+    dbOperation((err,db) => {
+      if (!err) {
+        let transaction = db.transaction(["games"], "readwrite");
         transaction.oncomplete = function() {
-          callback({}); //everything's fine
-        }
-        transaction.onerror = function() {
-          callback({errmsg: "removeGame failed: " + transaction.error});
+          callback(); //everything's fine
         };
+        transaction.objectStore("games").delete(gameId);
       }
-      transaction.objectStore("games").delete(gameId);
     });
-  },
+  }
 };