diff --git a/package.json b/package.json index 843ee33..c809550 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "beepboop", - "version": "2.1.2", + "version": "2.1.3", "description": "", "main": "index.js", "type": "module", diff --git a/src/steam-api/steam-browser-api.js b/src/steam-api/steam-browser-api.js index 293fdcf..c7c1d45 100644 --- a/src/steam-api/steam-browser-api.js +++ b/src/steam-api/steam-browser-api.js @@ -5,16 +5,17 @@ import SteamBrowserGuiApi from "./steam-browser-gui-api.js"; import DealWithSteamGuard from "../deal-with-steam-guard.js"; const selectors = { - loginUsername: "[type=text].newlogindialog_TextInput_2eKVn", - loginPassword: "[type=password].newlogindialog_TextInput_2eKVn", - loginRememberMe: ".newlogindialog_Checkbox_3tTFg", - loginRememberMeCheck: ".newlogindialog_Check_6EoZE", - loginCaptcha: "#input_captcha", + // Steam login selectors: + loginUsername: "[data-featuretarget=login] input[type=text]", + loginPassword: "[data-featuretarget=login] input[type=password]", + loginRememberMe: "[data-featuretarget=login] div[tabindex]", + loginCaptcha: "#input_captcha", // Captcha selectors are probably wrong, haven't seen the captcha in a while... loginCaptchaImg: "#captchaImg", - loginError: ".newlogindialog_FormError_1Mcy9", - loginButton: "[type=submit].newlogindialog_SubmitButton_2QgFE", - loading: ".WaitingForInterFaceReadyContainer", - steamGuardInput: ".segmentedinputs_SegmentedCharacterInput_3PDBF" + loginError: "[data-featuretarget=login] form > div:last-of-type:not(:first-of-type)", + loginButton: "[data-featuretarget=login] [type=submit]", + steamGuardInput: "[data-featuretarget=login] div:has(> input)", + // Steam Chat selectors: + loading: ".WaitingForInterFaceReadyContainer" }; const steamChatUrl = "https://steamcommunity.com/chat"; diff --git a/src/steam-api/steam-browser-gui-api.js b/src/steam-api/steam-browser-gui-api.js index a5a0235..7c697e4 100644 --- a/src/steam-api/steam-browser-gui-api.js +++ b/src/steam-api/steam-browser-gui-api.js @@ -6,7 +6,7 @@ const SteamBrowserGuiApi = { rememberMe: (selectors) => { let remember = document.querySelector(selectors.loginRememberMe); - if(!remember.querySelector(selectors.loginRememberMeCheck)) + if(remember.childElementCount == 0) remember.click(); }, @@ -15,7 +15,7 @@ const SteamBrowserGuiApi = { let steamGuardCounter = 0; let checkInt = setInterval(() => { let errorMsg = document.querySelector(selectors.loginError); - if(errorMsg && !errorMsg.innerText.blank()){ + if(errorMsg && errorMsg.childElementCount == 0 && !errorMsg.innerText.blank()){ console.error("Login error:", errorMsg.innerText); clearInterval(checkInt); reject(new Error("Login failed."));