X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=client%2Fsrc%2Fstore.js;h=a1e432f342d9313a6464a9f5a8c089ebc5076859;hb=d641bec1b3b299e16b7da93f966dad0b0bd35088;hp=055fff9dab66c3113e0df977340f28b76834758e;hpb=4486a21e09c50f65da5d4c3648430cea1b19a0cc;p=vchess.git

diff --git a/client/src/store.js b/client/src/store.js
index 055fff9d..a1e432f3 100644
--- a/client/src/store.js
+++ b/client/src/store.js
@@ -13,7 +13,8 @@ export const store =
     settings: {},
     lang: "",
   },
-  initialize() {
+  socketCloseListener: null,
+  initialize(page) {
     ajax("/variants", "GET", res => { this.state.variants = res.variantArray; });
     let mysid = localStorage["mysid"];
     if (!mysid)
@@ -21,6 +22,7 @@ export const store =
       mysid = getRandString();
       localStorage["mysid"] = mysid; //done only once (unless user clear browser data)
     }
+    // Quick user setup using local storage:
     this.state.user = {
       id: localStorage["myid"] || 0,
       name: localStorage["myname"] || "", //"" for "anonymous"
@@ -28,36 +30,40 @@ export const store =
       notify: false, //email notifications
       sid: mysid,
     };
-    if (this.state.user.id > 0)
-    {
-      fetch(params.serverUrl + "/whoami", {
-        method: "GET",
-        credentials: params.cors ? "include" : "omit",
-      }).then((res) => {
-        this.state.user.email = res.email;
-        this.state.user.notify = res.notify;
-      });
-    }
-    this.state.conn = new WebSocket(params.socketUrl + "/?sid=" + this.state.user.sid);
-    // Settings initialized with values from localStorage
-    this.state.settings = {
-      bcolor: localStorage["bcolor"] || "lichess",
-      sound: parseInt(localStorage["sound"]) || 2,
-      hints: parseInt(localStorage["hints"]) || 1,
-      coords: !!eval(localStorage["coords"]),
-      highlight: !!eval(localStorage["highlight"]),
-      sqSize: parseInt(localStorage["sqSize"]),
-    };
-    const socketCloseListener = () => {
-      this.state.conn = new WebSocket(params.socketUrl + "/?sid=" + mysid);
-    }
-    this.state.conn.onclose = socketCloseListener;
+    // Slow verification through the server:
+    // NOTE: still superficial identity usurpation possible, but difficult.
+    ajax("/whoami", "GET", res => {
+      this.state.user.id = res.id;
+      this.state.user.name = res.name;
+      this.state.user.email = res.email;
+      this.state.user.notify = res.notify;
+    });
     const supportedLangs = ["en","es","fr"];
     this.state.lang = localStorage["lang"] ||
-      supportedLangs.includes(navigator.language)
+      (supportedLangs.includes(navigator.language)
         ? navigator.language
-        : "en";
+        : "en");
     this.setTranslations();
+    // Initialize connection (even if the current page doesn't need it)
+    this.state.conn = new WebSocket(params.socketUrl + "/?sid=" + mysid +
+      "&page=" + encodeURIComponent(page));
+    // Settings initialized with values from localStorage
+    this.state.settings = {
+      bcolor: localStorage.getItem("bcolor") || "lichess",
+      sound: parseInt(localStorage.getItem("sound")) || 1,
+      hints: localStorage.getItem("hints") == "true",
+      highlight: localStorage.getItem("highlight") == "true",
+    };
+    this.socketCloseListener = () => {
+      // Next line may fail at first, but should retry and eventually success (TODO?)
+      this.state.conn = new WebSocket(params.socketUrl + "/?sid=" + mysid +
+        "&page=" + encodeURIComponent(page));
+    };
+    this.state.conn.onclose = this.socketCloseListener;
+  },
+  updateSetting: function(propName, value) {
+    this.state.settings[propName] = value;
+    localStorage.setItem(propName, value);
   },
   setTranslations: async function() {
     // Import translations from "./translations/$lang.js"