nocci/free-games-claimer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat: use novnc, fix Thank you for buying timeout

Browse source
This commit is contained in:
Trung Le 2022-04-09 14:50:42 +07:00
parent 9416f37698
commit 7971be297c
3 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Dockerfile
View file

@ -13,7 +13,9 @@ ENV DISPLAY :60
ENV VNC_ENABLED true ENV VNC_ENABLED true
ENV VNC_PASSWORD secret ENV VNC_PASSWORD secret
ENV VNC_PORT 5900 ENV VNC_PORT 5900
ENV NOVNC_PORT 6080
EXPOSE 5900 EXPOSE 5900
EXPOSE 6080
# Playwright # Playwright
ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD true ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD true
@ -44,6 +46,7 @@ RUN apt-get update \
x11vnc \ x11vnc \
curl \ curl \
tini \ tini \
novnc websockify \
&& apt-get clean \ && apt-get clean \
&& rm -rf \ && rm -rf \
/tmp/* \ /tmp/* \

5
docker/vnc-start.sh
View file

@ -2,7 +2,10 @@
# Start VNC in a background process: # Start VNC in a background process:
x11vnc -display "$DISPLAY" -forever -shared -rfbport "${VNC_PORT:-5900}" \ x11vnc -display "$DISPLAY" -forever -shared -rfbport "${VNC_PORT:-5900}" \
-passwd "${VNC_PASSWORD:-secret}" & -passwd "${VNC_PASSWORD:-secret}" -bg
NOVNC_HOME=/usr/share/novnc
ln -s $NOVNC_HOME/vnc_auto.html $NOVNC_HOME/index.html
websockify -D --web "$NOVNC_HOME" "$NOVNC_PORT" "localhost:$VNC_PORT" &
# Execute the given command: # Execute the given command:
exec "$@" exec "$@"

7
epic-games.js
View file

@ -6,7 +6,7 @@ const debug = process.env.PWDEBUG == '1'; // runs non-headless and opens https:/
const URL_CLAIM = 'https://store.epicgames.com/en-US/free-games'; const URL_CLAIM = 'https://store.epicgames.com/en-US/free-games';
const URL_LOGIN = 'https://www.epicgames.com/id/login?lang=en-US&noHostRedirect=true&redirectUrl=' + URL_CLAIM; const URL_LOGIN = 'https://www.epicgames.com/id/login?lang=en-US&noHostRedirect=true&redirectUrl=' + URL_CLAIM;
const TIMEOUT = 20 * 1000; // 20s, default is 30s const TIMEOUT = 20 * 1000; // 20s, default is 30s
const SCREEN_WIDTH = Number(process.env.SCREEN_WIDTH) || 1280; const SCREEN_WIDTH = Number(process.env.SCREEN_WIDTH) - 80 || 1280;
const SCREEN_HEIGHT = Number(process.env.SCREEN_HEIGHT) || 1280; const SCREEN_HEIGHT = Number(process.env.SCREEN_HEIGHT) || 1280;
// https://playwright.dev/docs/auth#multi-factor-authentication // https://playwright.dev/docs/auth#multi-factor-authentication
@ -86,10 +86,7 @@ for (let i = 1; i <= n; i++) {
// I Agree button is only shown for EU accounts! https://github.com/vogler/free-games-claimer/pull/7#issuecomment-1038964872 // I Agree button is only shown for EU accounts! https://github.com/vogler/free-games-claimer/pull/7#issuecomment-1038964872
const btnAgree = iframe.locator('button:has-text("I Agree")'); const btnAgree = iframe.locator('button:has-text("I Agree")');
try { try {
await Promise.any([btnAgree.waitFor(), page.waitForSelector('text=Thank you for buying')]); // EU: wait for agree button, non-EU: potentially done await Promise.any([btnAgree.waitFor().then(() => btnAgree.click()), page.waitForSelector('text=Thank you for buying')]); // EU: wait for agree button, non-EU: potentially done
// await clickIfExists('button:has-text("I Agree")', iframe); // default arg: FrameLocator is incompatible with Page and even Locator...
if (await btnAgree.count() > 0)
await btnAgree.click();
// TODO check for hcaptcha - the following is even true when no captcha is shown... // TODO check for hcaptcha - the following is even true when no captcha is shown...
// if (await iframe.frameLocator('#talon_frame_checkout_free_prod').locator('text=Please complete a security check to continue').count() > 0) { // if (await iframe.frameLocator('#talon_frame_checkout_free_prod').locator('text=Please complete a security check to continue').count() > 0) {
// console.error('Encountered hcaptcha. Giving up :('); // console.error('Encountered hcaptcha. Giving up :(');