Fix accumulation of socket.close code. Ready to finish Game.js and then the website

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

diff --git a/client/src/store.js b/client/src/store.js
index e8f4284..a999b0a 100644 (file)
--- a/client/src/store.js
+++ b/client/src/store.js
@@ -2,6 +2,7 @@ import { ajax } from "./utils/ajax";
 import { getRandString } from "./utils/alea";
 import params from "./parameters"; //for socket connection
 
+// Global store: see https://medium.com/fullstackio/managing-state-in-vue-js-23a0352b1c87
 export const store =
 {
   state: {
@@ -12,16 +13,33 @@ export const store =
     settings: {},
     lang: "",
   },
+  socketCloseListener: null,
   initialize() {
     ajax("/variants", "GET", res => { this.state.variants = res.variantArray; });
+    let mysid = localStorage["mysid"];
+    if (!mysid)
+    {
+      mysid = getRandString();
+      localStorage["mysid"] = mysid; //done only once (unless user clear browser data)
+    }
     this.state.user = {
-      // id and name could be undefined
-      id: localStorage["myuid"],
-      name: localStorage["myname"],
+      id: localStorage["myid"] || 0,
+      name: localStorage["myname"] || "", //"" for "anonymous"
+      email: "", //unknown yet
+      notify: false, //email notifications
+      sid: mysid,
     };
-    // TODO: if there is a socket ID in localStorage, it means a live game was interrupted (and should resume)
-    const mysid = localStorage["mysid"] || getRandString();
-    this.state.conn = new WebSocket(params.socketUrl + "/?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",
@@ -31,10 +49,10 @@ export const store =
       highlight: !!eval(localStorage["highlight"]),
       sqSize: parseInt(localStorage["sqSize"]),
     };
-    const socketCloseListener = () => {
+    this.socketCloseListener = () => {
       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)
@@ -43,9 +61,7 @@ export const store =
     this.setTranslations();
   },
   setTranslations: async function() {
-    // Fill modalWelcome, and import translations from "./translations/$lang.js"
-    document.getElementById("modalWelcome").innerHTML =
-      require("raw-loader!pug-plain-loader!@/welcome/" + this.state.lang + ".pug");
+    // Import translations from "./translations/$lang.js"
     const tModule = await import("@/translations/" + this.state.lang + ".js");
     this.state.tr = tModule.translations;
   },