Advance on Game.vue

[vchess.git] / client / src / store.js

diff --git a/client/src/store.js b/client/src/store.js
index 055fff9..3b280d9 100644 (file)
--- 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)
@@ -30,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=" + page);
     // Settings initialized with values from localStorage
     this.state.settings = {
       bcolor: localStorage["bcolor"] || "lichess",
@@ -48,10 +47,11 @@ export const store =
       highlight: !!eval(localStorage["highlight"]),
       sqSize: parseInt(localStorage["sqSize"]),
     };
-    const socketCloseListener = () => {
+    this.socketCloseListener = () => {
+      // Next line may fail at first, but should retry and eventually success (TODO?)
       this.state.conn = new WebSocket(params.socketUrl + "/?sid=" + mysid);
-    }
-    this.state.conn.onclose = socketCloseListener;
+    };
+    this.state.conn.onclose = this.socketCloseListener;
     const supportedLangs = ["en","es","fr"];
     this.state.lang = localStorage["lang"] ||
       supportedLangs.includes(navigator.language)