| {{ st.tr["Live games"] }}
button.tabbtn#corrGames(@click="setDisplay('corr',$event)")
| {{ st.tr["Correspondance games"] }}
+ button.tabbtn#importGames(@click="setDisplay('import',$event)")
+ | {{ st.tr["Imported games"] }}
GameList(
ref="livegames"
v-show="display=='live'"
@abortgame="abortGame"
)
GameList(
- ref="corrgames"
v-show="display=='corr'"
+ ref="corrgames"
:games="corrGames"
@show-game="showGame"
@abortgame="abortGame"
)
+ UploadGame(
+ v-show="display=='import'"
+ @game-uploaded="addGameImport"
+ )
+ GameList(
+ v-show="display=='import'"
+ ref="importgames"
+ :games="importGames"
+ @show-game="showGame"
+ )
+ button#loadMoreBtn(
+ v-show="hasMore[display]"
+ @click="loadMore(display)"
+ )
+ | {{ st.tr["Load more"] }}
</template>
<script>
import { store } from "@/store";
import { GameStorage } from "@/utils/gameStorage";
+import { ImportgameStorage } from "@/utils/importgameStorage";
import { ajax } from "@/utils/ajax";
import { getScoreMessage } from "@/utils/scoring";
import params from "@/parameters";
import { getRandString } from "@/utils/alea";
import GameList from "@/components/GameList.vue";
+import UploadGame from "@/components/UploadGame.vue";
export default {
name: "my-my-games",
components: {
- GameList
+ GameList,
+ UploadGame
},
data: function() {
return {
display: "live",
liveGames: [],
corrGames: [],
+ importGames: [],
+ // timestamp of last showed (oldest) game:
+ cursor: {
+ live: Number.MAX_SAFE_INTEGER,
+ "import": Number.MAX_SAFE_INTEGER,
+ corr: Number.MAX_SAFE_INTEGER
+ },
+ // hasMore == TRUE: a priori there could be more games to load
+ hasMore: {
+ live: true,
+ "import": true,
+ corr: (store.state.user.id > 0)
+ },
conn: null,
- connexionString: ""
+ connexionString: "",
+ socketCloseListener: 0
};
},
+ watch: {
+ $route: function(to, from) {
+ if (to.path != "/mygames") this.cleanBeforeDestroy();
+ }
+ },
created: function() {
+ window.addEventListener("beforeunload", this.cleanBeforeDestroy);
// Initialize connection
this.connexionString =
params.socketUrl +
- "/?sid=" +
- this.st.user.sid +
- "&id=" +
- this.st.user.id +
- "&tmpId=" +
- getRandString() +
+ "/?sid=" + this.st.user.sid +
+ "&id=" + this.st.user.id +
+ "&tmpId=" + getRandString() +
"&page=" +
encodeURIComponent(this.$route.path);
this.conn = new WebSocket(this.connexionString);
this.conn.onmessage = this.socketMessageListener;
- this.conn.onclose = this.socketCloseListener;
+ this.socketCloseListener = setInterval(
+ () => {
+ if (this.conn.readyState == 3) {
+ // Connexion is closed: re-open
+ this.conn.removeEventListener("message", this.socketMessageListener);
+ this.conn = new WebSocket(this.connexionString);
+ this.conn.addEventListener("message", this.socketMessageListener);
+ }
+ },
+ 1000
+ );
},
mounted: function() {
const adjustAndSetDisplay = () => {
}
this.setDisplay(showType);
};
- GameStorage.getAll(localGames => {
+ GameStorage.getRunning(localGames => {
localGames.forEach(g => g.type = "live");
this.decorate(localGames);
this.liveGames = localGames;
if (this.st.user.id > 0) {
+ // Ask running corr games first
ajax(
- "/games",
+ "/runninggames",
"GET",
{
- data: { uid: this.st.user.id },
+ credentials: true,
success: (res) => {
- let serverGames = res.games.filter(g => {
- const mySide =
- g.players[0].uid == this.st.user.id
- ? "White"
- : "Black";
- return !g["deletedBy" + mySide];
+ // These games are garanteed to not be deleted
+ this.corrGames = res.games;
+ this.corrGames.forEach(g => {
+ g.type = "corr";
+ g.score = "*";
});
- serverGames.forEach(g => g.type = "corr");
- this.decorate(serverGames);
- this.corrGames = serverGames;
- adjustAndSetDisplay();
+ this.decorate(this.corrGames);
+ // Now ask completed games (partial list)
+ this.loadMore(
+ "live",
+ () => this.loadMore("corr", () => {
+ this.loadMore("import", adjustAndSetDisplay);
+ })
+ );
}
}
);
- } else adjustAndSetDisplay();
+ }
+ else {
+ this.loadMore("live", () => {
+ this.loadMore("import", adjustAndSetDisplay);
+ });
+ }
});
},
beforeDestroy: function() {
- this.conn.send(JSON.stringify({code: "disconnect"}));
+ this.cleanBeforeDestroy();
},
methods: {
+ cleanBeforeDestroy: function() {
+ clearInterval(this.socketCloseListener);
+ window.removeEventListener("beforeunload", this.cleanBeforeDestroy);
+ this.conn.removeEventListener("message", this.socketMessageListener);
+ this.conn.send(JSON.stringify({code: "disconnect"}));
+ this.conn = null;
+ },
setDisplay: function(type, e) {
this.display = type;
localStorage.setItem("type-myGames", type);
let elt = e ? e.target : document.getElementById(type + "Games");
elt.classList.add("active");
elt.classList.remove("somethingnew"); //in case of
- if (elt.previousElementSibling)
- elt.previousElementSibling.classList.remove("active");
- else elt.nextElementSibling.classList.remove("active");
+ for (let t of ["live","corr","import"]) {
+ if (t != type)
+ document.getElementById(t + "Games").classList.remove("active");
+ }
+ },
+ addGameImport(game) {
+ game.type = "import";
+ ImportgameStorage.add(game, (err) => {
+ if (!!err) {
+ if (err.message.indexOf("Key already exists") < 0) {
+ alert(this.st.tr["An error occurred. Try again!"]);
+ return;
+ }
+ else alert(this.st.tr["The game was already imported"]);
+ }
+ this.$router.push("/game/" + game.id);
+ });
},
tryShowNewsIndicator: function(type) {
if (
- (type == "live" && this.display == "corr") ||
- (type == "corr" && this.display == "live")
+ (type == "live" && this.display != "live") ||
+ (type == "corr" && this.display != "corr")
) {
document
.getElementById(type + "Games")
decorate: function(games) {
games.forEach(g => {
g.myColor =
- (g.type == "corr" && g.players[0].uid == this.st.user.id) ||
+ (g.type == "corr" && g.players[0].id == this.st.user.id) ||
(g.type == "live" && g.players[0].sid == this.st.user.sid)
? 'w'
: 'b';
});
},
socketMessageListener: function(msg) {
+ if (!this.conn) return;
const data = JSON.parse(msg.data);
+ // NOTE: no imported games here
let gamesArrays = {
"corr": this.corrGames,
"live": this.liveGames
if (thing == "turn") {
game.myTurn = !game.myTurn;
if (game.myTurn) this.tryShowNewsIndicator(type);
- }
+ } else game.myTurn = false;
// TODO: forcing refresh like that is ugly and wrong.
// How to do it cleanly?
this.$refs[type + "games"].$forceUpdate();
gameInfo
);
game.myTurn =
- (type == "corr" && game.players[0].uid == this.st.user.id) ||
+ (type == "corr" && game.players[0].id == this.st.user.id) ||
(type == "live" && game.players[0].sid == this.st.user.sid);
gamesArrays[type].push(game);
if (game.myTurn) this.tryShowNewsIndicator(type);
}
}
},
- socketCloseListener: function() {
- this.conn = new WebSocket(this.connexionString);
- this.conn.addEventListener("message", this.socketMessageListener);
- this.conn.addEventListener("close", this.socketCloseListener);
- },
showGame: function(game) {
- if (game.type == "live" || !game.myTurn) {
+ if (game.type != "corr" || !game.myTurn) {
this.$router.push("/game/" + game.id);
return;
}
game.players[0].sid == this.st.user.sid
? game.players[1].sid
: game.players[0].sid;
- this.conn.send(
- JSON.stringify(
- {
- code: "mabort",
- gid: game.id,
- // NOTE: target might not be online
- target: oppsid
- }
- )
- );
+ if (!!this.conn) {
+ this.conn.send(
+ JSON.stringify(
+ {
+ code: "mabort",
+ gid: game.id,
+ // NOTE: target might not be online
+ target: oppsid
+ }
+ )
+ );
+ }
}
+ // NOTE: no imported games here
else if (!game.deletedByWhite || !game.deletedByBlack) {
// Set score if game isn't deleted on server:
ajax(
}
);
}
+ },
+ loadMore: function(type, cb) {
+ if (type == "corr" && this.st.user.id > 0) {
+ ajax(
+ "/completedgames",
+ "GET",
+ {
+ credentials: true,
+ data: { cursor: this.cursor["corr"] },
+ success: (res) => {
+ const L = res.games.length;
+ if (L > 0) {
+ this.cursor["corr"] = res.games[L - 1].created;
+ let moreGames = res.games;
+ moreGames.forEach(g => g.type = "corr");
+ this.decorate(moreGames);
+ this.corrGames = this.corrGames.concat(moreGames);
+ } else this.hasMore["corr"] = false;
+ if (!!cb) cb();
+ }
+ }
+ );
+ }
+ else if (type == "live") {
+ GameStorage.getNext(this.cursor["live"], localGames => {
+ const L = localGames.length;
+ if (L > 0) {
+ // Add "-1" because IDBKeyRange.upperBound includes boundary
+ this.cursor["live"] = localGames[L - 1].created - 1;
+ localGames.forEach(g => g.type = "live");
+ this.decorate(localGames);
+ this.liveGames = this.liveGames.concat(localGames);
+ } else this.hasMore["live"] = false;
+ if (!!cb) cb();
+ });
+ }
+ else if (type == "import") {
+ ImportgameStorage.getNext(this.cursor["import"], importGames => {
+ const L = importGames.length;
+ if (L > 0) {
+ // Add "-1" because IDBKeyRange.upperBound includes boundary
+ this.cursor["import"] = importGames[L - 1].created - 1;
+ importGames.forEach(g => g.type = "import");
+ this.importGames = this.importGames.concat(importGames);
+ } else this.hasMore["import"] = false;
+ if (!!cb) cb();
+ });
+ }
}
}
};
table.game-list
max-height: 100%
+button#loadMoreBtn
+ display: block
+ margin: 0 auto
+
.somethingnew
background-color: #c5fefe !important
</style>
projects / vchess.git / blobdiff