X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=client%2Fsrc%2Fstore.js;h=94dcb0656dd544aac5466794ff62338a92a51645;hb=4f8871051c030acd51172b73cd20aedce687c2a8;hp=a999b0ac989a1028419f619a3e2f065a56331f75;hpb=cdb34c934db9f75fcc1d749b5dc23d7ea217a289;p=vchess.git

diff --git a/client/src/store.js b/client/src/store.js
index a999b0ac..94dcb065 100644
--- a/client/src/store.js
+++ b/client/src/store.js
@@ -14,7 +14,7 @@ export const store =
     lang: "",
   },
   socketCloseListener: null,
-  initialize() {
+  initialize(page) {
     ajax("/variants", "GET", res => { this.state.variants = res.variantArray; });
     let mysid = localStorage["mysid"];
     if (!mysid)
@@ -31,15 +31,13 @@ export const store =
     };
     if (this.state.user.id > 0)
     {
-      fetch(params.serverUrl + "/whoami", {
-        method: "GET",
-        credentials: params.cors ? "include" : "omit",
-      }).then((res) => {
+      ajax("/whoami", "GET", 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);
+    this.state.conn = new WebSocket(params.socketUrl + "/?sid=" + mysid +
+      "&page=" + encodeURIComponent(page));
     // Settings initialized with values from localStorage
     this.state.settings = {
       bcolor: localStorage["bcolor"] || "lichess",
@@ -50,14 +48,16 @@ export const store =
       sqSize: parseInt(localStorage["sqSize"]),
     };
     this.socketCloseListener = () => {
-      this.state.conn = new WebSocket(params.socketUrl + "/?sid=" + mysid);
+      // 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;
     const supportedLangs = ["en","es","fr"];
     this.state.lang = localStorage["lang"] ||
-      supportedLangs.includes(navigator.language)
+      (supportedLangs.includes(navigator.language)
         ? navigator.language
-        : "en";
+        : "en");
     this.setTranslations();
   },
   setTranslations: async function() {