` to skip long-remaining offers
+- Screenshots: `SCREENSHOTS_DIR` (default `data/screenshots`)
+- Notifications: `NOTIFY='...'` (Apprise URL), optional `NOTIFY_TITLE`
+- Browser profile: `BROWSER_DIR` (default `data/browser`)
+- Recording: `RECORD=1` to save videos/HAR to `data/record/`
+- Debugging: `DEBUG=1` (opens Playwright inspector), `DEBUG_NETWORK=1` (logs requests), `TIME=1` (prints timings)
+- Dry run / Interaction: `DRYRUN=1` (do not claim), `INTERACTIVE=1` (ask before claiming), `HEADLESS` is derived from `SHOW`/`DEBUG`
+- Directories: `SCREENSHOTS_DIR`, `BROWSER_DIR`, `DATA_DIR` (prefix for data; default under `data/`)
+- VNC/noVNC: `VNC_PASSWORD` (for Docker entrypoint), `NOVNC_PORT`/`VNC_PORT` (Docker)
+- General timeouts: `TIMEOUT` (per action), `LOGIN_TIMEOUT` (extra time for login)
-This will run `node epic-games; node prime-gaming; node gog` - if you only want to claim games for one of the stores, you can override the default command by appending e.g. `node epic-games` at the end of the `docker run` command, or if you want several `bash -c "node epic-games.js; node gog.js"`.
-Data (including json files with claimed games, codes to redeem, screenshots) is stored in the Docker volume `fgc`.
+You can place a `data/config.env`; it is loaded via dotenv and is overridden by explicitly set environment variables.
-
- I want to run without Docker or develop locally.
+Local Run Without Docker
+------------------------
+```
+npm install
+SHOW=0 PG_EMAIL=... PG_PASSWORD=... PG_OTPKEY=... node prime-gaming.js
+```
+- Playwright downloads Firefox to `~/.cache/ms-playwright`.
+- Use `SHOW=1` for a visible browser (requires GUI/Xvfb).
-1. [Install Node.js](https://nodejs.org/en/download)
-2. Clone/download this repository and `cd` into it in a terminal
-3. Run `npm install`
-4. Run `pip install apprise` (or use [pipx](https://github.com/pypa/pipx) if you have [problems](https://stackoverflow.com/questions/75608323/how-do-i-solve-error-externally-managed-environment-every-time-i-use-pip-3)) to install [apprise](https://github.com/caronc/apprise) if you want notifications
-5. To get updates: `git pull; npm install`
-6. Run `node epic-games`, `node prime-gaming`, `node gog`...
+Persistence & Outputs
+---------------------
+- Data/status: `data/*.json` (per store)
+- Browser profile: `data/browser`
+- Screenshots: `data/screenshots//`
+- Optional videos/HAR: `RECORD=1` → `data/record/`
-During `npm install` Playwright will download its Firefox to a cache in home ([doc](https://playwright.dev/docs/browsers#managing-browser-binaries)).
-If you are missing some dependencies for the browser on your system, you can use `sudo npx playwright install firefox --with-deps`.
-
-If you don't want to use Docker for quasi-headless mode, you could run inside a virtual machine, on a server, or you wake your PC at night to avoid being interrupted.
-
-
-## Usage
-All scripts start an automated Firefox instance, either with the browser GUI shown or hidden (*headless mode*). By default, you won't see any browser open on your host system.
-
-- When running inside Docker, the browser will be shown only inside the container. You can open http://localhost:6080 to interact with the browser running inside the container via noVNC (or use other VNC clients on port 5900).
-- When running the scripts outside of Docker, the browser will be hidden by default; you can use `SHOW=1 ...` to show the UI (see options below).
-
-When running the first time, you have to login for each store you want to claim games on.
-You can login indirectly via the terminal or directly in the browser. The scripts will wait until you are successfully logged in.
-
-There will be prompts in the terminal asking you to enter email, password, and afterwards some OTP (one time password / security code) if you have 2FA/MFA (two-/multi-factor authentication) enabled. If you want to login yourself via the browser, you can press escape in the terminal to skip the prompts.
-
-After login, the script will continue claiming the current games. If it still waits after you are already logged in, you can restart it (and open an issue). If you run the scripts regularly, you should not have to login again.
-
-### Configuration / Options
-Options are set via [environment variables](https://kinsta.com/knowledgebase/what-is-an-environment-variable/) which allow for flexible configuration.
-
-TODO: ~~On the first run, the script will guide you through configuration and save all settings to `data/config.env`. You can edit this file directly or run `node fgc config` to run the configuration assistant again.~~
-
-Available options/variables and their default values:
-
-| Option | Default | Description |
-|--------------- |--------- |------------------------------------------------------------------------ |
-| SHOW | 1 | Show browser if 1. Default for Docker, not shown when running outside. |
-| WIDTH | 1280 | Width of the opened browser (and of screen for VNC in Docker). |
-| HEIGHT | 1280 | Height of the opened browser (and of screen for VNC in Docker). |
-| VNC_PASSWORD | | VNC password for Docker. No password used by default! |
-| NOTIFY | | Notification services to use (Pushover, Slack, Telegram...), see below. [Apprise](https://github.com/caronc/apprise) |
-| NOTIFY_TITLE | | Optional title for notifications, e.g. for Pushover. |
-| BROWSER_DIR | data/browser | Directory for browser profile, e.g. for multiple accounts. |
-| TIMEOUT | 60 | Timeout for any page action. Should be fine even on slow machines. |
-| LOGIN_TIMEOUT | 180 | Timeout for login in seconds. Will wait twice (prompt + manual login). |
-| EMAIL | | Default email for any login. |
-| PASSWORD | | Default password for any login. |
-| EG_EMAIL | | Epic Games email for login. Overrides EMAIL. |
-| EG_PASSWORD | | Epic Games password for login. Overrides PASSWORD. |
-| EG_OTPKEY | | Epic Games MFA OTP key. |
-| EG_PARENTALPIN | | Epic Games Parental Controls PIN. |
-| PG_EMAIL | | Prime Gaming email for login. Overrides EMAIL. |
-| PG_PASSWORD | | Prime Gaming password for login. Overrides PASSWORD. |
-| PG_OTPKEY | | Prime Gaming MFA OTP key. |
-| PG_REDEEM | 0 | Prime Gaming: try to redeem keys on external stores ([experimental](https://github.com/vogler/free-games-claimer/issues/5)). |
-| PG_CLAIMDLC | 0 | Prime Gaming: try to claim DLCs ([experimental](https://github.com/vogler/free-games-claimer/issues/55)). |
-| GOG_EMAIL | | GOG email for login. Overrides EMAIL. |
-| GOG_PASSWORD | | GOG password for login. Overrides PASSWORD. |
-| GOG_NEWSLETTER | 0 | Do not unsubscribe from newsletter after claiming a game if 1. |
-| LG_EMAIL | | Legacy Games: email to use for redeeming (if not set, defaults to PG_EMAIL) |
-
-See `src/config.js` for all options.
-
-#### How to set options
-You can add options directly in the command or put them in a file to load.
-
-##### Docker
-You can pass variables using `-e VAR=VAL`, for example `docker run -e EMAIL=foo@bar.baz -e NOTIFY='tgram://bottoken/ChatID' ...` or using `--env-file fgc.env` where `fgc.env` is a file on your host system (see [docs](https://docs.docker.com/engine/reference/commandline/run/#env)). You can also `docker cp` your configuration file to `/fgc/data/config.env` in the `fgc` volume to store it with the rest of the data instead of on the host ([example](https://github.com/moby/moby/issues/25245#issuecomment-365980572)).
-If you are using [docker compose](https://docs.docker.com/compose/environment-variables/) (or Portainer etc.), you can put options in the `environment:` section.
-
-##### Without Docker
-On Linux/macOS you can prefix the variables you want to set, for example `EMAIL=foo@bar.baz SHOW=1 node epic-games` will show the browser and skip asking you for your login email. On Windows you have to use `set`, [example](https://github.com/vogler/free-games-claimer/issues/314).
-You can also put options in `data/config.env` which will be loaded by [dotenv](https://github.com/motdotla/dotenv).
-
-### Notifications
-The scripts will try to send notifications for successfully claimed games and any errors like needing to log in or encountered captchas (should not happen).
-
-[apprise](https://github.com/caronc/apprise) is used for notifications and offers many services including Pushover, Slack, Telegram, SMS, Email, desktop and custom notifications.
-You just need to set `NOTIFY` to the notification services you want to use, e.g. `NOTIFY='mailto://myemail:mypass@gmail.com' 'pbul://o.gn5kj6nfhv736I7jC3cj3QLRiyhgl98b'` - refer to their list of services and [examples](https://github.com/caronc/apprise#command-line-usage).
-
-### Automatic login, two-factor authentication
-If you set the options for email, password and OTP key, there will be no prompts and logins should happen automatically. This is optional since all stores should stay logged in since cookies are refreshed.
-To get the OTP key, it is easiest to follow the store's guide for adding an authenticator app. You should also scan the shown QR code with your favorite app to have an alternative method for 2FA.
-
-- **Epic Games**: visit [password & security](https://www.epicgames.com/account/password), enable 'third-party authenticator app', copy the 'Manual Entry Key' and use it to set `EG_OTPKEY`.
-- **Prime Gaming**: visit Amazon 'Your Account › Login & security', 2-step verification › Manage › Add new app › Can't scan the barcode, copy the bold key and use it to set `PG_OTPKEY`
-- **GOG**: only offers OTP via email
-
-
-Beware that storing passwords and OTP keys as clear text may be a security risk. Use a unique/generated password! TODO: maybe at least offer to base64 encode for storage.
-
-### Epic Games Store
-Run `node epic-games` (locally or in Docker).
-
-### Amazon Prime Gaming
-Run `node prime-gaming` (locally or in Docker).
-
-Claiming the Amazon Games works out-of-the-box, however, for games on external stores you need to either link your account or redeem a key.
-
-- Stores that require account linking: Epic Games, Battle.net, Origin.
-- Stores that require redeeming a key: GOG.com, Microsoft Games, Legacy Games.
-
- Keys and URLs are printed to the console, included in notifications and saved in `data/prime-gaming.json`. A screenshot of the page with the key is also saved to `data/screenshots`.
- [TODO](https://github.com/vogler/free-games-claimer/issues/5): ~~redeem keys on external stores.~~
-
-
-
-
-### Run periodically
-#### How often?
-Epic Games usually has two free games *every week*, before Christmas every day.
-Prime Gaming has new games *every month* or more often during Prime days.
-GOG usually has one new game every couples of weeks.
-Unreal Engine has new assets to claim *every first Tuesday of a month*.
-
-
-It is safe to run the scripts every day.
-
-#### How to schedule?
-The container/scripts will claim currently available games and then exit.
-If you want it to run regularly, you have to schedule the runs yourself:
-
-- Linux/macOS: `crontab -e` ([example](https://github.com/vogler/free-games-claimer/discussions/56))
-- macOS: [launchd](https://stackoverflow.com/questions/132955/how-do-i-set-a-task-to-run-every-so-often)
-- Windows: [task scheduler](https://active-directory-wp.com/docs/Usage/How_to_add_a_cron_job_on_Windows/Scheduled_tasks_and_cron_jobs_on_Windows/index.html) ([example](https://github.com/vogler/free-games-claimer/wiki/%5BHowTo%5D-Schedule-runs-on-Windows)), [other options](https://stackoverflow.com/questions/132971/what-is-the-windows-version-of-cron), or just put the command in a `.bat` file in Autostart if you restart often...
-- any OS: use a process manager like [pm2](https://pm2.keymetrics.io/docs/usage/restart-strategies/)
-- Docker Compose `command: bash -c "node epic-games; node prime-gaming; node gog; echo sleeping; sleep 1d"` additionally add `restart: unless-stopped` to it.
-
-TODO: ~~add some server-mode where the script just keeps running and claims games e.g. every day.~~
-
-### Problems?
-
-Check the open [issues](https://github.com/vogler/free-games-claimer/issues) and comment there or open a new issue.
-
-If you're a developer, you can use `PWDEBUG=1 ...` to [inspect](https://playwright.dev/docs/inspector) which opens a debugger where you can step through the script.
-
-
-## History/DevLog
-
- Click to expand
-
-Tried [epicgames-freebies-claimer](https://github.com/Revadike/epicgames-freebies-claimer), but had problems since epicgames introduced hcaptcha (see [issue](https://github.com/Revadike/epicgames-freebies-claimer/issues/172)).
-
-Played around with puppeteer before, now trying newer https://playwright.dev which is pretty similar.
-Playwright Inspector and `codegen` to generate scripts are nice, but failed to generate the right code for clicking a button in an iframe.
-
-Added [main.spec.ts](https://github.com/vogler/epicgames-claimer/commit/e5ce7916ab6329cfc7134677c4d89c2b3fa3ba97#diff-d18d03e9c407a20e05fbf03cbd6f9299857740544fb6b50d6a70b9c6fbc35831) which was the test script generated by `npx playwright codegen` with manual fix for clicking buttons in the created iframe. Can be executed by `npx playwright test`. The test runner has options `--debug` and `--timeout` and can execute typescript which is nice. However, this only worked up to the button 'I Agree', and then showed an hcaptcha.
-
-Added [main.captcha.js](https://github.com/vogler/epicgames-claimer/commit/e5ce7916ab6329cfc7134677c4d89c2b3fa3ba97#diff-d18d03e9c407a20e05fbf03cbd6f9299857740544fb6b50d6a70b9c6fbc35831) which uses beta of `playwright-extra@next` and `@extra/recaptcha@next` (from [comment on puppeteer-extra](https://github.com/berstend/puppeteer-extra/pull/303#issuecomment-775277480)).
-However, `playwright-extra` seems to be old and missing `:has-text` selector (fixed [here](https://github.com/vogler/epicgames-claimer/commit/ba97a0e840b65f4476cca18e28d8461b0c703420)) and `page.frameLocator`, so the script did not run without adjustments.
-Also, solving via [2captcha](https://2captcha.com?from=13225256) is a paid service which takes time and may be unreliable.
-
-
-Added [main.stealth.js](https://github.com/vogler/epicgames-claimer/commit/64d0ba8ce71baec3947d1b64acd567befcb39340#diff-f70d3bd29df4a343f11062a97063953173491ce30fe34f69a0fc52517adbf342) which uses the stealth plugin without `playwright-extra` wrapper but up-to-date `playwright` (from [comment](https://github.com/berstend/puppeteer-extra/issues/454#issuecomment-917437212)).
-The listed evasions are enough to not show an hcaptcha. Script claimed game successfully in non-headless mode.
-
-Removed `main.captcha.js`.
-Using Playwright Test (`main.spec.ts`) instead of Library (`main.stealth.js`) has the advantage of free CLI like `--debug` and `--timeout`.
-
-
-Button selectors should preferably use text in order to be more stable against changes in the DOM.
-
-Renamed repository from epicgames-claimer to free-games-claimer since a script for Amazon Prime Gaming was also added. Removed all old scripts in favor of just `epic-games.js` and `prime-gaming.js`.
-
-epic games: `headless` mode gets hcaptcha challenge. More details/references in [issue](https://github.com/vogler/free-games-claimer/issues/2).
-
-https://github.com/vogler/free-games-claimer/pull/11 introduced a Dockerfile for running non-headless inside the container via xvfb which makes it headless for the host running the container.
-
-v1.0 Standalone scripts node epic-games and node prime-gaming using Chromium.
-
-Changed to Firefox for all scripts since Chromium led to captchas. Claiming then also worked in headless mode without Docker.
-
-Added options via env vars, configurable in `data/config.env`.
-
-Added OTP generation via otplib for automatic login, even with 2FA.
-
-Added notifications via [apprise](https://github.com/caronc/apprise).
-
-
-[](https://star-history.com/#vogler/free-games-claimer&Date)
-
-
-
-
----
-
-Logo with smaller aspect ratio (for Telegram bot etc.): 👾 - [emojipedia](https://emojipedia.org/alien-monster/)
-
-
+Tip: For captchas or first-time login, run with `SHOW=1` and log in once; cookies stay in the profile. Notifications via `NOTIFY` help surface errors (e.g., captcha, login).
diff --git a/aliexpress.js b/aliexpress.js
index 52e75a0..6d654d3 100644
--- a/aliexpress.js
+++ b/aliexpress.js
@@ -1,5 +1,5 @@
import { firefox } from 'playwright-firefox'; // stealth plugin needs no outdated playwright-extra
-import { datetime, filenamify, prompt, handleSIGINT, stealth } from './src/util.js';
+import { datetime, filenamify, prompt, handleSIGINT } from './src/util.js';
import { cfg } from './src/config.js';
// using https://github.com/apify/fingerprint-suite worked, but has no launchPersistentContext...
@@ -8,8 +8,8 @@ import { FingerprintInjector } from 'fingerprint-injector';
import { FingerprintGenerator } from 'fingerprint-generator';
const { fingerprint, headers } = new FingerprintGenerator().getFingerprint({
- devices: ["mobile"],
- operatingSystems: ["android"],
+ devices: ['mobile'],
+ operatingSystems: ['android'],
});
const context = await firefox.launchPersistentContext(cfg.dir.browser, {
@@ -21,11 +21,11 @@ const context = await firefox.launchPersistentContext(cfg.dir.browser, {
handleSIGINT: false, // have to handle ourselves and call context.close(), otherwise recordings from above won't be saved
userAgent: fingerprint.navigator.userAgent,
viewport: {
- width: fingerprint.screen.width,
- height: fingerprint.screen.height,
+ width: fingerprint.screen.width,
+ height: fingerprint.screen.height,
},
extraHTTPHeaders: {
- 'accept-language': headers['accept-language'],
+ 'accept-language': headers['accept-language'],
},
});
handleSIGINT(context);
@@ -36,7 +36,7 @@ context.setDefaultTimeout(cfg.debug ? 0 : cfg.timeout);
const page = context.pages().length ? context.pages()[0] : await context.newPage(); // should always exist
-const auth = async (url) => {
+const auth = async url => {
console.log('auth', url);
await page.goto(url, { waitUntil: 'domcontentloaded' });
// redirects to https://login.aliexpress.com/?return_url=https%3A%2F%2Fwww.aliexpress.com%2Fp%2Fcoin-pc-index%2Findex.html
@@ -45,7 +45,7 @@ const auth = async (url) => {
console.error('Not logged in! Will wait for 120s for you to login...');
// await page.waitForTimeout(120*1000);
// or try automated
- page.locator('span:has-text("Switch account")').click().catch(_ => {}); // sometimes no longer logged in, but previous user/email is pre-selected -> in this case we want to go back to the classic login
+ page.locator('span:has-text("Switch account")').click().catch(() => {}); // sometimes no longer logged in, but previous user/email is pre-selected -> in this case we want to go back to the classic login
const login = page.locator('.login-container');
const email = cfg.ae_email || await prompt({ message: 'Enter email' });
const emailInput = login.locator('input[label="Email or phone number"]');
@@ -58,11 +58,11 @@ const auth = async (url) => {
await login.locator('input[label="Password"]').fill(password);
await login.locator('button:has-text("Sign in")').click();
const error = login.locator('.error-text');
- error.waitFor().then(async _ => console.error('Login error:', await error.innerText()));
+ error.waitFor().then(async () => console.error('Login error:', await error.innerText()));
await page.waitForURL(url);
// await page.addLocatorHandler(page.getByRole('button', { name: 'Accept cookies' }), btn => btn.click());
- page.getByRole('button', { name: 'Accept cookies' }).click().then(_ => console.log('Accepted cookies')).catch(_ => { });
- }), page.locator('#nav-user-account').waitFor()]).catch(_ => {});
+ page.getByRole('button', { name: 'Accept cookies' }).click().then(() => console.log('Accepted cookies')).catch(() => { });
+ }), page.locator('#nav-user-account').waitFor()]).catch(() => {});
// await page.locator('#nav-user-account').hover();
// console.log('Logged in as:', await page.locator('.welcome-name').innerText());
@@ -80,6 +80,7 @@ const urls = {
merge: 'https://m.aliexpress.com/p/merge-market/index.html',
};
+/* eslint-disable no-unused-vars */
const coins = async () => {
// await auth(urls.coins);
await Promise.any([page.locator('.checkin-button').click(), page.locator('.addcoin').waitFor()]);
@@ -103,6 +104,7 @@ const euro = async () => {
const merge = async () => {
await page.pause();
};
+/* eslint-enable no-unused-vars */
try {
// await coins();
@@ -112,7 +114,11 @@ try {
// gogo,
// euro,
merge,
- ].reduce((a, f) => a.then(async _ => { await auth(urls[f.name]); await f(); console.log() }), Promise.resolve());
+ ].reduce((a, f) => a.then(async () => {
+ await auth(urls[f.name]);
+ await f();
+ console.log();
+ }), Promise.resolve());
// await page.pause();
} catch (error) {
diff --git a/prime-gaming.js b/prime-gaming.js
index dada15f..0c982bd 100644
--- a/prime-gaming.js
+++ b/prime-gaming.js
@@ -7,7 +7,7 @@ import { cfg } from './src/config.js';
const screenshot = (...a) => resolve(cfg.dir.screenshots, 'prime-gaming', ...a);
// const URL_LOGIN = 'https://www.amazon.de/ap/signin'; // wrong. needs some session args to be valid?
-const URL_CLAIM = 'https://gaming.amazon.com/home';
+const URL_CLAIM = 'https://luna.amazon.com/claims/home';
console.log(datetime(), 'started checking prime-gaming');
@@ -37,12 +37,62 @@ await page.setViewportSize({ width: cfg.width, height: cfg.height }); // TODO wo
const notify_games = [];
let user;
+const handleMFA = async p => {
+ const otpField = p.locator('#auth-mfa-otpcode, input[name=otpCode]');
+ if (!await otpField.count()) return false;
+ console.log('Two-Step Verification - enter the One Time Password (OTP), e.g. generated by your Authenticator App');
+ await p.locator('#auth-mfa-remember-device, [name=rememberDevice]').check().catch(() => {});
+ const otp = cfg.pg_otpkey && authenticator.generate(cfg.pg_otpkey) || await prompt({ type: 'text', message: 'Enter two-factor sign in code', validate: n => n.toString().length == 6 || 'The code must be 6 digits!' }); // can't use type: 'number' since it strips away leading zeros and codes sometimes have them
+ await otpField.first().pressSequentially(otp.toString());
+ await p.locator('input[type="submit"], button[type="submit"]').first().click();
+ return true;
+};
+
try {
await page.goto(URL_CLAIM, { waitUntil: 'domcontentloaded' }); // default 'load' takes forever
+ const handleDirectLoginPage = async () => {
+ if (!page.url().includes('/ap/signin')) return false;
+ console.log('On Amazon login page (redirect). Trying to sign in automatically.');
+ if (!cfg.debug) context.setDefaultTimeout(cfg.login_timeout);
+ const email = cfg.pg_email || await prompt({ message: 'Enter email' });
+ const password = email && (cfg.pg_password || await prompt({ type: 'password', message: 'Enter password' }));
+ if (email && password) {
+ await page.fill('[name=email]', email);
+ await page.click('input[type="submit"]');
+ await page.fill('[name=password]', password);
+ await page.click('input[type="submit"]');
+ await handleMFA(page).catch(() => {});
+ page.waitForURL('**/ap/signin**').then(async () => { // check for wrong credentials
+ const error = await page.locator('.a-alert-content').first().innerText();
+ if (!error.trim.length) return;
+ console.error('Login error:', error);
+ await notify(`prime-gaming: login: ${error}`);
+ await context.close(); // finishes potential recording
+ process.exit(1);
+ });
+ await page.waitForURL(/luna\.amazon\.com\/claims\/.*signedIn=true/);
+ if (!cfg.debug) context.setDefaultTimeout(cfg.timeout);
+ return true;
+ } else {
+ console.log('Waiting for manual login on redirect page.');
+ if (cfg.headless) {
+ console.log('Run `SHOW=1 node prime-gaming` to login in the opened browser.');
+ await context.close(); // finishes potential recording
+ process.exit(1);
+ }
+ return true;
+ }
+ };
+ await handleDirectLoginPage();
// need to wait for some elements to exist before checking if signed in or accepting cookies:
- await Promise.any(['button:has-text("Sign in")', '[data-a-target="user-dropdown-first-name-text"]'].map(s => page.waitForSelector(s)));
- page.click('[aria-label="Cookies usage disclaimer banner"] button:has-text("Accept Cookies")').catch(_ => { }); // to not waste screen space when non-headless, TODO does not work reliably, need to wait for something else first?
- while (await page.locator('button:has-text("Sign in")').count() > 0) {
+ await Promise.any([
+ 'button:has-text("Sign in")',
+ 'button:has-text("Anmelden")',
+ '[data-a-target="user-dropdown-first-name-text"]',
+ '[data-testid="user-dropdown-first-name-text"]',
+ ].map(s => page.waitForSelector(s)));
+ page.click('[aria-label="Cookies usage disclaimer banner"] button:has-text("Accept Cookies")').catch(() => { }); // to not waste screen space when non-headless, TODO does not work reliably, need to wait for something else first?
+ while (await page.locator('button:has-text("Sign in"), button:has-text("Anmelden")').count() > 0) {
console.error('Not signed in anymore.');
await page.click('button:has-text("Sign in")');
if (!cfg.debug) context.setDefaultTimeout(cfg.login_timeout); // give user some extra time to log in
@@ -65,14 +115,7 @@ try {
await context.close(); // finishes potential recording
process.exit(1);
});
- // handle MFA, but don't await it
- page.waitForURL('**/ap/mfa**').then(async () => {
- console.log('Two-Step Verification - enter the One Time Password (OTP), e.g. generated by your Authenticator App');
- await page.check('[name=rememberDevice]');
- const otp = cfg.pg_otpkey && authenticator.generate(cfg.pg_otpkey) || await prompt({ type: 'text', message: 'Enter two-factor sign in code', validate: n => n.toString().length == 6 || 'The code must be 6 digits!' }); // can't use type: 'number' since it strips away leading zeros and codes sometimes have them
- await page.locator('input[name=otpCode]').pressSequentially(otp.toString());
- await page.click('input[type="submit"]');
- }).catch(_ => { });
+ handleMFA(page).catch(() => {});
} else {
console.log('Waiting for you to login in the browser.');
await notify('prime-gaming: no longer signed in and not enough options set for automatic login.');
@@ -85,7 +128,7 @@ try {
await page.waitForURL('https://gaming.amazon.com/home?signedIn=true');
if (!cfg.debug) context.setDefaultTimeout(cfg.timeout);
}
- user = await page.locator('[data-a-target="user-dropdown-first-name-text"]').first().innerText();
+ user = await page.locator('[data-a-target="user-dropdown-first-name-text"], [data-testid="user-dropdown-first-name-text"]').first().innerText();
console.log(`Signed in as ${user}`);
// await page.click('button[aria-label="User dropdown and more options"]');
// const twitch = await page.locator('[data-a-target="TwitchDisplayName"]').first().innerText();
@@ -119,80 +162,290 @@ try {
await page.waitForTimeout(3000);
});
- await page.click('button[data-type="Game"]');
- const games = page.locator('div[data-a-target="offer-list-FGWP_FULL"]');
- await games.waitFor();
- // await scrollUntilStable(() => games.locator('.item-card__action').count()); // number of games
- await scrollUntilStable(() => page.evaluate(() => document.querySelector('.tw-full-width').scrollHeight)); // height may change during loading while number of games is still the same?
- console.log('Number of already claimed games (total):', await games.locator('p:has-text("Collected")').count());
- // can't use .all() since the list of elements via locator will change after click while we iterate over it
- const internal = await games.locator('.item-card__action:has(button[data-a-target="FGWPOffer"])').elementHandles();
- const external = await games.locator('.item-card__action:has(a[data-a-target="FGWPOffer"])').all();
+ const openGamesTab = async () => {
+ const selectors = [
+ 'button[data-type="Game"]', // old layout
+ 'button:has-text("Games")',
+ 'button:has-text("Games einlösen")',
+ '[data-test-selector="category-picker"] button:has-text("Games")',
+ '[data-testid="category-picker"] button:has-text("Games")',
+ ];
+ for (const sel of selectors) {
+ const btn = page.locator(sel).first();
+ if (await btn.count()) {
+ await btn.click();
+ return;
+ }
+ }
+ // New Luna claims home: try the filter/CTA button with embedded
+ const gamesTitle = page.locator('p.offer-filters__button__title:has-text("Games"), p.offer-filters__button__title:has-text("einlösen")');
+ if (await gamesTitle.count()) {
+ const btn = gamesTitle.first().locator('xpath=ancestor::button[1]');
+ if (await btn.count()) {
+ await btn.click();
+ return;
+ }
+ }
+ // New Luna claims home already shows games list
+ };
+
+ await openGamesTab();
+
+ const locateGamesList = async () => {
+ const selectors = [
+ 'div[data-a-target="offer-list-FGWP_FULL"]', // old layout
+ '[data-testid="offer-list"]',
+ '[data-test-selector="offer-list"]',
+ 'section:has(h2:has-text("Games with Prime"))',
+ 'section:has(h2:has-text("Games"))',
+ ];
+ for (const sel of selectors) {
+ const loc = page.locator(sel).first();
+ if (await loc.count()) return loc;
+ }
+ return null;
+ };
+
+ const games = await locateGamesList();
+ // Load all cards (old and new layout) by scrolling the container or the page
+ if (games) await scrollUntilStable(() => games.evaluate(el => el.scrollHeight).catch(() => 0));
+ await scrollUntilStable(() => page.evaluate(() => globalThis.document?.scrollingElement?.scrollHeight ?? 0));
+
+ const normalizeClaimUrl = url => {
+ if (!url) return { url, key: null };
+ const m = url.match(/(https?:\/\/[^/]+)?(\/claims\/[^?#]+)/);
+ if (!m) return { url, key: url };
+ const path = m[2];
+ const slug = path.split('/')[2];
+ return { url: 'https://luna.amazon.com' + path, key: slug || path };
+ };
+
+ const cards = [];
+ // New layout: direct claim buttons on cards (FGWPOffer) with "Spiel aktivieren"/"Claim"
+ const fgwps = page.locator('[data-a-target="FGWPOffer"]');
+ if (await fgwps.count()) {
+ for (const handle of await fgwps.elementHandles()) {
+ const href = await handle.getAttribute('href');
+ const { url, key } = normalizeClaimUrl(href?.startsWith('/') ? href : href || '');
+ const title =
+ await handle.$eval('p[title], span[title]', el => el.getAttribute('title')).catch(() => null) ||
+ await handle.$eval('p, span', el => el.textContent).catch(() => null) ||
+ key ||
+ 'Unknown title';
+ cards.push({ kind: 'external', title, url, key });
+ }
+ }
+
+ const anchorClaims = page.locator('a[href*="/claims/"][href*="amzn1.pg.item"]');
+ if (await anchorClaims.count()) {
+ const hrefs = [...new Set(await anchorClaims.evaluateAll(anchors => anchors.map(a => a.getAttribute('href')).filter(Boolean)))];
+ for (const href of hrefs) {
+ const { url, key } = normalizeClaimUrl(href);
+ const title = key || await anchorClaims.first().innerText() || 'Unknown title';
+ cards.push({ kind: 'external', title, url, key });
+ }
+ }
+
+ if (!cards.length && games) {
+ const cardLocator = games.locator([
+ '[data-testid="offer-card"]',
+ '[data-test-selector="offer-card"]',
+ '.item-card__action',
+ ].join(','));
+ if (await cardLocator.count() === 0) {
+ console.log('No games found in list.');
+ } else {
+ for (const handle of await cardLocator.elementHandles()) {
+ const text = (await handle.textContent() || '').toLowerCase();
+ if (text.includes('collected')) continue; // skip already claimed
+ const title = await (await handle.$('h3, h4, [data-testid="item-card-title"], [data-test-selector="item-card-title"], .item-card-details__body__primary'))?.innerText() || 'Unknown title';
+ const linkEl = await handle.$('a[href]');
+ let url = linkEl && await linkEl.getAttribute('href');
+ if (url?.startsWith('/')) url = 'https://luna.amazon.com' + url;
+ const { url: normUrl, key } = normalizeClaimUrl(url);
+ const hasLinkClaim = await handle.$('a:has-text("Claim"), a:has-text("Get"), a:has-text("Details")');
+ const hasButtonClaim = await handle.$('button:has-text("Claim"), button:has-text("Get"), button:has-text("Get game"), button:has-text("Play")');
+ const hasGermanCTA = await handle.$(':is(button,p,a):has-text("Spiel aktivieren"), :is(button,p,a):has-text("Spiel holen")');
+ if (hasLinkClaim || hasGermanCTA) cards.push({ kind: 'external', title, url: normUrl, key });
+ else if (hasButtonClaim) cards.push({ kind: 'internal', title, url: normUrl, key, handle });
+ }
+ }
+ }
+
+ // dedup by URL to avoid duplicates from multiple selectors
+ const seenUrl = new Set();
+ const uniq = cards.filter(c => {
+ const key = c.key || c.url || c.title;
+ if (seenUrl.has(key)) return false;
+ seenUrl.add(key);
+ return true;
+ });
+
+ const internal = uniq.filter(c => c.kind == 'internal');
+ const external = uniq.filter(c => c.kind == 'external');
// bottom to top: oldest to newest games
internal.reverse();
external.reverse();
- const sameOrNewPage = async url => new Promise(async (resolve, _reject) => {
+ const sameOrNewPage = async url => {
const isNew = page.url() != url;
let p = page;
if (isNew) {
p = await context.newPage();
await p.goto(url, { waitUntil: 'domcontentloaded' });
}
- resolve([p, isNew]);
- });
+ return [p, isNew];
+ };
const skipBasedOnTime = async url => {
// console.log(' Checking time left for game:', url);
const [p, isNew] = await sameOrNewPage(url);
- const dueDateOrg = await p.locator('.availability-date .tw-bold').innerText();
+ const dueDateLoc = p.locator('.availability-date .tw-bold, [data-testid="availability-end-date"], [data-test-selector="availability-end-date"]');
+ if (!await dueDateLoc.count()) {
+ if (isNew) await p.close();
+ return false;
+ }
+ const dueDateOrg = await dueDateLoc.first().innerText();
const dueDate = new Date(Date.parse(dueDateOrg + ' 17:00'));
- const daysLeft = (dueDate.getTime() - Date.now())/1000/60/60/24;
- console.log(' ', await p.locator('.availability-date').innerText(), '->', daysLeft.toFixed(2));
+ const daysLeft = (dueDate.getTime() - Date.now()) / 1000 / 60 / 60 / 24;
+ const availabilityText = await p.locator('.availability-date, [data-testid="availability-end-date"], [data-test-selector="availability-end-date"]').first().innerText().catch(() => dueDateOrg);
+ console.log(' ', availabilityText, '->', daysLeft.toFixed(2));
if (isNew) await p.close();
return daysLeft > cfg.pg_timeLeft;
- }
+ };
console.log('\nNumber of free unclaimed games (Prime Gaming):', internal.length);
// claim games in internal store
for (const card of internal) {
- await card.scrollIntoViewIfNeeded();
- const title = await (await card.$('.item-card-details__body__primary')).innerText();
- const slug = await (await card.$('a')).getAttribute('href');
- const url = 'https://gaming.amazon.com' + slug.split('?')[0];
+ await card.handle.scrollIntoViewIfNeeded();
+ const title = card.title;
+ const url = card.url;
console.log('Current free game:', chalk.blue(title));
- if (cfg.pg_timeLeft && await skipBasedOnTime(url)) continue;
+ if (cfg.pg_timeLeft && url && await skipBasedOnTime(url)) continue;
if (cfg.dryrun) continue;
if (cfg.interactive && !await confirm()) continue;
- await (await card.$('.tw-button:has-text("Claim")')).click();
+ await card.handle.locator('.tw-button:has-text("Claim"), .tw-button:has-text("Get"), button:has-text("Claim"), button:has-text("Get")').first().click();
db.data[user][title] ||= { title, time: datetime(), url, store: 'internal' };
notify_games.push({ title, status: 'claimed', url });
- // const img = await (await card.$('img.tw-image')).getAttribute('src');
- // console.log('Image:', img);
- await card.screenshot({ path: screenshot('internal', `${filenamify(title)}.png`) });
+ await card.handle.screenshot({ path: screenshot('internal', `${filenamify(title)}.png`) });
}
console.log('\nNumber of free unclaimed games (external stores):', external.length);
// claim games in external/linked stores. Linked: origin.com, epicgames.com; Redeem-key: gog.com, legacygames.com, microsoft
const external_info = [];
for (const card of external) { // need to get data incl. URLs in this loop and then navigate in another, otherwise .all() would update after coming back and .elementHandles() like above would lead to error due to page navigation: elementHandle.$: Protocol error (Page.adoptNode)
- const title = await card.locator('.item-card-details__body__primary').innerText();
- const slug = await card.locator('a:has-text("Claim")').first().getAttribute('href');
- const url = 'https://gaming.amazon.com' + slug.split('?')[0];
- // await (await card.$('text=Claim')).click(); // goes to URL of game, no need to wait
+ const title = card.title;
+ const url = card.url ? card.url.split('?')[0] : undefined;
+ if (!url) continue;
external_info.push({ title, url });
}
// external_info = [ { title: 'Fallout 76 (XBOX)', url: 'https://gaming.amazon.com/fallout-76-xbox-fgwp/dp/amzn1.pg.item.9fe17d7b-b6c2-4f58-b494-cc4e79528d0b?ingress=amzn&ref_=SM_Fallout76XBOX_S01_FGWP_CRWN' } ];
+
+ const clickCTA = async p => {
+ const candidates = [
+ p.locator('button[data-a-target="buy-box_call-to-action"]').first(),
+ p.locator('[data-a-target="buy-box_call-to-action"]').first(),
+ p.locator('[data-a-target="buy-box"] .tw-button:has-text("Get game")').first(),
+ p.locator('[data-a-target="buy-box"] .tw-button:has-text("Claim")').first(),
+ p.locator('.tw-button:has-text("Complete Claim")').first(),
+ p.locator('[data-a-target="buy-box_call-to-action-text"]').first().locator('xpath=ancestor::button[1]'),
+ p.locator('.tw-button:has-text("Spiel holen"), .tw-button:has-text("Spiel aktivieren")').first(),
+ p.locator('p:has-text("Spiel holen"), p:has-text("Spiel aktivieren")').first().locator('xpath=ancestor::button[1]'),
+ ];
+ for (const c of candidates) {
+ if (await c.count()) {
+ try {
+ await c.waitFor({ state: 'visible', timeout: 5000 });
+ if (!await c.isEnabled()) {
+ await c.evaluate(el => {
+ el.disabled = false;
+ el.removeAttribute('disabled');
+ el.click();
+ });
+ } else {
+ await c.click();
+ }
+ return true;
+ } catch {
+ // try next candidate
+ }
+ }
+ }
+ return false;
+ };
+
for (const { title, url } of external_info) {
console.log('Current free game:', chalk.blue(title)); // , url);
+ const existing = db.data[user]?.[title];
+ if (existing && existing.status && !existing.status.startsWith('failed')) {
+ console.log(` Already recorded as ${existing.status}, skipping.`);
+ notify_games.push({ title, url, status: 'existed' });
+ continue;
+ }
await page.goto(url, { waitUntil: 'domcontentloaded' });
+ await page.waitForSelector('[data-a-target="buy-box"]', { timeout: 10000 }).catch(() => {});
if (cfg.debug) await page.pause();
- const item_text = await page.innerText('[data-a-target="DescriptionItemDetails"]');
- const store = item_text.toLowerCase().replace(/.* on /, '').slice(0, -1);
+ let store = 'unknown';
+ const detailLoc = page.locator('[data-a-target="DescriptionItemDetails"], [data-testid="DescriptionItemDetails"]');
+ if (await detailLoc.count()) {
+ const item_text = await detailLoc.first().innerText();
+ store = item_text.toLowerCase().replace(/.* on /, '').slice(0, -1);
+ } else if (url.includes('/claims/')) {
+ const slug = url.split('/claims/')[1]?.split('/')[0] || '';
+ if (slug.includes('gog')) store = 'gog.com';
+ else if (slug.includes('epic')) store = 'epic-games';
+ else if (slug.includes('origin')) store = 'origin';
+ else if (slug.includes('xbox') || slug.includes('microsoft')) store = 'microsoft store';
+ else if (slug.includes('legacy')) store = 'legacy games';
+ const lunaPlay = await page.locator('[data-a-target="LunaOffer"], button[data-a-target="LunaOffer"], button:has-text("Spielen")').count();
+ if (store == 'unknown' && lunaPlay) store = 'luna';
+ }
console.log(' External store:', store);
+ const notify_game = { title, url };
+ notify_games.push(notify_game); // status is updated below
+ // Already collected? skip
+ const collectedLoc = page.locator('[data-a-target="ClaimStateQuantityAndDateContent"], [data-a-target="ClaimStateClaimCodeContent"]:has-text("Collected"), [data-a-target="ClaimStateVendorContent"], [data-a-target="ClaimStateViewDetailsAndInstructions"]');
+ const collectedText = page.getByText(/You collected this on/i);
+ const collectedEpic = page.getByText(/Sent to your Epic Games Store library/i);
+ const collectedBanner = page.locator('p.tw-c-text-alert-success:has-text("Collected"), p.tw-c-text-alert-success:has-text("Collected this")');
+ const collectedSuccessIcon = page.locator('[data-a-target="ItemCardDetailSuccessStatus"], .claim-state__success-icon');
+ const disabledCTA = page.locator('[data-a-target="buy-box_call-to-action"][disabled], button[disabled]:has-text("Get game")');
+ const collectedAny = await Promise.all([
+ collectedLoc.count(),
+ collectedBanner.count(),
+ collectedText.count(),
+ collectedEpic.count(),
+ collectedSuccessIcon.count(),
+ disabledCTA.count(),
+ ]).then(([a, b, c, d, e, f]) => a + b + c + d + e + f > 0);
+ if (collectedAny) {
+ console.log(' Already collected, skipping.');
+ notify_game.status = 'existed';
+ db.data[user][title] ||= { title, time: datetime(), url, store, status: 'existed' };
+ continue;
+ }
+ // Disabled CTA (e.g., needs linking or not available)
+ if (await disabledCTA.count()) {
+ if (store !== 'epic-games') {
+ console.log(' CTA is disabled, skipping (likely needs linking/not available).');
+ notify_game.status = 'disabled';
+ db.data[user][title] ||= { title, time: datetime(), url, store, status: 'disabled' };
+ continue;
+ } else {
+ console.log(' CTA disabled for epic-games, will still try to link/claim.');
+ }
+ }
+ if (store == 'luna') {
+ console.log(' Luna cloud title detected, skipping code redemption.');
+ notify_game.status = 'luna (play)';
+ db.data[user][title] ||= { title, time: datetime(), url, store: 'luna', status: 'luna (play)' };
+ continue;
+ }
if (cfg.pg_timeLeft && await skipBasedOnTime(url)) continue;
if (cfg.dryrun) continue;
if (cfg.interactive && !await confirm()) continue;
- await Promise.any([page.click('[data-a-target="buy-box"] .tw-button:has-text("Get game")'), page.click('[data-a-target="buy-box"] .tw-button:has-text("Claim")'), page.click('.tw-button:has-text("Complete Claim")'), page.waitForSelector('div:has-text("Link game account")'), page.waitForSelector('.thank-you-title:has-text("Success")')]); // waits for navigation
+ await clickCTA(page);
+ await Promise.any([
+ page.waitForSelector('.thank-you-title:has-text("Success")', { timeout: cfg.timeout }).catch(() => {}),
+ page.waitForSelector('div:has-text("Link game account")', { timeout: cfg.timeout }).catch(() => {}),
+ ]).catch(() => {});
db.data[user][title] ||= { title, time: datetime(), url, store };
- const notify_game = { title, url };
- notify_games.push(notify_game); // status is updated below
if (await page.locator('div:has-text("Link game account")').count() // TODO still needed? epic games store just has 'Link account' as the button text now.
|| await page.locator('div:has-text("Link account")').count()) {
console.error(' Account linking is required to claim this offer!');
@@ -214,7 +467,21 @@ try {
'legacy games': 'https://www.legacygames.com/primedeal',
};
if (store in redeem) { // did not work for linked origin: && !await page.locator('div:has-text("Successfully Claimed")').count()
- const code = await Promise.any([page.inputValue('input[type="text"]'), page.textContent('[data-a-target="ClaimStateClaimCodeContent"]').then(s => s.replace('Your code: ', ''))]); // input: Legacy Games; text: gog.com
+ let code;
+ try {
+ // ensure CTA was clicked in case code is behind it
+ await clickCTA(page).catch(() => {});
+ code = await Promise.any([
+ page.inputValue('input[type="text"]'),
+ page.textContent('[data-a-target="ClaimStateClaimCodeContent"]').then(s => s.replace('Your code: ', '')),
+ ]);
+ } catch {
+ console.error(' Could not find claim code on page (timeout). Please check manually.');
+ db.data[user][title].status = 'claimed (code not found)';
+ notify_game.status = 'claimed (code not found)';
+ await page.screenshot({ path: screenshot('external', `${filenamify(title)}_nocode.png`), fullPage: true }).catch(() => {});
+ continue;
+ }
console.log(' Code to redeem game:', chalk.blue(code));
if (store == 'legacy games') { // may be different URL like https://legacygames.com/primeday/puzzleoftheyear/
redeem[store] = await (await page.$('li:has-text("Click here") a')).getAttribute('href'); // full text: Click here to enter your redemption code.
@@ -300,7 +567,7 @@ try {
if (j?.events?.cart.length && j.events.cart[0]?.data?.reason == 'UserAlreadyOwnsContent') {
redeem_action = 'already redeemed';
console.error(' error: UserAlreadyOwnsContent');
- } else if (true) { // TODO what's returned on success?
+ } else { // TODO what's returned on success?
redeem_action = 'redeemed';
db.data[user][title].status = 'claimed and redeemed?';
console.log(' Redeemed successfully? Please report if not in https://github.com/vogler/free-games-claimer/issues/5');
@@ -347,11 +614,10 @@ try {
// await page.pause();
}
await page.goto(URL_CLAIM, { waitUntil: 'domcontentloaded' });
- await page.click('button[data-type="Game"]');
+ page.click('button[data-type="Game"]').catch(() => {});
- if (notify_games.length) { // make screenshot of all games if something was claimed
+ if (notify_games.length && games) { // make screenshot of all games if something was claimed and list exists
const p = screenshot(`${filenamify(datetime())}.png`);
- // await page.screenshot({ path: p, fullPage: true }); // fullPage does not make a difference since scroll not on body but on some element
await scrollUntilStable(() => games.locator('.item-card__action').count());
const viewportSize = page.viewportSize(); // current viewport size
await page.setViewportSize({ ...viewportSize, height: 3000 }); // increase height, otherwise element screenshot is cut off at the top and bottom
@@ -366,7 +632,7 @@ try {
await loot.waitFor();
process.stdout.write('Loading all DLCs on page...');
- await scrollUntilStable(() => loot.locator('[data-a-target="item-card"]').count())
+ await scrollUntilStable(() => loot.locator('[data-a-target="item-card"]').count());
console.log('\nNumber of already claimed DLC:', await loot.locator('p:has-text("Collected")').count());
@@ -395,7 +661,7 @@ try {
// most games have a button 'Get in-game content'
// epic-games: Fall Guys: Claim -> Continue -> Go to Epic Games (despite account linked and logged into epic-games) -> not tied to account but via some cookie?
await Promise.any([page.click('.tw-button:has-text("Get in-game content")'), page.click('.tw-button:has-text("Claim your gift")'), page.click('.tw-button:has-text("Claim")').then(() => page.click('button:has-text("Continue")'))]);
- page.click('button:has-text("Continue")').catch(_ => { });
+ page.click('button:has-text("Continue")').catch(() => { });
const linkAccountButton = page.locator('[data-a-target="LinkAccountButton"]');
let unlinked_store;
if (await linkAccountButton.count()) {
@@ -412,7 +678,7 @@ try {
dlc_unlinked[unlinked_store] ??= [];
dlc_unlinked[unlinked_store].push(title);
} else {
- const code = await page.inputValue('input[type="text"]').catch(_ => undefined);
+ const code = await page.inputValue('input[type="text"]').catch(() => undefined);
console.log(' Code to redeem game:', chalk.blue(code));
db.data[user][title].code = code;
db.data[user][title].status = 'claimed';
diff --git a/src/util.js b/src/util.js
index 308952d..8ba63a3 100644
--- a/src/util.js
+++ b/src/util.js
@@ -96,21 +96,21 @@ const timeoutPlugin = timeout => enquirer => { // cancel prompt after timeout ms
prompt.hint = () => 'timeout';
prompt.cancel();
}, timeout);
- prompt.on('submit', _ => clearTimeout(t));
- prompt.on('cancel', _ => clearTimeout(t));
+ prompt.on('submit', () => clearTimeout(t));
+ prompt.on('cancel', () => clearTimeout(t));
});
};
enquirer.use(timeoutPlugin(cfg.login_timeout)); // TODO may not want to have this timeout for all prompts; better extend Prompt and add a timeout prompt option
// single prompt that just returns the non-empty value instead of an object
// @ts-ignore
-export const prompt = o => enquirer.prompt({ name: 'name', type: 'input', message: 'Enter value', ...o }).then(r => r.name).catch(_ => {});
+export const prompt = o => enquirer.prompt({ name: 'name', type: 'input', message: 'Enter value', ...o }).then(r => r.name).catch(() => {});
export const confirm = o => prompt({ type: 'confirm', message: 'Continue?', ...o });
// notifications via apprise CLI
import { execFile } from 'child_process';
import { cfg } from './config.js';
-export const notify = html => new Promise((resolve, reject) => {
+export const notify = html => new Promise(resolve => {
if (!cfg.notify) {
if (cfg.debug) console.debug('notify: NOTIFY is not set!');
return resolve();
@@ -125,7 +125,8 @@ export const notify = html => new Promise((resolve, reject) => {
if (error.message.includes('command not found')) {
console.info('Run `pip install apprise`. See https://github.com/vogler/free-games-claimer#notifications');
}
- return reject(error);
+ // don't fail the whole run on notification errors
+ return resolve();
}
if (stderr) console.error(`stderr: ${stderr}`);
if (stdout) console.log(`stdout: ${stdout}`);
diff --git a/src/version.js b/src/version.js
index bfcd12a..cd054d8 100644
--- a/src/version.js
+++ b/src/version.js
@@ -1,15 +1,15 @@
// check if running the latest version
import { log } from 'console';
-import { exec } from 'child_process';
+import { execFile } from 'child_process';
-const execp = cmd => new Promise((resolve, reject) => {
- exec(cmd, (error, stdout, stderr) => {
+const runGit = (...args) => new Promise((resolve, reject) => {
+ execFile('git', args, { cwd: process.cwd() }, (error, stdout, stderr) => {
if (stderr) console.error(`stderr: ${stderr}`);
// if (stdout) console.log(`stdout: ${stdout}`);
if (error) {
console.log(`error: ${error.message}`);
- if (error.message.includes('command not found')) {
+ if (error.code === 'ENOENT' || error.message.includes('command not found')) {
console.info('Install git to check for updates!');
}
return reject(error);
@@ -29,8 +29,8 @@ if (process.env.NOVNC_PORT) {
date = process.env.NOW;
} else {
log('Not running inside Docker.');
- sha = await execp('git rev-parse HEAD');
- date = await execp('git show -s --format=%cD'); // same as format as `date -R` (RFC2822)
+ sha = await runGit('rev-parse', 'HEAD');
+ date = await runGit('show', '-s', '--format=%cD'); // same as format as `date -R` (RFC2822)
// date = await execp('git show -s --format=%ch'); // %ch is same as --date=human (short/relative)
}
diff --git a/steam-games.js b/steam-games.js
index 9b307fc..ed54253 100644
--- a/steam-games.js
+++ b/steam-games.js
@@ -12,8 +12,8 @@ import { FingerprintInjector } from 'fingerprint-injector';
import { FingerprintGenerator } from 'fingerprint-generator';
const { fingerprint, headers } = new FingerprintGenerator().getFingerprint({
- devices: ["desktop"],
- operatingSystems: ["windows"],
+ devices: ['desktop'],
+ operatingSystems: ['windows'],
});
const context = await firefox.launchPersistentContext(cfg.dir.browser, {
@@ -22,11 +22,11 @@ const context = await firefox.launchPersistentContext(cfg.dir.browser, {
locale: 'en-US', // ignore OS locale to be sure to have english text for locators -> done via /en in URL
userAgent: fingerprint.navigator.userAgent,
viewport: {
- width: fingerprint.screen.width,
- height: fingerprint.screen.height,
+ width: fingerprint.screen.width,
+ height: fingerprint.screen.height,
},
extraHTTPHeaders: {
- 'accept-language': headers['accept-language'],
+ 'accept-language': headers['accept-language'],
},
});
// await stealth(context);
diff --git a/test/sigint-enquirer-raw-keeps-running.js b/test/sigint-enquirer-raw-keeps-running.js
index 23d9983..ccb3081 100644
--- a/test/sigint-enquirer-raw-keeps-running.js
+++ b/test/sigint-enquirer-raw-keeps-running.js
@@ -12,10 +12,10 @@ function onRawSIGINT(fn) {
}
});
}
-console.log(1)
+console.log(1);
onRawSIGINT(() => {
console.log('raw'); process.exit(1);
});
-console.log(2)
+console.log(2);
// onRawSIGINT workaround for enquirer keeps the process from exiting here...
diff --git a/test/sigint-enquirer-raw.js b/test/sigint-enquirer-raw.js
index e6b538d..c85ee0d 100644
--- a/test/sigint-enquirer-raw.js
+++ b/test/sigint-enquirer-raw.js
@@ -7,19 +7,19 @@ import { prompt, handleSIGINT } from '../src/util.js';
// });
handleSIGINT();
-function onRawSIGINT(fn) {
- const { stdin, stdout } = process;
- stdin.setRawMode(true);
- stdin.resume();
- stdin.on('data', data => {
- const key = data.toString('utf-8');
- if (key === '\u0003') { // ctrl + c
- fn();
- } else {
- stdout.write(key);
- }
- });
-}
+// function onRawSIGINT(fn) {
+// const { stdin, stdout } = process;
+// stdin.setRawMode(true);
+// stdin.resume();
+// stdin.on('data', data => {
+// const key = data.toString('utf-8');
+// if (key === '\u0003') { // ctrl + c
+// fn();
+// } else {
+// stdout.write(key);
+// }
+// });
+// }
// onRawSIGINT(() => {
// console.log('raw'); process.exit(1);
// });
-