From 2aac6a8c5e9511b45c1253c4981021ce29e6cd91 Mon Sep 17 00:00:00 2001 From: Knkajfw Date: Sat, 25 Apr 2020 18:13:56 +0800 Subject: [PATCH 1/2] fix: uncaught exception in non-5v5 game This happens when try to fetch player level for tp cd calc during a non-5v5 game --- main.js | 72 ++++++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 56 insertions(+), 16 deletions(-) diff --git a/main.js b/main.js index d553140..8c5a909 100644 --- a/main.js +++ b/main.js @@ -36,6 +36,8 @@ const opponentSummonerSpellsObject = { }; var opponentSummonerSpellsString = ''; var currentGameMode = ''; +var opponentToGetLevelIndex = 0; +var skillSlotToGetLevel = ''; function createLoadingPageWindow() { Menu.setApplicationMenu(null); @@ -95,6 +97,20 @@ function getActivePlayerName() { getActivePlayerNameReq.end(); } +function getActivePlayerNameForLv() { + const getActivePlayerNameForLvReq = new net.request('https://127.0.0.1:2999/liveclientdata/activeplayername'); + getActivePlayerNameForLvReq.on('error', (error) => { + console.error('getActivePlayerNameForLvReqErr', error.message); + }) + getActivePlayerNameForLvReq.on('response', (response) => { + response.on('data', (chunk) => { + activePlayerName = JSON.parse(chunk); + requestPlayerListForLv(); + }) + }) + getActivePlayerNameForLvReq.end(); +} + function requestPlayerList() { const playerListReq = new net.request('https://127.0.0.1:2999/liveclientdata/playerlist'); playerListReq.on('error', (error) => { @@ -103,7 +119,6 @@ function requestPlayerList() { playerListReq.on('response', (response) => { response.on('data', (chunk) => { playerList = JSON.parse(chunk); - console.log(playerList.length) if (playerList.length === 10) { activePlayerTeam = findPlayerTeam(); if (activePlayerTeam === 'ORDER') { @@ -122,6 +137,27 @@ function requestPlayerList() { playerListReq.end(); } +function requestPlayerListForLv() { + const playerListForLvReq = new net.request('https://127.0.0.1:2999/liveclientdata/playerlist'); + playerListForLvReq.on('error', (error) => { + console.error('playerListForLvReqErr:', error.message); + }) + playerListForLvReq.on('response', (response) => { + response.on('data', (chunk) => { + playerList = JSON.parse(chunk); + activePlayerTeam = findPlayerTeam(); + if (activePlayerTeam === 'ORDER') { + opponentTeam = 'CHAOS'; + } + else if (activePlayerTeam === 'CHAOS') { + opponentTeam = 'ORDER'; + } + getOpponentObjectArrayForLv(); + }) + }) + playerListForLvReq.end(); +} + function findPlayerTeam() { for (let i=0; i { + return player.team === opponentTeam; + }) + sendLevel(); +} + +function sendLevel() { + if (opponents[opponentToGetLevelIndex] === undefined) /* Do nothing */; + else { + let level = opponents[opponentToGetLevelIndex].level; + console.log(pcClientId, skillSlotToGetLevel, level); + socket.emit('fetchlvp2s', pcClientId, skillSlotToGetLevel, level); + } +} + function getSummonerSpells() { opponentSummonerSpells = []; opponents.map(parseAndPushSummonerSpells); @@ -290,21 +342,9 @@ ipcMain.on('socketServerInfo', (event, arg) => { } }) socket.on('fetchlvs2p', (skillSlot) => { - let index = getLevelArrayIndexFromSkillSlot(skillSlot); - let lvreq = net.request('https://127.0.0.1:2999/liveclientdata/playerlist'); - lvreq.on('error', (error) => { - console.error('lvreq err:', error.message); - }) - lvreq.on('response', (response) => { - response.on('data', (chunk) => { - let lvPlayerList = JSON.parse(chunk); - let lvOpponents = lvPlayerList.filter(lvPlayer => lvPlayer.team === opponentTeam); - let level = lvOpponents[index].level; - console.log(pcClientId, skillSlot, level); - socket.emit('fetchlvp2s',pcClientId, skillSlot, level); - }) - }) - lvreq.end(); + opponentToGetLevelIndex = getLevelArrayIndexFromSkillSlot(skillSlot); + skillSlotToGetLevel = skillSlot; + getActivePlayerNameForLv(); }) }) From 0461bf6fe1dcec30da8e1067ae325871da9bd2ef Mon Sep 17 00:00:00 2001 From: Knkajfw Date: Sat, 25 Apr 2020 18:15:58 +0800 Subject: [PATCH 2/2] remove iconv + update version --- package-lock.json | 13 +++---------- package.json | 7 +++---- 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/package-lock.json b/package-lock.json index 1158238..ca9e1c7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "pastelikedoinb", - "version": "1.3.0", + "version": "1.3.2", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -1034,14 +1034,6 @@ "debug": "4" } }, - "iconv-lite": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.5.1.tgz", - "integrity": "sha512-ONHr16SQvKZNSqjQT9gy5z24Jw+uqfO02/ngBSBoqChZ+W8qXX7GPRa1RoUnzGADw8K63R1BXUMzarCVQBpY8Q==", - "requires": { - "safer-buffer": ">= 2.1.2 < 3" - } - }, "ieee754": { "version": "1.1.13", "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz", @@ -1801,7 +1793,8 @@ "safer-buffer": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", - "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", + "dev": true }, "sanitize-filename": { "version": "1.6.3", diff --git a/package.json b/package.json index bc6919d..4ad2e9f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pastelikedoinb", - "version": "1.3.1", + "version": "1.3.2", "description": "An app that generates and auto-type LOL flash tracking messages", "main": "main.js", "scripts": { @@ -15,11 +15,10 @@ }, "dependencies": { "https-proxy-agent": "^5.0.0", - "iconv-lite": "^0.5.1", + "minimist": ">=0.2.1", "nanoid": "^2.1.9", "qrcode": "^1.4.4", "robotjs": "^0.6.0", - "socket.io-client": "^2.3.0", - "minimist": ">=0.2.1" + "socket.io-client": "^2.3.0" } }